From fe4f01b1d8cce9762e47aaf42b6e17a3427a144b Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 20 Mar 2018 19:10:46 +0000
Subject: [PATCH] Fixed uses of WebCam for OpenCV 3.x
---
src/demo.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index 0dce144..59672f8 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -39,6 +39,7 @@
static image det_s;
static image disp = {0};
static CvCapture * cap;
+static int use_webcam = 0;
static float fps = 0;
static float demo_thresh = 0;
@@ -50,7 +51,7 @@
void draw_detections_cv(IplImage* show_img, int num, float thresh, box *boxes, float **probs, char **names, image **alphabet, int classes);
void show_image_cv_ipl(IplImage *disp, const char *name);
-image get_image_from_stream_resize(CvCapture *cap, int w, int h, IplImage** in_img);
+image get_image_from_stream_resize(CvCapture *cap, int w, int h, IplImage** in_img, int use_webcam);
IplImage* in_img;
IplImage* det_img;
IplImage* show_img;
@@ -60,7 +61,7 @@
void *fetch_in_thread(void *ptr)
{
//in = get_image_from_stream(cap);
- in = get_image_from_stream_resize(cap, net.w, net.h, &in_img);
+ in = get_image_from_stream_resize(cap, net.w, net.h, &in_img, use_webcam);
if(!in.data){
//error("Stream closed.");
flag_exit = 1;
@@ -143,7 +144,13 @@
printf("video file: %s\n", filename);
cap = cvCaptureFromFile(filename);
}else{
+ printf("Webcam index: %d\n", cam_index);
+#ifdef CV_VERSION_EPOCH // OpenCV 2.x
cap = cvCaptureFromCAM(cam_index);
+#else // OpenCV 3.x
+ use_webcam = 1;
+ cap = get_capture_webcam(cam_index);
+#endif
}
if(!cap) error("Couldn't connect to webcam.\n");
@@ -233,7 +240,7 @@
}
// if you run it with param -http_port 8090 then open URL in your web-browser: http://localhost:8090
- if (http_stream_port > 0) {
+ if (http_stream_port > 0 && show_img) {
//int port = 8090;
int port = http_stream_port;
int timeout = 200;
@@ -242,10 +249,11 @@
}
// save video file
- if (output_video_writer) {
+ if (output_video_writer && show_img) {
cvWriteFrame(output_video_writer, show_img);
printf("\n cvWriteFrame \n");
}
+
cvReleaseImage(&show_img);
pthread_join(fetch_thread, 0);
--
Gitblit v1.10.0