X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fv4l2.c;h=0654e4ab3a75c19a2fd8f206a998a4fbe6aa4905;hb=a000984010733d2a4e8c94308cfd85f466f9cb87;hp=a330819d92b478e7351ad51f56c9cde48c44d959;hpb=9922031c0bce2d30074cb0b1f6e708ac3d8a156d;p=vlc diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c index a330819d92..0654e4ab3a 100644 --- a/modules/access/v4l2.c +++ b/modules/access/v4l2.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -50,7 +51,13 @@ #include #include -#include +#if defined(HAVE_LINUX_VIDEODEV2_H) +# include +#elif defined(HAVE_SYS_VIDEOIO_H) +# include +#else +# error "No Video4Linux2 headers found." +#endif #include @@ -257,6 +264,16 @@ static const char *const psz_tuner_audio_modes_list_text[] = #define V4L2_DEFAULT "/dev/video0" #define CFG_PREFIX "v4l2-" +#ifdef HAVE_MAEMO +# define DEFAULT_WIDTH 640 +# define DEFAULT_HEIGHT 492 +#endif + +#ifndef DEFAULT_WIDTH +# define DEFAULT_WIDTH (-1) +# define DEFAULT_HEIGHT (-1) +#endif + vlc_module_begin () set_shortname( N_("Video4Linux2") ) set_description( N_("Video4Linux2 input") ) @@ -264,92 +281,92 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) set_section( N_( "Video input" ), NULL ) - add_integer( CFG_PREFIX "standard", 0, NULL, STANDARD_TEXT, + add_integer( CFG_PREFIX "standard", 0, STANDARD_TEXT, STANDARD_LONGTEXT, false ) - change_integer_list( i_standards_list, psz_standards_list_text, NULL ) - add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, + change_integer_list( i_standards_list, psz_standards_list_text ) + add_string( CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ) - add_integer( CFG_PREFIX "input", 0, NULL, INPUT_TEXT, INPUT_LONGTEXT, + add_integer( CFG_PREFIX "input", 0, INPUT_TEXT, INPUT_LONGTEXT, true ) - add_integer( CFG_PREFIX "audio-input", 0, NULL, AUDIO_INPUT_TEXT, + add_integer( CFG_PREFIX "audio-input", 0, AUDIO_INPUT_TEXT, AUDIO_INPUT_LONGTEXT, true ) - add_integer( CFG_PREFIX "io", IO_METHOD_AUTO, NULL, IOMETHOD_TEXT, + add_integer( CFG_PREFIX "io", IO_METHOD_AUTO, IOMETHOD_TEXT, IOMETHOD_LONGTEXT, true ) - change_integer_list( i_iomethod_list, psz_iomethod_list_text, NULL ) - add_integer( CFG_PREFIX "width", -1, NULL, WIDTH_TEXT, + change_integer_list( i_iomethod_list, psz_iomethod_list_text ) + add_integer( CFG_PREFIX "width", DEFAULT_WIDTH, WIDTH_TEXT, WIDTH_LONGTEXT, true ) - add_integer( CFG_PREFIX "height", -1, NULL, HEIGHT_TEXT, + add_integer( CFG_PREFIX "height", DEFAULT_HEIGHT, HEIGHT_TEXT, HEIGHT_LONGTEXT, true ) - add_string( CFG_PREFIX "aspect-ratio", "4:3", NULL, ASPECT_TEXT, + add_string( CFG_PREFIX "aspect-ratio", "4:3", ASPECT_TEXT, ASPECT_LONGTEXT, true ) - add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, true ) - add_integer( CFG_PREFIX "caching", 50 /* ms */, NULL, + add_float( CFG_PREFIX "fps", 0, FPS_TEXT, FPS_LONGTEXT, true ) + add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT, CACHING_LONGTEXT, true ) #ifdef HAVE_LIBV4L2 - add_bool( CFG_PREFIX "use-libv4l2", false, NULL, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true ); + add_bool( CFG_PREFIX "use-libv4l2", false, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true ); #endif set_section( N_( "Tuner" ), NULL ) - add_integer( CFG_PREFIX "tuner", 0, NULL, TUNER_TEXT, TUNER_LONGTEXT, + add_integer( CFG_PREFIX "tuner", 0, TUNER_TEXT, TUNER_LONGTEXT, true ) - add_integer( CFG_PREFIX "tuner-frequency", -1, NULL, FREQUENCY_TEXT, + add_integer( CFG_PREFIX "tuner-frequency", -1, FREQUENCY_TEXT, FREQUENCY_LONGTEXT, true ) - add_integer( CFG_PREFIX "tuner-audio-mode", -1, NULL, TUNER_AUDIO_MODE_TEXT, + add_integer( CFG_PREFIX "tuner-audio-mode", -1, TUNER_AUDIO_MODE_TEXT, TUNER_AUDIO_MODE_LONGTEXT, true ) change_integer_list( i_tuner_audio_modes_list, - psz_tuner_audio_modes_list_text, 0 ) + psz_tuner_audio_modes_list_text ) set_section( N_( "Controls" ), N_( "v4l2 driver controls, if supported by your v4l2 driver." ) ) - add_bool( CFG_PREFIX "controls-reset", false, NULL, CTRL_RESET_TEXT, + add_bool( CFG_PREFIX "controls-reset", false, CTRL_RESET_TEXT, CTRL_RESET_LONGTEXT, true ) - add_integer( CFG_PREFIX "brightness", -1, NULL, BRIGHTNESS_TEXT, + add_integer( CFG_PREFIX "brightness", -1, BRIGHTNESS_TEXT, BRIGHTNESS_LONGTEXT, true ) - add_integer( CFG_PREFIX "contrast", -1, NULL, CONTRAST_TEXT, + add_integer( CFG_PREFIX "contrast", -1, CONTRAST_TEXT, CONTRAST_LONGTEXT, true ) - add_integer( CFG_PREFIX "saturation", -1, NULL, SATURATION_TEXT, + add_integer( CFG_PREFIX "saturation", -1, SATURATION_TEXT, SATURATION_LONGTEXT, true ) - add_integer( CFG_PREFIX "hue", -1, NULL, HUE_TEXT, + add_integer( CFG_PREFIX "hue", -1, HUE_TEXT, HUE_LONGTEXT, true ) - add_integer( CFG_PREFIX "black-level", -1, NULL, BLACKLEVEL_TEXT, + add_integer( CFG_PREFIX "black-level", -1, BLACKLEVEL_TEXT, BLACKLEVEL_LONGTEXT, true ) - add_integer( CFG_PREFIX "auto-white-balance", -1, NULL, + add_integer( CFG_PREFIX "auto-white-balance", -1, AUTOWHITEBALANCE_TEXT, AUTOWHITEBALANCE_LONGTEXT, true ) - add_integer( CFG_PREFIX "do-white-balance", -1, NULL, DOWHITEBALANCE_TEXT, + add_integer( CFG_PREFIX "do-white-balance", -1, DOWHITEBALANCE_TEXT, DOWHITEBALANCE_LONGTEXT, true ) - add_integer( CFG_PREFIX "red-balance", -1, NULL, REDBALANCE_TEXT, + add_integer( CFG_PREFIX "red-balance", -1, REDBALANCE_TEXT, REDBALANCE_LONGTEXT, true ) - add_integer( CFG_PREFIX "blue-balance", -1, NULL, BLUEBALANCE_TEXT, + add_integer( CFG_PREFIX "blue-balance", -1, BLUEBALANCE_TEXT, BLUEBALANCE_LONGTEXT, true ) - add_integer( CFG_PREFIX "gamma", -1, NULL, GAMMA_TEXT, + add_integer( CFG_PREFIX "gamma", -1, GAMMA_TEXT, GAMMA_LONGTEXT, true ) - add_integer( CFG_PREFIX "exposure", -1, NULL, EXPOSURE_TEXT, + add_integer( CFG_PREFIX "exposure", -1, EXPOSURE_TEXT, EXPOSURE_LONGTEXT, true ) - add_integer( CFG_PREFIX "autogain", -1, NULL, AUTOGAIN_TEXT, + add_integer( CFG_PREFIX "autogain", -1, AUTOGAIN_TEXT, AUTOGAIN_LONGTEXT, true ) - add_integer( CFG_PREFIX "gain", -1, NULL, GAIN_TEXT, + add_integer( CFG_PREFIX "gain", -1, GAIN_TEXT, GAIN_LONGTEXT, true ) - add_integer( CFG_PREFIX "hflip", -1, NULL, HFLIP_TEXT, + add_integer( CFG_PREFIX "hflip", -1, HFLIP_TEXT, HFLIP_LONGTEXT, true ) - add_integer( CFG_PREFIX "vflip", -1, NULL, VFLIP_TEXT, + add_integer( CFG_PREFIX "vflip", -1, VFLIP_TEXT, VFLIP_LONGTEXT, true ) - add_integer( CFG_PREFIX "hcenter", -1, NULL, HCENTER_TEXT, + add_integer( CFG_PREFIX "hcenter", -1, HCENTER_TEXT, HCENTER_LONGTEXT, true ) - add_integer( CFG_PREFIX "vcenter", -1, NULL, VCENTER_TEXT, + add_integer( CFG_PREFIX "vcenter", -1, VCENTER_TEXT, VCENTER_LONGTEXT, true ) - add_integer( CFG_PREFIX "audio-volume", -1, NULL, AUDIO_VOLUME_TEXT, + add_integer( CFG_PREFIX "audio-volume", -1, AUDIO_VOLUME_TEXT, AUDIO_VOLUME_LONGTEXT, true ) - add_integer( CFG_PREFIX "audio-balance", -1, NULL, AUDIO_BALANCE_TEXT, + add_integer( CFG_PREFIX "audio-balance", -1, AUDIO_BALANCE_TEXT, AUDIO_BALANCE_LONGTEXT, true ) - add_bool( CFG_PREFIX "audio-mute", false, NULL, AUDIO_MUTE_TEXT, + add_bool( CFG_PREFIX "audio-mute", false, AUDIO_MUTE_TEXT, AUDIO_MUTE_LONGTEXT, true ) - add_integer( CFG_PREFIX "audio-bass", -1, NULL, AUDIO_BASS_TEXT, + add_integer( CFG_PREFIX "audio-bass", -1, AUDIO_BASS_TEXT, AUDIO_BASS_LONGTEXT, true ) - add_integer( CFG_PREFIX "audio-treble", -1, NULL, AUDIO_TREBLE_TEXT, + add_integer( CFG_PREFIX "audio-treble", -1, AUDIO_TREBLE_TEXT, AUDIO_TREBLE_LONGTEXT, true ) - add_integer( CFG_PREFIX "audio-loudness", -1, NULL, AUDIO_LOUDNESS_TEXT, + add_integer( CFG_PREFIX "audio-loudness", -1, AUDIO_LOUDNESS_TEXT, AUDIO_LOUDNESS_LONGTEXT, true ) - add_string( CFG_PREFIX "set-ctrls", NULL, NULL, S_CTRLS_TEXT, + add_string( CFG_PREFIX "set-ctrls", NULL, S_CTRLS_TEXT, S_CTRLS_LONGTEXT, true ) add_obsolete_string( CFG_PREFIX "dev" ) @@ -364,8 +381,7 @@ vlc_module_begin () set_callbacks( DemuxOpen, DemuxClose ) add_submodule () - add_shortcut( "v4l2" ) - add_shortcut( "v4l2c" ) + add_shortcut( "v4l2", "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 */ @@ -551,7 +567,6 @@ struct demux_sys_t int i_height; unsigned int i_aspect; float f_fps; /* <= 0.0 mean to grab at full rate */ - mtime_t i_video_pts; /* only used when f_fps > 0 */ int i_fourcc; uint32_t i_block_flags; @@ -565,7 +580,6 @@ struct demux_sys_t /* Controls */ char *psz_set_ctrls; - #ifdef HAVE_LIBV4L2 /* */ int (*pf_open)(const char *, int, ...); @@ -582,7 +596,7 @@ struct demux_sys_t #ifdef HAVE_LIBV4L2 static void use_kernel_v4l2( demux_sys_t *p_sys ) { - p_sys->pf_open = utf8_open; + p_sys->pf_open = vlc_open; p_sys->pf_close = close; p_sys->pf_dup = dup; p_sys->pf_ioctl = ioctl; @@ -612,7 +626,7 @@ static void use_libv4l2( demux_sys_t *p_sys ) # define v4l2_mmap (p_sys->pf_mmap) # define v4l2_munmap (p_sys->pf_munmap) #else -# define v4l2_open utf8_open +# define v4l2_open vlc_open # define v4l2_close close # define v4l2_dup dup # define v4l2_ioctl ioctl @@ -665,10 +679,10 @@ static int DemuxOpen( vlc_object_t *p_this ) GetV4L2Params(p_sys, (vlc_object_t *) p_demux); - ParseMRL( p_sys, p_demux->psz_path, (vlc_object_t *) p_demux ); + ParseMRL( p_sys, p_demux->psz_location, (vlc_object_t *) p_demux ); #ifdef HAVE_LIBV4L2 - if( !config_GetInt( p_this, CFG_PREFIX "use-libv4l2" ) ) + if( !var_InheritBool( p_this, CFG_PREFIX "use-libv4l2" ) ) { msg_Dbg( p_this, "Trying direct kernel v4l2" ); use_kernel_v4l2( p_sys ); @@ -691,8 +705,6 @@ static int DemuxOpen( vlc_object_t *p_this ) *****************************************************************************/ static void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj ) { - p_sys->i_video_pts = -1; - p_sys->i_selected_standard_id = i_standards_list[var_CreateGetInteger( p_obj, "v4l2-standard" )]; @@ -1120,10 +1132,10 @@ static int AccessOpen( vlc_object_t * p_this ) GetV4L2Params( p_sys, (vlc_object_t *) p_access ); - ParseMRL( p_sys, p_access->psz_path, (vlc_object_t *) p_access ); + ParseMRL( p_sys, p_access->psz_location, (vlc_object_t *) p_access ); #ifdef HAVE_LIBV4L2 - if( !config_GetInt( p_this, CFG_PREFIX "use-libv4l2" ) ) + if( !var_InheritBool( p_this, CFG_PREFIX "use-libv4l2" ) ) { msg_Dbg( p_this, "Trying direct kernel v4l2" ); use_kernel_v4l2( p_sys ); @@ -1247,13 +1259,8 @@ static block_t *AccessRead( access_t * p_access ) fd.revents = 0; /* Wait for data */ - if( poll( &fd, 1, 500 ) ) /* Timeout after 0.5 seconds since I don't know if pf_demux can be blocking. */ - { - if( fd.revents & (POLLIN|POLLPRI) ) - { - return GrabVideo( VLC_OBJECT(p_access), p_sys ); - } - } + if( poll( &fd, 1, 500 ) > 0 ) /* Timeout after 0.5 seconds since I don't know if pf_demux can be blocking. */ + return GrabVideo( VLC_OBJECT(p_access), p_sys ); return NULL; } @@ -1281,7 +1288,8 @@ static ssize_t AccessReadStream( access_t * p_access, uint8_t * p_buffer, size_t if( i_ret < 0 ) { - msg_Err( p_access, "Polling error (%m)." ); + if( errno != EINTR ) + msg_Err( p_access, "poll error" ); return -1; } @@ -1311,16 +1319,21 @@ static int Demux( demux_t *p_demux ) fd.revents = 0; /* Wait for data */ - if( poll( &fd, 1, 500 ) ) /* Timeout after 0.5 seconds since I don't know if pf_demux can be blocking. */ - { - if( fd.revents & (POLLIN|POLLPRI) ) + /* Timeout after 0.5 seconds since I don't know if pf_demux can be blocking. */ + while( poll( &fd, 1, 500 ) == -1 ) + if( errno != EINTR ) { - block_t *p_block = GrabVideo( VLC_OBJECT(p_demux), p_sys ); - 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 ); - } + msg_Err( p_demux, "poll error: %m" ); + return -1; + } + + if( fd.revents ) + { + block_t *p_block = GrabVideo( VLC_OBJECT(p_demux), p_sys ); + 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 ); } } @@ -1332,18 +1345,10 @@ static int Demux( demux_t *p_demux ) *****************************************************************************/ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys ) { - block_t *p_block = NULL; + block_t *p_block; struct v4l2_buffer buf; ssize_t i_ret; - if( p_sys->f_fps >= 0.1 && p_sys->i_video_pts > 0 ) - { - mtime_t i_dur = (mtime_t)((double)1000000 / (double)p_sys->f_fps); - - /* Did we wait long enough ? (frame rate reduction) */ - if( p_sys->i_video_pts + i_dur > mdate() ) return 0; - } - /* Grab Video Frame */ switch( p_sys->io ) { @@ -1354,7 +1359,7 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys ) switch( errno ) { case EAGAIN: - return 0; + return NULL; case EIO: /* Could ignore EIO, see spec. */ /* fall through */ @@ -1365,7 +1370,8 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys ) } p_block = ProcessVideoFrame( p_demux, (uint8_t*)p_sys->p_buffers[0].start, i_ret ); - if( !p_block ) return 0; + if( !p_block ) + return NULL; break; @@ -1380,30 +1386,31 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys ) switch( errno ) { case EAGAIN: - return 0; + return NULL; case EIO: /* Could ignore EIO, see spec. */ /* fall through */ default: msg_Err( p_demux, "Failed to wait (VIDIOC_DQBUF)" ); - return 0; + return NULL; } } if( buf.index >= p_sys->i_nbuffers ) { msg_Err( p_demux, "Failed capturing new frame as i>=nbuffers" ); - return 0; + return NULL; } p_block = ProcessVideoFrame( p_demux, p_sys->p_buffers[buf.index].start, buf.bytesused ); - if( !p_block ) return 0; + if( !p_block ) + return NULL; /* Unlock */ if( v4l2_ioctl( p_sys->i_fd, VIDIOC_QBUF, &buf ) < 0 ) { msg_Err( p_demux, "Failed to unlock (VIDIOC_QBUF)" ); block_Release( p_block ); - return 0; + return NULL; } break; @@ -1419,13 +1426,13 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys ) switch( errno ) { case EAGAIN: - return 0; + return NULL; case EIO: /* Could ignore EIO, see spec. */ /* fall through */ default: msg_Err( p_demux, "Failed to wait (VIDIOC_DQBUF)" ); - return 0; + return NULL; } } @@ -1440,28 +1447,29 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys ) if( i >= p_sys->i_nbuffers ) { msg_Err( p_demux, "Failed capturing new frame as i>=nbuffers" ); - return 0; + return NULL; } p_block = ProcessVideoFrame( p_demux, (uint8_t*)buf.m.userptr, buf.bytesused ); - if( !p_block ) return 0; + if( !p_block ) + return NULL; /* Unlock */ if( v4l2_ioctl( p_sys->i_fd, VIDIOC_QBUF, &buf ) < 0 ) { msg_Err( p_demux, "Failed to unlock (VIDIOC_QBUF)" ); block_Release( p_block ); - return 0; + return NULL; } break; default: - break; + return NULL; } /* Timestamp */ - p_sys->i_video_pts = p_block->i_pts = p_block->i_dts = mdate(); + p_block->i_pts = p_block->i_dts = mdate(); p_block->i_flags |= p_sys->i_block_flags; return p_block; @@ -1475,13 +1483,13 @@ static block_t* ProcessVideoFrame( vlc_object_t *p_demux, uint8_t *p_frame, size { block_t *p_block; - if( !p_frame ) return 0; + if( !p_frame ) return NULL; /* New block */ if( !( p_block = block_New( p_demux, i_size ) ) ) { msg_Warn( p_demux, "Cannot get new block" ); - return 0; + return NULL; } /* Copy frame */ @@ -2219,7 +2227,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) char psz_fourcc[5]; memset( &psz_fourcc, 0, sizeof( psz_fourcc ) ); vlc_fourcc_to_char( p_sys->i_fourcc, &psz_fourcc ); - msg_Dbg( p_obj, "supported frame intervals for %4s, %dx%d:", + msg_Dbg( p_obj, "supported frame intervals for %4.4s, %dx%d:", psz_fourcc, frmival.width, frmival.height ); switch( frmival.type ) { @@ -2282,7 +2290,12 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) es_fmt.video.i_height = p_sys->i_height; /* Get aspect-ratio */ - es_fmt.video.i_aspect = p_sys->i_aspect; + es_fmt.video.i_sar_num = p_sys->i_aspect * es_fmt.video.i_height; + es_fmt.video.i_sar_den = VOUT_ASPECT_FACTOR * es_fmt.video.i_width; + + /* Framerate */ + es_fmt.video.i_frame_rate = p_sys->f_fps * INT64_C(1000000); + es_fmt.video.i_frame_rate_base = INT64_C(1000000); demux_t *p_demux = (demux_t *) p_obj; msg_Dbg( p_demux, "added new video es %4.4s %dx%d", @@ -2454,10 +2467,10 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, msg_Dbg( p_obj, "device supports hardware frequency seeking" ); #endif if( p_sys->dev_cap.capabilities & V4L2_CAP_VBI_CAPTURE ) - msg_Dbg( p_obj, "device support raw VBI capture" ); + msg_Dbg( p_obj, "device supports raw VBI capture" ); if( p_sys->dev_cap.capabilities & V4L2_CAP_SLICED_VBI_CAPTURE ) - msg_Dbg( p_obj, "device support sliced VBI capture" ); + msg_Dbg( p_obj, "device supports sliced VBI capture" ); /* Now, enumerate all the video inputs. This is useless at the moment since we have no way to present that info to the user except with @@ -2470,6 +2483,8 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, p_sys->i_input = 0; while( v4l2_ioctl( i_fd, VIDIOC_ENUMINPUT, &t_input ) >= 0 ) { + if( t_input.index != p_sys->i_input ) + break; p_sys->i_input++; t_input.index = p_sys->i_input; } @@ -2506,6 +2521,8 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, p_sys->i_standard = 0; while( v4l2_ioctl( i_fd, VIDIOC_ENUMSTD, &t_standards ) >=0 ) { + if( t_standards.index != p_sys->i_standard ) + break; p_sys->i_standard++; t_standards.index = p_sys->i_standard; } @@ -2571,6 +2588,8 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, p_sys->i_tuner = 0; while( v4l2_ioctl( i_fd, VIDIOC_G_TUNER, &tuner ) >= 0 ) { + if( tuner.index != p_sys->i_tuner ) + break; p_sys->i_tuner++; memset( &tuner, 0, sizeof(tuner) ); tuner.index = p_sys->i_tuner; @@ -2634,6 +2653,8 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FMT, &codec ) >= 0 ) { + if( codec.index != i_index ) + break; i_index++; codec.index = i_index; } @@ -2670,7 +2691,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, memset( &psz_fourcc, 0, sizeof( psz_fourcc ) ); vlc_fourcc_to_char( v4l2chroma_to_fourcc[i].i_fourcc, &psz_fourcc ); - msg_Dbg( p_obj, "device supports chroma %4s [%s, %s]", + msg_Dbg( p_obj, "device supports chroma %4.4s [%s, %s]", psz_fourcc, p_sys->p_codecs[i_index].description, psz_fourcc_v4l2 ); @@ -2720,7 +2741,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, if( !b_codec_supported ) { msg_Dbg( p_obj, - "device codec %4s (%s) not supported", + "device codec %4.4s (%s) not supported", psz_fourcc_v4l2, p_sys->p_codecs[i_index].description ); }