From 22796c5a496a89e47dfafa68342e090d576c4866 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Sun, 10 Jun 2018 10:58:37 +0000
Subject: [PATCH] Minor fix
---
src/image.c | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/image.c b/src/image.c
index 9084e7e..625e7df 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1011,6 +1011,26 @@
return im;
}
+int wait_for_stream(CvCapture *cap, IplImage* src, int dont_close) {
+ if (!src) {
+ if (dont_close) src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, 3);
+ else return 0;
+ }
+ if (src->width < 1 || src->height < 1 || src->nChannels < 1) {
+ if (dont_close) {
+ cvReleaseImage(&src);
+ int z = 0;
+ for (z = 0; z < 20; ++z) {
+ get_webcam_frame(cap);
+ cvReleaseImage(&src);
+ }
+ src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, 3);
+ }
+ else return 0;
+ }
+ return 1;
+}
+
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;
@@ -1029,22 +1049,8 @@
}
else src = cvQueryFrame(cap);
- 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);
- int z = 0;
- for (z = 0; z < 10; ++z) {
- get_webcam_frame(cap);
- cvReleaseImage(&src);
- }
- }
- if (dont_close) src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, c);
- else return make_empty_image(0, 0, 0);
- }
+ if (cpp_video_capture)
+ if(!wait_for_stream(cap, src, dont_close)) 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