Changeset 7f4aba6183dab7a43b2d87ce8b73383aa5d79aa0

Timestamp:

01/01/08 15:54:42 (6 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1199199282 +0000

git-parent:

[5ceb0f293b338279011f5aa7cafa8b86888e3768]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1199199282 +0000

Message:

v4l2: Factorize code, fix the video controls init, add Dennis Lou's contributions to the v4l2 module in THANKS.

Files:

• THANKS (modified) (1 diff)
• modules/access/v4l2.c (modified) (44 diffs)

THANKS

@@ -67 +67 @@
-Davor Orel <syntheticamac at yahoo.it> - Mac OS X icons
-Dennis van Amerongen <Dennis dot vanAmerongen at nob dot nl> - x264 options unification
-
+, MPEG2 support in the v4l2 module
-Dermot McGahon <dermot at dspsrv dot com> - Bug fixes, RC interface loop and repeat
-Diego Petteno <flameeyes at gentoo dot org> - remove usage of internal ffmpeg symbols, configure fixes

modules/access/v4l2.c

@@ -7 +7 @@
- * Authors: Benjamin Pracht <bigben at videolan dot org>
- *          Richard Hosking <richard at hovis dot net>
-
+
+
- *
- * This program is free software; you can redistribute it and/or modify
@@ -108 +109 @@
-#define BRIGHTNESS_TEXT N_( "Brightness" )
-#define BRIGHTNESS_LONGTEXT N_( \
-
+ (if supported by v4l2 driver)
-#define CONTRAST_TEXT N_( "Contrast" )
-#define CONTRAST_LONGTEXT N_( \
-
+ (if supported by v4l2 driver)
-#define SATURATION_TEXT N_( "Saturation" )
-#define SATURATION_LONGTEXT N_( \
-
+ (if supported by v4l2 driver)
-#define HUE_TEXT N_( "Hue" )
-#define HUE_LONGTEXT N_( \
-
+ (if supported by v4l2 driver)
-#define GAMMA_TEXT N_( "Gamma" )
-#define GAMMA_LONGTEXT N_( \
-
+ (if supported by v4l2 driver)
-
-#define ADEV_TEXT N_("Audio device name")
@@ -184 +185 @@
-    add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_TRUE );
-
-    set_section( N_( "Video controls" ), NULL );
-    add_bool( CFG_PREFIX "controls-reset", VLC_FALSE, NULL, CTRL_RESET_TEXT,
-              CTRL_RESET_LONGTEXT, VLC_TRUE );
-    add_integer( CFG_PREFIX "brightness", -1, NULL, BRIGHTNESS_TEXT,
-                BRIGHTNESS_LONGTEXT, VLC_TRUE );
-    add_integer( CFG_PREFIX "contrast", -1, NULL, CONTRAST_TEXT,
-                CONTRAST_LONGTEXT, VLC_TRUE );
-    add_integer( CFG_PREFIX "saturation", -1, NULL, SATURATION_TEXT,
-                SATURATION_LONGTEXT, VLC_TRUE );
-    add_integer( CFG_PREFIX "hue", -1, NULL, HUE_TEXT,
-                HUE_LONGTEXT, VLC_TRUE );
-    add_integer( CFG_PREFIX "gamma", -1, NULL, GAMMA_TEXT,
-                GAMMA_LONGTEXT, VLC_TRUE );
-
-    set_section( N_( "Audio input" ), NULL );
-    add_string( CFG_PREFIX "adev", "/dev/dsp", 0, ADEV_TEXT, ADEV_LONGTEXT,
@@ -212 +199 @@
-                CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
-
+    set_section( N_( "Controls" ), N_( "v4l2 driver controls" ) );
+    add_bool( CFG_PREFIX "controls-reset", VLC_FALSE, NULL, CTRL_RESET_TEXT,
+              CTRL_RESET_LONGTEXT, VLC_TRUE );
+    add_integer( CFG_PREFIX "brightness", -1, NULL, BRIGHTNESS_TEXT,
+                BRIGHTNESS_LONGTEXT, VLC_TRUE );
+    add_integer( CFG_PREFIX "contrast", -1, NULL, CONTRAST_TEXT,
+                CONTRAST_LONGTEXT, VLC_TRUE );
+    add_integer( CFG_PREFIX "saturation", -1, NULL, SATURATION_TEXT,
+                SATURATION_LONGTEXT, VLC_TRUE );
+    add_integer( CFG_PREFIX "hue", -1, NULL, HUE_TEXT,
+                HUE_LONGTEXT, VLC_TRUE );
+    add_integer( CFG_PREFIX "gamma", -1, NULL, GAMMA_TEXT,
+                GAMMA_LONGTEXT, VLC_TRUE );
+
+
-    add_shortcut( "v4l2" );
-    set_capability( "access_demux", 10 );
@@ -230 +232 @@
-static void CommonClose( vlc_object_t *, demux_sys_t * );
-static void ParseMRL( demux_sys_t *, char *, vlc_object_t * );
- 
+
-
-static int DemuxControl( demux_t *, int, va_list );
@@ -242 +244 @@
-static block_t* GrabAudio( demux_t *p_demux );
-
-
-
-
+
+
+
+
-static int OpenVideoDev( vlc_object_t *, demux_sys_t *, vlc_bool_t );
-
-
-
+
+
+
+
+
-
-static int ControlList( vlc_object_t *, int , vlc_bool_t, vlc_bool_t );
-static int Control( vlc_object_t *, int i_fd,
-                    const char *psz_name, int i_cid, int i_value );
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-static int AccessControlResetCallback( vlc_object_t *p_this,
-const char *psz_var, vlc_value_t oldval, vlc_value_t new
-
+                                   const char *psz_var, vlc_value_t old
+                                   vlc_value_t newval, 
-
-static struct
@@ -400 +406 @@
-};
-
+#define FIND_VIDEO 1
+#define FIND_AUDIO 2
+
+static int FindMainDevice( vlc_object_t *p_this, demux_sys_t *p_sys,
+                           int i_flags, vlc_bool_t b_demux,
+                           vlc_bool_t b_forced )
+{
+    /* Find main device (video or audio) */
+    if( p_sys->psz_device && *p_sys->psz_device )
+    {
+        msg_Dbg( p_this, "main device='%s'", p_sys->psz_device );
+
+        /* Try to open as video device */
+        if( i_flags & FIND_VIDEO )
+        {
+            msg_Dbg( p_this, "trying device '%s' as video", p_sys->psz_device );
+            if( ProbeVideoDev( p_this, p_sys, p_sys->psz_device ) )
+            {
+                msg_Dbg( p_this, "'%s' is a video device", p_sys->psz_device );
+                /* Device was a video device */
+                if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
+                p_sys->psz_vdev = p_sys->psz_device;
+                p_sys->psz_device = NULL;
+                p_sys->i_fd_video = OpenVideoDev( p_this, p_sys, b_demux );
+                if( p_sys->i_fd_video < 0 )
+                    return VLC_EGENERIC;
+                return VLC_SUCCESS;
+            }
+        }
+
+        if( i_flags & FIND_AUDIO )
+        {
+            /* Try to open as audio device */
+            msg_Dbg( p_this, "trying device '%s' as audio", p_sys->psz_device );
+            if( ProbeAudioDev( p_this, p_sys, p_sys->psz_device ) )
+            {
+                msg_Dbg( p_this, "'%s' is an audio device", p_sys->psz_device );
+                /* Device was an audio device */
+                if( p_sys->psz_adev ) free( p_sys->psz_adev );
+                p_sys->psz_adev = p_sys->psz_device;
+                p_sys->psz_device = NULL;
+                p_sys->i_fd_audio = OpenAudioDev( p_this, p_sys, b_demux );
+                if( p_sys->i_fd_audio < 0 )
+                    return VLC_EGENERIC;
+                return VLC_SUCCESS;
+            }
+        }
+    }
+
+    /* If no device opened, only continue if the access was forced */
+    if( b_forced == VLC_FALSE
+        && !( ( i_flags & FIND_VIDEO && p_sys->i_fd_video >= 0 )
+           || ( i_flags & FIND_AUDIO && p_sys->i_fd_audio >= 0 ) ) )
+    {
+        return VLC_EGENERIC;
+    }
+
+    /* Find video device */
+    if( i_flags & FIND_VIDEO && p_sys->i_fd_video < 0 )
+    {
+        if( !p_sys->psz_vdev || !*p_sys->psz_vdev )
+        {
+            if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
+            p_sys->psz_vdev = var_CreateGetString( p_this, "v4l2-dev" );
+        }
+
+        msg_Dbg( p_this, "opening '%s' as video", p_sys->psz_vdev );
+        if( p_sys->psz_vdev && *p_sys->psz_vdev
+         && ProbeVideoDev( p_this, p_sys, p_sys->psz_vdev ) )
+        {
+            p_sys->i_fd_video = OpenVideoDev( p_this, p_sys, b_demux );
+        }
+    }
+
+    /* Find audio device */
+    if( i_flags & FIND_AUDIO && p_sys->i_fd_audio < 0 )
+    {
+        if( !p_sys->psz_adev || !*p_sys->psz_adev )
+        {
+            if( p_sys->psz_adev ) free( p_sys->psz_adev );
+            p_sys->psz_adev = var_CreateGetString( p_this, "v4l2-adev" );
+        }
+
+        msg_Dbg( p_this, "opening '%s' as audio", p_sys->psz_adev );
+        if( p_sys->psz_adev && *p_sys->psz_adev
+         && ProbeAudioDev( p_this, p_sys, p_sys->psz_adev ) )
+        {
+            p_sys->i_fd_audio = OpenAudioDev( p_this, p_sys, b_demux );
+        }
+    }
+
+    if( !( ( i_flags & FIND_VIDEO && p_sys->i_fd_video >= 0 )
+        || ( i_flags & FIND_AUDIO && p_sys->i_fd_audio >= 0 ) ) )
+    {
+        return VLC_EGENERIC;
+    }
+    return VLC_SUCCESS;
+}
+
-/*****************************************************************************
- * DemuxOpen: opens v4l2 device, access_demux callback
@@ -434 +539 @@
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    {
-        DemuxClose( p_this );
@@ -530 +552 @@
- * GetV4L2Params: fill in p_sys parameters (shared by DemuxOpen and AccessOpen)
- *****************************************************************************/
-
-
-
-
+
+
-    p_sys->i_video_pts = -1;
-
-
-
-
+
+
-
-    p_sys->i_selected_input = var_CreateGetInteger( p_obj, "v4l2-input" );
@@ -549 +568 @@
-    var_CreateGetBool( p_obj, "v4l2-controls-reset" );
-
-
-
-
-
-
-
-
-
+
+
-    p_sys->psz_requested_chroma = var_CreateGetString( p_obj, "v4l2-chroma" );
-
-#ifdef HAVE_ALSA
-
-
-
+
-#endif
-
-
-
-
+
-
-    p_sys->i_pts = var_CreateGetInteger( p_obj, "v4l2-caching" );
@@ -947 +956 @@
-    if( p_sys == NULL ) return VLC_ENOMEM;
-
-p_sys, (vlc_object_t *) p_access
+ p_sys, (vlc_object_t *) p_access 
-
-    ParseMRL( p_sys, p_access->psz_path, (vlc_object_t *) p_access );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    {
-        AccessClose( p_this );
@@ -1602 +1562 @@
- * in the array of supported formats returned by the driver
- *****************************************************************************/
-
+static 
-{
-    demux_sys_t *p_sys = p_demux->p_sys;
@@ -1617 +1577 @@
- * OpenVideoDev: open and set up the video device and probe for capabilities
- *****************************************************************************/
-
+static 
-{
-    int i_fd;
@@ -1661 +1621 @@
-    /* TODO: Move the resolution stuff up here */
-    /* if MPEG encoder card, no need to do anything else after this */
+    ControlList( p_obj, i_fd,
+                  var_GetBool( p_obj, "v4l2-controls-reset" ), b_demux );
-    if( VLC_FALSE == b_demux)
-    {
-        ControlList( p_obj, i_fd,
-                      var_GetBool( p_obj, "v4l2-controls-reset" ), b_demux );
-
-        return i_fd;
-    }
@@ -1981 +1940 @@
- * ResolveALSADeviceName: Change any . to : in the ALSA device name
- *****************************************************************************/
-char* 
+static char *
-{
-    char* psz_alsa_name = strdup( psz_device );
@@ -1995 +1954 @@
- * OpenAudioDev: open and set up the audio device and probe for capabilities
- *****************************************************************************/
-
-
-
+
+
+
+
-    int i_fd = 0;
-    int i_format;
@@ -2018 +1978 @@
-            SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK ) ) < 0)
-        {
-
-
-
+
+
-            goto adev_fail;
-        }
@@ -2026 +1985 @@
-        if( ( i_err = snd_pcm_nonblock( p_sys->p_alsa_pcm, 1 ) ) < 0)
-        {
-demux, "Cannot set ALSA nonblock (%s)", 
-
+this, "Cannot set ALSA nonblock (%s)",
+     
-            goto adev_fail;
-        }
@@ -2035 +1994 @@
-        if( ( i_err = snd_pcm_hw_params_malloc( &p_hw_params ) ) < 0 )
-        {
-
-
+
+
+
-            goto adev_fail;
-        }
@@ -2042 +2002 @@
-        if( ( i_err = snd_pcm_hw_params_any( p_sys->p_alsa_pcm, p_hw_params ) ) < 0 )
-        {
-
-
+
+
+
-            goto adev_fail;
-        }
@@ -2050 +2011 @@
-        if( ( i_err = snd_pcm_hw_params_set_access( p_sys->p_alsa_pcm, p_hw_params, SND_PCM_ACCESS_RW_INTERLEAVED ) ) < 0 )
-        {
-demux
-
+this
+     
-            goto adev_fail;
-        }
@@ -2058 +2019 @@
-        if( ( i_err = snd_pcm_hw_params_set_format( p_sys->p_alsa_pcm, p_hw_params, SND_PCM_FORMAT_S16_LE ) ) < 0 )
-        {
-demux
-
+this
+     
-            goto adev_fail;
-        }
@@ -2071 +2032 @@
-        if( i_err < 0 )
-        {
-demux
-
+this
+     
-            goto adev_fail;
-        }
@@ -2081 +2042 @@
-        {
-            channels = ( channels==1 ) ? 2 : 1;
-
-
-
+
+
+
+
-            if( ( i_err = snd_pcm_hw_params_set_channels( p_sys->p_alsa_pcm, p_hw_params, channels ) ) < 0 )
-            {
-demux
-
+this
+     
-                goto adev_fail;
-            }
@@ -2097 +2059 @@
-        if( ( i_err = snd_pcm_hw_params_get_buffer_time_max(p_hw_params, &buffer_time, 0) ) < 0 )
-        {
-demux
-
+this
+     
-            goto adev_fail;
-        }
@@ -2112 +2074 @@
-        if( i_err < 0 )
-        {
-demux
-
+this
+     
-            goto adev_fail;
-        }
@@ -2125 +2087 @@
-        if( i_err < 0 )
-        {
-demux
-
+this
+     
-            goto adev_fail;
-        }
@@ -2133 +2095 @@
-        if( ( i_err = snd_pcm_hw_params( p_sys->p_alsa_pcm, p_hw_params ) ) < 0 )
-        {
-demux
-
+this
+     
-            goto adev_fail;
-        }
@@ -2143 +2105 @@
-        if (chunk_size == buffer_size)
-        {
-
-
+
+
+
-            goto adev_fail;
-        }
@@ -2161 +2124 @@
-        if( ( i_err = snd_pcm_prepare( p_sys->p_alsa_pcm ) ) < 0 )
-        {
-
-
+
+
+
-            goto adev_fail;
-        }
@@ -2177 +2141 @@
-        if( (i_fd = open( psz_device, O_RDONLY | O_NONBLOCK )) < 0 )
-        {
-demux
+this
-            goto adev_fail;
-        }
@@ -2185 +2149 @@
-            || i_format != AFMT_S16_LE )
-        {
-demux, "cannot set audio format (16b little endian) "
-
+this,
+cannot set audio format (16b little endian) 
-            goto adev_fail;
-        }
@@ -2193 +2157 @@
-                   &p_sys->b_stereo ) < 0 )
-        {
-demux
+this
-            goto adev_fail;
-        }
@@ -2200 +2164 @@
-                   &p_sys->i_sample_rate ) < 0 )
-        {
-demux
+this
-            goto adev_fail;
-        }
@@ -2207 +2171 @@
-    }
-
-demux
+this
-             psz_device, p_sys->b_stereo ? "stereo" : "mono",
-             p_sys->i_sample_rate );
@@ -2220 +2184 @@
-    fmt.i_bitrate = fmt.audio.i_channels * fmt.audio.i_rate * fmt.audio.i_bitspersample;
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-#ifdef HAVE_ALSA
@@ -2248 +2216 @@
- * ProbeVideoDev: probe video for capabilities
- *****************************************************************************/
-
+
+
-{
-    int i_index;
@@ -2538 +2507 @@
- * ProbeAudioDev: probe audio for capabilities
- *****************************************************************************/
-
+
+
-{
-    int i_fd = 0;
@@ -2544 +2514 @@
-
-#ifdef HAVE_ALSA
-    demux_sys_t *p_sys = p_demux->p_sys;
-
-    if( p_sys->b_use_alsa )
-    {
@@ -2556 +2524 @@
-        if( ( i_err = snd_pcm_open( &p_alsa_pcm, psz_alsa_device_name, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK ) ) < 0 )
-        {
-demux
+this
-            free( psz_alsa_device_name );
-            goto open_failed;
@@ -2571 +2539 @@
-        if( ( i_fd = open( psz_device, O_RDONLY | O_NONBLOCK ) ) < 0 )
-        {
-demux
+this
-            goto open_failed;
-        }
@@ -2578 +2546 @@
-        if( ioctl( i_fd, SNDCTL_DSP_GETCAPS, &i_caps ) < 0 )
-        {
-demux
+this
-            goto open_failed;
-        }
@@ -2590 +2558 @@
-    if( i_fd >= 0 ) close( i_fd );
-    return VLC_FALSE;
-
-}
-
@@ -2767 +2734 @@
- * value and create the relevant variables to enable runtime changes
- *****************************************************************************/
-
+
+
-{
-    struct v4l2_queryctrl queryctrl;