mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-20 19:17:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cap_v4l: Fix private control enumeration end condition

Browse Source 
Currently the private control enumeration will be stopped when QUERYCTRL
returns -EINVAL only. It is possible however that other errors occur.

One particular case is when the v4l2 device doesn't support any controls
and doesn't implement the QUERYCTRL ioctl. In that case the v4l2
framework returns -ENOTTY. In that case the current control enumeration
will go in an endless loop.

To fix this change the control enumeration stop condition. If any errors
occur, end the control enumeration.

Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
This commit is contained in:
Todor Tomov 2018-09-04 11:33:08 +03:00
parent 0f0a82b619
commit 9988e1b6ee
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -512,9 +512,11 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
for (ctrl_id = V4L2_CID_PRIVATE_BASE;;ctrl_id++)
{
errno = 0;
v4l2_control_range(capture, ctrl_id);
if (errno == EINVAL)
if (errno)
break;
}