X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fv4l2%2Fv4l2.c;h=be2690f57dab867c77c835e0b9fb2b5b0e4359f1;hb=a1bef303513da1410e1b793541713b5dbb3f96aa;hp=6b7c7e6a1318c76946818b5c216346cbd53dd566;hpb=00b95848260cd44f140a05da8aa5baf13580e2d3;p=vlc diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c index 6b7c7e6a13..be2690f57d 100644 --- a/modules/access/v4l2/v4l2.c +++ b/modules/access/v4l2/v4l2.c @@ -1,7 +1,7 @@ /***************************************************************************** * v4l2.c : Video4Linux2 input module for vlc ***************************************************************************** - * Copyright (C) 2002-2007 the VideoLAN team + * Copyright (C) 2002-2009 the VideoLAN team * $Id$ * * Authors: Benjamin Pracht @@ -27,11 +27,6 @@ /* * 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 */ /***************************************************************************** @@ -67,6 +62,17 @@ #include +#ifdef HAVE_LIBV4L2 +# include +#else +# define v4l2_close close +# define v4l2_dup dup +# define v4l2_ioctl ioctl +# define v4l2_read read +# define v4l2_mmap mmap +# define v4l2_munmap munmap +#endif + /***************************************************************************** * Module descriptior *****************************************************************************/ @@ -76,10 +82,6 @@ static void DemuxClose( vlc_object_t * ); static int AccessOpen ( vlc_object_t * ); static void AccessClose( vlc_object_t * ); -#define DEV_TEXT N_("Device name") -#define DEV_LONGTEXT N_( \ - "Name of the device to use. " \ - "If you don't specify anything, /dev/video0 will be used.") #define STANDARD_TEXT N_( "Standard" ) #define STANDARD_LONGTEXT N_( \ "Video standard (Default, SECAM, PAL, or NTSC)." ) @@ -166,26 +168,6 @@ static void AccessClose( vlc_object_t * ); #define VCENTER_LONGTEXT N_( \ "Set the camera's vertical centering (if supported by the v4l2 driver)." ) -#define ADEV_TEXT N_("Audio device name") -#ifndef HAVE_ALSA -#define ADEV_LONGTEXT N_( \ - "Name of the audio device to use. " \ - "If you don't specify anything, \"/dev/dsp\" will be used for OSS.") -#else -#define ADEV_LONGTEXT N_( \ - "Name of the audio device to use. " \ - "If you don't specify anything, \"/dev/dsp\" will be used for OSS, " \ - "\"hw\" for Alsa.") -#endif -#define AUDIO_METHOD_TEXT N_( "Audio method" ) -#ifndef HAVE_ALSA -#define AUDIO_METHOD_LONGTEXT N_( \ - "Audio method to use: 0 to disable audio, 1 for OSS." ) -#else -#define AUDIO_METHOD_LONGTEXT N_( \ - "Audio method to use: 0 to disable audio, 1 for OSS, 2 for ALSA, " \ - "3 for ALSA or OSS (ALSA is preferred)." ) -#endif #define AUDIO_VOLUME_TEXT N_( "Volume" ) #define AUDIO_VOLUME_LONGTEXT N_( \ "Volume of the audio input (if supported by the v4l2 driver)." ) @@ -205,13 +187,6 @@ static void AccessClose( vlc_object_t * ); #define AUDIO_LOUDNESS_LONGTEXT N_( \ "Loudness of the audio input (if supported by the v4l2 driver)." ) -#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 " \ @@ -234,6 +209,11 @@ static void AccessClose( vlc_object_t * ); #define TUNER_AUDIO_MODE_LONGTEXT N_( \ "Tuner audio mono/stereo and track selection." ) +#define AUDIO_DEPRECATED_ERROR N_( \ + "Alsa or OSS audio capture in the v4l2 access is deprecated. " \ + "please use 'v4l2:/""/ --input-slave alsa:/""/' or " \ + "'v4l2:/""/ --input-slave oss:/""/' instead." ) + typedef enum { IO_METHOD_READ, IO_METHOD_MMAP, @@ -262,27 +242,19 @@ static const char *const psz_tuner_audio_modes_list_text[] = N_( "Second audio program (Analog TV tuners only)" ), N_( "Primary language left, Secondary language right" ) }; -#define FIND_VIDEO 1 -#define FIND_AUDIO 2 - -#define AUDIO_METHOD_OSS 1 -#define OSS_DEFAULT "/dev/dsp" -#define AUDIO_METHOD_ALSA 2 -#define ALSA_DEFAULT "hw" +#define V4L2_DEFAULT "/dev/video0" #define CFG_PREFIX "v4l2-" -vlc_module_begin(); - set_shortname( N_("Video4Linux2") ); - set_description( N_("Video4Linux2 input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("Video4Linux2") ) + set_description( N_("Video4Linux2 input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) - set_section( N_( "Video input" ), NULL ); - add_string( CFG_PREFIX "dev", "/dev/video0", 0, DEV_TEXT, DEV_LONGTEXT, - false ); + set_section( N_( "Video input" ), NULL ) add_integer( CFG_PREFIX "standard", 0, NULL, STANDARD_TEXT, STANDARD_LONGTEXT, false ); - change_integer_list( i_standards_list, psz_standards_list_text, 0 ); + change_integer_list( i_standards_list, psz_standards_list_text, NULL ); add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ); add_integer( CFG_PREFIX "input", 0, NULL, INPUT_TEXT, INPUT_LONGTEXT, @@ -291,26 +263,16 @@ vlc_module_begin(); AUDIO_INPUT_LONGTEXT, true ); add_integer( CFG_PREFIX "io", IO_METHOD_MMAP, NULL, IOMETHOD_TEXT, IOMETHOD_LONGTEXT, true ); - change_integer_list( i_iomethod_list, psz_iomethod_list_text, 0 ); + change_integer_list( i_iomethod_list, psz_iomethod_list_text, NULL ); add_integer( CFG_PREFIX "width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ); add_integer( CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true ); - add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, true ); - - set_section( N_( "Audio input" ), NULL ); - add_string( CFG_PREFIX "adev", NULL, 0, ADEV_TEXT, ADEV_LONGTEXT, - false ); - add_integer( CFG_PREFIX "audio-method", AUDIO_METHOD_OSS|AUDIO_METHOD_ALSA, - NULL, AUDIO_METHOD_TEXT, AUDIO_METHOD_LONGTEXT, true ); - add_bool( CFG_PREFIX "stereo", true, NULL, STEREO_TEXT, STEREO_LONGTEXT, - true ); - add_integer( CFG_PREFIX "samplerate", 48000, NULL, SAMPLERATE_TEXT, - SAMPLERATE_LONGTEXT, true ); + add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, true ) add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - set_section( N_( "Tuner" ), NULL ); + set_section( N_( "Tuner" ), NULL ) add_integer( CFG_PREFIX "tuner", 0, NULL, TUNER_TEXT, TUNER_LONGTEXT, true ); add_integer( CFG_PREFIX "tuner-frequency", -1, NULL, FREQUENCY_TEXT, @@ -373,18 +335,25 @@ vlc_module_begin(); add_string( CFG_PREFIX "set-ctrls", NULL, NULL, S_CTRLS_TEXT, S_CTRLS_LONGTEXT, true ); - add_shortcut( "v4l2" ); - set_capability( "access_demux", 10 ); - set_callbacks( DemuxOpen, DemuxClose ); + add_obsolete_string( CFG_PREFIX "dev" ); - add_submodule(); - add_shortcut( "v4l2c" ); - set_description( N_("Video4Linux2 Compressed A/V") ); - set_capability( "access", 0 ); + add_obsolete_string( CFG_PREFIX "adev" ); + add_obsolete_integer( CFG_PREFIX "audio-method" ); + add_obsolete_bool( CFG_PREFIX "stereo" ); + add_obsolete_integer( CFG_PREFIX "samplerate" ); + + add_shortcut( "v4l2" ) + set_capability( "access_demux", 10 ) + set_callbacks( DemuxOpen, DemuxClose ) + + add_submodule () + add_shortcut( "v4l2c" ) + set_description( N_("Video4Linux2 Compressed A/V") ) + set_capability( "access", 0 ) /* use these when open as access_demux fails; VLC will use another demux */ - set_callbacks( AccessOpen, AccessClose ); + set_callbacks( AccessOpen, AccessClose ) -vlc_module_end(); +vlc_module_end () /***************************************************************************** * Access: local prototypes @@ -403,20 +372,13 @@ static ssize_t AccessRead( access_t *, uint8_t *, size_t ); 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* GrabAudio( demux_t *p_demux ); static bool IsPixelFormatSupported( demux_t *p_demux, unsigned int i_pixelformat ); -#ifdef HAVE_ALSA -static char* ResolveALSADeviceName( const char *psz_device ); -#endif static int OpenVideoDev( vlc_object_t *, demux_sys_t *, bool ); -static int OpenAudioDev( vlc_object_t *, demux_sys_t *, bool ); static bool ProbeVideoDev( vlc_object_t *, demux_sys_t *, - char *psz_device ); -static bool ProbeAudioDev( vlc_object_t *, demux_sys_t *, - char *psz_device ); + const char *psz_device ); static int ControlList( vlc_object_t *, int , bool, bool ); static int Control( vlc_object_t *, int i_fd, @@ -435,52 +397,65 @@ static int AccessControlResetCallback( vlc_object_t *p_this, const char *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ); -static struct +static const struct { unsigned int i_v4l2; int i_fourcc; + int i_rmask; + int i_gmask; + int i_bmask; } v4l2chroma_to_fourcc[] = { /* Raw data types */ - { 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('Y','V','1','2') }, - { V4L2_PIX_FMT_YUV411P, VLC_FOURCC('I','4','1','1') }, - { V4L2_PIX_FMT_YUV410, VLC_FOURCC('I','4','1','0') }, + { V4L2_PIX_FMT_GREY, VLC_FOURCC('G','R','E','Y'), 0, 0, 0 }, + { V4L2_PIX_FMT_HI240, VLC_FOURCC('I','2','4','0'), 0, 0, 0 }, + { V4L2_PIX_FMT_RGB555, VLC_FOURCC('R','V','1','5'), 0x001f,0x03e0,0x7c00 }, + { V4L2_PIX_FMT_RGB565, VLC_FOURCC('R','V','1','6'), 0x001f,0x07e0,0xf800 }, + /* Won't work since we don't know how to handle such gmask values + * correctly + { V4L2_PIX_FMT_RGB555X, VLC_FOURCC('R','V','1','5'), 0x007c,0xe003,0x1f00 }, + { V4L2_PIX_FMT_RGB565X, VLC_FOURCC('R','V','1','6'), 0x00f8,0xe007,0x1f00 }, + */ + { V4L2_PIX_FMT_BGR24, VLC_FOURCC('R','V','2','4'), 0xff0000,0xff00,0xff }, + { V4L2_PIX_FMT_RGB24, VLC_FOURCC('R','V','2','4'), 0xff,0xff00,0xff0000 }, + { V4L2_PIX_FMT_BGR32, VLC_FOURCC('R','V','3','2'), 0xff0000,0xff00,0xff }, + { V4L2_PIX_FMT_RGB32, VLC_FOURCC('R','V','3','2'), 0xff,0xff00,0xff0000 }, + { V4L2_PIX_FMT_YUYV, VLC_FOURCC('Y','U','Y','2'), 0, 0, 0 }, + { V4L2_PIX_FMT_YUYV, VLC_FOURCC('Y','U','Y','V'), 0, 0, 0 }, + { V4L2_PIX_FMT_UYVY, VLC_FOURCC('U','Y','V','Y'), 0, 0, 0 }, + { V4L2_PIX_FMT_Y41P, VLC_FOURCC('I','4','1','N'), 0, 0, 0 }, + { V4L2_PIX_FMT_YUV422P, VLC_FOURCC('I','4','2','2'), 0, 0, 0 }, + { V4L2_PIX_FMT_YVU420, VLC_FOURCC('Y','V','1','2'), 0, 0, 0 }, + { V4L2_PIX_FMT_YUV411P, VLC_FOURCC('I','4','1','1'), 0, 0, 0 }, + { V4L2_PIX_FMT_YUV410, VLC_FOURCC('I','4','1','0'), 0, 0, 0 }, /* Raw data types, not in V4L2 spec but still in videodev2.h and supported * by VLC */ - { V4L2_PIX_FMT_YUV420, VLC_FOURCC('I','4','2','0') }, + { V4L2_PIX_FMT_YUV420, VLC_FOURCC('I','4','2','0'), 0, 0, 0 }, /* FIXME { V4L2_PIX_FMT_RGB444, VLC_FOURCC('R','V','3','2') }, */ /* Compressed data types */ - { V4L2_PIX_FMT_MJPEG, VLC_FOURCC('M','J','P','G') }, + { V4L2_PIX_FMT_MJPEG, VLC_FOURCC('M','J','P','G'), 0, 0, 0 }, #if 0 { V4L2_PIX_FMT_JPEG, VLC_FOURCC('J','P','E','G') }, { V4L2_PIX_FMT_DV, VLC_FOURCC('?','?','?','?') }, { V4L2_PIX_FMT_MPEG, VLC_FOURCC('?','?','?','?') }, #endif - { 0, 0 } + { 0, 0, 0, 0, 0 } }; /** * List of V4L2 chromas were confident enough to use as fallbacks if the * user hasn't provided a --v4l2-chroma value. + * + * Try YUV chromas first, then RGB little endian and MJPEG as last resort. */ static const __u32 p_chroma_fallbacks[] = { V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_YVU420, V4L2_PIX_FMT_YUV422P, - V4L2_PIX_FMT_YUYV, V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_MJPEG }; + V4L2_PIX_FMT_YUYV, V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_BGR24, + V4L2_PIX_FMT_BGR32, V4L2_PIX_FMT_MJPEG }; -static struct +static const struct { const char *psz_name; unsigned int i_cid; @@ -520,20 +495,15 @@ struct buffer_t struct demux_sys_t { - char *psz_device; /* Main device from MRL, can be video or audio */ - - char *psz_vdev; - int i_fd_video; - - char *psz_adev; - int i_fd_audio; + char *psz_device; /* Main device from MRL */ + int i_fd; char *psz_requested_chroma; /* Video */ io_method io; - int i_pts; + int i_cache; struct v4l2_capability dev_cap; @@ -565,23 +535,7 @@ struct demux_sys_t mtime_t i_video_pts; /* only used when f_fps > 0 */ int i_fourcc; - es_out_id_t *p_es_video; - - /* Audio */ - unsigned int i_sample_rate; - bool b_stereo; - size_t i_audio_max_frame_size; - block_t *p_block_audio; - es_out_id_t *p_es_audio; - - int i_audio_method; - -#ifdef HAVE_ALSA - /* ALSA Audio */ - snd_pcm_t *p_alsa_pcm; - size_t i_alsa_frame_size; - int i_alsa_chunk_size; -#endif + es_out_id_t *p_es; /* Tuner */ int i_cur_tuner; @@ -593,99 +547,18 @@ struct demux_sys_t }; static int FindMainDevice( vlc_object_t *p_this, demux_sys_t *p_sys, - int i_flags, bool b_demux, - bool b_forced ) + bool b_demux ) { - /* 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 ); - - bool b_maindevice_is_video = false; - - /* 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 */ - 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; - b_maindevice_is_video = true; - /* If successful we carry on to try the audio if access is forced */ - } - } - - /* Try to open as audio device only if main device was not detected as video above */ - if( i_flags & FIND_AUDIO && !b_maindevice_is_video ) - { - 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 */ - 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; - /* If successful we carry on to try the video if access is forced */ - } - } - } - - /* If no device opened, only continue if the access was forced */ - if( b_forced == 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 ) - { - 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 ) + /* TODO: if using default device, loop through all /dev/video* until + * one works */ + msg_Dbg( p_this, "opening device '%s'", p_sys->psz_device ); + if( ProbeVideoDev( p_this, p_sys, p_sys->psz_device ) ) { - if( !p_sys->psz_adev ) - { - p_sys->psz_adev = var_CreateGetNonEmptyString( p_this, "v4l2-adev" ); - } - - msg_Dbg( p_this, "opening '%s' as audio", p_sys->psz_adev ); - if( ProbeAudioDev( p_this, p_sys, p_sys->psz_adev ) ) - { - p_sys->i_fd_audio = OpenAudioDev( p_this, p_sys, b_demux ); - } + msg_Dbg( p_this, "'%s' is a video device", p_sys->psz_device ); + p_sys->i_fd = OpenVideoDev( 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; - } + if( p_sys->i_fd < 0 ) return VLC_EGENERIC; return VLC_SUCCESS; } @@ -718,13 +591,7 @@ static int DemuxOpen( vlc_object_t *p_this ) 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, - true, !strncmp( p_demux->psz_access, "v4l2", 4 ) ) != VLC_SUCCESS ) + if( FindMainDevice( p_this, p_sys, true ) != VLC_SUCCESS) { DemuxClose( p_this ); return VLC_EGENERIC; @@ -752,17 +619,12 @@ static void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj ) p_sys->i_width = var_CreateGetInteger( p_obj, "v4l2-width" ); p_sys->i_height = var_CreateGetInteger( p_obj, "v4l2-height" ); - var_CreateGetBool( p_obj, "v4l2-controls-reset" ); + var_Create( p_obj, "v4l2-controls-reset", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); p_sys->f_fps = var_CreateGetFloat( p_obj, "v4l2-fps" ); - p_sys->i_sample_rate = var_CreateGetInteger( p_obj, "v4l2-samplerate" ); p_sys->psz_requested_chroma = var_CreateGetString( p_obj, "v4l2-chroma" ); - p_sys->i_audio_method = var_CreateGetInteger( p_obj, "v4l2-audio-method" ); - - p_sys->b_stereo = var_CreateGetBool( p_obj, "v4l2-stereo" ); - - p_sys->i_pts = var_CreateGetInteger( p_obj, "v4l2-caching" ); + p_sys->i_cache = var_CreateGetInteger( p_obj, "v4l2-caching" ); p_sys->i_cur_tuner = var_CreateGetInteger( p_obj, "v4l2-tuner" ); p_sys->i_frequency = var_CreateGetInteger( p_obj, "v4l2-tuner-frequency" ); @@ -770,12 +632,10 @@ static void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj ) p_sys->psz_set_ctrls = var_CreateGetString( p_obj, "v4l2-set-ctrls" ); - p_sys->psz_device = p_sys->psz_vdev = p_sys->psz_adev = NULL; - p_sys->i_fd_video = -1; - p_sys->i_fd_audio = -1; + p_sys->psz_device = NULL; + p_sys->i_fd = -1; - p_sys->p_es_video = p_sys->p_es_audio = 0; - p_sys->p_block_audio = 0; + p_sys->p_es = NULL; } /***************************************************************************** @@ -798,30 +658,7 @@ static void ParseMRL( demux_sys_t *p_sys, char *psz_path, vlc_object_t *p_obj ) { *psz_parser++ = '\0'; - if( !strncmp( psz_parser, "adev=", strlen( "adev=" ) ) ) - { - int i_len; - - psz_parser += strlen( "adev=" ); - if( strchr( psz_parser, ':' ) ) - { - i_len = strchr( psz_parser, ':' ) - psz_parser; - } - else - { - i_len = strlen( psz_parser ); - } - - p_sys->psz_adev = strndup( psz_parser, i_len ); - if( !*p_sys->psz_adev ) - { - free( p_sys->psz_adev ); - p_sys->psz_adev = NULL; - } - - psz_parser += i_len; - } - else if( !strncmp( psz_parser, "standard=", strlen( "standard=" ) ) ) + if( !strncmp( psz_parser, "standard=", strlen( "standard=" ) ) ) { psz_parser += strlen( "standard=" ); if( !strncmp( psz_parser, "pal", strlen( "pal" ) ) ) @@ -963,33 +800,10 @@ static void ParseMRL( demux_sys_t *p_sys, char *psz_path, vlc_object_t *p_obj ) &psz_parser, 0 ) ); } #endif - else if( !strncmp( psz_parser, "samplerate=", - strlen( "samplerate=" ) ) ) - { - p_sys->i_sample_rate = - strtol( psz_parser + strlen( "samplerate=" ), - &psz_parser, 0 ); - } - else if( !strncmp( psz_parser, "audio-method", strlen( "audio-method" ) ) ) - { - p_sys->i_audio_method = - strtol( psz_parser + strlen( "audio-method" ), - &psz_parser, 0 ); - } - else if( !strncmp( psz_parser, "stereo", strlen( "stereo" ) ) ) - { - psz_parser += strlen( "stereo" ); - p_sys->b_stereo = true; - } - else if( !strncmp( psz_parser, "mono", strlen( "mono" ) ) ) - { - psz_parser += strlen( "mono" ); - p_sys->b_stereo = false; - } else if( !strncmp( psz_parser, "caching=", strlen( "caching=" ) ) ) { - p_sys->i_pts = strtol( psz_parser + strlen( "caching=" ), - &psz_parser, 0 ); + p_sys->i_cache = strtol( psz_parser + strlen( "caching=" ), + &psz_parser, 0 ); } else if( !strncmp( psz_parser, "tuner=", strlen( "tuner=" ) ) ) { @@ -1026,6 +840,23 @@ static void ParseMRL( demux_sys_t *p_sys, char *psz_path, vlc_object_t *p_obj ) psz_parser += i_len; } + else if( !strncmp( psz_parser, "adev=", strlen( "adev=" ) ) + || !strncmp( psz_parser, "samplerate=", strlen( "samplerate=" ) ) + || !strncmp( psz_parser, "audio-method", strlen( "audio-method" ) ) + || !strncmp( psz_parser, "stereo", strlen( "stereo" ) ) + || !strncmp( psz_parser, "mono", strlen( "mono" ) ) ) + { + if( strchr( psz_parser, ':' ) ) + { + psz_parser = strchr( psz_parser, ':' ); + } + else + { + psz_parser += strlen( psz_parser ); + } + + msg_Err( p_obj, AUDIO_DEPRECATED_ERROR ); + } else { char *psz_unk = strchr( psz_parser, ':' ); @@ -1051,9 +882,9 @@ static void ParseMRL( demux_sys_t *p_sys, char *psz_path, vlc_object_t *p_obj ) /* Main device */ if( *psz_dup ) - { p_sys->psz_device = strdup( psz_dup ); - } + else + p_sys->psz_device = strdup( V4L2_DEFAULT ); free( psz_dup ); } @@ -1078,7 +909,7 @@ static void DemuxClose( vlc_object_t *p_this ) demux_sys_t *p_sys = p_demux->p_sys; /* Stop video capture */ - if( p_sys->i_fd_video >= 0 ) + if( p_sys->i_fd >= 0 ) { switch( p_sys->io ) { @@ -1095,11 +926,11 @@ static void DemuxClose( vlc_object_t *p_this ) buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = ( p_sys->io == IO_METHOD_USERPTR ) ? V4L2_MEMORY_USERPTR : V4L2_MEMORY_MMAP; - ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ); /* ignore result */ + v4l2_ioctl( p_sys->i_fd, VIDIOC_DQBUF, &buf ); /* ignore result */ } buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if( ioctl( p_sys->i_fd_video, VIDIOC_STREAMOFF, &buf_type ) < 0 ) { + if( v4l2_ioctl( p_sys->i_fd, VIDIOC_STREAMOFF, &buf_type ) < 0 ) { msg_Err( p_this, "VIDIOC_STREAMOFF failed" ); } @@ -1118,7 +949,7 @@ static void DemuxClose( vlc_object_t *p_this ) case IO_METHOD_MMAP: for( i = 0; i < p_sys->i_nbuffers; ++i ) { - if( munmap( p_sys->p_buffers[i].start, p_sys->p_buffers[i].length ) ) + if( v4l2_munmap( p_sys->p_buffers[i].start, p_sys->p_buffers[i].length ) ) { msg_Err( p_this, "munmap failed" ); } @@ -1140,21 +971,10 @@ static void DemuxClose( vlc_object_t *p_this ) static void CommonClose( vlc_object_t *p_this, demux_sys_t *p_sys ) { + (void)p_this; /* Close */ - if( p_sys->i_fd_video >= 0 ) close( p_sys->i_fd_video ); -#ifdef HAVE_ALSA - if( p_sys->p_alsa_pcm ) - { - snd_pcm_close( p_sys->p_alsa_pcm ); - p_sys->i_fd_audio = -1; - } -#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->i_fd >= 0 ) v4l2_close( p_sys->i_fd ); free( p_sys->psz_device ); - free( p_sys->psz_vdev ); - free( p_sys->psz_adev ); free( p_sys->p_standards ); free( p_sys->p_inputs ); free( p_sys->p_tuners ); @@ -1199,8 +1019,7 @@ static int AccessOpen( vlc_object_t * p_this ) ParseMRL( p_sys, p_access->psz_path, (vlc_object_t *) p_access ); - if( FindMainDevice( p_this, p_sys, FIND_VIDEO, - false, !strncmp( p_access->psz_access, "v4l2", 4 ) ) != VLC_SUCCESS ) + if( FindMainDevice( p_this, p_sys, false ) != VLC_SUCCESS ) { AccessClose( p_this ); return VLC_EGENERIC; @@ -1231,7 +1050,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args ) case DEMUX_GET_PTS_DELAY: pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = (int64_t)p_sys->i_pts * 1000; + *pi64 = (int64_t)p_sys->i_cache * 1000; return VLC_SUCCESS; case DEMUX_GET_TIME: @@ -1282,7 +1101,7 @@ static int AccessControl( access_t *p_access, int i_query, va_list args ) case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = (int64_t) p_sys->i_pts * 1000; + *pi_64 = (int64_t) p_sys->i_cache * 1000; break; /* */ @@ -1315,7 +1134,7 @@ static ssize_t AccessRead( access_t * p_access, uint8_t * p_buffer, size_t i_len struct pollfd ufd; int i_ret; - ufd.fd = p_sys->i_fd_video; + ufd.fd = p_sys->i_fd; ufd.events = POLLIN; if( p_access->info.b_eof ) @@ -1336,7 +1155,7 @@ static ssize_t AccessRead( access_t * p_access, uint8_t * p_buffer, size_t i_len return -1; } - i_ret = read( p_sys->i_fd_video, p_buffer, i_len ); + i_ret = v4l2_read( p_sys->i_fd, p_buffer, i_len ); if( i_ret == 0 ) { p_access->info.b_eof = true; @@ -1355,28 +1174,26 @@ static ssize_t AccessRead( access_t * p_access, uint8_t * p_buffer, size_t i_len static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - es_out_id_t *p_es = p_sys->p_es_audio; - block_t *p_block = NULL; - /* Try grabbing audio frames first */ - if( p_sys->i_fd_audio < 0 || !( p_block = GrabAudio( p_demux ) ) ) - { - /* Try grabbing video frame */ - p_es = p_sys->p_es_video; - if( p_sys->i_fd_video > 0 ) p_block = GrabVideo( p_demux ); - } + struct pollfd fd; + fd.fd = p_sys->i_fd; + fd.events = POLLIN|POLLPRI; + fd.revents = 0; - if( !p_block ) + /* Wait for data */ + if( poll( &fd, 1, 500 ) ) /* Timeout after 0.5 seconds since I don't know if pf_demux can be blocking. */ { - /* Sleep so we do not consume all the cpu, 10ms seems - * like a good value (100fps) */ - msleep( 10 ); - return 1; + if( fd.revents & (POLLIN|POLLPRI) ) + { + block_t *p_block = GrabVideo( p_demux ); + if( p_block ) + { + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts ); + es_out_Send( p_demux->out, p_sys->p_es, p_block ); + } + } } - es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts ); - es_out_Send( p_demux->out, p_es, p_block ); - return 1; } @@ -1403,7 +1220,7 @@ static block_t* GrabVideo( demux_t *p_demux ) switch( p_sys->io ) { case IO_METHOD_READ: - i_ret = read( p_sys->i_fd_video, p_sys->p_buffers[0].start, p_sys->p_buffers[0].length ); + i_ret = v4l2_read( p_sys->i_fd, p_sys->p_buffers[0].start, p_sys->p_buffers[0].length ); if( i_ret == -1 ) { switch( errno ) @@ -1430,7 +1247,7 @@ static block_t* GrabVideo( demux_t *p_demux ) buf.memory = V4L2_MEMORY_MMAP; /* Wait for next frame */ - if (ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ) < 0 ) + if (v4l2_ioctl( p_sys->i_fd, VIDIOC_DQBUF, &buf ) < 0 ) { switch( errno ) { @@ -1454,9 +1271,10 @@ static block_t* GrabVideo( demux_t *p_demux ) if( !p_block ) return 0; /* Unlock */ - if( ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 ) + if( v4l2_ioctl( p_sys->i_fd, VIDIOC_QBUF, &buf ) < 0 ) { - msg_Err (p_demux, "Failed to unlock (VIDIOC_QBUF)"); + msg_Err( p_demux, "Failed to unlock (VIDIOC_QBUF)" ); + block_Release( p_block ); return 0; } @@ -1468,7 +1286,7 @@ static block_t* GrabVideo( demux_t *p_demux ) buf.memory = V4L2_MEMORY_USERPTR; /* Wait for next frame */ - if (ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ) < 0 ) + if (v4l2_ioctl( p_sys->i_fd, VIDIOC_DQBUF, &buf ) < 0 ) { switch( errno ) { @@ -1501,9 +1319,10 @@ static block_t* GrabVideo( demux_t *p_demux ) if( !p_block ) return 0; /* Unlock */ - if( ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 ) + if( v4l2_ioctl( p_sys->i_fd, VIDIOC_QBUF, &buf ) < 0 ) { - msg_Err (p_demux, "Failed to unlock (VIDIOC_QBUF)"); + msg_Err( p_demux, "Failed to unlock (VIDIOC_QBUF)" ); + block_Release( p_block ); return 0; } @@ -1540,140 +1359,23 @@ static block_t* ProcessVideoFrame( demux_t *p_demux, uint8_t *p_frame, size_t i_ return p_block; } -/***************************************************************************** - * GrabAudio: Grab an audio frame - *****************************************************************************/ -static block_t* GrabAudio( demux_t *p_demux ) -{ - demux_sys_t *p_sys = p_demux->p_sys; - struct audio_buf_info buf_info; - int i_read = 0, i_correct; - block_t *p_block; - - 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 ); - - if( !p_block ) - { - msg_Warn( p_demux, "cannot get block" ); - return 0; - } - - p_sys->p_block_audio = p_block; - -#ifdef HAVE_ALSA - if( p_sys->i_audio_method & AUDIO_METHOD_ALSA ) - { - /* ALSA */ - i_read = snd_pcm_readi( p_sys->p_alsa_pcm, p_block->p_buffer, p_sys->i_alsa_chunk_size ); - if( i_read <= 0 ) - { - int i_resume; - switch( i_read ) - { - case -EAGAIN: - break; - case -EPIPE: - /* xrun */ - snd_pcm_prepare( p_sys->p_alsa_pcm ); - break; - case -ESTRPIPE: - /* suspend */ - i_resume = snd_pcm_resume( p_sys->p_alsa_pcm ); - if( i_resume < 0 && i_resume != -EAGAIN ) snd_pcm_prepare( p_sys->p_alsa_pcm ); - break; - default: - msg_Err( p_demux, "Failed to read alsa frame (%s)", snd_strerror( i_read ) ); - return 0; - } - } - else - { - /* convert from frames to bytes */ - i_read *= p_sys->i_alsa_frame_size; - } - } - else -#endif - if( p_sys->i_audio_method & AUDIO_METHOD_OSS ) - { - /* 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; - - p_block->i_buffer = i_read; - p_sys->p_block_audio = 0; - - /* Correct the date because of kernel buffering */ - i_correct = i_read; - if( p_sys->i_audio_method & AUDIO_METHOD_OSS ) - { - /* OSS */ - if( ioctl( p_sys->i_fd_audio, SNDCTL_DSP_GETISPACE, &buf_info ) == 0 ) - { - i_correct += buf_info.bytes; - } - } -#ifdef HAVE_ALSA - else if( p_sys->i_audio_method & AUDIO_METHOD_ALSA ) - { - /* ALSA */ - int i_err; - snd_pcm_sframes_t delay = 0; - if( ( i_err = snd_pcm_delay( p_sys->p_alsa_pcm, &delay ) ) >= 0 ) - { - size_t 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 (%zu > %zu)", - i_correction_delta, p_sys->i_audio_max_frame_size ); - 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 = - mdate() - INT64_C(1000000) * (mtime_t)i_correct / - 2 / ( p_sys->b_stereo ? 2 : 1) / p_sys->i_sample_rate; - - return p_block; -} - /***************************************************************************** * Helper function to initalise video IO using the Read method *****************************************************************************/ -static int InitRead( demux_t *p_demux, int i_fd, unsigned int i_buffer_size ) +static int InitRead( demux_t *p_demux, unsigned int i_buffer_size ) { demux_sys_t *p_sys = p_demux->p_sys; p_sys->p_buffers = calloc( 1, sizeof( *p_sys->p_buffers ) ); if( !p_sys->p_buffers ) - goto open_failed; + return VLC_EGENERIC; p_sys->p_buffers[0].length = i_buffer_size; p_sys->p_buffers[0].start = malloc( i_buffer_size ); if( !p_sys->p_buffers[0].start ) - goto open_failed; + return VLC_ENOMEM; return VLC_SUCCESS; - -open_failed: - return VLC_EGENERIC; - } /***************************************************************************** @@ -1689,7 +1391,7 @@ static int InitMmap( demux_t *p_demux, int i_fd ) req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_MMAP; - if( ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 ) { msg_Err( p_demux, "device does not support mmap i/o" ); goto open_failed; @@ -1703,10 +1405,7 @@ static int InitMmap( demux_t *p_demux, int i_fd ) p_sys->p_buffers = calloc( req.count, sizeof( *p_sys->p_buffers ) ); if( !p_sys->p_buffers ) - { - msg_Err( p_demux, "Out of memory" ); goto open_failed; - } for( p_sys->i_nbuffers = 0; p_sys->i_nbuffers < req.count; ++p_sys->i_nbuffers ) { @@ -1717,7 +1416,7 @@ static int InitMmap( demux_t *p_demux, int i_fd ) buf.memory = V4L2_MEMORY_MMAP; buf.index = p_sys->i_nbuffers; - if( ioctl( i_fd, VIDIOC_QUERYBUF, &buf ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QUERYBUF, &buf ) < 0 ) { msg_Err( p_demux, "VIDIOC_QUERYBUF" ); goto open_failed; @@ -1725,7 +1424,7 @@ static int InitMmap( demux_t *p_demux, int i_fd ) p_sys->p_buffers[p_sys->i_nbuffers].length = buf.length; p_sys->p_buffers[p_sys->i_nbuffers].start = - mmap( NULL, buf.length, PROT_READ | PROT_WRITE, MAP_SHARED, i_fd, buf.m.offset ); + v4l2_mmap( NULL, buf.length, PROT_READ | PROT_WRITE, MAP_SHARED, i_fd, buf.m.offset ); if( p_sys->p_buffers[p_sys->i_nbuffers].start == MAP_FAILED ) { @@ -1758,35 +1457,28 @@ static int InitUserP( demux_t *p_demux, int i_fd, unsigned int i_buffer_size ) req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_USERPTR; - if( ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 ) { msg_Err( p_demux, "device does not support user pointer i/o" ); - goto open_failed; + return VLC_EGENERIC; } p_sys->p_buffers = calloc( 4, sizeof( *p_sys->p_buffers ) ); if( !p_sys->p_buffers ) - { - msg_Err( p_demux, "Out of memory" ); goto open_failed; - } 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; - posix_memalign( &p_sys->p_buffers[p_sys->i_nbuffers].start, - /* boundary */ i_page_size, i_buffer_size ); - - if( !p_sys->p_buffers[p_sys->i_nbuffers].start ) - { - msg_Err( p_demux, "out of memory" ); + if( posix_memalign( &p_sys->p_buffers[p_sys->i_nbuffers].start, + /* boundary */ i_page_size, i_buffer_size ) ) goto open_failed; - } } return VLC_SUCCESS; open_failed: + free( p_sys->p_buffers ); return VLC_EGENERIC; } @@ -1819,7 +1511,9 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) struct v4l2_format fmt; unsigned int i_min; enum v4l2_buf_type buf_type; - char *psz_device = p_sys->psz_vdev; + const char *psz_device = p_sys->psz_device; + es_format_t es_fmt; + int libv4l2_fd; if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 ) { @@ -1827,6 +1521,20 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) goto open_failed; } +#ifdef HAVE_LIBV4L2 + /* Note the v4l2_xxx functions are designed so that if they get passed an + unknown fd, the will behave exactly as their regular xxx counterparts, + so if v4l2_fd_open fails, we continue as normal (missing the libv4l2 + custom cam format to normal formats conversion). Chances are big we will + still fail then though, as normally v4l2_fd_open only fails if the + device is not a v4l2 device. */ + libv4l2_fd = v4l2_fd_open( i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION ); + if( libv4l2_fd != -1 ) + i_fd = libv4l2_fd; +#else + libv4l2_fd = i_fd; +#endif + /* Tune the tuner */ if( p_sys->i_frequency >= 0 ) { @@ -1840,7 +1548,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) frequency.tuner = p_sys->i_cur_tuner; frequency.type = p_sys->p_tuners[p_sys->i_cur_tuner].type; frequency.frequency = p_sys->i_frequency / 62.5; - if( ioctl( i_fd, VIDIOC_S_FREQUENCY, &frequency ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_S_FREQUENCY, &frequency ) < 0 ) { msg_Err( p_obj, "cannot set tuner frequency (%m)" ); goto open_failed; @@ -1860,7 +1568,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) memset( &tuner, 0, sizeof( tuner ) ); tuner.index = p_sys->i_cur_tuner; tuner.audmode = p_sys->i_audio_mode; - if( ioctl( i_fd, VIDIOC_S_TUNER, &tuner ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_S_TUNER, &tuner ) < 0 ) { msg_Err( p_obj, "cannot set tuner audio mode (%m)" ); goto open_failed; @@ -1872,7 +1580,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) if( p_sys->i_selected_standard_id != V4L2_STD_UNKNOWN ) { - if( ioctl( i_fd, VIDIOC_S_STD, &p_sys->i_selected_standard_id ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_S_STD, &p_sys->i_selected_standard_id ) < 0 ) { msg_Err( p_obj, "cannot set standard (%m)" ); goto open_failed; @@ -1888,7 +1596,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) p_sys->i_selected_input = 0; } - if( ioctl( i_fd, VIDIOC_S_INPUT, &p_sys->i_selected_input ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_S_INPUT, &p_sys->i_selected_input ) < 0 ) { msg_Err( p_obj, "cannot set input (%m)" ); goto open_failed; @@ -1905,7 +1613,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) p_sys->i_selected_audio_input = 0; } - if( ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_selected_audio_input] ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_selected_audio_input] ) < 0 ) { msg_Err( p_obj, "cannot set audio input (%m)" ); goto open_failed; @@ -1954,11 +1662,11 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) /* Reset Cropping */ memset( &cropcap, 0, sizeof(cropcap) ); cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if( ioctl( i_fd, VIDIOC_CROPCAP, &cropcap ) >= 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_CROPCAP, &cropcap ) >= 0 ) { crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; crop.c = cropcap.defrect; /* reset to default */ - if( ioctl( i_fd, VIDIOC_S_CROP, &crop ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_S_CROP, &crop ) < 0 ) { switch( errno ) { @@ -1978,7 +1686,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) if( p_sys->i_width <= 0 || p_sys->i_height <= 0 ) { - if( ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 ) { msg_Err( p_demux, "Cannot get default width and height." ); goto open_failed; @@ -2021,7 +1729,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) } } /* Try and set user chroma */ - if( !IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) || ( fmt.fmt.pix.pixelformat && ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 ) ) + if( !IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) || ( fmt.fmt.pix.pixelformat && v4l2_ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 ) ) { msg_Warn( p_demux, "Driver is unable to use specified chroma %s. Trying defaults.", p_sys->psz_requested_chroma ); fmt.fmt.pix.pixelformat = 0; @@ -2037,7 +1745,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) { fmt.fmt.pix.pixelformat = p_chroma_fallbacks[i]; if( IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) - && ioctl( i_fd, VIDIOC_S_FMT, &fmt ) >= 0 ) + && v4l2_ioctl( i_fd, VIDIOC_S_FMT, &fmt ) >= 0 ) break; } if( i == ARRAY_SIZE( p_chroma_fallbacks ) ) @@ -2058,6 +1766,10 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) if( v4l2chroma_to_fourcc[i].i_v4l2 == fmt.fmt.pix.pixelformat ) { p_sys->i_fourcc = v4l2chroma_to_fourcc[i].i_fourcc; + es_format_Init( &es_fmt, VIDEO_ES, p_sys->i_fourcc ); + es_fmt.video.i_rmask = v4l2chroma_to_fourcc[i].i_rmask; + es_fmt.video.i_gmask = v4l2chroma_to_fourcc[i].i_gmask; + es_fmt.video.i_bmask = v4l2chroma_to_fourcc[i].i_bmask; break; } } @@ -2078,7 +1790,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) frmival.pixel_format = fmt.fmt.pix.pixelformat; frmival.width = p_sys->i_width; frmival.height = p_sys->i_height; - if( ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 ) { char psz_fourcc[5]; memset( &psz_fourcc, 0, sizeof( psz_fourcc ) ); @@ -2094,7 +1806,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) frmival.discrete.numerator, frmival.discrete.denominator ); frmival.index++; - } while( ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 ); + } while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 ); break; case V4L2_FRMIVAL_TYPE_STEPWISE: msg_Dbg( p_demux, " supported frame intervals: %d/%d to " @@ -2121,7 +1833,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) switch( p_sys->io ) { case IO_METHOD_READ: - if( InitRead( p_demux, i_fd, fmt.fmt.pix.sizeimage ) != VLC_SUCCESS ) goto open_failed; + if( InitRead( p_demux, fmt.fmt.pix.sizeimage ) != VLC_SUCCESS ) goto open_failed; break; case IO_METHOD_MMAP: @@ -2135,24 +1847,13 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) } /* Add */ - es_format_t es_fmt; - es_format_Init( &es_fmt, VIDEO_ES, p_sys->i_fourcc ); es_fmt.video.i_width = p_sys->i_width; es_fmt.video.i_height = p_sys->i_height; es_fmt.video.i_aspect = 4 * VOUT_ASPECT_FACTOR / 3; - /* Setup rgb mask for RGB formats */ - if( p_sys->i_fourcc == VLC_FOURCC( 'R','V','2','4' ) ) - { - /* This is in BGR format */ - es_fmt.video.i_bmask = 0x00ff0000; - es_fmt.video.i_gmask = 0x0000ff00; - es_fmt.video.i_rmask = 0x000000ff; - } - msg_Dbg( p_demux, "added new video es %4.4s %dx%d", (char*)&es_fmt.i_codec, es_fmt.video.i_width, es_fmt.video.i_height ); - p_sys->p_es_video = es_out_Add( p_demux->out, &es_fmt ); + p_sys->p_es = es_out_Add( p_demux->out, &es_fmt ); /* Start Capture */ @@ -2172,7 +1873,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) buf.memory = V4L2_MEMORY_MMAP; buf.index = i; - if( ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 ) { msg_Err( p_demux, "VIDIOC_QBUF failed" ); goto open_failed; @@ -2180,7 +1881,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) } buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if( ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 ) { msg_Err( p_demux, "VIDIOC_STREAMON failed" ); goto open_failed; @@ -2200,7 +1901,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) buf.m.userptr = (unsigned long)p_sys->p_buffers[i].start; buf.length = p_sys->p_buffers[i].length; - if( ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 ) { msg_Err( p_demux, "VIDIOC_QBUF failed" ); goto open_failed; @@ -2208,7 +1909,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) } buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if( ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 ) { msg_Err( p_demux, "VIDIOC_STREAMON failed" ); goto open_failed; @@ -2226,335 +1927,46 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) return i_fd; open_failed: - if( i_fd >= 0 ) close( i_fd ); - return -1; - -} - -#ifdef HAVE_ALSA -/***************************************************************************** - * ResolveALSADeviceName: Change any . to : in the ALSA device name - *****************************************************************************/ -static char *ResolveALSADeviceName( const 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 - *****************************************************************************/ -#ifdef HAVE_ALSA -static int OpenAudioDevAlsa( vlc_object_t *p_this, demux_sys_t *p_sys, - bool b_demux ) -{ - char *psz_device = p_sys->psz_adev; - p_sys->p_alsa_pcm = NULL; - char* psz_alsa_device_name = NULL; - snd_pcm_hw_params_t *p_hw_params = NULL; - snd_pcm_uframes_t buffer_size; - snd_pcm_uframes_t chunk_size; - - /* ALSA */ - int i_err; - psz_alsa_device_name = - ResolveALSADeviceName( psz_device?: ALSA_DEFAULT ); - - 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_this, "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_this, "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_this, - "ALSA: cannot allocate hardware parameter structure (%s)", - snd_strerror( i_err ) ); - goto adev_fail; - } - - if( ( i_err = snd_pcm_hw_params_any( p_sys->p_alsa_pcm, p_hw_params ) ) < 0 ) - { - msg_Err( p_this, - "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_this, "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_this, "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_this, "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_this, "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_this, "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_this, "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_this, "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_this, "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_this, "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_this, - "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_frame / 8; - 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_this, - "ALSA: cannot prepare audio interface for use (%s)", - snd_strerror( i_err ) ); - goto adev_fail; - } - - free( psz_alsa_device_name ); - - if( !p_sys->psz_adev ) - p_sys->psz_adev = strdup( ALSA_DEFAULT ); - - /* Return a fake handle so other tests work */ - return 1; - - adev_fail: - - 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 ); - - return -1; - -} -#endif - -static int OpenAudioDevOss( vlc_object_t *p_this, demux_sys_t *p_sys, - bool b_demux ) -{ - int i_fd = 0; - int i_format; - /* OSS */ - char* psz_oss_device_name = strdup( p_sys->psz_adev ? p_sys->psz_adev : OSS_DEFAULT ); - - if( (i_fd = open( psz_oss_device_name, O_RDONLY | O_NONBLOCK )) < 0 ) - { - msg_Err( p_this, "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_this, - "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_this, "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_this, "cannot set audio sample rate (%m)" ); - goto adev_fail; - } - - p_sys->i_audio_max_frame_size = 6 * 1024; - - if( !p_sys->psz_adev ) - p_sys->psz_adev = strdup( OSS_DEFAULT ); - free( psz_oss_device_name ); - return i_fd; - - adev_fail: - - free( psz_oss_device_name ); - if( i_fd >= 0 ) close( i_fd ); + if( i_fd >= 0 ) v4l2_close( i_fd ); return -1; } -static int OpenAudioDev( vlc_object_t *p_this, demux_sys_t *p_sys, - bool b_demux ) -{ - char *psz_device; - int i_fd = -1; - -#ifdef HAVE_ALSA - if( ( p_sys->i_audio_method & AUDIO_METHOD_ALSA ) && i_fd < 0 ) - i_fd = OpenAudioDevAlsa( p_this, p_sys, b_demux ); -#endif - - if( ( p_sys->i_audio_method & AUDIO_METHOD_OSS ) && i_fd < 0 ) - i_fd = OpenAudioDevOss( p_this, p_sys, b_demux ); - - if( i_fd < 0 ) - return i_fd; - - psz_device = p_sys->psz_adev; - - msg_Dbg( p_this, "opened adev=`%s' %s %dHz", - psz_device, p_sys->b_stereo ? "stereo" : "mono", - p_sys->i_sample_rate ); - - 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; - 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; - - msg_Dbg( p_this, "new audio es %d channels %dHz", - fmt.audio.i_channels, fmt.audio.i_rate ); - - if( b_demux ) - { - demux_t *p_demux = (demux_t *)p_this; - p_sys->p_es_audio = es_out_Add( p_demux->out, &fmt ); - } - - return i_fd; -} - /***************************************************************************** * ProbeVideoDev: probe video for capabilities *****************************************************************************/ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, - char *psz_device ) + const char *psz_device ) { int i_index; int i_standard; int i_fd; + int libv4l2_fd; if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 ) { - msg_Err( p_obj, "cannot open video device (%m)" ); + msg_Err( p_obj, "cannot open video device '%s' (%m)", psz_device ); goto open_failed; } +#ifdef HAVE_LIBV4L2 + /* Note the v4l2_xxx functions are designed so that if they get passed an + unknown fd, the will behave exactly as their regular xxx counterparts, + so if v4l2_fd_open fails, we continue as normal (missing the libv4l2 + custom cam format to normal formats conversion). Chances are big we will + still fail then though, as normally v4l2_fd_open only fails if the + device is not a v4l2 device. */ + libv4l2_fd = v4l2_fd_open( i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION ); + if( libv4l2_fd != -1 ) + i_fd = libv4l2_fd; +#else + libv4l2_fd = i_fd; +#endif + /* Get device capabilites */ - if( ioctl( i_fd, VIDIOC_QUERYCAP, &p_sys->dev_cap ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QUERYCAP, &p_sys->dev_cap ) < 0 ) { msg_Err( p_obj, "cannot get video capabilities (%m)" ); goto open_failed; @@ -2590,7 +2002,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, { struct v4l2_input t_input; t_input.index = 0; - while( ioctl( i_fd, VIDIOC_ENUMINPUT, &t_input ) >= 0 ) + while( v4l2_ioctl( i_fd, VIDIOC_ENUMINPUT, &t_input ) >= 0 ) { p_sys->i_input++; t_input.index = p_sys->i_input; @@ -2603,7 +2015,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, { p_sys->p_inputs[i_index].index = i_index; - if( ioctl( i_fd, VIDIOC_ENUMINPUT, &p_sys->p_inputs[i_index] ) ) + if( v4l2_ioctl( i_fd, VIDIOC_ENUMINPUT, &p_sys->p_inputs[i_index] ) ) { msg_Err( p_obj, "cannot get video input characteristics (%m)" ); goto open_failed; @@ -2624,7 +2036,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, { struct v4l2_standard t_standards; t_standards.index = 0; - while( ioctl( i_fd, VIDIOC_ENUMSTD, &t_standards ) >=0 ) + while( v4l2_ioctl( i_fd, VIDIOC_ENUMSTD, &t_standards ) >=0 ) { p_sys->i_standard++; t_standards.index = p_sys->i_standard; @@ -2637,7 +2049,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, { p_sys->p_standards[i_standard].index = i_standard; - if( ioctl( i_fd, VIDIOC_ENUMSTD, &p_sys->p_standards[i_standard] ) ) + if( v4l2_ioctl( i_fd, VIDIOC_ENUMSTD, &p_sys->p_standards[i_standard] ) ) { msg_Err( p_obj, "cannot get video input standards (%m)" ); goto open_failed; @@ -2659,9 +2071,9 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, if( p_sys->dev_cap.capabilities & V4L2_CAP_AUDIO ) { while( p_sys->i_audio < 32 && - ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_audio] ) >= 0 ) + v4l2_ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_audio] ) >= 0 ) { - if( ioctl( i_fd, VIDIOC_G_AUDIO, &p_sys->p_audios[ p_sys->i_audio] ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_G_AUDIO, &p_sys->p_audios[ p_sys->i_audio] ) < 0 ) { msg_Err( p_obj, "cannot get audio input characteristics (%m)" ); goto open_failed; @@ -2687,7 +2099,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, { struct v4l2_tuner tuner; memset( &tuner, 0, sizeof(tuner) ); - while( ioctl( i_fd, VIDIOC_G_TUNER, &tuner ) >= 0 ) + while( v4l2_ioctl( i_fd, VIDIOC_G_TUNER, &tuner ) >= 0 ) { p_sys->i_tuner++; memset( &tuner, 0, sizeof(tuner) ); @@ -2701,7 +2113,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, { p_sys->p_tuners[i_index].index = i_index; - if( ioctl( i_fd, VIDIOC_G_TUNER, &p_sys->p_tuners[i_index] ) ) + if( v4l2_ioctl( i_fd, VIDIOC_G_TUNER, &p_sys->p_tuners[i_index] ) ) { msg_Err( p_obj, "cannot get tuner characteristics (%m)" ); goto open_failed; @@ -2724,7 +2136,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, struct v4l2_frequency frequency; memset( &frequency, 0, sizeof( frequency ) ); - if( ioctl( i_fd, VIDIOC_G_FREQUENCY, &frequency ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_G_FREQUENCY, &frequency ) < 0 ) { msg_Err( p_obj, "cannot get tuner frequency (%m)" ); goto open_failed; @@ -2749,7 +2161,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, codec.index = i_index; codec.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - while( ioctl( i_fd, VIDIOC_ENUM_FMT, &codec ) >= 0 ) + while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FMT, &codec ) >= 0 ) { i_index++; codec.index = i_index; @@ -2764,7 +2176,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, p_sys->p_codecs[i_index].index = i_index; p_sys->p_codecs[i_index].type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if( ioctl( i_fd, VIDIOC_ENUM_FMT, &p_sys->p_codecs[i_index] ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_ENUM_FMT, &p_sys->p_codecs[i_index] ) < 0 ) { msg_Err( p_obj, "cannot get codec description (%m)" ); goto open_failed; @@ -2797,7 +2209,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, struct v4l2_frmsizeenum frmsize; frmsize.index = 0; frmsize.pixel_format = p_sys->p_codecs[i_index].pixelformat; - if( ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) < 0 ) { /* Not all devices support this ioctl */ msg_Warn( p_obj, "Unable to query for frame sizes" ); @@ -2813,7 +2225,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, " device supports size %dx%d", frmsize.discrete.width, frmsize.discrete.height ); frmsize.index++; - } while( ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) >= 0 ); + } while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) >= 0 ); break; case V4L2_FRMSIZE_TYPE_STEPWISE: msg_Dbg( p_obj, @@ -2845,95 +2257,16 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, } - if( i_fd >= 0 ) close( i_fd ); + if( i_fd >= 0 ) v4l2_close( i_fd ); return true; open_failed: - if( i_fd >= 0 ) close( i_fd ); + if( i_fd >= 0 ) v4l2_close( i_fd ); return false; } -/***************************************************************************** - * ProbeAudioDev: probe audio for capabilities - *****************************************************************************/ -#ifdef HAVE_ALSA -static bool ProbeAudioDevAlsa( vlc_object_t *p_this, demux_sys_t *p_sys, - char *psz_device ) -{ - int i_err; - snd_pcm_t *p_alsa_pcm; - char* psz_alsa_device_name = ResolveALSADeviceName( psz_device ?: ALSA_DEFAULT ); - - if( ( i_err = snd_pcm_open( &p_alsa_pcm, psz_alsa_device_name, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK ) ) < 0 ) - { - 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 ); - return false; - } - - snd_pcm_close( p_alsa_pcm ); - free( psz_alsa_device_name ); - - return true; -} -#endif - -static bool ProbeAudioDevOss( vlc_object_t *p_this, demux_sys_t *p_sys, - char *psz_device ) -{ - int i_fd = 0; - int i_caps; - char* psz_oss_device_name = strdup( psz_device ? psz_device : OSS_DEFAULT ); - - if( ( i_fd = open( psz_oss_device_name, O_RDONLY | O_NONBLOCK ) ) < 0 ) - { - msg_Err( p_this, "cannot open device %s for OSS audio (%m)", psz_oss_device_name ); - goto open_failed; - } - - /* this will fail if the device is video */ - if( ioctl( i_fd, SNDCTL_DSP_GETCAPS, &i_caps ) < 0 ) - { - msg_Err( p_this, "cannot get audio caps (%m)" ); - goto open_failed; - } - - free( psz_oss_device_name ); - if( i_fd >= 0 ) close( i_fd ); - - return true; - -open_failed: - free( psz_oss_device_name ); - if( i_fd >= 0 ) close( i_fd ); - return false; -} - -static bool ProbeAudioDev( vlc_object_t *p_this, demux_sys_t *p_sys, - char *psz_device ) -{ -#ifdef HAVE_ALSA - if( ( p_sys->i_audio_method & AUDIO_METHOD_ALSA ) - && ProbeAudioDevAlsa( p_this, p_sys, psz_device ) ) - { - p_sys->i_audio_method = AUDIO_METHOD_ALSA; - return true; - } -#endif - - if( ( p_sys->i_audio_method & AUDIO_METHOD_OSS ) - && ProbeAudioDevOss( p_this, p_sys, psz_device ) ) - { - p_sys->i_audio_method = AUDIO_METHOD_OSS; - return true; - } - - p_sys->i_audio_method = 0; - return false; -} - static void name2var( unsigned char *name ) { for( ; *name; name++ ) @@ -3016,7 +2349,7 @@ static void ControlListPrint( vlc_object_t *p_obj, int i_fd, { querymenu.index = i_mid; querymenu.id = queryctrl.id; - if( ioctl( i_fd, VIDIOC_QUERYMENU, &querymenu ) >= 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QUERYMENU, &querymenu ) >= 0 ) { msg_Dbg( p_obj, " %d: %s", querymenu.index, querymenu.name ); @@ -3053,7 +2386,7 @@ static void ControlListPrint( vlc_object_t *p_obj, int i_fd, queryctrl.default_value ); memset( &control, 0, sizeof( control ) ); control.id = queryctrl.id; - if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 ) { msg_Dbg( p_obj, " current value: %d", control.value ); } @@ -3106,10 +2439,10 @@ static void ControlListPrint( vlc_object_t *p_obj, int i_fd, if( b_demux ) var_AddCallback( p_obj, psz_name, - DemuxControlCallback, (void*)queryctrl.id ); + DemuxControlCallback, (void*)(intptr_t)queryctrl.id ); else var_AddCallback( p_obj, psz_name, - AccessControlCallback, (void*)queryctrl.id ); + AccessControlCallback, (void*)(intptr_t)queryctrl.id ); free( psz_name ); } @@ -3150,13 +2483,13 @@ static int ControlList( vlc_object_t *p_obj, int i_fd, var_AddCallback( p_obj, "controls-reset", AccessControlResetCallback, NULL ); queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL; - if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) { msg_Dbg( p_obj, "Extended control API supported by v4l2 driver" ); /* List extended controls */ queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL; - while( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) + while( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) { if( queryctrl.type == V4L2_CTRL_TYPE_CTRL_CLASS ) { @@ -3194,7 +2527,7 @@ static int ControlList( vlc_object_t *p_obj, int i_fd, i_cid ++ ) { queryctrl.id = i_cid; - if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) { if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) continue; @@ -3210,7 +2543,7 @@ static int ControlList( vlc_object_t *p_obj, int i_fd, i_cid ++ ) { queryctrl.id = i_cid; - if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) { if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) continue; @@ -3309,11 +2642,11 @@ static int ControlReset( vlc_object_t *p_obj, int i_fd ) memset( &queryctrl, 0, sizeof( queryctrl ) ); queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL; - if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) { /* Extended control API supported */ queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL; - while( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) + while( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) { if( queryctrl.type == V4L2_CTRL_TYPE_CTRL_CLASS || V4L2_CTRL_ID2CLASS( queryctrl.id ) == V4L2_CTRL_CLASS_MPEG ) @@ -3324,7 +2657,7 @@ static int ControlReset( vlc_object_t *p_obj, int i_fd ) struct v4l2_control control; memset( &control, 0, sizeof( control ) ); control.id = queryctrl.id; - if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 + if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 && queryctrl.default_value != control.value ) { int i; @@ -3347,14 +2680,14 @@ static int ControlReset( vlc_object_t *p_obj, int i_fd ) i_cid ++ ) { queryctrl.id = i_cid; - if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) { struct v4l2_control control; if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) continue; memset( &control, 0, sizeof( control ) ); control.id = queryctrl.id; - if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 + if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 && queryctrl.default_value != control.value ) { int i; @@ -3374,14 +2707,14 @@ static int ControlReset( vlc_object_t *p_obj, int i_fd ) i_cid ++ ) { queryctrl.id = i_cid; - if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 ) { struct v4l2_control control; if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) continue; memset( &control, 0, sizeof( control ) ); control.id = queryctrl.id; - if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 + if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 && queryctrl.default_value != control.value ) { name2var( queryctrl.name ); @@ -3414,7 +2747,7 @@ static int Control( vlc_object_t *p_obj, int i_fd, queryctrl.id = i_cid; - if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) < 0 + if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) < 0 || queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) { msg_Dbg( p_obj, "%s (%x) control is not supported.", psz_name, i_cid ); @@ -3435,20 +2768,20 @@ static int Control( vlc_object_t *p_obj, int i_fd, if( i_value >= 0 ) { ext_control.value = i_value; - if( ioctl( i_fd, VIDIOC_S_EXT_CTRLS, &ext_controls ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_S_EXT_CTRLS, &ext_controls ) < 0 ) { control.value = i_value; - if( ioctl( i_fd, VIDIOC_S_CTRL, &control ) < 0 ) + if( v4l2_ioctl( i_fd, VIDIOC_S_CTRL, &control ) < 0 ) { msg_Err( p_obj, "unable to set %s (%x) to %d (%m)", psz_name, i_cid, i_value ); return VLC_EGENERIC; } - i_ret = ioctl( i_fd, VIDIOC_G_CTRL, &control ); + i_ret = v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ); } else { - i_ret = ioctl( i_fd, VIDIOC_G_EXT_CTRLS, &ext_controls ); + i_ret = v4l2_ioctl( i_fd, VIDIOC_G_EXT_CTRLS, &ext_controls ); control.value = ext_control.value; } } @@ -3481,11 +2814,12 @@ static int DemuxControlCallback( vlc_object_t *p_this, const char *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + (void)oldval; demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys = p_demux->p_sys; - int i_cid = (int)p_data; + int i_cid = (long int)p_data; - int i_fd = p_sys->i_fd_video; + int i_fd = p_sys->i_fd; if( i_fd < 0 ) return VLC_EGENERIC; @@ -3496,13 +2830,13 @@ static int DemuxControlCallback( vlc_object_t *p_this, } static int DemuxControlResetCallback( vlc_object_t *p_this, - const char *psz_var, vlc_value_t oldval, vlc_value_t newval, - void *p_data ) + const char *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + (void)psz_var; (void)oldval; (void)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; + int i_fd = p_sys->i_fd; if( i_fd < 0 ) return VLC_EGENERIC; @@ -3516,11 +2850,12 @@ static int AccessControlCallback( vlc_object_t *p_this, const char *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + (void)oldval; access_t *p_access = (access_t *)p_this; demux_sys_t *p_sys = (demux_sys_t *) p_access->p_sys; - int i_cid = (int)p_data; + int i_cid = (long int)p_data; - int i_fd = p_sys->i_fd_video; + int i_fd = p_sys->i_fd; if( i_fd < 0 ) return VLC_EGENERIC; @@ -3531,13 +2866,13 @@ static int AccessControlCallback( 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, - void *p_data ) + const char *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + (void)psz_var; (void)oldval; (void)newval; (void)p_data; access_t *p_access = (access_t *)p_this; demux_sys_t *p_sys = (demux_sys_t *) p_access->p_sys; - int i_fd = p_sys->i_fd_video; + int i_fd = p_sys->i_fd; if( i_fd < 0 ) return VLC_EGENERIC;