From 5d8e3526edb9c7df26a4430b5b294b221bab3cb2 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Sun, 03 Jun 2018 12:21:48 +0000
Subject: [PATCH] Fix for unreliable IP-cameras
---
src/image.c | 13 ++++++++++---
src/demo.c | 5 +++--
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index 72f9c03..0a6a4cb 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -51,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 draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float thresh, char **names, image **alphabet, int classes, int ext_output);
void show_image_cv_ipl(IplImage *disp, const char *name);
-image get_image_from_stream_resize(CvCapture *cap, int w, int h, int c, IplImage** in_img, int cpp_video_capture);
+image get_image_from_stream_resize(CvCapture *cap, int w, int h, int c, IplImage** in_img, int cpp_video_capture, int dont_close);
IplImage* in_img;
IplImage* det_img;
IplImage* show_img;
@@ -61,7 +61,8 @@
void *fetch_in_thread(void *ptr)
{
//in = get_image_from_stream(cap);
- in_s = get_image_from_stream_resize(cap, net.w, net.h, net.c, &in_img, cpp_video_capture);
+ int dont_close_stream = 0; // set 1 if your IP-camera periodically turns off and turns on video-stream
+ in_s = get_image_from_stream_resize(cap, net.w, net.h, net.c, &in_img, cpp_video_capture, dont_close_stream);
if(!in_s.data){
//error("Stream closed.");
printf("Stream closed.\n");
diff --git a/src/image.c b/src/image.c
index 3ffd552..35e8551 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1011,7 +1011,7 @@
return im;
}
-image get_image_from_stream_resize(CvCapture *cap, int w, int h, int c, IplImage** in_img, int cpp_video_capture)
+image get_image_from_stream_resize(CvCapture *cap, int w, int h, int c, IplImage** in_img, int cpp_video_capture, int dont_close)
{
c = c ? c : 3;
IplImage* src;
@@ -1029,8 +1029,15 @@
}
else src = cvQueryFrame(cap);
- if (!src) return make_empty_image(0, 0, 0);
- if (src->width < 1 || src->height < 1 || src->nChannels < 1) return make_empty_image(0, 0, 0);
+ if (!src) {
+ if (dont_close) src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, c);
+ else return make_empty_image(0, 0, 0);
+ }
+ if (src->width < 1 || src->height < 1 || src->nChannels < 1) {
+ if (cpp_video_capture) cvReleaseImage(&src);
+ if (dont_close) src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, c);
+ else return make_empty_image(0, 0, 0);
+ }
IplImage* new_img = cvCreateImage(cvSize(w, h), IPL_DEPTH_8U, c);
*in_img = cvCreateImage(cvSize(src->width, src->height), IPL_DEPTH_8U, c);
cvResize(src, *in_img, CV_INTER_LINEAR);
--
Gitblit v1.10.0