generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for #3554

Browse Source 
v4l2_scan_controls_enumerate_menu is unused and causes ioctl error on
RaspberryPi and possibly other Video4Linux variants. See
http://www.raspberrypi.org/forum/viewtopic.php?f=43&t=65026 for more
detail.
This commit is contained in:
Dave Hughes 2014-03-05 02:44:40 +00:00
parent ba4513503e
commit b184d7f27b
2 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/highgui/src/cap_libv4l.cpp
View File

@ -321,7 +321,6 @@ typedef struct CvCaptureCAM_V4L
struct v4l2_control control;
enum v4l2_buf_type type;
struct v4l2_queryctrl queryctrl;
struct v4l2_querymenu querymenu;
/* V4L2 control variables */
v4l2_ctrl_range** v4l2_ctrl_ranges;
@ -491,25 +490,6 @@ static int try_init_v4l2(CvCaptureCAM_V4L* capture, char *deviceName)
}
static void v4l2_scan_controls_enumerate_menu(CvCaptureCAM_V4L* capture)
{
// printf (" Menu items:\n");
CLEAR (capture->querymenu);
capture->querymenu.id = capture->queryctrl.id;
for (capture->querymenu.index = capture->queryctrl.minimum;
(int)capture->querymenu.index <= capture->queryctrl.maximum;
capture->querymenu.index++)
{
if (0 == xioctl (capture->deviceHandle, VIDIOC_QUERYMENU,
&capture->querymenu))
{
//printf (" %s\n", capture->querymenu.name);
} else {
perror ("VIDIOC_QUERYMENU");
}
}
}
static void v4l2_free_ranges(CvCaptureCAM_V4L* capture) {
int i;
if (capture->v4l2_ctrl_ranges != NULL) {
@ -590,9 +570,6 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) {
if(capture->queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) {
continue;
}
if (capture->queryctrl.type == V4L2_CTRL_TYPE_MENU) {
v4l2_scan_controls_enumerate_menu(capture);
}
if(capture->queryctrl.type != V4L2_CTRL_TYPE_INTEGER &&
capture->queryctrl.type != V4L2_CTRL_TYPE_BOOLEAN &&
capture->queryctrl.type != V4L2_CTRL_TYPE_MENU) {
@ -613,9 +590,6 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) {
if(capture->queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) {
continue;
}
if (capture->queryctrl.type == V4L2_CTRL_TYPE_MENU) {
v4l2_scan_controls_enumerate_menu(capture);
}
if(capture->queryctrl.type != V4L2_CTRL_TYPE_INTEGER &&
capture->queryctrl.type != V4L2_CTRL_TYPE_BOOLEAN &&
capture->queryctrl.type != V4L2_CTRL_TYPE_MENU) {
@ -637,9 +611,6 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) {
continue;
}
if (capture->queryctrl.type == V4L2_CTRL_TYPE_MENU) {
v4l2_scan_controls_enumerate_menu(capture);
}
if(capture->queryctrl.type != V4L2_CTRL_TYPE_INTEGER &&
capture->queryctrl.type != V4L2_CTRL_TYPE_BOOLEAN &&

24
modules/highgui/src/cap_v4l.cpp
View File

@ -325,7 +325,6 @@ typedef struct CvCaptureCAM_V4L
struct v4l2_control control;
enum v4l2_buf_type type;
struct v4l2_queryctrl queryctrl;
struct v4l2_querymenu querymenu;
struct timeval timestamp;
@ -641,24 +640,6 @@ static int autosetup_capture_mode_v4l(CvCaptureCAM_V4L* capture)
#ifdef HAVE_CAMV4L2
static void v4l2_scan_controls_enumerate_menu(CvCaptureCAM_V4L* capture)
{
// printf (" Menu items:\n");
CLEAR (capture->querymenu);
capture->querymenu.id = capture->queryctrl.id;
for (capture->querymenu.index = capture->queryctrl.minimum;
(int)capture->querymenu.index <= capture->queryctrl.maximum;
capture->querymenu.index++)
{
if (0 == ioctl (capture->deviceHandle, VIDIOC_QUERYMENU,
&capture->querymenu))
{
// printf (" %s\n", capture->querymenu.name);
} else {
perror ("VIDIOC_QUERYMENU");
}
}
}
static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
{
@ -723,8 +704,6 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
capture->v4l2_exposure_max = capture->queryctrl.maximum;
}
if (capture->queryctrl.type == V4L2_CTRL_TYPE_MENU)
v4l2_scan_controls_enumerate_menu(capture);
} else {
@ -793,9 +772,6 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
capture->v4l2_exposure_max = capture->queryctrl.maximum;
}
if (capture->queryctrl.type == V4L2_CTRL_TYPE_MENU)
v4l2_scan_controls_enumerate_menu(capture);
} else {
if (errno == EINVAL)