From 9c406f6a19a29a200136c2ba668ae272d80e7b3f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 26 Oct 2008 10:49:02 +0000 Subject: [PATCH] -Hans patch is merged upstream --- vlc-0.9.3-libv4l2.patch | 634 ---------------------------------------- 1 file changed, 634 deletions(-) delete mode 100644 vlc-0.9.3-libv4l2.patch diff --git a/vlc-0.9.3-libv4l2.patch b/vlc-0.9.3-libv4l2.patch deleted file mode 100644 index c44e188..0000000 --- a/vlc-0.9.3-libv4l2.patch +++ /dev/null @@ -1,634 +0,0 @@ -diff -up vlc-0.9.3/configure.ac.libv4l2 vlc-0.9.3/configure.ac ---- vlc-0.9.3/configure.ac.libv4l2 2008-09-25 20:23:10.000000000 +0200 -+++ vlc-0.9.3/configure.ac 2008-09-27 19:43:30.000000000 +0200 -@@ -2421,6 +2421,7 @@ then - AC_DEFINE(HAVE_ALSA, 1, Define if ALSA is present.) - fi - -+ VLC_ADD_LDFLAGS([v4l2],[-lv4l2]) - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" - AC_CHECK_HEADERS(linux/videodev2.h, [ - VLC_ADD_PLUGIN([v4l2]) -diff -up vlc-0.9.3/configure.libv4l2 vlc-0.9.3/configure ---- vlc-0.9.3/configure.libv4l2 2008-09-29 15:00:35.000000000 +0200 -+++ vlc-0.9.3/configure 2008-09-29 15:00:51.000000000 +0200 -@@ -45416,6 +45416,12 @@ _ACEOF - - fi - -+ -+ for element in v4l2; do -+ eval "LDFLAGS_${element}="'"'"-lv4l2 "'$'"{LDFLAGS_${element}} "'"' -+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" -+ done -+ - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" - - for ac_header in linux/videodev2.h - -diff -up vlc-0.9.3/modules/access/v4l2/v4l2.c.libv4l2 vlc-0.9.3/modules/access/v4l2/v4l2.c ---- vlc-0.9.3/modules/access/v4l2/v4l2.c.libv4l2 2008-09-18 23:03:35.000000000 +0200 -+++ vlc-0.9.3/modules/access/v4l2/v4l2.c 2008-09-27 19:45:58.000000000 +0200 -@@ -67,6 +67,8 @@ - - #include - -+#include -+ - /***************************************************************************** - * Module descriptior - *****************************************************************************/ -@@ -1108,11 +1110,11 @@ static void DemuxClose( vlc_object_t *p_ - buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - buf.memory = ( p_sys->io == IO_METHOD_USERPTR ) ? - V4L2_MEMORY_USERPTR : V4L2_MEMORY_MMAP; -- ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ); /* ignore result */ -+ v4l2_ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ); /* ignore result */ - } - - buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE; -- if( ioctl( p_sys->i_fd_video, VIDIOC_STREAMOFF, &buf_type ) < 0 ) { -+ if( v4l2_ioctl( p_sys->i_fd_video, VIDIOC_STREAMOFF, &buf_type ) < 0 ) { - msg_Err( p_this, "VIDIOC_STREAMOFF failed" ); - } - -@@ -1131,7 +1133,7 @@ static void DemuxClose( vlc_object_t *p_ - case IO_METHOD_MMAP: - for( i = 0; i < p_sys->i_nbuffers; ++i ) - { -- if( munmap( p_sys->p_buffers[i].start, p_sys->p_buffers[i].length ) ) -+ if( v4l2_munmap( p_sys->p_buffers[i].start, p_sys->p_buffers[i].length ) ) - { - msg_Err( p_this, "munmap failed" ); - } -@@ -1155,7 +1157,7 @@ static void CommonClose( vlc_object_t *p - { - (void)p_this; - /* Close */ -- if( p_sys->i_fd_video >= 0 ) close( p_sys->i_fd_video ); -+ if( p_sys->i_fd_video >= 0 ) v4l2_close( p_sys->i_fd_video ); - #ifdef HAVE_ALSA - if( p_sys->p_alsa_pcm ) - { -@@ -1350,7 +1352,7 @@ static ssize_t AccessRead( access_t * p_ - return -1; - } - -- i_ret = read( p_sys->i_fd_video, p_buffer, i_len ); -+ i_ret = v4l2_read( p_sys->i_fd_video, p_buffer, i_len ); - if( i_ret == 0 ) - { - p_access->info.b_eof = true; -@@ -1419,7 +1421,7 @@ static block_t* GrabVideo( demux_t *p_de - switch( p_sys->io ) - { - case IO_METHOD_READ: -- i_ret = read( p_sys->i_fd_video, p_sys->p_buffers[0].start, p_sys->p_buffers[0].length ); -+ i_ret = v4l2_read( p_sys->i_fd_video, p_sys->p_buffers[0].start, p_sys->p_buffers[0].length ); - if( i_ret == -1 ) - { - switch( errno ) -@@ -1446,7 +1448,7 @@ static block_t* GrabVideo( demux_t *p_de - buf.memory = V4L2_MEMORY_MMAP; - - /* Wait for next frame */ -- if (ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ) < 0 ) -+ if (v4l2_ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ) < 0 ) - { - switch( errno ) - { -@@ -1470,7 +1472,7 @@ static block_t* GrabVideo( demux_t *p_de - if( !p_block ) return 0; - - /* Unlock */ -- if( ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 ) -+ if( v4l2_ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 ) - { - msg_Err (p_demux, "Failed to unlock (VIDIOC_QBUF)"); - return 0; -@@ -1484,7 +1486,7 @@ static block_t* GrabVideo( demux_t *p_de - buf.memory = V4L2_MEMORY_USERPTR; - - /* Wait for next frame */ -- if (ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ) < 0 ) -+ if (v4l2_ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ) < 0 ) - { - switch( errno ) - { -@@ -1517,7 +1519,7 @@ static block_t* GrabVideo( demux_t *p_de - if( !p_block ) return 0; - - /* Unlock */ -- if( ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 ) -+ if( v4l2_ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 ) - { - msg_Err (p_demux, "Failed to unlock (VIDIOC_QBUF)"); - return 0; -@@ -1705,7 +1707,7 @@ static int InitMmap( demux_t *p_demux, i - req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - req.memory = V4L2_MEMORY_MMAP; - -- if( ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 ) - { - msg_Err( p_demux, "device does not support mmap i/o" ); - goto open_failed; -@@ -1733,7 +1735,7 @@ static int InitMmap( demux_t *p_demux, i - buf.memory = V4L2_MEMORY_MMAP; - buf.index = p_sys->i_nbuffers; - -- if( ioctl( i_fd, VIDIOC_QUERYBUF, &buf ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYBUF, &buf ) < 0 ) - { - msg_Err( p_demux, "VIDIOC_QUERYBUF" ); - goto open_failed; -@@ -1741,7 +1743,7 @@ static int InitMmap( demux_t *p_demux, i - - p_sys->p_buffers[p_sys->i_nbuffers].length = buf.length; - p_sys->p_buffers[p_sys->i_nbuffers].start = -- mmap( NULL, buf.length, PROT_READ | PROT_WRITE, MAP_SHARED, i_fd, buf.m.offset ); -+ v4l2_mmap( NULL, buf.length, PROT_READ | PROT_WRITE, MAP_SHARED, i_fd, buf.m.offset ); - - if( p_sys->p_buffers[p_sys->i_nbuffers].start == MAP_FAILED ) - { -@@ -1774,7 +1776,7 @@ static int InitUserP( demux_t *p_demux, - req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - req.memory = V4L2_MEMORY_USERPTR; - -- if( ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 ) - { - msg_Err( p_demux, "device does not support user pointer i/o" ); - return VLC_EGENERIC; -@@ -1830,6 +1832,7 @@ static int OpenVideoDev( vlc_object_t *p - enum v4l2_buf_type buf_type; - char *psz_device = p_sys->psz_vdev; - es_format_t es_fmt; -+ int libv4l2_fd; - - if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 ) - { -@@ -1837,6 +1840,16 @@ static int OpenVideoDev( vlc_object_t *p - goto open_failed; - } - -+ /* Note the v4l2_xxx functions are designed so that if they get passed an -+ unknown fd, the will behave exactly as their regular xxx counterparts, -+ so if v4l2_fd_open fails, we continue as normal (missing the libv4l2 -+ custom cam format to normal formats conversion). Chances are big we will -+ still fail then though, as normally v4l2_fd_open only fails if the -+ device is not a v4l2 device. */ -+ libv4l2_fd = v4l2_fd_open(i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION); -+ if (libv4l2_fd != -1) -+ i_fd = libv4l2_fd; -+ - /* Tune the tuner */ - if( p_sys->i_frequency >= 0 ) - { -@@ -1850,7 +1863,7 @@ static int OpenVideoDev( vlc_object_t *p - frequency.tuner = p_sys->i_cur_tuner; - frequency.type = p_sys->p_tuners[p_sys->i_cur_tuner].type; - frequency.frequency = p_sys->i_frequency / 62.5; -- if( ioctl( i_fd, VIDIOC_S_FREQUENCY, &frequency ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_S_FREQUENCY, &frequency ) < 0 ) - { - msg_Err( p_obj, "cannot set tuner frequency (%m)" ); - goto open_failed; -@@ -1870,7 +1883,7 @@ static int OpenVideoDev( vlc_object_t *p - memset( &tuner, 0, sizeof( tuner ) ); - tuner.index = p_sys->i_cur_tuner; - tuner.audmode = p_sys->i_audio_mode; -- if( ioctl( i_fd, VIDIOC_S_TUNER, &tuner ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_S_TUNER, &tuner ) < 0 ) - { - msg_Err( p_obj, "cannot set tuner audio mode (%m)" ); - goto open_failed; -@@ -1882,7 +1895,7 @@ static int OpenVideoDev( vlc_object_t *p - - if( p_sys->i_selected_standard_id != V4L2_STD_UNKNOWN ) - { -- if( ioctl( i_fd, VIDIOC_S_STD, &p_sys->i_selected_standard_id ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_S_STD, &p_sys->i_selected_standard_id ) < 0 ) - { - msg_Err( p_obj, "cannot set standard (%m)" ); - goto open_failed; -@@ -1898,7 +1911,7 @@ static int OpenVideoDev( vlc_object_t *p - p_sys->i_selected_input = 0; - } - -- if( ioctl( i_fd, VIDIOC_S_INPUT, &p_sys->i_selected_input ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_S_INPUT, &p_sys->i_selected_input ) < 0 ) - { - msg_Err( p_obj, "cannot set input (%m)" ); - goto open_failed; -@@ -1915,7 +1928,7 @@ static int OpenVideoDev( vlc_object_t *p - p_sys->i_selected_audio_input = 0; - } - -- if( ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_selected_audio_input] ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_selected_audio_input] ) < 0 ) - { - msg_Err( p_obj, "cannot set audio input (%m)" ); - goto open_failed; -@@ -1964,11 +1977,11 @@ static int OpenVideoDev( vlc_object_t *p - /* Reset Cropping */ - memset( &cropcap, 0, sizeof(cropcap) ); - cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; -- if( ioctl( i_fd, VIDIOC_CROPCAP, &cropcap ) >= 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_CROPCAP, &cropcap ) >= 0 ) - { - crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - crop.c = cropcap.defrect; /* reset to default */ -- if( ioctl( i_fd, VIDIOC_S_CROP, &crop ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_S_CROP, &crop ) < 0 ) - { - switch( errno ) - { -@@ -1988,7 +2001,7 @@ static int OpenVideoDev( vlc_object_t *p - - if( p_sys->i_width <= 0 || p_sys->i_height <= 0 ) - { -- if( ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 ) - { - msg_Err( p_demux, "Cannot get default width and height." ); - goto open_failed; -@@ -2031,7 +2044,7 @@ static int OpenVideoDev( vlc_object_t *p - } - } - /* Try and set user chroma */ -- if( !IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) || ( fmt.fmt.pix.pixelformat && ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 ) ) -+ if( !IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) || ( fmt.fmt.pix.pixelformat && v4l2_ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 ) ) - { - msg_Warn( p_demux, "Driver is unable to use specified chroma %s. Trying defaults.", p_sys->psz_requested_chroma ); - fmt.fmt.pix.pixelformat = 0; -@@ -2047,7 +2060,7 @@ static int OpenVideoDev( vlc_object_t *p - { - fmt.fmt.pix.pixelformat = p_chroma_fallbacks[i]; - if( IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) -- && ioctl( i_fd, VIDIOC_S_FMT, &fmt ) >= 0 ) -+ && v4l2_ioctl( i_fd, VIDIOC_S_FMT, &fmt ) >= 0 ) - break; - } - if( i == ARRAY_SIZE( p_chroma_fallbacks ) ) -@@ -2092,7 +2105,7 @@ static int OpenVideoDev( vlc_object_t *p - frmival.pixel_format = fmt.fmt.pix.pixelformat; - frmival.width = p_sys->i_width; - frmival.height = p_sys->i_height; -- if( ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 ) - { - char psz_fourcc[5]; - memset( &psz_fourcc, 0, sizeof( psz_fourcc ) ); -@@ -2108,7 +2121,7 @@ static int OpenVideoDev( vlc_object_t *p - frmival.discrete.numerator, - frmival.discrete.denominator ); - frmival.index++; -- } while( ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 ); -+ } while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 ); - break; - case V4L2_FRMIVAL_TYPE_STEPWISE: - msg_Dbg( p_demux, " supported frame intervals: %d/%d to " -@@ -2175,7 +2188,7 @@ static int OpenVideoDev( vlc_object_t *p - buf.memory = V4L2_MEMORY_MMAP; - buf.index = i; - -- if( ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 ) - { - msg_Err( p_demux, "VIDIOC_QBUF failed" ); - goto open_failed; -@@ -2183,7 +2196,7 @@ static int OpenVideoDev( vlc_object_t *p - } - - buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE; -- if( ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 ) - { - msg_Err( p_demux, "VIDIOC_STREAMON failed" ); - goto open_failed; -@@ -2203,7 +2216,7 @@ static int OpenVideoDev( vlc_object_t *p - buf.m.userptr = (unsigned long)p_sys->p_buffers[i].start; - buf.length = p_sys->p_buffers[i].length; - -- if( ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 ) - { - msg_Err( p_demux, "VIDIOC_QBUF failed" ); - goto open_failed; -@@ -2211,7 +2224,7 @@ static int OpenVideoDev( vlc_object_t *p - } - - buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE; -- if( ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 ) - { - msg_Err( p_demux, "VIDIOC_STREAMON failed" ); - goto open_failed; -@@ -2229,7 +2242,7 @@ static int OpenVideoDev( vlc_object_t *p - return i_fd; - - open_failed: -- if( i_fd >= 0 ) close( i_fd ); -+ if( i_fd >= 0 ) v4l2_close( i_fd ); - return -1; - - } -@@ -2548,6 +2561,7 @@ static bool ProbeVideoDev( vlc_object_t - int i_standard; - - int i_fd; -+ int libv4l2_fd; - - if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 ) - { -@@ -2555,9 +2569,19 @@ static bool ProbeVideoDev( vlc_object_t - goto open_failed; - } - -+ /* Note the v4l2_xxx functions are designed so that if they get passed an -+ unknown fd, the will behave exactly as their regular xxx counterparts, -+ so if v4l2_fd_open fails, we continue as normal (missing the libv4l2 -+ custom cam format to normal formats conversion). Chances are big we will -+ still fail then though, as normally v4l2_fd_open only fails if the -+ device is not a v4l2 device. */ -+ libv4l2_fd = v4l2_fd_open(i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION); -+ if (libv4l2_fd != -1) -+ i_fd = libv4l2_fd; -+ - /* Get device capabilites */ - -- if( ioctl( i_fd, VIDIOC_QUERYCAP, &p_sys->dev_cap ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCAP, &p_sys->dev_cap ) < 0 ) - { - msg_Err( p_obj, "cannot get video capabilities (%m)" ); - goto open_failed; -@@ -2593,7 +2617,7 @@ static bool ProbeVideoDev( vlc_object_t - { - struct v4l2_input t_input; - t_input.index = 0; -- while( ioctl( i_fd, VIDIOC_ENUMINPUT, &t_input ) >= 0 ) -+ while( v4l2_ioctl( i_fd, VIDIOC_ENUMINPUT, &t_input ) >= 0 ) - { - p_sys->i_input++; - t_input.index = p_sys->i_input; -@@ -2606,7 +2630,7 @@ static bool ProbeVideoDev( vlc_object_t - { - p_sys->p_inputs[i_index].index = i_index; - -- if( ioctl( i_fd, VIDIOC_ENUMINPUT, &p_sys->p_inputs[i_index] ) ) -+ if( v4l2_ioctl( i_fd, VIDIOC_ENUMINPUT, &p_sys->p_inputs[i_index] ) ) - { - msg_Err( p_obj, "cannot get video input characteristics (%m)" ); - goto open_failed; -@@ -2627,7 +2651,7 @@ static bool ProbeVideoDev( vlc_object_t - { - struct v4l2_standard t_standards; - t_standards.index = 0; -- while( ioctl( i_fd, VIDIOC_ENUMSTD, &t_standards ) >=0 ) -+ while( v4l2_ioctl( i_fd, VIDIOC_ENUMSTD, &t_standards ) >=0 ) - { - p_sys->i_standard++; - t_standards.index = p_sys->i_standard; -@@ -2640,7 +2664,7 @@ static bool ProbeVideoDev( vlc_object_t - { - p_sys->p_standards[i_standard].index = i_standard; - -- if( ioctl( i_fd, VIDIOC_ENUMSTD, &p_sys->p_standards[i_standard] ) ) -+ if( v4l2_ioctl( i_fd, VIDIOC_ENUMSTD, &p_sys->p_standards[i_standard] ) ) - { - msg_Err( p_obj, "cannot get video input standards (%m)" ); - goto open_failed; -@@ -2662,9 +2686,9 @@ static bool ProbeVideoDev( vlc_object_t - if( p_sys->dev_cap.capabilities & V4L2_CAP_AUDIO ) - { - while( p_sys->i_audio < 32 && -- ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_audio] ) >= 0 ) -+ v4l2_ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_audio] ) >= 0 ) - { -- if( ioctl( i_fd, VIDIOC_G_AUDIO, &p_sys->p_audios[ p_sys->i_audio] ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_G_AUDIO, &p_sys->p_audios[ p_sys->i_audio] ) < 0 ) - { - msg_Err( p_obj, "cannot get audio input characteristics (%m)" ); - goto open_failed; -@@ -2690,7 +2714,7 @@ static bool ProbeVideoDev( vlc_object_t - { - struct v4l2_tuner tuner; - memset( &tuner, 0, sizeof(tuner) ); -- while( ioctl( i_fd, VIDIOC_G_TUNER, &tuner ) >= 0 ) -+ while( v4l2_ioctl( i_fd, VIDIOC_G_TUNER, &tuner ) >= 0 ) - { - p_sys->i_tuner++; - memset( &tuner, 0, sizeof(tuner) ); -@@ -2704,7 +2728,7 @@ static bool ProbeVideoDev( vlc_object_t - { - p_sys->p_tuners[i_index].index = i_index; - -- if( ioctl( i_fd, VIDIOC_G_TUNER, &p_sys->p_tuners[i_index] ) ) -+ if( v4l2_ioctl( i_fd, VIDIOC_G_TUNER, &p_sys->p_tuners[i_index] ) ) - { - msg_Err( p_obj, "cannot get tuner characteristics (%m)" ); - goto open_failed; -@@ -2727,7 +2751,7 @@ static bool ProbeVideoDev( vlc_object_t - - struct v4l2_frequency frequency; - memset( &frequency, 0, sizeof( frequency ) ); -- if( ioctl( i_fd, VIDIOC_G_FREQUENCY, &frequency ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_G_FREQUENCY, &frequency ) < 0 ) - { - msg_Err( p_obj, "cannot get tuner frequency (%m)" ); - goto open_failed; -@@ -2752,7 +2776,7 @@ static bool ProbeVideoDev( vlc_object_t - codec.index = i_index; - codec.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - -- while( ioctl( i_fd, VIDIOC_ENUM_FMT, &codec ) >= 0 ) -+ while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FMT, &codec ) >= 0 ) - { - i_index++; - codec.index = i_index; -@@ -2767,7 +2791,7 @@ static bool ProbeVideoDev( vlc_object_t - p_sys->p_codecs[i_index].index = i_index; - p_sys->p_codecs[i_index].type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - -- if( ioctl( i_fd, VIDIOC_ENUM_FMT, &p_sys->p_codecs[i_index] ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_ENUM_FMT, &p_sys->p_codecs[i_index] ) < 0 ) - { - msg_Err( p_obj, "cannot get codec description (%m)" ); - goto open_failed; -@@ -2800,7 +2824,7 @@ static bool ProbeVideoDev( vlc_object_t - struct v4l2_frmsizeenum frmsize; - frmsize.index = 0; - frmsize.pixel_format = p_sys->p_codecs[i_index].pixelformat; -- if( ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) < 0 ) - { - /* Not all devices support this ioctl */ - msg_Warn( p_obj, "Unable to query for frame sizes" ); -@@ -2816,7 +2840,7 @@ static bool ProbeVideoDev( vlc_object_t - " device supports size %dx%d", - frmsize.discrete.width, frmsize.discrete.height ); - frmsize.index++; -- } while( ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) >= 0 ); -+ } while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) >= 0 ); - break; - case V4L2_FRMSIZE_TYPE_STEPWISE: - msg_Dbg( p_obj, -@@ -2848,12 +2872,12 @@ static bool ProbeVideoDev( vlc_object_t - } - - -- if( i_fd >= 0 ) close( i_fd ); -+ if( i_fd >= 0 ) v4l2_close( i_fd ); - return true; - - open_failed: - -- if( i_fd >= 0 ) close( i_fd ); -+ if( i_fd >= 0 ) v4l2_close( i_fd ); - return false; - - } -@@ -3019,7 +3043,7 @@ static void ControlListPrint( vlc_object - { - querymenu.index = i_mid; - querymenu.id = queryctrl.id; -- if( ioctl( i_fd, VIDIOC_QUERYMENU, &querymenu ) >= 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYMENU, &querymenu ) >= 0 ) - { - msg_Dbg( p_obj, " %d: %s", - querymenu.index, querymenu.name ); -@@ -3056,7 +3080,7 @@ static void ControlListPrint( vlc_object - queryctrl.default_value ); - memset( &control, 0, sizeof( control ) ); - control.id = queryctrl.id; -- if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 ) - { - msg_Dbg( p_obj, " current value: %d", control.value ); - } -@@ -3153,13 +3177,13 @@ static int ControlList( vlc_object_t *p_ - var_AddCallback( p_obj, "controls-reset", AccessControlResetCallback, NULL ); - - queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL; -- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) - { - msg_Dbg( p_obj, "Extended control API supported by v4l2 driver" ); - - /* List extended controls */ - queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL; -- while( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) -+ while( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) - { - if( queryctrl.type == V4L2_CTRL_TYPE_CTRL_CLASS ) - { -@@ -3197,7 +3221,7 @@ static int ControlList( vlc_object_t *p_ - i_cid ++ ) - { - queryctrl.id = i_cid; -- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) - { - if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) - continue; -@@ -3213,7 +3237,7 @@ static int ControlList( vlc_object_t *p_ - i_cid ++ ) - { - queryctrl.id = i_cid; -- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) - { - if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) - continue; -@@ -3312,11 +3336,11 @@ static int ControlReset( vlc_object_t *p - memset( &queryctrl, 0, sizeof( queryctrl ) ); - - queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL; -- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) - { - /* Extended control API supported */ - queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL; -- while( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) -+ while( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) - { - if( queryctrl.type == V4L2_CTRL_TYPE_CTRL_CLASS - || V4L2_CTRL_ID2CLASS( queryctrl.id ) == V4L2_CTRL_CLASS_MPEG ) -@@ -3327,7 +3351,7 @@ static int ControlReset( vlc_object_t *p - struct v4l2_control control; - memset( &control, 0, sizeof( control ) ); - control.id = queryctrl.id; -- if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 -+ if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 - && queryctrl.default_value != control.value ) - { - int i; -@@ -3350,14 +3374,14 @@ static int ControlReset( vlc_object_t *p - i_cid ++ ) - { - queryctrl.id = i_cid; -- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) - { - struct v4l2_control control; - if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) - continue; - memset( &control, 0, sizeof( control ) ); - control.id = queryctrl.id; -- if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 -+ if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 - && queryctrl.default_value != control.value ) - { - int i; -@@ -3377,14 +3401,14 @@ static int ControlReset( vlc_object_t *p - i_cid ++ ) - { - queryctrl.id = i_cid; -- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) - { - struct v4l2_control control; - if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) - continue; - memset( &control, 0, sizeof( control ) ); - control.id = queryctrl.id; -- if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 -+ if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 - && queryctrl.default_value != control.value ) - { - name2var( queryctrl.name ); -@@ -3417,7 +3441,7 @@ static int Control( vlc_object_t *p_obj, - - queryctrl.id = i_cid; - -- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) < 0 -+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) < 0 - || queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) - { - msg_Dbg( p_obj, "%s (%x) control is not supported.", psz_name, i_cid ); -@@ -3438,20 +3462,20 @@ static int Control( vlc_object_t *p_obj, - if( i_value >= 0 ) - { - ext_control.value = i_value; -- if( ioctl( i_fd, VIDIOC_S_EXT_CTRLS, &ext_controls ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_S_EXT_CTRLS, &ext_controls ) < 0 ) - { - control.value = i_value; -- if( ioctl( i_fd, VIDIOC_S_CTRL, &control ) < 0 ) -+ if( v4l2_ioctl( i_fd, VIDIOC_S_CTRL, &control ) < 0 ) - { - msg_Err( p_obj, "unable to set %s (%x) to %d (%m)", - psz_name, i_cid, i_value ); - return VLC_EGENERIC; - } -- i_ret = ioctl( i_fd, VIDIOC_G_CTRL, &control ); -+ i_ret = v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ); - } - else - { -- i_ret = ioctl( i_fd, VIDIOC_G_EXT_CTRLS, &ext_controls ); -+ i_ret = v4l2_ioctl( i_fd, VIDIOC_G_EXT_CTRLS, &ext_controls ); - control.value = ext_control.value; - } - }