#include <fcntl.h>
#include <arpa/inet.h>
-#include <poll.h>
-
/* From GStreamer's v4l plugin:
* Because of some really cool feature in video4linux1, also known as
* 'not including sys/types.h and sys/time.h', we had to include it
set_subcategory( SUBCAT_INPUT_ACCESS )
add_integer( "v4l-caching", DEFAULT_PTS_DELAY / 1000, NULL,
- CACHING_TEXT, CACHING_LONGTEXT, true );
+ CACHING_TEXT, CACHING_LONGTEXT, true )
add_obsolete_string( "v4l-vdev" );
add_obsolete_string( "v4l-adev" );
add_string( "v4l-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
- true );
+ true )
add_float( "v4l-fps", -1.0, NULL, FPS_TEXT, FPS_LONGTEXT, true )
add_obsolete_integer( "v4l-samplerate" );
add_integer( "v4l-channel", 0, NULL, CHANNEL_TEXT, CHANNEL_LONGTEXT,
- true );
+ true )
add_integer( "v4l-tuner", -1, NULL, TUNER_TEXT, TUNER_LONGTEXT, true )
add_integer( "v4l-norm", VIDEO_MODE_AUTO, NULL, NORM_TEXT, NORM_LONGTEXT,
- false );
+ false )
change_integer_list( i_norm_list, psz_norm_list_text, NULL );
add_integer( "v4l-frequency", -1, NULL, FREQUENCY_TEXT, FREQUENCY_LONGTEXT,
- false );
+ false )
add_integer( "v4l-audio", -1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, true )
add_obsolete_bool( "v4l-stereo" );
add_integer( "v4l-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true )
add_integer( "v4l-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT,
- true );
+ true )
add_integer( "v4l-brightness", -1, NULL, BRIGHTNESS_TEXT,
- BRIGHTNESS_LONGTEXT, true );
+ BRIGHTNESS_LONGTEXT, true )
add_integer( "v4l-colour", -1, NULL, COLOUR_TEXT, COLOUR_LONGTEXT,
- true );
+ true )
add_integer( "v4l-hue", -1, NULL, HUE_TEXT, HUE_LONGTEXT, true )
add_integer( "v4l-contrast", -1, NULL, CONTRAST_TEXT, CONTRAST_LONGTEXT,
- true );
+ true )
add_bool( "v4l-mjpeg", false, NULL, MJPEG_TEXT, MJPEG_LONGTEXT,
- true );
+ true )
add_integer( "v4l-decimation", 1, NULL, DECIMATION_TEXT,
- DECIMATION_LONGTEXT, true );
+ DECIMATION_LONGTEXT, true )
add_integer( "v4l-quality", 100, NULL, QUALITY_TEXT, QUALITY_LONGTEXT,
- true );
+ true )
add_shortcut( "v4l" )
set_capability( "access_demux", 10 )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- vlc_value_t val;
/* Only when selected */
if( *p_demux->psz_access == '\0' )
if( !p_sys )
return VLC_ENOMEM;
- var_Create( p_demux, "v4l-audio", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-audio", &val );
- p_sys->i_audio = val.i_int;
-
- var_Create( p_demux, "v4l-channel", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-channel", &val );
- p_sys->i_channel = val.i_int;
-
- var_Create( p_demux, "v4l-norm", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-norm", &val );
- p_sys->i_norm = val.i_int;
-
- var_Create( p_demux, "v4l-tuner", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-tuner", &val );
- p_sys->i_tuner = val.i_int;
-
- var_Create( p_demux, "v4l-frequency",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-frequency", &val );
- p_sys->i_frequency = val.i_int;
-
- var_Create( p_demux, "v4l-fps", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-fps", &val );
- p_sys->f_fps = val.f_float;
-
- var_Create( p_demux, "v4l-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-width", &val );
- p_sys->i_width = val.i_int;
-
- var_Create( p_demux, "v4l-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-height", &val );
- p_sys->i_height = val.i_int;
-
- p_sys->i_video_pts = -1;
+ p_sys->i_audio = var_CreateGetInteger( p_demux, "v4l-audio" );
+ p_sys->i_channel = var_CreateGetInteger( p_demux, "v4l-channel" );
+ p_sys->i_norm = var_CreateGetInteger( p_demux, "v4l-norm" );
+ p_sys->i_tuner = var_CreateGetInteger( p_demux, "v4l-tuner" );
+ p_sys->i_frequency = var_CreateGetInteger( p_demux, "v4l-frequency" );
- var_Create( p_demux, "v4l-brightness", VLC_VAR_INTEGER |
- VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-brightness", &val );
- p_sys->i_brightness = val.i_int;
+ p_sys->f_fps = var_CreateGetFloat( p_demux, "v4l-fps" );
+ p_sys->i_width = var_CreateGetInteger( p_demux, "v4l-width" );
+ p_sys->i_height = var_CreateGetInteger( p_demux, "v4l-height" );
+ p_sys->i_video_pts = -1;
+ p_sys->i_brightness = var_CreateGetInteger( p_demux, "v4l-brightness" );
- var_Create( p_demux, "v4l-hue", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-hue", &val );
- p_sys->i_hue = -1;
+ p_sys->i_hue = var_CreateGetInteger( p_demux, "v4l-hue" );
+ p_sys->i_colour = var_CreateGetInteger( p_demux, "v4l-colour" );
+ p_sys->i_contrast = var_CreateGetInteger( p_demux, "v4l-contrast" );
- var_Create( p_demux, "v4l-colour", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-colour", &val );
- p_sys->i_colour = val.i_int;
-
- var_Create( p_demux, "v4l-contrast", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-contrast", &val );
- p_sys->i_contrast = val.i_int;
-
- var_Create( p_demux, "v4l-mjpeg", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-mjpeg", &val );
- p_sys->b_mjpeg = val.b_bool;
-
- var_Create( p_demux, "v4l-decimation", VLC_VAR_INTEGER |
- VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-decimation", &val );
- p_sys->i_decimation = val.i_int;
-
- var_Create( p_demux, "v4l-quality", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_demux, "v4l-quality", &val );
- p_sys->i_quality = val.i_int;
+ p_sys->b_mjpeg = var_CreateGetBool( p_demux, "v4l-mjpeg" );
+ p_sys->i_decimation = var_CreateGetInteger( p_demux, "v4l-decimation" );
+ p_sys->i_quality = var_CreateGetInteger( p_demux, "v4l-quality" );
p_sys->psz_device = NULL;
p_sys->i_fd = -1;
{
demux_sys_t *p_sys = p_demux->p_sys;
- struct pollfd fd;
- fd.fd = p_sys->i_fd;
- fd.events = POLLIN|POLLPRI;
- fd.revents = 0;
+ block_t *p_block = GrabVideo( p_demux );
- /* Wait for data */
- if( poll( &fd, 1, 500 ) )
+ if( !p_block )
{
- 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 );
- }
- }
+ msleep( 10000 ); /* Unfortunately v4l doesn't allow polling */
+ return 1;
}
+ 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 );
+
return 1;
}
projects / vlc / blobdiff