Merge pull request #17770 from jasonKercher:3.4_triggered

3.4 Allow first capture to return false

* fix first capture timeout

* fix first capture timeout
pull/18084/head
jasonKercher 5 years ago committed by GitHub
parent 1c0b70bbd2
commit 749bd80091
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      modules/videoio/src/cap_v4l.cpp

@ -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)

Loading…
Cancel
Save