mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17770 from jasonKercher:3.4_triggered

Browse Source 
3.4 Allow first capture to return false

* fix first capture timeout

* fix first capture timeout
This commit is contained in:
jasonKercher 2020-07-13 08:29:54 -04:00 committed by GitHub
parent 1c0b70bbd2
commit 749bd80091
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/videoio/src/cap_v4l.cpp
View File

@ -1033,15 +1033,16 @@ bool CvCaptureCAM_V4L::grabFrame()
return false;
}
// No need to skip this if the first read returns false
/* preparation is ok */
FirstCapture = false;
#if defined(V4L_ABORT_BADJPEG)
// skip first frame. it is often bad -- this is unnotied in traditional apps,
// but could be fatal if bad jpeg is enabled
if (!read_frame_v4l2())
return false;
#endif
/* preparation is ok */
FirstCapture = false;
}
// In the case that the grab frame was without retrieveFrame
if (bufferIndex >= 0)