/*
* Sections based on the reference V4L2 capture example at
* http://v4l2spec.bytesex.org/spec/capture-example.html
+ *
+ * ALSA support based on parts of
+ * http://www.equalarea.com/paul/alsa-audio.html
+ * and hints taken from alsa-utils (aplay/arecord)
+ * http://www.alsa-project.org
*/
/*
* TODO: No mjpeg support yet.
- * TODO: mmap untested.
* TODO: Tuner partial implementation.
- * TODO: Alsa input support?
+ * TODO: Alsa input support - experimental
*/
/*****************************************************************************
#include <sys/soundcard.h>
+#ifdef HAVE_ALSA
+# define ALSA_PCM_NEW_HW_PARAMS_API
+# define ALSA_PCM_NEW_SW_PARAMS_API
+# include <alsa/asoundlib.h>
+#endif
+
/*****************************************************************************
* Module descriptior
*****************************************************************************/
#define DEV_LONGTEXT N_( \
"Name of the device to use. " \
"If you don't specify anything, /dev/video0 will be used.")
-#define ADEV_TEXT N_("Audio device name")
-#define ADEV_LONGTEXT N_( \
- "Name of the audio device to use. " \
- "If you don't specify anything, no audio device will be used.")
#define STANDARD_TEXT N_( "Standard" )
#define STANDARD_LONGTEXT N_( \
"Video standard (Default, SECAM, PAL, or NTSC)." )
#define IOMETHOD_TEXT N_( "IO Method" )
#define IOMETHOD_LONGTEXT N_( \
"IO Method (READ, MMAP, USERPTR)." )
+#define WIDTH_TEXT N_( "Width" )
+#define WIDTH_LONGTEXT N_( \
+ "Force width (-1 for autodetect)." )
+#define HEIGHT_TEXT N_( "Height" )
+#define HEIGHT_LONGTEXT N_( \
+ "Force height (-1 for autodetect)." )
#define FPS_TEXT N_( "Framerate" )
#define FPS_LONGTEXT N_( "Framerate to capture, if applicable " \
"(-1 for autodetect)." )
+
+#define VIDEOCTRL_RESET_TEXT N_( "Reset video controls" )
+#define VIDEOCTRL_RESET_LONGTEXT N_( \
+ "Reset video controls to defaults provided by the v4l2 driver." )
+#define BRIGHTNESS_TEXT N_( "Brightness" )
+#define BRIGHTNESS_LONGTEXT N_( \
+ "Brightness of the video input." )
+#define CONTRAST_TEXT N_( "Contrast" )
+#define CONTRAST_LONGTEXT N_( \
+ "Contrast of the video input." )
+#define SATURATION_TEXT N_( "Saturation" )
+#define SATURATION_LONGTEXT N_( \
+ "Saturation of the video input." )
+#define HUE_TEXT N_( "Hue" )
+#define HUE_LONGTEXT N_( \
+ "Hue of the video input." )
+#define GAMMA_TEXT N_( "Gamma" )
+#define GAMMA_LONGTEXT N_( \
+ "Gamma of the video input." )
+
+#define ADEV_TEXT N_("Audio device name")
+#define ADEV_LONGTEXT N_( \
+ "Name of the audio device to use. " \
+ "If you don't specify anything, /dev/dsp will be used.")
+#define ALSA_TEXT N_( "Use Alsa" )
+#define ALSA_LONGTEXT N_( \
+ "Use ALSA instead of OSS for audio" )
#define STEREO_TEXT N_( "Stereo" )
#define STEREO_LONGTEXT N_( \
"Capture the audio stream in stereo." )
#define SAMPLERATE_TEXT N_( "Samplerate" )
#define SAMPLERATE_LONGTEXT N_( \
"Samplerate of the captured audio stream, in Hz (eg: 11025, 22050, 44100, 48000)" )
+
#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
"Caching value for V4L2 captures. This " \
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
+ set_section( N_( "Video input" ), NULL );
add_string( "v4l2-dev", "/dev/video0", 0, DEV_TEXT, DEV_LONGTEXT,
VLC_FALSE );
- add_string( "v4l2-adev", "/dev/dsp", 0, DEV_TEXT, DEV_LONGTEXT,
- VLC_FALSE );
add_integer( "v4l2-standard", 0, NULL, STANDARD_TEXT, STANDARD_LONGTEXT,
VLC_FALSE );
change_integer_list( i_standards_list, psz_standards_list_text, 0 );
add_integer( "v4l2-input", 0, NULL, INPUT_TEXT, INPUT_LONGTEXT,
VLC_TRUE );
add_integer( "v4l2-io", IO_METHOD_MMAP, NULL, IOMETHOD_TEXT,
- IOMETHOD_LONGTEXT, VLC_FALSE );
+ IOMETHOD_LONGTEXT, VLC_TRUE );
change_integer_list( i_iomethod_list, psz_iomethod_list_text, 0 );
+ add_integer( "v4l2-width", 0, NULL, WIDTH_TEXT,
+ WIDTH_LONGTEXT, VLC_TRUE );
+ add_integer( "v4l2-height", 0, NULL, HEIGHT_TEXT,
+ HEIGHT_LONGTEXT, VLC_TRUE );
add_float( "v4l2-fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_TRUE );
+
+ set_section( N_( "Video controls" ), NULL );
+ add_bool( "v4l2-videocontrol-reset", VLC_FALSE, NULL, VIDEOCTRL_RESET_TEXT,
+ VIDEOCTRL_RESET_LONGTEXT, VLC_TRUE );
+ add_integer( "v4l2-brightness", -1, NULL, BRIGHTNESS_TEXT,
+ BRIGHTNESS_LONGTEXT, VLC_TRUE );
+ add_integer( "v4l2-contrast", -1, NULL, CONTRAST_TEXT,
+ CONTRAST_LONGTEXT, VLC_TRUE );
+ add_integer( "v4l2-saturation", -1, NULL, SATURATION_TEXT,
+ SATURATION_LONGTEXT, VLC_TRUE );
+ add_integer( "v4l2-hue", -1, NULL, HUE_TEXT,
+ HUE_LONGTEXT, VLC_TRUE );
+ add_integer( "v4l2-gamma", -1, NULL, GAMMA_TEXT,
+ GAMMA_LONGTEXT, VLC_TRUE );
+
+ set_section( N_( "Audio input" ), NULL );
+ add_string( "v4l2-adev", "/dev/dsp", 0, ADEV_TEXT, ADEV_LONGTEXT,
+ VLC_FALSE );
+#ifdef HAVE_ALSA
+ add_bool( "v4l2-alsa", VLC_FALSE, NULL, ALSA_TEXT, ALSA_LONGTEXT,
+ VLC_TRUE );
+#endif
add_bool( "v4l2-stereo", VLC_TRUE, NULL, STEREO_TEXT, STEREO_LONGTEXT,
VLC_TRUE );
add_integer( "v4l2-samplerate", 48000, NULL, SAMPLERATE_TEXT,
static block_t* ProcessVideoFrame( demux_t *p_demux, uint8_t *p_frame );
static block_t* GrabAudio( demux_t *p_demux );
-vlc_bool_t IsChromaSupported( demux_t *p_demux, unsigned int i_v4l2 );
-unsigned int GetChromaFromFourcc( char *psz_fourcc );
+vlc_bool_t IsPixelFormatSupported( demux_t *p_demux, unsigned int i_pixelformat );
+char* ResolveALSADeviceName( char *psz_device );
static int OpenVideoDev( demux_t *, char *psz_device );
static int OpenAudioDev( demux_t *, char *psz_device );
static vlc_bool_t ProbeVideoDev( demux_t *, char *psz_device );
static vlc_bool_t ProbeAudioDev( demux_t *, char *psz_device );
+static int VideoControlList( demux_t *p_demux, int i_fd, vlc_bool_t b_reset );
+static int VideoControl( demux_t *, int i_fd,
+ const char *psz_label, int i_cid, int i_value );
+static int VideoControlCallback( vlc_object_t *p_this,
+ const char *psz_var, vlc_value_t oldval, vlc_value_t newval,
+ void *p_data );
+
static struct
{
unsigned int i_v4l2;
int i_fourcc;
} v4l2chroma_to_fourcc[] =
{
- { V4L2_PIX_FMT_GREY, VLC_FOURCC( 'G', 'R', 'E', 'Y' ) },
- { V4L2_PIX_FMT_HI240, VLC_FOURCC( 'I', '2', '4', '0' ) },
- { V4L2_PIX_FMT_RGB565, VLC_FOURCC( 'R', 'V', '1', '6' ) },
- { V4L2_PIX_FMT_RGB555, VLC_FOURCC( 'R', 'V', '1', '5' ) },
- { V4L2_PIX_FMT_BGR24, VLC_FOURCC( 'R', 'V', '2', '4' ) },
- { V4L2_PIX_FMT_BGR32, VLC_FOURCC( 'R', 'V', '3', '2' ) },
- { V4L2_PIX_FMT_YUYV, VLC_FOURCC( 'Y', 'U', 'Y', '2' ) },
- { V4L2_PIX_FMT_YUYV, VLC_FOURCC( 'Y', 'U', 'Y', 'V' ) },
- { V4L2_PIX_FMT_UYVY, VLC_FOURCC( 'U', 'Y', 'V', 'Y' ) },
- { V4L2_PIX_FMT_Y41P, VLC_FOURCC( 'I', '4', '1', 'N' ) },
+ { V4L2_PIX_FMT_GREY, VLC_FOURCC( 'G', 'R', 'E', 'Y' ) },
+ { V4L2_PIX_FMT_HI240, VLC_FOURCC( 'I', '2', '4', '0' ) },
+ { V4L2_PIX_FMT_RGB565, VLC_FOURCC( 'R', 'V', '1', '6' ) },
+ { V4L2_PIX_FMT_RGB555, VLC_FOURCC( 'R', 'V', '1', '5' ) },
+ { V4L2_PIX_FMT_BGR24, VLC_FOURCC( 'R', 'V', '2', '4' ) },
+ { V4L2_PIX_FMT_BGR32, VLC_FOURCC( 'R', 'V', '3', '2' ) },
+ { V4L2_PIX_FMT_YUYV, VLC_FOURCC( 'Y', 'U', 'Y', '2' ) },
+ { V4L2_PIX_FMT_YUYV, VLC_FOURCC( 'Y', 'U', 'Y', 'V' ) },
+ { V4L2_PIX_FMT_UYVY, VLC_FOURCC( 'U', 'Y', 'V', 'Y' ) },
+ { V4L2_PIX_FMT_Y41P, VLC_FOURCC( 'I', '4', '1', 'N' ) },
{ V4L2_PIX_FMT_YUV422P, VLC_FOURCC( 'I', '4', '2', '2' ) },
- { V4L2_PIX_FMT_YVU420, VLC_FOURCC( 'I', '4', '2', '0' ) },
+ { V4L2_PIX_FMT_YVU420, VLC_FOURCC( 'I', '4', '2', '0' ) },
{ V4L2_PIX_FMT_YUV411P, VLC_FOURCC( 'I', '4', '1', '1' ) },
- { V4L2_PIX_FMT_YUV410, VLC_FOURCC( 'I', '4', '1', '0' ) },
+ { V4L2_PIX_FMT_YUV410, VLC_FOURCC( 'I', '4', '1', '0' ) },
{ 0, 0 }
};
{
void * start;
size_t length;
+ void * orig_userp;
};
struct demux_sys_t
char *psz_adev;
int i_fd_audio;
+ char *psz_requested_chroma;
+
/* Video */
io_method io;
mtime_t i_video_pts; /* only used when f_fps > 0 */
int i_fourcc;
+ vlc_bool_t b_videoctrl_reset;
+ int i_brightness;
+ int i_contrast;
+ int i_saturation;
+ int i_hue;
+ int i_gamma;
+
picture_t pic;
int i_video_frame_size;
es_out_id_t *p_es_video;
/* Audio */
- int i_sample_rate;
+ unsigned int i_sample_rate;
vlc_bool_t b_stereo;
int i_audio_max_frame_size;
block_t *p_block_audio;
es_out_id_t *p_es_audio;
+
+#ifdef HAVE_ALSA
+ /* ALSA Audio */
+ vlc_bool_t b_use_alsa;
+ snd_pcm_t *p_alsa_pcm;
+ int i_alsa_frame_size;
+ int i_alsa_chunk_size;
+#endif
};
/*****************************************************************************
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
vlc_value_t val;
- char *psz;
/* Only when selected */
if( *p_demux->psz_access == '\0' ) return VLC_EGENERIC;
p_sys->io = var_CreateGetInteger( p_demux, "v4l2-io" );
+ p_sys->i_width = var_CreateGetInteger( p_demux, "v4l2-width" );
+ p_sys->i_height = var_CreateGetInteger( p_demux, "v4l2-height" );
+
+ p_sys->b_videoctrl_reset =
+ var_CreateGetBool( p_demux, "v4l2-videocontrol-reset" );
+ p_sys->i_brightness =
+ var_CreateGetIntegerCommand( p_demux, "v4l2-brightness" );
+ p_sys->i_contrast =
+ var_CreateGetIntegerCommand( p_demux, "v4l2-contrast" );
+ p_sys->i_saturation =
+ var_CreateGetIntegerCommand( p_demux, "v4l2-saturation" );
+ p_sys->i_hue =
+ var_CreateGetIntegerCommand( p_demux, "v4l2-hue" );
+ p_sys->i_gamma =
+ var_CreateGetIntegerCommand( p_demux, "v4l2-gamma" );
+
+ var_AddCallback( p_demux, "v4l2-brightness", VideoControlCallback, NULL );
+ var_AddCallback( p_demux, "v4l2-contrast", VideoControlCallback, NULL );
+ var_AddCallback( p_demux, "v4l2-saturation", VideoControlCallback, NULL );
+ var_AddCallback( p_demux, "v4l2-hue", VideoControlCallback, NULL );
+ var_AddCallback( p_demux, "v4l2-gamma", VideoControlCallback, NULL );
+
+ var_Create( p_demux, "videocontrol", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_demux, "videocontrol", VideoControlCallback, NULL );
+
var_Create( p_demux, "v4l2-fps", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
var_Get( p_demux, "v4l2-fps", &val );
p_sys->f_fps = val.f_float;
var_Get( p_demux, "v4l2-samplerate", &val );
p_sys->i_sample_rate = val.i_int;
- psz = var_CreateGetString( p_demux, "v4l2-chroma" );
- p_sys->i_fourcc = GetChromaFromFourcc( psz );
- free( psz );
+ p_sys->psz_requested_chroma = var_CreateGetString( p_demux, "v4l2-chroma" );
+
+#ifdef HAVE_ALSA
+ var_Create( p_demux, "v4l2-alsa", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Get( p_demux, "v4l2-alsa", &val );
+ p_sys->b_use_alsa = val.b_bool;
+#endif
var_Create( p_demux, "v4l2-stereo", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Get( p_demux, "v4l2-stereo", &val );
ParseMRL( p_demux );
+#ifdef HAVE_ALSA
+ /* Alsa support available? */
+ msg_Dbg( p_demux, "ALSA input support available" );
+#endif
+
/* Find main device (video or audio) */
if( p_sys->psz_device && *p_sys->psz_device )
{
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_demux, "v4l2-dev" );;
+ p_sys->psz_vdev = var_CreateGetString( p_demux, "v4l2-dev" );
}
+ msg_Dbg( p_demux, "opening '%s' as video", p_sys->psz_vdev );
if( p_sys->psz_vdev && *p_sys->psz_vdev && ProbeVideoDev( p_demux, p_sys->psz_vdev ) )
{
p_sys->i_fd_video = OpenVideoDev( p_demux, p_sys->psz_vdev );
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_demux, "v4l2-adev" );;
+ p_sys->psz_adev = var_CreateGetString( p_demux, "v4l2-adev" );
}
+ msg_Dbg( p_demux, "opening '%s' as audio", p_sys->psz_adev );
if( p_sys->psz_adev && *p_sys->psz_adev && ProbeAudioDev( p_demux, p_sys->psz_adev ) )
{
p_sys->i_fd_audio = OpenAudioDev( p_demux, p_sys->psz_adev );
i_len = strlen( psz_parser );
}
- char* chroma = strndup( psz_parser, i_len );
- p_sys->i_fourcc = GetChromaFromFourcc( chroma );
- free( chroma );
+ if( p_sys->psz_requested_chroma ) free( p_sys->psz_requested_chroma );
+ p_sys->psz_requested_chroma = strndup( psz_parser, i_len );
psz_parser += i_len;
}
p_sys->io = strtol( psz_parser, &psz_parser, 0 );
}
}
+ else if( !strncmp( psz_parser, "width=",
+ strlen( "width=" ) ) )
+ {
+ p_sys->i_width =
+ strtol( psz_parser + strlen( "width=" ),
+ &psz_parser, 0 );
+ }
+ else if( !strncmp( psz_parser, "height=",
+ strlen( "height=" ) ) )
+ {
+ p_sys->i_height =
+ strtol( psz_parser + strlen( "height=" ),
+ &psz_parser, 0 );
+ }
+ else if( !strncmp( psz_parser, "videocontrol-reset",
+ strlen( "videocontrol-reset" ) ) )
+ {
+ p_sys->b_videoctrl_reset = VLC_TRUE;
+ psz_parser += strlen( "videocontrol-reset" );
+ }
+ else if( !strncmp( psz_parser, "brightness=",
+ strlen( "brightness=" ) ) )
+ {
+ p_sys->i_brightness =
+ strtol( psz_parser + strlen( "brightness=" ),
+ &psz_parser, 0 );
+ }
+ else if( !strncmp( psz_parser, "contrast=",
+ strlen( "contrast=" ) ) )
+ {
+ p_sys->i_contrast =
+ strtol( psz_parser + strlen( "contrast=" ),
+ &psz_parser, 0 );
+ }
+ else if( !strncmp( psz_parser, "saturation=",
+ strlen( "saturation=" ) ) )
+ {
+ p_sys->i_saturation =
+ strtol( psz_parser + strlen( "saturation=" ),
+ &psz_parser, 0 );
+ }
+ else if( !strncmp( psz_parser, "hue=",
+ strlen( "hue=" ) ) )
+ {
+ p_sys->i_hue =
+ strtol( psz_parser + strlen( "hue=" ),
+ &psz_parser, 0 );
+ }
+ else if( !strncmp( psz_parser, "gamma=",
+ strlen( "gamma=" ) ) )
+ {
+ p_sys->i_gamma =
+ strtol( psz_parser + strlen( "gamma=" ),
+ &psz_parser, 0 );
+ }
else if( !strncmp( psz_parser, "samplerate=",
strlen( "samplerate=" ) ) )
{
strtol( psz_parser + strlen( "samplerate=" ),
&psz_parser, 0 );
}
+#ifdef HAVE_ALSA
+ else if( !strncmp( psz_parser, "alsa", strlen( "alsa" ) ) )
+ {
+ psz_parser += strlen( "alsa" );
+ p_sys->b_use_alsa = VLC_TRUE;
+ }
+#endif
else if( !strncmp( psz_parser, "stereo", strlen( "stereo" ) ) )
{
psz_parser += strlen( "stereo" );
else if( !strncmp( psz_parser, "caching=", strlen( "caching=" ) ) )
{
p_sys->i_pts = strtol( psz_parser + strlen( "caching=" ),
- &psz_parser, DEFAULT_PTS_DELAY / 1000 );
+ &psz_parser, 0 );
}
else
{
{
memset( &buf, 0, sizeof(buf) );
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- buf.memory = V4L2_MEMORY_USERPTR;
+ 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 */
}
}
}
- /* Close */
- if( p_sys->i_fd_video >= 0 ) close( p_sys->i_fd_video );
- if( p_sys->i_fd_audio >= 0 ) close( p_sys->i_fd_audio );
-
/* Free Video Buffers */
if( p_sys->p_buffers ) {
switch( p_sys->io )
case IO_METHOD_USERPTR:
for( i = 0; i < p_sys->i_nbuffers; ++i )
{
- free( p_sys->p_buffers[i].start );
+ free( p_sys->p_buffers[i].orig_userp );
}
break;
}
free( p_sys->p_buffers );
}
+ /* Close */
+ if( p_sys->i_fd_video >= 0 ) close( p_sys->i_fd_video );
+#ifdef HAVE_ALSA
+ if( p_sys->b_use_alsa )
+ {
+ if( p_sys->p_alsa_pcm ) snd_pcm_close( p_sys->p_alsa_pcm );
+ }
+ else
+#endif
+ {
+ if( p_sys->i_fd_audio >= 0 ) close( p_sys->i_fd_audio );
+ }
+
if( p_sys->p_block_audio ) block_Release( p_sys->p_block_audio );
if( p_sys->psz_device ) free( p_sys->psz_device );
if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
if( p_sys->p_inputs ) free( p_sys->p_inputs );
if( p_sys->p_tuners ) free( p_sys->p_tuners );
if( p_sys->p_codecs ) free( p_sys->p_codecs );
+ if( p_sys->psz_requested_chroma ) free( p_sys->psz_requested_chroma );
free( p_sys );
}
default:
msg_Err( p_demux, "Failed to wait (VIDIOC_DQBUF)" );
return 0;
- }
+ }
}
/* Find frame? */
buf.length == p_sys->p_buffers[i].length ) break;
}
- if( i >= p_sys->i_nbuffers ) {
+ if( i >= p_sys->i_nbuffers )
+ {
msg_Err( p_demux, "Failed capturing new frame as i>=nbuffers" );
return 0;
}
block_t *p_block;
if( !p_frame ) return 0;
-
+
/* New block */
if( !( p_block = block_New( p_demux, p_sys->i_video_frame_size ) ) )
{
int i_read, i_correct;
block_t *p_block;
- /* Copied from v4l.c */
-
if( p_sys->p_block_audio ) p_block = p_sys->p_block_audio;
else p_block = block_New( p_demux, p_sys->i_audio_max_frame_size );
p_sys->p_block_audio = p_block;
- i_read = read( p_sys->i_fd_audio, p_block->p_buffer,
- p_sys->i_audio_max_frame_size );
+#ifdef HAVE_ALSA
+ if( p_sys->b_use_alsa )
+ {
+ /* ALSA */
+ i_read = snd_pcm_readi( p_sys->p_alsa_pcm, p_block->p_buffer, p_sys->i_alsa_chunk_size );
+ /* TODO: ALSA ERROR HANDLING?? xrun?? */
+ }
+ else
+#endif
+ {
+ /* OSS */
+ i_read = read( p_sys->i_fd_audio, p_block->p_buffer,
+ p_sys->i_audio_max_frame_size );
+ }
if( i_read <= 0 ) return 0;
/* Correct the date because of kernel buffering */
i_correct = i_read;
- if( ioctl( p_sys->i_fd_audio, SNDCTL_DSP_GETISPACE, &buf_info ) == 0 )
+#ifdef HAVE_ALSA
+ if( !p_sys->b_use_alsa )
+#endif
+ {
+ if( ioctl( p_sys->i_fd_audio, SNDCTL_DSP_GETISPACE, &buf_info ) == 0 )
+ {
+ i_correct += buf_info.bytes;
+ }
+ }
+#ifdef HAVE_ALSA
+ else
{
- i_correct += buf_info.bytes;
+ /* TODO: ALSA timing */
+ /* Very experimental code... */
+ int i_err;
+ snd_pcm_sframes_t delay = 0;
+ if( ( i_err = snd_pcm_delay( p_sys->p_alsa_pcm, &delay ) ) >= 0 )
+ {
+ int i_correction_delta = delay * p_sys->i_alsa_frame_size;
+ /* Test for overrun */
+ if( i_correction_delta>p_sys->i_audio_max_frame_size )
+ {
+ msg_Warn( p_demux, "ALSA read overrun" );
+ i_correction_delta = p_sys->i_audio_max_frame_size;
+ snd_pcm_prepare( p_sys->p_alsa_pcm );
+ }
+ i_correct += i_correction_delta;
+ }
+ else
+ {
+ /* delay failed so reset */
+ msg_Warn( p_demux, "ALSA snd_pcm_delay failed (%s)", snd_strerror( i_err ) );
+ snd_pcm_prepare( p_sys->p_alsa_pcm );
+ }
}
+#endif
/* Timestamp */
p_block->i_pts = p_block->i_dts =
for( p_sys->i_nbuffers = 0; p_sys->i_nbuffers < req.count; ++p_sys->i_nbuffers )
{
struct v4l2_buffer buf;
-
+
memset( &buf, 0, sizeof(buf) );
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_MMAP;
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, p_sys->i_fd_video, buf.m.offset );
+ 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 )
{
- msg_Err( p_demux, "mmap failed" );
+ msg_Err( p_demux, "mmap failed (%m)" );
goto open_failed;
}
}
{
demux_sys_t *p_sys = p_demux->p_sys;
struct v4l2_requestbuffers req;
+ unsigned int i_page_size;
+
+ i_page_size = getpagesize();
+ i_buffer_size = ( i_buffer_size + i_page_size - 1 ) & ~( i_page_size - 1);
memset( &req, 0, sizeof(req) );
req.count = 4;
for( p_sys->i_nbuffers = 0; p_sys->i_nbuffers < 4; ++p_sys->i_nbuffers )
{
p_sys->p_buffers[p_sys->i_nbuffers].length = i_buffer_size;
- p_sys->p_buffers[p_sys->i_nbuffers].start = malloc( i_buffer_size );
+ p_sys->p_buffers[p_sys->i_nbuffers].start =
+ vlc_memalign( &p_sys->p_buffers[p_sys->i_nbuffers].orig_userp,
+ /* boundary */ i_page_size, i_buffer_size );
if( !p_sys->p_buffers[p_sys->i_nbuffers].start )
{
}
/*****************************************************************************
- * GetChromaFromFourcc: Returns the fourcc code from the given string
+ * IsPixelFormatSupported: returns true if the specified V4L2 pixel format is
+ * in the array of supported formats returned by the driver
*****************************************************************************/
-unsigned int GetChromaFromFourcc( char *psz_fourcc )
-{
- if( strlen( psz_fourcc ) >= 4 )
- {
- int i_chroma = VLC_FOURCC( psz_fourcc[0], psz_fourcc[1], psz_fourcc[2], psz_fourcc[3] );
-
- /* Find out v4l2 chroma code */
- for( int i = 0; v4l2chroma_to_fourcc[i].i_fourcc != 0; i++ )
- {
- if( v4l2chroma_to_fourcc[i].i_fourcc == i_chroma )
- {
- return v4l2chroma_to_fourcc[i].i_fourcc;
- }
- }
- }
-
- return 0;
-}
-
-/*****************************************************************************
- * IsChromaSupported: returns true if the specified V4L2 chroma constant is
- * in the array of supported chromas returned by the driver
- *****************************************************************************/
-vlc_bool_t IsChromaSupported( demux_t *p_demux, unsigned int i_chroma )
+vlc_bool_t IsPixelFormatSupported( demux_t *p_demux, unsigned int i_pixelformat )
{
demux_sys_t *p_sys = p_demux->p_sys;
for( int i_index = 0; i_index < p_sys->i_codec; i_index++ )
{
- if( p_sys->p_codecs[i_index].pixelformat == i_chroma ) return VLC_TRUE;
+ if( p_sys->p_codecs[i_index].pixelformat == i_pixelformat ) return VLC_TRUE;
}
return VLC_FALSE;
{
if( ioctl( i_fd, VIDIOC_S_STD, &p_sys->i_selected_standard_id ) < 0 )
{
- msg_Err( p_demux, "cannot set input (%m)" );
- goto open_failed;
+ msg_Err( p_demux, "cannot set standard (%m)" );
+ goto open_failed;
}
msg_Dbg( p_demux, "Set standard" );
}
if( ioctl( i_fd, VIDIOC_S_INPUT, &p_sys->i_selected_input ) < 0 )
{
- msg_Err( p_demux, "cannot set input (%m)" );
- goto open_failed;
+ msg_Err( p_demux, "cannot set input (%m)" );
+ goto open_failed;
}
/* Verify device support for the various IO methods */
}
/* Try and find default resolution if not specified */
- if( !p_sys->i_width && !p_sys->i_height ) {
- memset( &fmt, 0, sizeof(fmt) );
- fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ memset( &fmt, 0, sizeof(fmt) );
+ fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if ( ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 )
+ if( p_sys->i_width <= 0 || p_sys->i_height <= 0 )
+ {
+ if( ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 )
{
msg_Err( p_demux, "Cannot get default width and height." );
goto open_failed;
p_sys->i_height = p_sys->i_height * 2;
}
}
+ else
+ {
+ msg_Dbg( p_demux, "trying specified size %dx%d", p_sys->i_width, p_sys->i_height );
+ }
fmt.fmt.pix.width = p_sys->i_width;
fmt.fmt.pix.height = p_sys->i_height;
/* Test and set Chroma */
fmt.fmt.pix.pixelformat = 0;
- if( p_sys->i_fourcc )
+ if( p_sys->psz_requested_chroma && strlen( p_sys->psz_requested_chroma ) > 0 )
{
/* User specified chroma */
- for( int i = 0; v4l2chroma_to_fourcc[i].i_v4l2 != 0; i++ )
+ if( strlen( p_sys->psz_requested_chroma ) >= 4 )
{
- if( v4l2chroma_to_fourcc[i].i_fourcc == p_sys->i_fourcc )
+ int i_requested_fourcc = VLC_FOURCC(
+ p_sys->psz_requested_chroma[0], p_sys->psz_requested_chroma[1],
+ p_sys->psz_requested_chroma[2], p_sys->psz_requested_chroma[3] );
+ for( int i = 0; v4l2chroma_to_fourcc[i].i_v4l2 != 0; i++ )
{
- fmt.fmt.pix.pixelformat = v4l2chroma_to_fourcc[i].i_v4l2;
- break;
+ if( v4l2chroma_to_fourcc[i].i_fourcc == i_requested_fourcc )
+ {
+ fmt.fmt.pix.pixelformat = v4l2chroma_to_fourcc[i].i_v4l2;
+ break;
+ }
}
}
/* Try and set user chroma */
- if( !IsChromaSupported( 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 && ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 ) )
{
- msg_Warn( p_demux, "Driver is unable to use specified chroma. Using defaults." );
+ msg_Warn( p_demux, "Driver is unable to use specified chroma %s. Trying defaults.", p_sys->psz_requested_chroma );
fmt.fmt.pix.pixelformat = 0;
}
}
if( !fmt.fmt.pix.pixelformat )
{
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YVU420;
- if( !IsChromaSupported( p_demux, fmt.fmt.pix.pixelformat ) || ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 )
+ if( !IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) || ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 )
{
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV422P;
- if( !IsChromaSupported( p_demux, fmt.fmt.pix.pixelformat ) || ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 )
+ if( !IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) || ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 )
{
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
- if( !IsChromaSupported( p_demux, fmt.fmt.pix.pixelformat ) || ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 )
+ if( !IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) || ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 )
{
msg_Err( p_demux, "Could not select any of the default chromas!" );
goto open_failed;
if( fmt.fmt.pix.sizeimage < i_min )
fmt.fmt.pix.sizeimage = i_min;
+#ifdef VIDIOC_ENUM_FRAMEINTERVALS
+ /* This is new in Linux 2.6.19 */
+ /* List supported frame rates */
+ struct v4l2_frmivalenum frmival;
+ frmival.index = 0;
+ 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 )
+ {
+ char sz_fourcc[5];
+ memset( &sz_fourcc, 0, sizeof( sz_fourcc ) );
+ vlc_fourcc_to_char( p_sys->i_fourcc, &sz_fourcc );
+ msg_Dbg( p_demux, "supported frame intervals for %4s, %dx%d:",
+ sz_fourcc, frmival.width, frmival.height );
+ switch( frmival.type )
+ {
+ case V4L2_FRMIVAL_TYPE_DISCRETE:
+ do
+ {
+ msg_Dbg( p_demux, " supported frame interval: %d/%d",
+ frmival.discrete.numerator,
+ frmival.discrete.denominator );
+ frmival.index++;
+ } while( ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 );
+ break;
+ case V4L2_FRMIVAL_TYPE_STEPWISE:
+ msg_Dbg( p_demux, " supported frame intervals: %d/%d to "
+ "%d/%d using %d/%d increments",
+ frmival.stepwise.min.numerator,
+ frmival.stepwise.min.denominator,
+ frmival.stepwise.max.numerator,
+ frmival.stepwise.max.denominator,
+ frmival.stepwise.step.numerator,
+ frmival.stepwise.step.denominator );
+ break;
+ case V4L2_FRMIVAL_TYPE_CONTINUOUS:
+ msg_Dbg( p_demux, " supported frame intervals: %d/%d to %d/%d",
+ frmival.stepwise.min.numerator,
+ frmival.stepwise.min.denominator,
+ frmival.stepwise.max.numerator,
+ frmival.stepwise.max.denominator );
+ break;
+ }
+ }
+#endif
+
+ VideoControlList( p_demux, i_fd, p_sys->b_videoctrl_reset );
+
+ VideoControl( p_demux, i_fd,
+ "brightness", V4L2_CID_BRIGHTNESS, p_sys->i_brightness );
+ VideoControl( p_demux, i_fd,
+ "contrast", V4L2_CID_CONTRAST, p_sys->i_contrast );
+ VideoControl( p_demux, i_fd,
+ "saturation", V4L2_CID_SATURATION, p_sys->i_saturation );
+ VideoControl( p_demux, i_fd, "hue", V4L2_CID_HUE, p_sys->i_hue );
+ VideoControl( p_demux, i_fd, "gamma", V4L2_CID_GAMMA, p_sys->i_gamma );
+
/* Init vout Picture */
vout_InitPicture( VLC_OBJECT(p_demux), &p_sys->pic, p_sys->i_fourcc,
p_sys->i_width, p_sys->i_height, p_sys->i_width *
buf.memory = V4L2_MEMORY_MMAP;
buf.index = i;
- if( ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 ) {
+ if( ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 )
+ {
msg_Err( p_demux, "VIDIOC_QBUF failed" );
goto open_failed;
}
}
buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if( ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 ) {
+ if( ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 )
+ {
msg_Err( p_demux, "VIDIOC_STREAMON failed" );
goto open_failed;
}
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( ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 )
+ {
msg_Err( p_demux, "VIDIOC_QBUF failed" );
goto open_failed;
}
}
buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if( ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 ) {
+ if( ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 )
+ {
msg_Err( p_demux, "VIDIOC_STREAMON failed" );
goto open_failed;
}
return i_fd;
open_failed:
- if( i_fd ) close( i_fd );
+ if( i_fd >= 0 ) close( i_fd );
return -1;
}
+#ifdef HAVE_ALSA
+/*****************************************************************************
+ * ResolveALSADeviceName: Change any . to : in the ALSA device name
+ *****************************************************************************/
+char* ResolveALSADeviceName( char *psz_device )
+{
+ char* psz_alsa_name = strdup( psz_device );
+ for( unsigned int i = 0; i < strlen( psz_device ); i++ )
+ {
+ if( psz_alsa_name[i] == '.' ) psz_alsa_name[i] = ':';
+ }
+ return psz_alsa_name;
+}
+#endif
+
/*****************************************************************************
* OpenAudioDev: open and set up the audio device and probe for capabilities
*****************************************************************************/
int OpenAudioDev( demux_t *p_demux, char *psz_device )
{
demux_sys_t *p_sys = p_demux->p_sys;
- int i_fd, i_format;
-
- if( (i_fd = open( psz_device, O_RDONLY | O_NONBLOCK )) < 0 )
+ int i_fd = 0;
+ int i_format;
+#ifdef HAVE_ALSA
+ p_sys->p_alsa_pcm = NULL;
+ char* psz_alsa_device_name = ResolveALSADeviceName( psz_device );
+ snd_pcm_hw_params_t *p_hw_params = NULL;
+ snd_pcm_uframes_t buffer_size;
+ snd_pcm_uframes_t chunk_size;
+#endif
+
+#ifdef HAVE_ALSA
+ if( p_sys->b_use_alsa )
{
- msg_Err( p_demux, "cannot open audio device (%m)" );
- goto adev_fail;
- }
+ /* ALSA */
- i_format = AFMT_S16_LE;
- if( ioctl( i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0
- || i_format != AFMT_S16_LE )
- {
- msg_Err( p_demux, "cannot set audio format (16b little endian) "
- "(%m)" );
- goto adev_fail;
- }
+ int i_err;
- if( ioctl( i_fd, SNDCTL_DSP_STEREO,
- &p_sys->b_stereo ) < 0 )
- {
- msg_Err( p_demux, "cannot set audio channels count (%m)" );
- goto adev_fail;
- }
+ if( ( i_err = snd_pcm_open( &p_sys->p_alsa_pcm, psz_alsa_device_name,
+ SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK ) ) < 0)
+ {
+ msg_Err( p_demux, "Cannot open ALSA audio device %s (%s)",
+ psz_alsa_device_name,
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+
+ if( ( i_err = snd_pcm_nonblock( p_sys->p_alsa_pcm, 1 ) ) < 0)
+ {
+ msg_Err( p_demux, "Cannot set ALSA nonblock (%s)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+
+ /* Begin setting hardware parameters */
+
+ if( ( i_err = snd_pcm_hw_params_malloc( &p_hw_params ) ) < 0 )
+ {
+ msg_Err( p_demux, "ALSA: cannot allocate hardware parameter structure (%s)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
- if( ioctl( i_fd, SNDCTL_DSP_SPEED,
- &p_sys->i_sample_rate ) < 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)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+
+ /* 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 )
+ {
+ msg_Err( p_demux, "ALSA: cannot set access type (%s)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+
+ /* 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 )
+ {
+ msg_Err( p_demux, "ALSA: cannot set sample format (%s)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+
+ /* Set sample rate */
+#ifdef HAVE_ALSA_NEW_API
+ i_err = snd_pcm_hw_params_set_rate_near( p_sys->p_alsa_pcm, p_hw_params, &p_sys->i_sample_rate, NULL );
+#else
+ i_err = snd_pcm_hw_params_set_rate_near( p_sys->p_alsa_pcm, p_hw_params, p_sys->i_sample_rate, NULL );
+#endif
+ if( i_err < 0 )
+ {
+ msg_Err( p_demux, "ALSA: cannot set sample rate (%s)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+
+ /* Set channels */
+ unsigned int channels = p_sys->b_stereo ? 2 : 1;
+ if( ( i_err = snd_pcm_hw_params_set_channels( p_sys->p_alsa_pcm, p_hw_params, channels ) ) < 0 )
+ {
+ channels = ( channels==1 ) ? 2 : 1;
+ msg_Warn( p_demux, "ALSA: cannot set channel count (%s). Trying with channels=%d",
+ snd_strerror( i_err ),
+ channels );
+ 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)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+ p_sys->b_stereo = ( channels == 2 );
+ }
+
+ /* Set metrics for buffer calculations later */
+ unsigned int buffer_time;
+ 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)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+ if (buffer_time > 500000) buffer_time = 500000;
+
+ /* Set period time */
+ unsigned int period_time = buffer_time / 4;
+#ifdef HAVE_ALSA_NEW_API
+ i_err = snd_pcm_hw_params_set_period_time_near( p_sys->p_alsa_pcm, p_hw_params, &period_time, 0 );
+#else
+ i_err = snd_pcm_hw_params_set_period_time_near( p_sys->p_alsa_pcm, p_hw_params, period_time, 0 );
+#endif
+ if( i_err < 0 )
+ {
+ msg_Err( p_demux, "ALSA: cannot set period time (%s)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+
+ /* Set buffer time */
+#ifdef HAVE_ALSA_NEW_API
+ i_err = snd_pcm_hw_params_set_buffer_time_near( p_sys->p_alsa_pcm, p_hw_params, &buffer_time, 0 );
+#else
+ i_err = snd_pcm_hw_params_set_buffer_time_near( p_sys->p_alsa_pcm, p_hw_params, buffer_time, 0 );
+#endif
+ if( i_err < 0 )
+ {
+ msg_Err( p_demux, "ALSA: cannot set buffer time (%s)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+
+ /* Apply new hardware parameters */
+ 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)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+
+ /* Get various buffer metrics */
+ snd_pcm_hw_params_get_period_size( p_hw_params, &chunk_size, 0 );
+ snd_pcm_hw_params_get_buffer_size( p_hw_params, &buffer_size );
+ if (chunk_size == buffer_size)
+ {
+ msg_Err( p_demux, "ALSA: period cannot equal buffer size (%lu == %lu)",
+ chunk_size, buffer_size);
+ goto adev_fail;
+ }
+
+ int bits_per_sample = snd_pcm_format_physical_width(SND_PCM_FORMAT_S16_LE);
+ int bits_per_frame = bits_per_sample * channels;
+
+ p_sys->i_alsa_chunk_size = chunk_size;
+ p_sys->i_alsa_frame_size = (bits_per_sample / 8) * channels;
+ p_sys->i_audio_max_frame_size = chunk_size * bits_per_frame / 8;
+
+ snd_pcm_hw_params_free( p_hw_params );
+ p_hw_params = NULL;
+
+ /* Prep device */
+ if( ( i_err = snd_pcm_prepare( p_sys->p_alsa_pcm ) ) < 0 )
+ {
+ msg_Err( p_demux, "ALSA: cannot prepare audio interface for use (%s)",
+ snd_strerror( i_err ) );
+ goto adev_fail;
+ }
+
+ /* Return a fake handle so other tests work */
+ i_fd = 1;
+
+ }
+ else
+#endif /* HAVE_ALSA */
{
- msg_Err( p_demux, "cannot set audio sample rate (%m)" );
- goto adev_fail;
+ /* OSS */
+
+ if( (i_fd = open( psz_device, O_RDONLY | O_NONBLOCK )) < 0 )
+ {
+ msg_Err( p_demux, "cannot open OSS audio device (%m)" );
+ goto adev_fail;
+ }
+
+ i_format = AFMT_S16_LE;
+ if( ioctl( i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0
+ || i_format != AFMT_S16_LE )
+ {
+ msg_Err( p_demux, "cannot set audio format (16b little endian) "
+ "(%m)" );
+ goto adev_fail;
+ }
+
+ if( ioctl( i_fd, SNDCTL_DSP_STEREO,
+ &p_sys->b_stereo ) < 0 )
+ {
+ msg_Err( p_demux, "cannot set audio channels count (%m)" );
+ goto adev_fail;
+ }
+
+ if( ioctl( i_fd, SNDCTL_DSP_SPEED,
+ &p_sys->i_sample_rate ) < 0 )
+ {
+ msg_Err( p_demux, "cannot set audio sample rate (%m)" );
+ goto adev_fail;
+ }
+
+ p_sys->i_audio_max_frame_size = 6 * 1024;
}
msg_Dbg( p_demux, "opened adev=`%s' %s %dHz",
psz_device, p_sys->b_stereo ? "stereo" : "mono",
p_sys->i_sample_rate );
- p_sys->i_audio_max_frame_size = 6 * 1024;
-
es_format_t fmt;
es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC('a','r','a','w') );
fmt.audio.i_channels = p_sys->b_stereo ? 2 : 1;
fmt.audio.i_rate = p_sys->i_sample_rate;
- fmt.audio.i_bitspersample = 16; /* FIXME ? */
+ fmt.audio.i_bitspersample = 16;
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;
p_sys->p_es_audio = es_out_Add( p_demux->out, &fmt );
+#ifdef HAVE_ALSA
+ free( psz_alsa_device_name );
+#endif
+
return i_fd;
adev_fail:
if( i_fd >= 0 ) close( i_fd );
+
+#ifdef HAVE_ALSA
+ if( p_hw_params ) snd_pcm_hw_params_free( p_hw_params );
+ if( p_sys->p_alsa_pcm ) snd_pcm_close( p_sys->p_alsa_pcm );
+ free( psz_alsa_device_name );
+#endif
+
return -1;
}
int i_fd;
demux_sys_t *p_sys = p_demux->p_sys;
-/* msg_Dbg( p_demux, "main device='%s'", p_sys->psz_device ); */
-
if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
{
msg_Err( p_demux, "cannot open video device (%m)" );
{
if( ioctl( i_fd, VIDIOC_G_AUDIO, &p_sys->p_audios[ p_sys->i_audio] ) < 0 )
{
- msg_Err( p_demux, "cannot get video input characteristics (%m)" );
+ msg_Err( p_demux, "cannot get audio input characteristics (%m)" );
goto open_failed;
}
goto open_failed;
}
- msg_Dbg( p_demux, "device supports Codec %s",
+ /* only print if vlc supports the format */
+ vlc_bool_t b_codec_supported = VLC_FALSE;
+ for( int i = 0; v4l2chroma_to_fourcc[i].i_v4l2 != 0; i++ )
+ {
+ if( v4l2chroma_to_fourcc[i].i_v4l2 == p_sys->p_codecs[i_index].pixelformat )
+ {
+ b_codec_supported = VLC_TRUE;
+
+ char sz_fourcc[5];
+ memset( &sz_fourcc, 0, sizeof( sz_fourcc ) );
+ vlc_fourcc_to_char( v4l2chroma_to_fourcc[i].i_fourcc, &sz_fourcc );
+ msg_Dbg( p_demux, "device supports chroma %4s [%s]",
+ sz_fourcc,
p_sys->p_codecs[i_index].description );
+
+#ifdef VIDIOC_ENUM_FRAMESIZES
+ /* This is new in Linux 2.6.19 */
+ /* List valid frame sizes for this format */
+ 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 )
+ {
+ msg_Err( p_demux, "Error while querying for frame size" );
+ }
+ else
+ {
+ switch( frmsize.type )
+ {
+ case V4L2_FRMSIZE_TYPE_DISCRETE:
+ do
+ {
+ msg_Dbg( p_demux,
+ " device supports size %dx%d",
+ frmsize.discrete.width, frmsize.discrete.height );
+ frmsize.index++;
+ } while( ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) >= 0 );
+ break;
+ case V4L2_FRMSIZE_TYPE_STEPWISE:
+ msg_Dbg( p_demux,
+ " device supports sizes %dx%d to %dx%d using %dx%d increments",
+ frmsize.stepwise.min_width, frmsize.stepwise.min_height,
+ frmsize.stepwise.max_width, frmsize.stepwise.max_height,
+ frmsize.stepwise.step_width, frmsize.stepwise.step_height );
+ break;
+ case V4L2_FRMSIZE_TYPE_CONTINUOUS:
+ msg_Dbg( p_demux,
+ " device supports all sizes %dx%d to %dx%d",
+ frmsize.stepwise.min_width, frmsize.stepwise.min_height,
+ frmsize.stepwise.max_width, frmsize.stepwise.max_height );
+ break;
+ }
+ }
+#endif
+ }
+ }
+ if( !b_codec_supported )
+ {
+ msg_Dbg( p_demux, "device codec %s not supported",
+ p_sys->p_codecs[i_index].description );
+ }
+
}
}
int i_fd = 0;
int i_caps;
- if( ( i_fd = open( psz_device, O_RDONLY | O_NONBLOCK ) ) < 0 )
+#ifdef HAVE_ALSA
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ if( p_sys->b_use_alsa )
{
- msg_Err( p_demux, "cannot open audio device (%m)" );
- goto open_failed;
- }
+ /* ALSA */
+
+ int i_err;
+ snd_pcm_t *p_alsa_pcm;
+ char* psz_alsa_device_name = ResolveALSADeviceName( psz_device );
+
+ 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 ) );
+ free( psz_alsa_device_name );
+ goto open_failed;
+ }
- /* this will fail if the device is video */
- if( ioctl( i_fd, SNDCTL_DSP_GETCAPS, &i_caps ) < 0 )
+ snd_pcm_close( p_alsa_pcm );
+ free( psz_alsa_device_name );
+ }
+ else
+#endif /* HAVE_ALSA */
{
- msg_Err( p_demux, "cannot get audio caps (%m)" );
- goto open_failed;
+ /* OSS */
+
+ 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 );
+ goto open_failed;
+ }
+
+ /* this will fail if the device is video */
+ if( ioctl( i_fd, SNDCTL_DSP_GETCAPS, &i_caps ) < 0 )
+ {
+ msg_Err( p_demux, "cannot get audio caps (%m)" );
+ goto open_failed;
+ }
+
+ if( i_fd >= 0 ) close( i_fd );
}
- if( i_fd ) close( i_fd );
return VLC_TRUE;
open_failed:
- if( i_fd ) close( i_fd );
+ if( i_fd >= 0 ) close( i_fd );
return VLC_FALSE;
}
+/*****************************************************************************
+ * List available controls
+ *****************************************************************************/
+static void VideoControlListPrint( demux_t *p_demux, int i_fd,
+ struct v4l2_queryctrl queryctrl,
+ vlc_bool_t b_reset )
+{
+ struct v4l2_querymenu querymenu;
+ if( queryctrl.flags & V4L2_CTRL_FLAG_GRABBED )
+ msg_Dbg( p_demux, " control is busy" );
+ if( queryctrl.flags & V4L2_CTRL_FLAG_READ_ONLY )
+ msg_Dbg( p_demux, " control is read-only" );
+ switch( queryctrl.type )
+ {
+ case V4L2_CTRL_TYPE_INTEGER:
+ msg_Dbg( p_demux, " integer control" );
+ msg_Dbg( p_demux,
+ " valid values: %d to %d by steps of %d",
+ queryctrl.minimum, queryctrl.maximum,
+ queryctrl.step );
+ break;
+ case V4L2_CTRL_TYPE_BOOLEAN:
+ msg_Dbg( p_demux, " boolean control" );
+ break;
+ case V4L2_CTRL_TYPE_MENU:
+ msg_Dbg( p_demux, " menu control" );
+ memset( &querymenu, 0, sizeof( querymenu ) );
+ querymenu.id = queryctrl.id;
+ for( querymenu.index = queryctrl.minimum;
+ querymenu.index <= (unsigned)queryctrl.maximum;
+ querymenu.index++ )
+ {
+ if( ioctl( i_fd, VIDIOC_QUERYMENU, &querymenu ) >= 0 )
+ {
+ msg_Dbg( p_demux, " %d: %s",
+ querymenu.index, querymenu.name );
+ }
+ }
+ break;
+ case V4L2_CTRL_TYPE_BUTTON:
+ msg_Dbg( p_demux, " button control" );
+ break;
+ default:
+ msg_Dbg( p_demux, " unknown control type (FIXME)" );
+ /* FIXME */
+ break;
+ }
+
+ switch( queryctrl.type )
+ {
+ case V4L2_CTRL_TYPE_INTEGER:
+ case V4L2_CTRL_TYPE_BOOLEAN:
+ case V4L2_CTRL_TYPE_MENU:
+ {
+ struct v4l2_control control;
+ msg_Dbg( p_demux, " default value: %d",
+ queryctrl.default_value );
+ memset( &control, 0, sizeof( control ) );
+ control.id = queryctrl.id;
+ if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 )
+ {
+ msg_Dbg( p_demux, " current value: %d", control.value );
+ }
+ if( b_reset && queryctrl.default_value != control.value )
+ {
+ msg_Dbg( p_demux, " reset value to default" );
+ VideoControl( p_demux, i_fd, NULL,
+ queryctrl.id, queryctrl.default_value );
+ }
+ }
+ break;
+ default:
+ break;
+ }
+}
+
+static int VideoControlList( demux_t *p_demux, int i_fd, vlc_bool_t b_reset )
+{
+ struct v4l2_queryctrl queryctrl;
+
+ memset( &queryctrl, 0, sizeof( queryctrl ) );
+
+ /* List public controls */
+ for( queryctrl.id = V4L2_CID_BASE;
+ queryctrl.id < V4L2_CID_LASTP1;
+ queryctrl.id ++ )
+ {
+ if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
+ {
+ if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
+ continue;
+ msg_Dbg( p_demux, "Available control: %s (%x)",
+ queryctrl.name, queryctrl.id );
+ VideoControlListPrint( p_demux, i_fd, queryctrl, b_reset );
+ }
+ }
+
+ /* List private controls */
+ for( queryctrl.id = V4L2_CID_PRIVATE_BASE;
+ ;
+ queryctrl.id ++ )
+ {
+ if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
+ {
+ if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
+ continue;
+ msg_Dbg( p_demux, "Available private control: %s (%x)",
+ queryctrl.name, queryctrl.id );
+ VideoControlListPrint( p_demux, i_fd, queryctrl, b_reset );
+ }
+ else
+ break;
+ }
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Issue video controls
+ *****************************************************************************/
+static int VideoControl( demux_t *p_demux, int i_fd,
+ const char *psz_label, int i_cid, int i_value )
+{
+ struct v4l2_queryctrl queryctrl;
+ struct v4l2_control control;
+
+ if( i_value == -1 )
+ return VLC_SUCCESS;
+
+ memset( &queryctrl, 0, sizeof( queryctrl ) );
+
+ queryctrl.id = i_cid;
+
+ if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) < 0
+ || queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
+ {
+ msg_Err( p_demux, "%s (%x) control is not supported.", psz_label,
+ i_cid );
+ return VLC_EGENERIC;
+ }
+
+ if( !psz_label )
+ psz_label = (const char*)queryctrl.name;
+
+ memset( &control, 0, sizeof( control ) );
+ control.id = i_cid;
+
+ if( i_value >= 0 )
+ {
+ control.value = i_value;
+ if( ioctl( i_fd, VIDIOC_S_CTRL, &control ) < 0 )
+ {
+ msg_Err( p_demux, "unable to set %s to %d (%m)", psz_label,
+ i_value );
+ return VLC_EGENERIC;
+ }
+ }
+ if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 )
+ {
+ msg_Dbg( p_demux, "video %s: %d", psz_label, control.value );
+ }
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * On the fly change settings callback
+ *****************************************************************************/
+static int VideoControlCallback( vlc_object_t *p_this,
+ const char *psz_var, vlc_value_t oldval, vlc_value_t newval,
+ void *p_data )
+{
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ int i_fd = p_sys->i_fd_video;
+
+ if( i_fd < 0 )
+ return VLC_EGENERIC;
+
+ if( !strcmp( psz_var, "v4l2-brightness" ) )
+ {
+ p_sys->i_brightness = newval.i_int;
+ return VideoControl( p_demux, i_fd,
+ "brightness", V4L2_CID_BRIGHTNESS, p_sys->i_brightness );
+ }
+ else if( !strcmp( psz_var, "v4l2-contrast" ) )
+ {
+ p_sys->i_contrast = newval.i_int;
+ return VideoControl( p_demux, i_fd,
+ "contrast", V4L2_CID_CONTRAST, p_sys->i_contrast );
+ }
+ else if( !strcmp( psz_var, "v4l2-saturation" ) )
+ {
+ p_sys->i_saturation = newval.i_int;
+ return VideoControl( p_demux, i_fd,
+ "saturation", V4L2_CID_SATURATION, p_sys->i_saturation );
+ }
+ else if( !strcmp( psz_var, "v4l2-hue" ) )
+ {
+ p_sys->i_hue = newval.i_int;
+ return VideoControl( p_demux, i_fd,
+ "hue", V4L2_CID_HUE, p_sys->i_hue );
+ }
+ else if( !strcmp( psz_var, "v4l2-gamma" ) )
+ {
+ p_sys->i_gamma = newval.i_int;
+ return VideoControl( p_demux, i_fd,
+ "gamma", V4L2_CID_HUE, p_sys->i_gamma );
+ }
+ else if( !strcmp( psz_var, "videocontrol" ) )
+ {
+ char *psz_var = newval.psz_string;
+ int i_cid = strtol( psz_var, &psz_var, 16 );
+ int i_value = strtol( psz_var, &psz_var, 0 );
+ return VideoControl( p_demux, i_fd, NULL, i_cid, i_value );
+ }
+
+ return VLC_EGENERIC;
+}
projects / vlc / blobdiff