From 2302dbed5763a7b98a204fbe5e3c9d2202b0feae Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Mon, 26 Mar 2018 22:55:33 +0000
Subject: [PATCH] Merge pull request #505 from judwhite/patch-2
---
src/demo.c | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index 0dce144..e0a6ed3 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,11 +61,12 @@
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.");
+ printf("Stream closed.\n");
flag_exit = 1;
- return;
+ return EXIT_FAILURE;
}
//in_s = resize_image(in, net.w, net.h);
in_s = make_image(in.w, in.h, in.c);
@@ -143,7 +145,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");
@@ -159,6 +167,8 @@
probs = (float **)calloc(l.w*l.h*l.n, sizeof(float *));
for(j = 0; j < l.w*l.h*l.n; ++j) probs[j] = (float *)calloc(l.classes, sizeof(float *));
+ flag_exit = 0;
+
pthread_t fetch_thread;
pthread_t detect_thread;
@@ -191,7 +201,7 @@
}
CvVideoWriter* output_video_writer = NULL; // cv::VideoWriter output_video;
- if (out_filename)
+ if (out_filename && !flag_exit)
{
CvSize size;
size.width = det_img->width, size.height = det_img->height;
@@ -205,7 +215,6 @@
//output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('X', 'V', 'I', 'D'), 25, size, 1);
//output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('W', 'M', 'V', '2'), 25, size, 1);
}
- flag_exit = 0;
double before = get_wall_time();
@@ -233,7 +242,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 +251,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