Skip to content

V
vlc
Commit 7f4aba61 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

v4l2: Factorize code, fix the video controls init, add Dennis Lou's... 

v4l2: Factorize code, fix the video controls init, add Dennis Lou's contributions to the v4l2 module in THANKS.
parent 5ceb0f29
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 238 deletions
THANKS
View file @ 7f4aba61
...@@ -66,7 +66,7 @@ David Thiel - security audit and report ...@@ -66,7 +66,7 @@ David Thiel - security audit and report
David Weber <david_weber at gmx.de> - Mac OS X interface design & graphics (v0.5.0) David Weber <david_weber at gmx.de> - Mac OS X interface design & graphics (v0.5.0)
Davor Orel <syntheticamac at yahoo.it> - Mac OS X icons Davor Orel <syntheticamac at yahoo.it> - Mac OS X icons
Dennis van Amerongen <Dennis dot vanAmerongen at nob dot nl> - x264 options unification Dennis van Amerongen <Dennis dot vanAmerongen at nob dot nl> - x264 options unification
Dennis Lou <dlou99 at yahoo dot com> - ATSC support in the DVB module Dennis Lou <dlou99 at yahoo dot com> - ATSC support in the DVB module, MPEG2 support in the v4l2 module
Dermot McGahon <dermot at dspsrv dot com> - Bug fixes, RC interface loop and repeat 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 Diego Petteno <flameeyes at gentoo dot org> - remove usage of internal ffmpeg symbols, configure fixes
DirektX <direktx at freemail.hu> - Hungarian translation DirektX <direktx at freemail.hu> - Hungarian translation
......
modules/access/v4l2.c
View file @ 7f4aba61
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
* *
* Authors: Benjamin Pracht <bigben at videolan dot org> * Authors: Benjamin Pracht <bigben at videolan dot org>
* Richard Hosking <richard at hovis dot net> * Richard Hosking <richard at hovis dot net>
* Antoine Cellerier <dionoea at videolan d.t net> * Antoine Cellerier <dionoea at videolan d.t org>
* Dennis Lou <dlou99 at yahoo dot com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -107,19 +108,19 @@ static void AccessClose( vlc_object_t * ); ...@@ -107,19 +108,19 @@ static void AccessClose( vlc_object_t * );
"Reset controls to defaults provided by the v4l2 driver." ) "Reset controls to defaults provided by the v4l2 driver." )
#define BRIGHTNESS_TEXT N_( "Brightness" ) #define BRIGHTNESS_TEXT N_( "Brightness" )
#define BRIGHTNESS_LONGTEXT N_( \ #define BRIGHTNESS_LONGTEXT N_( \
"Brightness of the video input." ) "Brightness of the video input (if supported by v4l2 driver)." )
#define CONTRAST_TEXT N_( "Contrast" ) #define CONTRAST_TEXT N_( "Contrast" )
#define CONTRAST_LONGTEXT N_( \ #define CONTRAST_LONGTEXT N_( \
"Contrast of the video input." ) "Contrast of the video input (if supported by v4l2 driver)." )
#define SATURATION_TEXT N_( "Saturation" ) #define SATURATION_TEXT N_( "Saturation" )
#define SATURATION_LONGTEXT N_( \ #define SATURATION_LONGTEXT N_( \
"Saturation of the video input." ) "Saturation of the video input (if supported by v4l2 driver)." )
#define HUE_TEXT N_( "Hue" ) #define HUE_TEXT N_( "Hue" )
#define HUE_LONGTEXT N_( \ #define HUE_LONGTEXT N_( \
"Hue of the video input." ) "Hue of the video input (if supported by v4l2 driver)." )
#define GAMMA_TEXT N_( "Gamma" ) #define GAMMA_TEXT N_( "Gamma" )
#define GAMMA_LONGTEXT N_( \ #define GAMMA_LONGTEXT N_( \
"Gamma of the video input." ) "Gamma of the video input (if supported by v4l2 driver)." )
#define ADEV_TEXT N_("Audio device name") #define ADEV_TEXT N_("Audio device name")
#define ADEV_LONGTEXT N_( \ #define ADEV_LONGTEXT N_( \
...@@ -183,20 +184,6 @@ vlc_module_begin(); ...@@ -183,20 +184,6 @@ vlc_module_begin();
HEIGHT_LONGTEXT, VLC_TRUE ); HEIGHT_LONGTEXT, VLC_TRUE );
add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_TRUE ); 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 ); set_section( N_( "Audio input" ), NULL );
add_string( CFG_PREFIX "adev", "/dev/dsp", 0, ADEV_TEXT, ADEV_LONGTEXT, add_string( CFG_PREFIX "adev", "/dev/dsp", 0, ADEV_TEXT, ADEV_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
...@@ -211,6 +198,21 @@ vlc_module_begin(); ...@@ -211,6 +198,21 @@ vlc_module_begin();
add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); 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" ); add_shortcut( "v4l2" );
set_capability( "access_demux", 10 ); set_capability( "access_demux", 10 );
set_callbacks( DemuxOpen, DemuxClose ); set_callbacks( DemuxOpen, DemuxClose );
...@@ -229,7 +231,7 @@ vlc_module_end(); ...@@ -229,7 +231,7 @@ vlc_module_end();
static void CommonClose( vlc_object_t *, demux_sys_t * ); static void CommonClose( vlc_object_t *, demux_sys_t * );
static void ParseMRL( demux_sys_t *, char *, vlc_object_t * ); static void ParseMRL( demux_sys_t *, char *, vlc_object_t * );
static void GetV4L2Params( demux_sys_t * , vlc_object_t * ); static void GetV4L2Params( demux_sys_t *, vlc_object_t * );
static int DemuxControl( demux_t *, int, va_list ); static int DemuxControl( demux_t *, int, va_list );
static int AccessControl( access_t *, int, va_list ); static int AccessControl( access_t *, int, va_list );
...@@ -241,29 +243,33 @@ static block_t* GrabVideo( demux_t *p_demux ); ...@@ -241,29 +243,33 @@ static block_t* GrabVideo( demux_t *p_demux );
static block_t* ProcessVideoFrame( demux_t *p_demux, uint8_t *p_frame, size_t ); static block_t* ProcessVideoFrame( demux_t *p_demux, uint8_t *p_frame, size_t );
static block_t* GrabAudio( demux_t *p_demux ); static block_t* GrabAudio( demux_t *p_demux );
vlc_bool_t IsPixelFormatSupported( demux_t *p_demux, unsigned int i_pixelformat ); static vlc_bool_t IsPixelFormatSupported( demux_t *p_demux,
unsigned int i_pixelformat );
char* ResolveALSADeviceName( char *psz_device ); static char* ResolveALSADeviceName( char *psz_device );
static int OpenVideoDev( vlc_object_t *, demux_sys_t *, vlc_bool_t ); static int OpenVideoDev( vlc_object_t *, demux_sys_t *, vlc_bool_t );
static int OpenAudioDev( demux_t *, char *psz_device ); static int OpenAudioDev( vlc_object_t *, demux_sys_t *, vlc_bool_t );
static vlc_bool_t ProbeVideoDev( vlc_object_t *, demux_sys_t *, char *psz_device ); static vlc_bool_t ProbeVideoDev( vlc_object_t *, demux_sys_t *,
static vlc_bool_t ProbeAudioDev( demux_t *, char *psz_device ); char *psz_device );
static vlc_bool_t ProbeAudioDev( vlc_object_t *, demux_sys_t *,
char *psz_device );
static int ControlList( vlc_object_t *, int , vlc_bool_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, static int Control( vlc_object_t *, int i_fd,
const char *psz_name, int i_cid, int i_value ); const char *psz_name, int i_cid, int i_value );
static int DemuxControlCallback( vlc_object_t *p_this,
const char *psz_var, vlc_value_t oldval, vlc_value_t newval, static int DemuxControlCallback( vlc_object_t *p_this, const char *psz_var,
void *p_data ); vlc_value_t oldval, vlc_value_t newval,
static int DemuxControlResetCallback( vlc_object_t *p_this, void *p_data );
const char *psz_var, vlc_value_t oldval, vlc_value_t newval, static int DemuxControlResetCallback( vlc_object_t *p_this, const char *psz_var,
void *p_data ); vlc_value_t oldval, vlc_value_t newval,
static int AccessControlCallback( vlc_object_t *p_this, void *p_data );
const char *psz_var, vlc_value_t oldval, vlc_value_t newval, static int AccessControlCallback( vlc_object_t *p_this, const char *psz_var,
void *p_data ); vlc_value_t oldval, vlc_value_t newval,
void *p_data );
static int AccessControlResetCallback( vlc_object_t *p_this, static int AccessControlResetCallback( vlc_object_t *p_this,
const char *psz_var, vlc_value_t oldval, vlc_value_t newval, const char *psz_var, vlc_value_t oldval,
void *p_data ); vlc_value_t newval, void *p_data );
static struct static struct
{ {
...@@ -399,125 +405,141 @@ struct demux_sys_t ...@@ -399,125 +405,141 @@ struct demux_sys_t
#endif #endif
}; };
/***************************************************************************** #define FIND_VIDEO 1
* DemuxOpen: opens v4l2 device, access_demux callback #define FIND_AUDIO 2
*****************************************************************************
*
* url: <video device>::::
*
*****************************************************************************/
static int DemuxOpen( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
/* Only when selected */
if( *p_demux->psz_access == '\0' ) return VLC_EGENERIC;
/* Set up p_demux */
p_demux->pf_control = DemuxControl;
p_demux->pf_demux = Demux;
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
if( p_sys == NULL ) return VLC_ENOMEM;
GetV4L2Params(p_sys, (vlc_object_t *) p_demux);
ParseMRL( p_sys, p_demux->psz_path, (vlc_object_t *) p_demux );
#ifdef HAVE_ALSA
/* Alsa support available? */
msg_Dbg( p_demux, "ALSA input support available" );
#endif
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) */ /* Find main device (video or audio) */
if( p_sys->psz_device && *p_sys->psz_device ) if( p_sys->psz_device && *p_sys->psz_device )
{ {
msg_Dbg( p_demux, "main device='%s'", p_sys->psz_device ); msg_Dbg( p_this, "main device='%s'", p_sys->psz_device );
/* Try to open as video device */ /* Try to open as video device */
msg_Dbg( p_demux, "trying device '%s' as video", p_sys->psz_device ); if( i_flags & FIND_VIDEO )
if( ProbeVideoDev( (vlc_object_t *) p_demux, p_sys, p_sys->psz_device ) )
{ {
msg_Dbg( p_demux, "'%s' is a video device", p_sys->psz_device ); msg_Dbg( p_this, "trying device '%s' as video", p_sys->psz_device );
/* Device was a video device */ if( ProbeVideoDev( p_this, p_sys, p_sys->psz_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( (vlc_object_t *) p_demux, p_sys, VLC_TRUE );
if( p_sys->i_fd_video < 0 )
{ {
DemuxClose( p_this ); msg_Dbg( p_this, "'%s' is a video device", p_sys->psz_device );
return VLC_EGENERIC; /* 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;
} }
} }
else
if( i_flags & FIND_AUDIO )
{ {
/* Try to open as audio device */ /* Try to open as audio device */
msg_Dbg( p_demux, "trying device '%s' as audio", p_sys->psz_device ); msg_Dbg( p_this, "trying device '%s' as audio", p_sys->psz_device );
if( ProbeAudioDev( p_demux, p_sys->psz_device ) ) if( ProbeAudioDev( p_this, p_sys, p_sys->psz_device ) )
{ {
msg_Dbg( p_demux, "'%s' is an audio device", p_sys->psz_device ); msg_Dbg( p_this, "'%s' is an audio device", p_sys->psz_device );
/* Device was an audio device */ /* Device was an audio device */
if( p_sys->psz_adev ) free( p_sys->psz_adev ); if( p_sys->psz_adev ) free( p_sys->psz_adev );
p_sys->psz_adev = p_sys->psz_device; p_sys->psz_adev = p_sys->psz_device;
p_sys->psz_device = NULL; p_sys->psz_device = NULL;
p_sys->i_fd_audio = OpenAudioDev( p_demux, p_sys->psz_adev ); p_sys->i_fd_audio = OpenAudioDev( p_this, p_sys, b_demux );
if( p_sys->i_fd_audio < 0 ) if( p_sys->i_fd_audio < 0 )
{
DemuxClose( p_this );
return VLC_EGENERIC; return VLC_EGENERIC;
} return VLC_SUCCESS;
} }
} }
} }
/* If no device opened, only continue if the access was forced */ /* If no device opened, only continue if the access was forced */
if( p_sys->i_fd_video < 0 && p_sys->i_fd_audio < 0 ) 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 ) ) )
{ {
if( strcmp( p_demux->psz_access, "v4l2" ) ) return VLC_EGENERIC;
{
DemuxClose( p_this );
return VLC_EGENERIC;
}
} }
/* Find video device */ /* Find video device */
if( p_sys->i_fd_video < 0 ) 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 || !*p_sys->psz_vdev )
{ {
if( p_sys->psz_vdev ) free( p_sys->psz_vdev ); if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
p_sys->psz_vdev = var_CreateGetString( p_demux, "v4l2-dev" ); p_sys->psz_vdev = var_CreateGetString( p_this, "v4l2-dev" );
} }
msg_Dbg( p_demux, "opening '%s' as video", p_sys->psz_vdev ); msg_Dbg( p_this, "opening '%s' as video", p_sys->psz_vdev );
if( p_sys->psz_vdev && *p_sys->psz_vdev && ProbeVideoDev( (vlc_object_t *) p_demux, p_sys, 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( (vlc_object_t *) p_demux, p_sys, VLC_TRUE ); p_sys->i_fd_video = OpenVideoDev( p_this, p_sys, b_demux );
} }
} }
/* Find audio device */ /* Find audio device */
if( p_sys->i_fd_audio < 0 ) 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 || !*p_sys->psz_adev )
{ {
if( p_sys->psz_adev ) free( p_sys->psz_adev ); if( p_sys->psz_adev ) free( p_sys->psz_adev );
p_sys->psz_adev = var_CreateGetString( p_demux, "v4l2-adev" ); p_sys->psz_adev = var_CreateGetString( p_this, "v4l2-adev" );
} }
msg_Dbg( p_demux, "opening '%s' as audio", p_sys->psz_adev ); msg_Dbg( p_this, "opening '%s' as audio", p_sys->psz_adev );
if( p_sys->psz_adev && *p_sys->psz_adev && ProbeAudioDev( p_demux, 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_demux, p_sys->psz_adev ); p_sys->i_fd_audio = OpenAudioDev( p_this, p_sys, b_demux );
} }
} }
if( p_sys->i_fd_video < 0 && p_sys->i_fd_audio < 0 ) 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
*****************************************************************************
*
* url: <video device>::::
*
*****************************************************************************/
static int DemuxOpen( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
/* Only when selected */
if( *p_demux->psz_access == '\0' ) return VLC_EGENERIC;
/* Set up p_demux */
p_demux->pf_control = DemuxControl;
p_demux->pf_demux = Demux;
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
if( p_sys == NULL ) return VLC_ENOMEM;
GetV4L2Params(p_sys, (vlc_object_t *) p_demux);
ParseMRL( p_sys, p_demux->psz_path, (vlc_object_t *) p_demux );
#ifdef HAVE_ALSA
/* Alsa support available? */
msg_Dbg( p_demux, "ALSA input support available" );
#endif
if( FindMainDevice( p_this, p_sys, FIND_VIDEO|FIND_AUDIO,
VLC_TRUE, !strcmp( p_demux->psz_access, "v4l2" ) ) != VLC_SUCCESS )
{ {
DemuxClose( p_this ); DemuxClose( p_this );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -529,15 +551,12 @@ static int DemuxOpen( vlc_object_t *p_this ) ...@@ -529,15 +551,12 @@ static int DemuxOpen( vlc_object_t *p_this )
/***************************************************************************** /*****************************************************************************
* GetV4L2Params: fill in p_sys parameters (shared by DemuxOpen and AccessOpen) * GetV4L2Params: fill in p_sys parameters (shared by DemuxOpen and AccessOpen)
*****************************************************************************/ *****************************************************************************/
void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj ) static void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj )
{ {
vlc_value_t val;
p_sys->i_video_pts = -1; p_sys->i_video_pts = -1;
var_Create( p_obj, "v4l2-standard", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); p_sys->i_selected_standard_id =
var_Get( p_obj, "v4l2-standard", &val ); i_standards_list[var_CreateGetInteger( p_obj, "v4l2-standard" )];
p_sys->i_selected_standard_id = i_standards_list[val.i_int];
p_sys->i_selected_input = var_CreateGetInteger( p_obj, "v4l2-input" ); p_sys->i_selected_input = var_CreateGetInteger( p_obj, "v4l2-input" );
...@@ -548,25 +567,15 @@ void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj ) ...@@ -548,25 +567,15 @@ void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj )
var_CreateGetBool( p_obj, "v4l2-controls-reset" ); var_CreateGetBool( p_obj, "v4l2-controls-reset" );
var_Create( p_obj, "v4l2-fps", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); p_sys->f_fps = var_CreateGetFloat( p_obj, "v4l2-fps" );
var_Get( p_obj, "v4l2-fps", &val ); p_sys->i_sample_rate = var_CreateGetInteger( p_obj, "v4l2-samplerate" );
p_sys->f_fps = val.f_float;
var_Create( p_obj, "v4l2-samplerate", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Get( p_obj, "v4l2-samplerate", &val );
p_sys->i_sample_rate = val.i_int;
p_sys->psz_requested_chroma = var_CreateGetString( p_obj, "v4l2-chroma" ); p_sys->psz_requested_chroma = var_CreateGetString( p_obj, "v4l2-chroma" );
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
var_Create( p_obj, "v4l2-alsa", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); p_sys->b_use_alsa = var_CreateGetBool( p_obj, "v4l2-alsa" );
var_Get( p_obj, "v4l2-alsa", &val );
p_sys->b_use_alsa = val.b_bool;
#endif #endif
var_Create( p_obj, "v4l2-stereo", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); p_sys->b_stereo = var_CreateGetBool( p_obj, "v4l2-stereo" );
var_Get( p_obj, "v4l2-stereo", &val );
p_sys->b_stereo = val.b_bool;
p_sys->i_pts = var_CreateGetInteger( p_obj, "v4l2-caching" ); p_sys->i_pts = var_CreateGetInteger( p_obj, "v4l2-caching" );
...@@ -946,61 +955,12 @@ static int AccessOpen( vlc_object_t * p_this ) ...@@ -946,61 +955,12 @@ static int AccessOpen( vlc_object_t * p_this )
p_access->p_sys = (access_sys_t *) p_sys; p_access->p_sys = (access_sys_t *) p_sys;
if( p_sys == NULL ) return VLC_ENOMEM; if( p_sys == NULL ) return VLC_ENOMEM;
GetV4L2Params(p_sys, (vlc_object_t *) p_access); GetV4L2Params( p_sys, (vlc_object_t *) p_access );
ParseMRL( p_sys, p_access->psz_path, (vlc_object_t *) p_access ); ParseMRL( p_sys, p_access->psz_path, (vlc_object_t *) p_access );
/* Find main device (video) */ if( FindMainDevice( p_this, p_sys, FIND_VIDEO,
if( p_sys->psz_device && *p_sys->psz_device ) VLC_FALSE, !strcmp( p_access->psz_access, "v4l2" ) ) != VLC_SUCCESS )
{
msg_Dbg( p_access, "main device='%s'", p_sys->psz_device );
/* Try to open as video device */
msg_Dbg( p_access, "trying device '%s' as video", p_sys->psz_device );
if( ProbeVideoDev( (vlc_object_t *) p_access, p_sys, p_sys->psz_device ) )
{
msg_Dbg( p_access, "'%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( (vlc_object_t *) p_access, p_sys, VLC_FALSE );
if( p_sys->i_fd_video < 0 )
{
AccessClose( p_this );
return VLC_EGENERIC;
}
}
}
/* If no device opened, only continue if the access was forced */
if( p_sys->i_fd_video < 0 )
{
if( strcmp( p_access->psz_access, "v4l2" ) )
{
AccessClose( p_this );
return VLC_EGENERIC;
}
}
/* Find video device */
if( 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_access, "v4l2-dev" );
}
msg_Dbg( p_access, "opening '%s' as video", p_sys->psz_vdev );
if( p_sys->psz_vdev && *p_sys->psz_vdev && ProbeVideoDev( (vlc_object_t *) p_access, p_sys, p_sys->psz_vdev ) )
{
p_sys->i_fd_video = OpenVideoDev( (vlc_object_t *) p_access, p_sys, VLC_FALSE );
}
}
if( p_sys->i_fd_video < 0 )
{ {
AccessClose( p_this ); AccessClose( p_this );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -1601,7 +1561,7 @@ open_failed: ...@@ -1601,7 +1561,7 @@ open_failed:
* IsPixelFormatSupported: returns true if the specified V4L2 pixel format is * IsPixelFormatSupported: returns true if the specified V4L2 pixel format is
* in the array of supported formats returned by the driver * in the array of supported formats returned by the driver
*****************************************************************************/ *****************************************************************************/
vlc_bool_t IsPixelFormatSupported( demux_t *p_demux, unsigned int i_pixelformat ) static vlc_bool_t IsPixelFormatSupported( demux_t *p_demux, unsigned int i_pixelformat )
{ {
demux_sys_t *p_sys = p_demux->p_sys; demux_sys_t *p_sys = p_demux->p_sys;
...@@ -1616,7 +1576,7 @@ vlc_bool_t IsPixelFormatSupported( demux_t *p_demux, unsigned int i_pixelformat ...@@ -1616,7 +1576,7 @@ vlc_bool_t IsPixelFormatSupported( demux_t *p_demux, unsigned int i_pixelformat
/***************************************************************************** /*****************************************************************************
* OpenVideoDev: open and set up the video device and probe for capabilities * OpenVideoDev: open and set up the video device and probe for capabilities
*****************************************************************************/ *****************************************************************************/
int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, vlc_bool_t b_demux ) static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, vlc_bool_t b_demux )
{ {
int i_fd; int i_fd;
struct v4l2_cropcap cropcap; struct v4l2_cropcap cropcap;
...@@ -1660,11 +1620,10 @@ int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, vlc_bool_t b_demux ) ...@@ -1660,11 +1620,10 @@ int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, vlc_bool_t b_demux )
/* TODO: Move the resolution stuff up here */ /* TODO: Move the resolution stuff up here */
/* if MPEG encoder card, no need to do anything else after this */ /* 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) if( VLC_FALSE == b_demux)
{ {
ControlList( p_obj, i_fd,
var_GetBool( p_obj, "v4l2-controls-reset" ), b_demux );
return i_fd; return i_fd;
} }
...@@ -1980,7 +1939,7 @@ open_failed: ...@@ -1980,7 +1939,7 @@ open_failed:
/***************************************************************************** /*****************************************************************************
* ResolveALSADeviceName: Change any . to : in the ALSA device name * ResolveALSADeviceName: Change any . to : in the ALSA device name
*****************************************************************************/ *****************************************************************************/
char* ResolveALSADeviceName( char *psz_device ) static char *ResolveALSADeviceName( char *psz_device )
{ {
char* psz_alsa_name = strdup( psz_device ); char* psz_alsa_name = strdup( psz_device );
for( unsigned int i = 0; i < strlen( psz_device ); i++ ) for( unsigned int i = 0; i < strlen( psz_device ); i++ )
...@@ -1994,9 +1953,10 @@ char* ResolveALSADeviceName( char *psz_device ) ...@@ -1994,9 +1953,10 @@ char* ResolveALSADeviceName( char *psz_device )
/***************************************************************************** /*****************************************************************************
* OpenAudioDev: open and set up the audio device and probe for capabilities * OpenAudioDev: open and set up the audio device and probe for capabilities
*****************************************************************************/ *****************************************************************************/
int OpenAudioDev( demux_t *p_demux, char *psz_device ) static int OpenAudioDev( vlc_object_t *p_this, demux_sys_t *p_sys,
vlc_bool_t b_demux )
{ {
demux_sys_t *p_sys = p_demux->p_sys; char *psz_device = p_sys->psz_adev;
int i_fd = 0; int i_fd = 0;
int i_format; int i_format;
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
...@@ -2017,16 +1977,15 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2017,16 +1977,15 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
if( ( i_err = snd_pcm_open( &p_sys->p_alsa_pcm, psz_alsa_device_name, if( ( i_err = snd_pcm_open( &p_sys->p_alsa_pcm, psz_alsa_device_name,
SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK ) ) < 0) SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK ) ) < 0)
{ {
msg_Err( p_demux, "Cannot open ALSA audio device %s (%s)", msg_Err( p_this, "Cannot open ALSA audio device %s (%s)",
psz_alsa_device_name, psz_alsa_device_name, snd_strerror( i_err ) );
snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
if( ( i_err = snd_pcm_nonblock( p_sys->p_alsa_pcm, 1 ) ) < 0) if( ( i_err = snd_pcm_nonblock( p_sys->p_alsa_pcm, 1 ) ) < 0)
{ {
msg_Err( p_demux, "Cannot set ALSA nonblock (%s)", msg_Err( p_this, "Cannot set ALSA nonblock (%s)",
snd_strerror( i_err ) ); snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
...@@ -2034,31 +1993,33 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2034,31 +1993,33 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
if( ( i_err = snd_pcm_hw_params_malloc( &p_hw_params ) ) < 0 ) if( ( i_err = snd_pcm_hw_params_malloc( &p_hw_params ) ) < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot allocate hardware parameter structure (%s)", msg_Err( p_this,
snd_strerror( i_err ) ); "ALSA: cannot allocate hardware parameter structure (%s)",
snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
if( ( i_err = snd_pcm_hw_params_any( p_sys->p_alsa_pcm, p_hw_params ) ) < 0 ) if( ( i_err = snd_pcm_hw_params_any( p_sys->p_alsa_pcm, p_hw_params ) ) < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot initialize hardware parameter structure (%s)", msg_Err( p_this,
snd_strerror( i_err ) ); "ALSA: cannot initialize hardware parameter structure (%s)",
snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
/* Set Interleaved access */ /* Set Interleaved access */
if( ( i_err = snd_pcm_hw_params_set_access( p_sys->p_alsa_pcm, p_hw_params, SND_PCM_ACCESS_RW_INTERLEAVED ) ) < 0 ) if( ( i_err = snd_pcm_hw_params_set_access( p_sys->p_alsa_pcm, p_hw_params, SND_PCM_ACCESS_RW_INTERLEAVED ) ) < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot set access type (%s)", msg_Err( p_this, "ALSA: cannot set access type (%s)",
snd_strerror( i_err ) ); snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
/* Set 16 bit little endian */ /* Set 16 bit little endian */
if( ( i_err = snd_pcm_hw_params_set_format( p_sys->p_alsa_pcm, p_hw_params, SND_PCM_FORMAT_S16_LE ) ) < 0 ) if( ( i_err = snd_pcm_hw_params_set_format( p_sys->p_alsa_pcm, p_hw_params, SND_PCM_FORMAT_S16_LE ) ) < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot set sample format (%s)", msg_Err( p_this, "ALSA: cannot set sample format (%s)",
snd_strerror( i_err ) ); snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
...@@ -2070,8 +2031,8 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2070,8 +2031,8 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
#endif #endif
if( i_err < 0 ) if( i_err < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot set sample rate (%s)", msg_Err( p_this, "ALSA: cannot set sample rate (%s)",
snd_strerror( i_err ) ); snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
...@@ -2080,13 +2041,14 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2080,13 +2041,14 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
if( ( i_err = snd_pcm_hw_params_set_channels( p_sys->p_alsa_pcm, p_hw_params, channels ) ) < 0 ) if( ( i_err = snd_pcm_hw_params_set_channels( p_sys->p_alsa_pcm, p_hw_params, channels ) ) < 0 )
{ {
channels = ( channels==1 ) ? 2 : 1; channels = ( channels==1 ) ? 2 : 1;
msg_Warn( p_demux, "ALSA: cannot set channel count (%s). Trying with channels=%d", msg_Warn( p_this, "ALSA: cannot set channel count (%s). "
snd_strerror( i_err ), "Trying with channels=%d",
channels ); snd_strerror( i_err ),
channels );
if( ( i_err = snd_pcm_hw_params_set_channels( p_sys->p_alsa_pcm, p_hw_params, channels ) ) < 0 ) if( ( i_err = snd_pcm_hw_params_set_channels( p_sys->p_alsa_pcm, p_hw_params, channels ) ) < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot set channel count (%s)", msg_Err( p_this, "ALSA: cannot set channel count (%s)",
snd_strerror( i_err ) ); snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
p_sys->b_stereo = ( channels == 2 ); p_sys->b_stereo = ( channels == 2 );
...@@ -2096,8 +2058,8 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2096,8 +2058,8 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
unsigned int buffer_time; unsigned int buffer_time;
if( ( i_err = snd_pcm_hw_params_get_buffer_time_max(p_hw_params, &buffer_time, 0) ) < 0 ) if( ( i_err = snd_pcm_hw_params_get_buffer_time_max(p_hw_params, &buffer_time, 0) ) < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot get buffer time max (%s)", msg_Err( p_this, "ALSA: cannot get buffer time max (%s)",
snd_strerror( i_err ) ); snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
if (buffer_time > 500000) buffer_time = 500000; if (buffer_time > 500000) buffer_time = 500000;
...@@ -2111,8 +2073,8 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2111,8 +2073,8 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
#endif #endif
if( i_err < 0 ) if( i_err < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot set period time (%s)", msg_Err( p_this, "ALSA: cannot set period time (%s)",
snd_strerror( i_err ) ); snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
...@@ -2124,16 +2086,16 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2124,16 +2086,16 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
#endif #endif
if( i_err < 0 ) if( i_err < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot set buffer time (%s)", msg_Err( p_this, "ALSA: cannot set buffer time (%s)",
snd_strerror( i_err ) ); snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
/* Apply new hardware parameters */ /* Apply new hardware parameters */
if( ( i_err = snd_pcm_hw_params( p_sys->p_alsa_pcm, p_hw_params ) ) < 0 ) if( ( i_err = snd_pcm_hw_params( p_sys->p_alsa_pcm, p_hw_params ) ) < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot set hw parameters (%s)", msg_Err( p_this, "ALSA: cannot set hw parameters (%s)",
snd_strerror( i_err ) ); snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
...@@ -2142,8 +2104,9 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2142,8 +2104,9 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
snd_pcm_hw_params_get_buffer_size( p_hw_params, &buffer_size ); snd_pcm_hw_params_get_buffer_size( p_hw_params, &buffer_size );
if (chunk_size == buffer_size) if (chunk_size == buffer_size)
{ {
msg_Err( p_demux, "ALSA: period cannot equal buffer size (%lu == %lu)", msg_Err( p_this,
chunk_size, buffer_size); "ALSA: period cannot equal buffer size (%lu == %lu)",
chunk_size, buffer_size);
goto adev_fail; goto adev_fail;
} }
...@@ -2160,8 +2123,9 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2160,8 +2123,9 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
/* Prep device */ /* Prep device */
if( ( i_err = snd_pcm_prepare( p_sys->p_alsa_pcm ) ) < 0 ) if( ( i_err = snd_pcm_prepare( p_sys->p_alsa_pcm ) ) < 0 )
{ {
msg_Err( p_demux, "ALSA: cannot prepare audio interface for use (%s)", msg_Err( p_this,
snd_strerror( i_err ) ); "ALSA: cannot prepare audio interface for use (%s)",
snd_strerror( i_err ) );
goto adev_fail; goto adev_fail;
} }
...@@ -2176,7 +2140,7 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2176,7 +2140,7 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
if( (i_fd = open( psz_device, O_RDONLY | O_NONBLOCK )) < 0 ) if( (i_fd = open( psz_device, O_RDONLY | O_NONBLOCK )) < 0 )
{ {
msg_Err( p_demux, "cannot open OSS audio device (%m)" ); msg_Err( p_this, "cannot open OSS audio device (%m)" );
goto adev_fail; goto adev_fail;
} }
...@@ -2184,29 +2148,29 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2184,29 +2148,29 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
if( ioctl( i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 if( ioctl( i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0
|| i_format != AFMT_S16_LE ) || i_format != AFMT_S16_LE )
{ {
msg_Err( p_demux, "cannot set audio format (16b little endian) " msg_Err( p_this,
"(%m)" ); "cannot set audio format (16b little endian) (%m)" );
goto adev_fail; goto adev_fail;
} }
if( ioctl( i_fd, SNDCTL_DSP_STEREO, if( ioctl( i_fd, SNDCTL_DSP_STEREO,
&p_sys->b_stereo ) < 0 ) &p_sys->b_stereo ) < 0 )
{ {
msg_Err( p_demux, "cannot set audio channels count (%m)" ); msg_Err( p_this, "cannot set audio channels count (%m)" );
goto adev_fail; goto adev_fail;
} }
if( ioctl( i_fd, SNDCTL_DSP_SPEED, if( ioctl( i_fd, SNDCTL_DSP_SPEED,
&p_sys->i_sample_rate ) < 0 ) &p_sys->i_sample_rate ) < 0 )
{ {
msg_Err( p_demux, "cannot set audio sample rate (%m)" ); msg_Err( p_this, "cannot set audio sample rate (%m)" );
goto adev_fail; goto adev_fail;
} }
p_sys->i_audio_max_frame_size = 6 * 1024; p_sys->i_audio_max_frame_size = 6 * 1024;
} }
msg_Dbg( p_demux, "opened adev=`%s' %s %dHz", msg_Dbg( p_this, "opened adev=`%s' %s %dHz",
psz_device, p_sys->b_stereo ? "stereo" : "mono", psz_device, p_sys->b_stereo ? "stereo" : "mono",
p_sys->i_sample_rate ); p_sys->i_sample_rate );
...@@ -2219,10 +2183,14 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2219,10 +2183,14 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
fmt.audio.i_blockalign = fmt.audio.i_channels * fmt.audio.i_bitspersample / 8; fmt.audio.i_blockalign = fmt.audio.i_channels * fmt.audio.i_bitspersample / 8;
fmt.i_bitrate = fmt.audio.i_channels * fmt.audio.i_rate * fmt.audio.i_bitspersample; fmt.i_bitrate = fmt.audio.i_channels * fmt.audio.i_rate * fmt.audio.i_bitspersample;
msg_Dbg( p_demux, "new audio es %d channels %dHz", msg_Dbg( p_this, "new audio es %d channels %dHz",
fmt.audio.i_channels, fmt.audio.i_rate ); fmt.audio.i_channels, fmt.audio.i_rate );
p_sys->p_es_audio = es_out_Add( p_demux->out, &fmt ); if( b_demux )
{
demux_t *p_demux = (demux_t *)p_this;
p_sys->p_es_audio = es_out_Add( p_demux->out, &fmt );
}
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
free( psz_alsa_device_name ); free( psz_alsa_device_name );
...@@ -2247,7 +2215,8 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2247,7 +2215,8 @@ int OpenAudioDev( demux_t *p_demux, char *psz_device )
/***************************************************************************** /*****************************************************************************
* ProbeVideoDev: probe video for capabilities * ProbeVideoDev: probe video for capabilities
*****************************************************************************/ *****************************************************************************/
vlc_bool_t ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, char *psz_device ) static vlc_bool_t ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
char *psz_device )
{ {
int i_index; int i_index;
int i_standard; int i_standard;
...@@ -2537,14 +2506,13 @@ open_failed: ...@@ -2537,14 +2506,13 @@ open_failed:
/***************************************************************************** /*****************************************************************************
* ProbeAudioDev: probe audio for capabilities * ProbeAudioDev: probe audio for capabilities
*****************************************************************************/ *****************************************************************************/
vlc_bool_t ProbeAudioDev( demux_t *p_demux, char *psz_device ) static vlc_bool_t ProbeAudioDev( vlc_object_t *p_this, demux_sys_t *p_sys,
char *psz_device )
{ {
int i_fd = 0; int i_fd = 0;
int i_caps; int i_caps;
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
demux_sys_t *p_sys = p_demux->p_sys;
if( p_sys->b_use_alsa ) if( p_sys->b_use_alsa )
{ {
/* ALSA */ /* ALSA */
...@@ -2555,7 +2523,7 @@ vlc_bool_t ProbeAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2555,7 +2523,7 @@ vlc_bool_t ProbeAudioDev( demux_t *p_demux, char *psz_device )
if( ( i_err = snd_pcm_open( &p_alsa_pcm, psz_alsa_device_name, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK ) ) < 0 ) if( ( i_err = snd_pcm_open( &p_alsa_pcm, psz_alsa_device_name, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK ) ) < 0 )
{ {
msg_Err( p_demux, "cannot open device %s for ALSA audio (%s)", psz_alsa_device_name, snd_strerror( i_err ) ); msg_Err( p_this, "cannot open device %s for ALSA audio (%s)", psz_alsa_device_name, snd_strerror( i_err ) );
free( psz_alsa_device_name ); free( psz_alsa_device_name );
goto open_failed; goto open_failed;
} }
...@@ -2570,14 +2538,14 @@ vlc_bool_t ProbeAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2570,14 +2538,14 @@ vlc_bool_t ProbeAudioDev( demux_t *p_demux, char *psz_device )
if( ( i_fd = open( psz_device, O_RDONLY | O_NONBLOCK ) ) < 0 ) if( ( i_fd = open( psz_device, O_RDONLY | O_NONBLOCK ) ) < 0 )
{ {
msg_Err( p_demux, "cannot open device %s for OSS audio (%m)", psz_device ); msg_Err( p_this, "cannot open device %s for OSS audio (%m)", psz_device );
goto open_failed; goto open_failed;
} }
/* this will fail if the device is video */ /* this will fail if the device is video */
if( ioctl( i_fd, SNDCTL_DSP_GETCAPS, &i_caps ) < 0 ) if( ioctl( i_fd, SNDCTL_DSP_GETCAPS, &i_caps ) < 0 )
{ {
msg_Err( p_demux, "cannot get audio caps (%m)" ); msg_Err( p_this, "cannot get audio caps (%m)" );
goto open_failed; goto open_failed;
} }
...@@ -2589,7 +2557,6 @@ vlc_bool_t ProbeAudioDev( demux_t *p_demux, char *psz_device ) ...@@ -2589,7 +2557,6 @@ vlc_bool_t ProbeAudioDev( demux_t *p_demux, char *psz_device )
open_failed: open_failed:
if( i_fd >= 0 ) close( i_fd ); if( i_fd >= 0 ) close( i_fd );
return VLC_FALSE; return VLC_FALSE;
} }
/***************************************************************************** /*****************************************************************************
...@@ -2766,7 +2733,8 @@ static void ControlListPrint( vlc_object_t *p_obj, int i_fd, ...@@ -2766,7 +2733,8 @@ static void ControlListPrint( vlc_object_t *p_obj, int i_fd,
* List all user-class v4l2 controls, set them to the user specified * List all user-class v4l2 controls, set them to the user specified
* value and create the relevant variables to enable runtime changes * value and create the relevant variables to enable runtime changes
*****************************************************************************/ *****************************************************************************/
static int ControlList( vlc_object_t *p_obj, int i_fd, vlc_bool_t b_reset, vlc_bool_t b_demux ) static int ControlList( vlc_object_t *p_obj, int i_fd,
vlc_bool_t b_reset, vlc_bool_t b_demux )
{ {
struct v4l2_queryctrl queryctrl; struct v4l2_queryctrl queryctrl;
int i_cid; int i_cid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment