Ticket #1804: vlc-0.9.3-libv4l2.patch

vlc-0.9.3/configure.ac

@@ -2421 +2421 @@
-    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])

vlc-0.9.3/modules/access/v4l2/v4l2.c

@@ -67 +67 @@
-
-#include <poll.h>
-
+#include <libv4l2.h>
+
-/*****************************************************************************
- * Module descriptior
- *****************************************************************************/
@@ -1108 +1110 @@
-                buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                buf.memory = ( p_sys->io == IO_METHOD_USERPTR ) ?
-                    V4L2_MEMORY_USERPTR : V4L2_MEMORY_MMAP;
-
+v4l2_
-            }
-
-            buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
+v4l2_
-                msg_Err( p_this, "VIDIOC_STREAMOFF failed" );
-            }
-
@@ -1131 +1133 @@
-        case IO_METHOD_MMAP:
-            for( i = 0; i < p_sys->i_nbuffers; ++i )
-            {
-
+v4l2_
-                {
-                    msg_Err( p_this, "munmap failed" );
-                }
@@ -1155 +1157 @@
-{
-    (void)p_this;
-    /* Close */
-
+v4l2_
-#ifdef HAVE_ALSA
-    if( p_sys->p_alsa_pcm )
-    {
@@ -1350 +1352 @@
-        return -1;
-    }
-
-
+v4l2_
-    if( i_ret == 0 )
-    {
-        p_access->info.b_eof = true;
@@ -1419 +1421 @@
-    switch( p_sys->io )
-    {
-    case IO_METHOD_READ:
-
+v4l2_
-        if( i_ret == -1 )
-        {
-            switch( errno )
@@ -1446 +1448 @@
-        buf.memory = V4L2_MEMORY_MMAP;
-
-        /* Wait for next frame */
-
+v4l2_
-        {
-            switch( errno )
-            {
@@ -1470 +1472 @@
-        if( !p_block ) return 0;
-
-        /* Unlock */
-
+v4l2_
-        {
-            msg_Err (p_demux, "Failed to unlock (VIDIOC_QBUF)");
-            return 0;
@@ -1484 +1486 @@
-        buf.memory = V4L2_MEMORY_USERPTR;
-
-        /* Wait for next frame */
-
+v4l2_
-        {
-            switch( errno )
-            {
@@ -1517 +1519 @@
-        if( !p_block ) return 0;
-
-        /* Unlock */
-
+v4l2_
-        {
-            msg_Err (p_demux, "Failed to unlock (VIDIOC_QBUF)");
-            return 0;
@@ -1705 +1707 @@
-    req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-    req.memory = V4L2_MEMORY_MMAP;
-
-
+v4l2_
-    {
-        msg_Err( p_demux, "device does not support mmap i/o" );
-        goto open_failed;
@@ -1733 +1735 @@
-        buf.memory = V4L2_MEMORY_MMAP;
-        buf.index = p_sys->i_nbuffers;
-
-
+v4l2_
-        {
-            msg_Err( p_demux, "VIDIOC_QUERYBUF" );
-            goto open_failed;
@@ -1741 +1743 @@
-
-        p_sys->p_buffers[p_sys->i_nbuffers].length = buf.length;
-        p_sys->p_buffers[p_sys->i_nbuffers].start =
-
+v4l2_
-
-        if( p_sys->p_buffers[p_sys->i_nbuffers].start == MAP_FAILED )
-        {
@@ -1774 +1776 @@
-    req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-    req.memory = V4L2_MEMORY_USERPTR;
-
-
+v4l2_
-    {
-        msg_Err( p_demux, "device does not support user pointer i/o" );
-        return VLC_EGENERIC;
@@ -1830 +1832 @@
-    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 +1840 @@
-        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 +1863 @@
-        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;
-
+v4l2_
-        {
-            msg_Err( p_obj, "cannot set tuner frequency (%m)" );
-            goto open_failed;
@@ -1870 +1883 @@
-        memset( &tuner, 0, sizeof( tuner ) );
-        tuner.index = p_sys->i_cur_tuner;
-        tuner.audmode = p_sys->i_audio_mode;
-
+v4l2_
-        {
-            msg_Err( p_obj, "cannot set tuner audio mode (%m)" );
-            goto open_failed;
@@ -1882 +1895 @@
-
-    if( p_sys->i_selected_standard_id != V4L2_STD_UNKNOWN )
-    {
-
+v4l2_
-        {
-            msg_Err( p_obj, "cannot set standard (%m)" );
-            goto open_failed;
@@ -1898 +1911 @@
-        p_sys->i_selected_input = 0;
-    }
-
-
+v4l2_
-    {
-        msg_Err( p_obj, "cannot set input (%m)" );
-        goto open_failed;
@@ -1915 +1928 @@
-            p_sys->i_selected_audio_input = 0;
-        }
-
-
+v4l2_
-        {
-            msg_Err( p_obj, "cannot set audio input (%m)" );
-            goto open_failed;
@@ -1964 +1977 @@
-    /* Reset Cropping */
-    memset( &cropcap, 0, sizeof(cropcap) );
-    cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
+v4l2_
-    {
-        crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        crop.c = cropcap.defrect; /* reset to default */
-
+v4l2_
-        {
-            switch( errno )
-            {
@@ -1988 +2001 @@
-
-    if( p_sys->i_width <= 0 || p_sys->i_height <= 0 )
-    {
-
+v4l2_
-        {
-            msg_Err( p_demux, "Cannot get default width and height." );
-            goto open_failed;
@@ -2031 +2044 @@
-            }
-        }
-        /* Try and set user chroma */
-
+v4l2_
-        {
-            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 +2060 @@
-        {
-            fmt.fmt.pix.pixelformat = p_chroma_fallbacks[i];
-            if( IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat )
-
+v4l2_
-                break;
-        }
-        if( i == ARRAY_SIZE( p_chroma_fallbacks ) )
@@ -2092 +2105 @@
-    frmival.pixel_format = fmt.fmt.pix.pixelformat;
-    frmival.width = p_sys->i_width;
-    frmival.height = p_sys->i_height;
-
+v4l2_
-    {
-        char psz_fourcc[5];
-        memset( &psz_fourcc, 0, sizeof( psz_fourcc ) );
@@ -2108 +2121 @@
-                             frmival.discrete.numerator,
-                             frmival.discrete.denominator );
-                    frmival.index++;
-
+v4l2_
-                break;
-            case V4L2_FRMIVAL_TYPE_STEPWISE:
-                msg_Dbg( p_demux, "    supported frame intervals: %d/%d to "
@@ -2175 +2188 @@
-            buf.memory = V4L2_MEMORY_MMAP;
-            buf.index = i;
-
-
+v4l2_
-            {
-                msg_Err( p_demux, "VIDIOC_QBUF failed" );
-                goto open_failed;
@@ -2183 +2196 @@
-        }
-
-        buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
+v4l2_
-        {
-            msg_Err( p_demux, "VIDIOC_STREAMON failed" );
-            goto open_failed;
@@ -2203 +2216 @@
-            buf.m.userptr = (unsigned long)p_sys->p_buffers[i].start;
-            buf.length = p_sys->p_buffers[i].length;
-
-
+v4l2_
-            {
-                msg_Err( p_demux, "VIDIOC_QBUF failed" );
-                goto open_failed;
@@ -2211 +2224 @@
-        }
-
-        buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
+v4l2_
-        {
-            msg_Err( p_demux, "VIDIOC_STREAMON failed" );
-            goto open_failed;
@@ -2229 +2242 @@
-    return i_fd;
-
-open_failed:
-
+v4l2_
-    return -1;
-
-}
@@ -2548 +2561 @@
-    int i_standard;
-
-    int i_fd;
+    int libv4l2_fd;
-
-    if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
-    {
@@ -2555 +2569 @@
-        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 */
-
-
+v4l2_
-    {
-        msg_Err( p_obj, "cannot get video capabilities (%m)" );
-        goto open_failed;
@@ -2593 +2617 @@
-    {
-        struct v4l2_input t_input;
-        t_input.index = 0;
-
+v4l2_
-        {
-            p_sys->i_input++;
-            t_input.index = p_sys->i_input;
@@ -2606 +2630 @@
-        {
-            p_sys->p_inputs[i_index].index = i_index;
-
-
+v4l2_
-            {
-                msg_Err( p_obj, "cannot get video input characteristics (%m)" );
-                goto open_failed;
@@ -2627 +2651 @@
-    {
-        struct v4l2_standard t_standards;
-        t_standards.index = 0;
-
+v4l2_
-        {
-            p_sys->i_standard++;
-            t_standards.index = p_sys->i_standard;
@@ -2640 +2664 @@
-        {
-            p_sys->p_standards[i_standard].index = i_standard;
-
-
+v4l2_
-            {
-                msg_Err( p_obj, "cannot get video input standards (%m)" );
-                goto open_failed;
@@ -2662 +2686 @@
-    if( p_sys->dev_cap.capabilities & V4L2_CAP_AUDIO )
-    {
-        while( p_sys->i_audio < 32 &&
-
+v4l2_
-        {
-
+v4l2_
-            {
-                msg_Err( p_obj, "cannot get audio input characteristics (%m)" );
-                goto open_failed;
@@ -2690 +2714 @@
-    {
-        struct v4l2_tuner tuner;
-        memset( &tuner, 0, sizeof(tuner) );
-
+v4l2_
-        {
-            p_sys->i_tuner++;
-            memset( &tuner, 0, sizeof(tuner) );
@@ -2704 +2728 @@
-        {
-            p_sys->p_tuners[i_index].index = i_index;
-
-
+v4l2_
-            {
-                msg_Err( p_obj, "cannot get tuner characteristics (%m)" );
-                goto open_failed;
@@ -2727 +2751 @@
-
-            struct v4l2_frequency frequency;
-            memset( &frequency, 0, sizeof( frequency ) );
-
+v4l2_
-            {
-                msg_Err( p_obj, "cannot get tuner frequency (%m)" );
-                goto open_failed;
@@ -2752 +2776 @@
-        codec.index = i_index;
-        codec.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-
+v4l2_
-        {
-            i_index++;
-            codec.index = i_index;
@@ -2767 +2791 @@
-            p_sys->p_codecs[i_index].index = i_index;
-            p_sys->p_codecs[i_index].type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-
+v4l2_
-            {
-                msg_Err( p_obj, "cannot get codec description (%m)" );
-                goto open_failed;
@@ -2800 +2824 @@
-                    struct v4l2_frmsizeenum frmsize;
-                    frmsize.index = 0;
-                    frmsize.pixel_format = p_sys->p_codecs[i_index].pixelformat;
-
+v4l2_
-                    {
-                        /* Not all devices support this ioctl */
-                        msg_Warn( p_obj, "Unable to query for frame sizes" );
@@ -2816 +2840 @@
-                "    device supports size %dx%d",
-                frmsize.discrete.width, frmsize.discrete.height );
-                                    frmsize.index++;
-
+v4l2_
-                                break;
-                            case V4L2_FRMSIZE_TYPE_STEPWISE:
-                                msg_Dbg( p_obj,
@@ -2848 +2872 @@
-    }
-
-
-
+v4l2_
-    return true;
-
-open_failed:
-
-
+v4l2_
-    return false;
-
-}
@@ -3019 +3043 @@
-            {
-                querymenu.index = i_mid;
-                querymenu.id = queryctrl.id;
-
+v4l2_
-                {
-                    msg_Dbg( p_obj, "        %d: %s",
-                             querymenu.index, querymenu.name );
@@ -3056 +3080 @@
-                         queryctrl.default_value );
-                memset( &control, 0, sizeof( control ) );
-                control.id = queryctrl.id;
-
+v4l2_
-                {
-                    msg_Dbg( p_obj, "    current value: %d", control.value );
-                }
@@ -3153 +3177 @@
-        var_AddCallback( p_obj, "controls-reset", AccessControlResetCallback, NULL );
-
-    queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
-
+v4l2_
-    {
-        msg_Dbg( p_obj, "Extended control API supported by v4l2 driver" );
-
-        /* List extended controls */
-        queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
-
+v4l2_
-        {
-            if( queryctrl.type == V4L2_CTRL_TYPE_CTRL_CLASS )
-            {
@@ -3197 +3221 @@
-             i_cid ++ )
-        {
-            queryctrl.id = i_cid;
-
+v4l2_
-            {
-                if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
-                    continue;
@@ -3213 +3237 @@
-             i_cid ++ )
-        {
-            queryctrl.id = i_cid;
-
+v4l2_
-            {
-                if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
-                    continue;
@@ -3312 +3336 @@
-    memset( &queryctrl, 0, sizeof( queryctrl ) );
-
-    queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
-
+v4l2_
-    {
-        /* Extended control API supported */
-        queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
-
+v4l2_
-        {
-            if( queryctrl.type == V4L2_CTRL_TYPE_CTRL_CLASS
-             || V4L2_CTRL_ID2CLASS( queryctrl.id ) == V4L2_CTRL_CLASS_MPEG )
@@ -3327 +3351 @@
-            struct v4l2_control control;
-            memset( &control, 0, sizeof( control ) );
-            control.id = queryctrl.id;
-
+v4l2_
-             && queryctrl.default_value != control.value )
-            {
-                int i;
@@ -3350 +3374 @@
-             i_cid ++ )
-        {
-            queryctrl.id = i_cid;
-
+v4l2_
-            {
-                struct v4l2_control control;
-                if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
-                    continue;
-                memset( &control, 0, sizeof( control ) );
-                control.id = queryctrl.id;
-
+v4l2_
-                 && queryctrl.default_value != control.value )
-                {
-                    int i;
@@ -3377 +3401 @@
-             i_cid ++ )
-        {
-            queryctrl.id = i_cid;
-
+v4l2_
-            {
-                struct v4l2_control control;
-                if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
-                    continue;
-                memset( &control, 0, sizeof( control ) );
-                control.id = queryctrl.id;
-
+v4l2_
-                 && queryctrl.default_value != control.value )
-                {
-                    name2var( queryctrl.name );
@@ -3417 +3441 @@
-
-    queryctrl.id = i_cid;
-
-
+v4l2_
-        || queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
-    {
-        msg_Dbg( p_obj, "%s (%x) control is not supported.", psz_name, i_cid );
@@ -3438 +3462 @@
-    if( i_value >= 0 )
-    {
-        ext_control.value = i_value;
-
+v4l2_
-        {
-            control.value = i_value;
-
+v4l2_
-            {
-                msg_Err( p_obj, "unable to set %s (%x) to %d (%m)",
-                         psz_name, i_cid, i_value );
-                return VLC_EGENERIC;
-            }
-
+v4l2_
-        }
-        else
-        {
-
+v4l2_
-            control.value = ext_control.value;
-        }
-    }