Commit bb1eff8a authored by gbazin's avatar gbazin
Browse files

* modules/access/v4l/v4l.c: converted to access_demux module (less code, more CPU efficient).

parent f9610dec
......@@ -66,11 +66,8 @@
/*****************************************************************************
* Module descriptior
*****************************************************************************/
static int AccessOpen ( vlc_object_t * );
static void AccessClose( vlc_object_t * );
static int DemuxOpen ( vlc_object_t * );
static void DemuxClose ( vlc_object_t * );
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
......@@ -103,31 +100,22 @@ vlc_module_begin();
VLC_TRUE );
add_shortcut( "v4l" );
set_capability( "access2", 10 );
set_callbacks( AccessOpen, AccessClose );
add_submodule();
set_description( _("Video4Linux demuxer") );
add_shortcut( "v4l" );
set_capability( "demux2", 20 );
set_callbacks( DemuxOpen, DemuxClose );
set_capability( "access_demux", 10 );
set_callbacks( Open, Close );
vlc_module_end();
/*****************************************************************************
* Access: local prototypes
*****************************************************************************/
static int AccessRead ( access_t *, uint8_t *, int );
static int AccessControl( access_t *, int, va_list );
static int Demux ( demux_t * );
static int Control( demux_t *, int, va_list );
static void ParseMRL ( access_t * );
static int OpenVideoDev( access_t *, char * );
static int OpenAudioDev( access_t *, char * );
static int GrabAudio( access_t *, uint8_t **, int *, mtime_t * );
static int GrabVideo( access_t *, uint8_t **, int *, mtime_t * );
static void ParseMRL ( demux_t * );
static int OpenVideoDev( demux_t *, char * );
static int OpenAudioDev( demux_t *, char * );
static block_t *GrabAudio( demux_t * );
static block_t *GrabVideo( demux_t * );
#define MJPEG_BUFFER_SIZE (256*1024)
......@@ -170,7 +158,7 @@ static struct
{ 0, 0 }
};
struct access_sys_t
struct demux_sys_t
{
/* Devices */
char *psz_device; /* Main device from MRL, can be video or audio */
......@@ -215,91 +203,38 @@ struct access_sys_t
struct video_mmap vid_mmap;
struct video_picture vid_picture;
uint8_t *p_video_frame;
int i_video_frame_size;
int i_video_frame_size_allocated;
int i_video_frame_size;
es_out_id_t *p_es_video;
/* Audio properties */
vlc_fourcc_t i_acodec_raw;
int i_sample_rate;
vlc_bool_t b_stereo;
uint8_t *p_audio_frame;
int i_audio_frame_size;
int i_audio_frame_size_allocated;
/* header */
int i_streams;
int i_header_size;
int i_header_pos;
uint8_t *p_header; // at lest 8 bytes allocated
/* data */
int i_data_size;
int i_data_pos;
uint8_t *p_data; // never allocated
int i_audio_max_frame_size;
block_t *p_block_audio;
es_out_id_t *p_es_audio;
};
/*
* header:
* fcc ".v4l"
* u32 stream count
* fcc "auds"|"vids" 0
* fcc codec 4
* if vids
* u32 width 8
* u32 height 12
* u32 padding 16
* if auds
* u32 channels 12
* u32 samplerate 8
* u32 samplesize 16
*
* data:
* u32 stream number
* u32 data size
* u8 data
*/
static void SetDWBE( uint8_t *p, uint32_t dw )
{
p[0] = (dw >> 24)&0xff;
p[1] = (dw >> 16)&0xff;
p[2] = (dw >> 8)&0xff;
p[3] = (dw )&0xff;
}
static void SetQWBE( uint8_t *p, uint64_t qw )
{
SetDWBE( p, (qw >> 32)&0xffffffff );
SetDWBE( &p[4], qw&0xffffffff);
}
/*****************************************************************************
* AccessOpen: opens v4l device
* Open: opens v4l device
*****************************************************************************
*
* url: <video device>::::
*
*****************************************************************************/
static int AccessOpen( vlc_object_t *p_this )
static int Open( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys;
/* Set up p_access */
p_access->pf_read = AccessRead;
p_access->pf_block = NULL;
p_access->pf_control = AccessControl;
p_access->pf_seek = NULL;
p_access->info.i_update = 0;
p_access->info.i_size = 0;
p_access->info.i_pos = 0;
p_access->info.b_eof = VLC_FALSE;
p_access->info.i_title = 0;
p_access->info.i_seekpoint = 0;
p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
memset( p_sys, 0, sizeof( access_sys_t ) );
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
/* Set up p_demux */
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
memset( p_sys, 0, sizeof( demux_sys_t ) );
p_sys->i_audio = -1;
p_sys->i_norm = VIDEO_MODE_AUTO; // auto
......@@ -318,36 +253,30 @@ static int AccessOpen( vlc_object_t *p_this )
p_sys->i_decimation = 1;
p_sys->i_quality = 100;
p_sys->i_video_frame_size_allocated = 0;
p_sys->i_frame_pos = 0;
p_sys->p_audio_frame = 0;
p_sys->i_sample_rate = 44100;
p_sys->b_stereo = VLC_TRUE;
p_sys->p_header = NULL;
p_sys->i_data_size = 0;
p_sys->i_data_pos = 0;
p_sys->p_data = NULL;
p_sys->psz_device = p_sys->psz_vdev = p_sys->psz_adev = NULL;
p_sys->fd_video = -1;
p_sys->fd_audio = -1;
ParseMRL( p_access );
p_sys->p_es_video = p_sys->p_es_audio = 0;
p_sys->p_block_audio = 0;
ParseMRL( p_demux );
/* Find main device (video or audio) */
if( p_sys->psz_device && *p_sys->psz_device )
{
msg_Dbg( p_access, "main device=`%s'", p_sys->psz_device );
msg_Dbg( p_demux, "main device=`%s'", p_sys->psz_device );
/* Try to open as video device */
p_sys->fd_video = OpenVideoDev( p_access, p_sys->psz_device );
p_sys->fd_video = OpenVideoDev( p_demux, p_sys->psz_device );
if( p_sys->fd_video < 0 )
{
/* Try to open as audio device */
p_sys->fd_audio = OpenAudioDev( p_access, p_sys->psz_device );
p_sys->fd_audio = OpenAudioDev( p_demux, p_sys->psz_device );
if( p_sys->fd_audio >= 0 )
{
if( p_sys->psz_adev ) free( p_sys->psz_adev );
......@@ -366,9 +295,9 @@ static int AccessOpen( vlc_object_t *p_this )
/* If no device opened, only continue if the access was forced */
if( p_sys->fd_video < 0 && p_sys->fd_audio < 0 )
{
if( strcmp( p_access->psz_access, "v4l" ) )
if( strcmp( p_demux->psz_access, "v4l" ) )
{
AccessClose( p_this );
Close( p_this );
return VLC_EGENERIC;
}
}
......@@ -379,12 +308,12 @@ static int AccessOpen( vlc_object_t *p_this )
if( !p_sys->psz_vdev || !*p_sys->psz_vdev )
{
if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
p_sys->psz_vdev = var_CreateGetString( p_access, "v4l-vdev" );;
p_sys->psz_vdev = var_CreateGetString( p_demux, "v4l-vdev" );;
}
if( p_sys->psz_vdev && *p_sys->psz_vdev )
{
p_sys->fd_video = OpenVideoDev( p_access, p_sys->psz_vdev );
p_sys->fd_video = OpenVideoDev( p_demux, p_sys->psz_vdev );
}
}
......@@ -394,92 +323,75 @@ static int AccessOpen( vlc_object_t *p_this )
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_access, "v4l-adev" );;
p_sys->psz_adev = var_CreateGetString( p_demux, "v4l-adev" );;
}
if( p_sys->psz_adev && *p_sys->psz_adev )
{
p_sys->fd_audio = OpenAudioDev( p_access, p_sys->psz_adev );
p_sys->fd_audio = OpenAudioDev( p_demux, p_sys->psz_adev );
}
}
if( p_sys->fd_video < 0 && p_sys->fd_audio < 0 )
{
AccessClose( p_this );
Close( p_this );
return VLC_EGENERIC;
}
msg_Dbg( p_access, "v4l grabbing started" );
/* create header */
p_sys->i_streams = 0;
p_sys->i_header_size = 8;
p_sys->i_header_pos = 8;
p_sys->p_header = malloc( p_sys->i_header_size );
memcpy( p_sys->p_header, ".v4l", 4 );
msg_Dbg( p_demux, "v4l grabbing started" );
/* Declare elementary streams */
if( p_sys->fd_video >= 0 )
{
p_sys->i_header_size += 20;
p_sys->p_header = realloc( p_sys->p_header, p_sys->i_header_size );
SetDWBE( &p_sys->p_header[4], ++p_sys->i_streams );
memcpy( &p_sys->p_header[p_sys->i_header_pos], "vids", 4 );
memcpy( &p_sys->p_header[p_sys->i_header_pos+4],
&p_sys->i_fourcc, 4 );
SetDWBE( &p_sys->p_header[p_sys->i_header_pos+8], p_sys->i_width );
SetDWBE( &p_sys->p_header[p_sys->i_header_pos+12], p_sys->i_height );
SetDWBE( &p_sys->p_header[p_sys->i_header_pos+16], 0 );
es_format_t fmt;
es_format_Init( &fmt, VIDEO_ES, p_sys->i_fourcc );
fmt.video.i_width = p_sys->i_width;
fmt.video.i_height = p_sys->i_height;
p_sys->i_header_pos = p_sys->i_header_size;
msg_Dbg( p_demux, "added new video es %4.4s %dx%d",
(char*)&fmt.i_codec, fmt.video.i_width, fmt.video.i_height );
p_sys->p_es_video = es_out_Add( p_demux->out, &fmt );
}
if( p_sys->fd_audio >= 0 )
{
p_sys->i_header_size += 20;
p_sys->p_header = realloc( p_sys->p_header, p_sys->i_header_size );
es_format_t fmt;
es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC('a','r','a','w') );
SetDWBE( &p_sys->p_header[4], ++p_sys->i_streams );
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_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;
memcpy( &p_sys->p_header[p_sys->i_header_pos], "auds", 4 );
memcpy( &p_sys->p_header[p_sys->i_header_pos+4], "araw", 4 );
SetDWBE( &p_sys->p_header[p_sys->i_header_pos+8],
p_sys->b_stereo ? 2 : 1 );
SetDWBE( &p_sys->p_header[p_sys->i_header_pos+12],
p_sys->i_sample_rate );
SetDWBE( &p_sys->p_header[p_sys->i_header_pos+16], 16 );
msg_Dbg( p_demux, "new audio es %d channels %dHz",
fmt.audio.i_channels, fmt.audio.i_rate );
p_sys->i_header_pos = p_sys->i_header_size;
p_sys->p_es_audio = es_out_Add( p_demux->out, &fmt );
}
p_sys->i_header_pos = 0;
/* Update default_pts to a suitable value for access */
var_Create( p_access, "v4l-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
/* Force v4l demuxer */
p_access->psz_demux = strdup( "v4l" );
var_Create( p_demux, "v4l-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
return VLC_SUCCESS;
}
/*****************************************************************************
* AccessClose: close device, free resources
* Close: close device, free resources
*****************************************************************************/
static void AccessClose( vlc_object_t *p_this )
static void Close( vlc_object_t *p_this )
{
access_t *p_access = (access_t *)p_this;
access_sys_t *p_sys = p_access->p_sys;
demux_t *p_demux = (demux_t *)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
if( p_sys->psz_device ) free( p_sys->psz_device );
if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
if( p_sys->psz_adev ) free( p_sys->psz_adev );
if( p_sys->fd_video >= 0 ) close( p_sys->fd_video );
if( p_sys->fd_audio >= 0 ) close( p_sys->fd_audio );
if( p_sys->p_header ) free( p_sys->p_header );
if( p_sys->p_audio_frame ) free( p_sys->p_audio_frame );
if( p_sys->p_block_audio ) block_Release( p_sys->p_block_audio );
if( p_sys->b_mjpeg )
{
......@@ -500,161 +412,75 @@ static void AccessClose( vlc_object_t *p_this )
}
/*****************************************************************************
* AccessControl:
* Control:
*****************************************************************************/
static int AccessControl( access_t *p_access, int i_query, va_list args )
static int Control( demux_t *p_demux, int i_query, va_list args )
{
vlc_bool_t *pb_bool;
int *pi_int;
int64_t *pi_64;
vlc_bool_t *pb;
int64_t *pi64;
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
*pb_bool = VLC_FALSE;
break;
/* */
case ACCESS_GET_MTU:
pi_int = (int*)va_arg( args, int * );
*pi_int = 0;
break;
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = (int64_t)var_GetInteger( p_access, "v4l-caching" ) * I64C(1000);
break;
/* */
case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
return VLC_EGENERIC;
/* Special for access_demux */
case DEMUX_CAN_PAUSE:
case DEMUX_SET_PAUSE_STATE:
case DEMUX_CAN_CONTROL_PACE:
pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
*pb = VLC_FALSE;
return VLC_SUCCESS;
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = (int64_t)var_GetInteger( p_demux, "v4l-caching" ) * 1000;
return VLC_SUCCESS;
/* TODO implement others */
default:
msg_Err( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
return VLC_EGENERIC;
}
/*****************************************************************************
* AccessRead:
* Demux:
*****************************************************************************/
static int AccessRead( access_t *p_access, uint8_t *p_buffer, int i_len )
static int Demux( demux_t *p_demux )
{
access_sys_t *p_sys = p_access->p_sys;
int i_data = 0;
int i_stream;
mtime_t i_pts;
demux_sys_t *p_sys = p_demux->p_sys;
es_out_id_t *p_es = p_sys->p_es_audio;
block_t *p_block;
while( i_len > 0 )
/* Try grabbing audio frames first */
if( p_sys->fd_audio < 0 || !( p_block = GrabAudio( p_demux ) ) )
{
/* First copy header if any */
if( p_sys->i_header_pos < p_sys->i_header_size )
{
int i_copy;
i_copy = __MIN( p_sys->i_header_size - p_sys->i_header_pos,
(int)i_len );
memcpy( p_buffer, &p_sys->p_header[p_sys->i_header_pos], i_copy );
p_sys->i_header_pos += i_copy;
p_buffer += i_copy;
i_len -= i_copy;
i_data += i_copy;
}
/* then data */
if( i_len > 0 && p_sys->i_data_pos < p_sys->i_data_size )
{
int i_copy;
i_copy = __MIN( p_sys->i_data_size - p_sys->i_data_pos,
(int)i_len );
memcpy( p_buffer, &p_sys->p_data[p_sys->i_data_pos], i_copy );
p_sys->i_data_pos += i_copy;
p_buffer += i_copy;
i_len -= i_copy;
i_data += i_copy;
}
/* The caller got what he wanted */
if( i_len == 0 )
{
return i_data;
}
/* Read no more than one frame at a time.
* That kills latency, especially for encoded v4l streams */
if( p_sys->i_data_size && p_sys->i_data_pos == p_sys->i_data_size )
{
p_sys->i_data_pos = 0; p_sys->i_data_size = 0;
return i_data;
}
/* Re-fill data by grabbing audio/video */
p_sys->i_data_pos = p_sys->i_data_size = 0;
/* Try grabbing audio frames first */
i_stream = p_sys->i_streams - 1;
if( p_sys->fd_audio < 0 ||
GrabAudio( p_access, &p_sys->p_data,
&p_sys->i_data_size, &i_pts ) != VLC_SUCCESS )
{
int i_ret = VLC_ETIMEOUT;
/* Try grabbing video frame */
i_stream = 0;
if( p_sys->fd_video > 0 )
{
i_ret = GrabVideo( p_access, &p_sys->p_data,
&p_sys->i_data_size, &i_pts );
}
/* No video or timeout */
if( i_ret == VLC_ETIMEOUT )
{
/* Sleep so we do not consume all the cpu, 10ms seems
* like a good value (100fps) */
msleep( 10000 );
continue;
}
else if( i_ret != VLC_SUCCESS )
{
msg_Err( p_access, "Error during capture!" );
return -1;
}
}
/* Try grabbing video frame */
p_es = p_sys->p_es_video;
if( p_sys->fd_video > 0 ) p_block = GrabVideo( p_demux );
}
/* create pseudo header */
p_sys->i_header_size = 16;
p_sys->i_header_pos = 0;
SetDWBE( &p_sys->p_header[0], i_stream );
SetDWBE( &p_sys->p_header[4], p_sys->i_data_size );
SetQWBE( &p_sys->p_header[8], i_pts );
if( !p_block )
{
/* Sleep so we do not consume all the cpu, 10ms seems
* like a good value (100fps) */
msleep( 10000 );
return 1;
}
return i_data;
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;
}
/*****************************************************************************
* ParseMRL: parse the options contained in the MRL
*****************************************************************************/
static void ParseMRL( access_t *p_access )
static void ParseMRL( demux_t *p_demux )
{
access_sys_t *p_sys = p_access->p_sys;
demux_sys_t *p_sys = p_demux->p_sys;
char *psz_dup = strdup( p_access->psz_path );
char *psz_dup = strdup( p_demux->psz_path );
char *psz_parser = psz_dup;
while( *psz_parser && *psz_parser != ':' )
......@@ -709,7 +535,7 @@ static void ParseMRL( access_t *p_access )
&psz_parser, 0 );
if( p_sys->i_frequency < 30000 )
{
msg_Warn( p_access, "v4l syntax has changed : "
msg_Warn( p_demux, "v4l syntax has changed : "
"'frequency' is now channel frequency in kHz");
}
}
......@@ -760,7 +586,7 @@ static void ParseMRL( access_t *p_access )
p_sys->i_height = strtol( psz_parser + 1,
&psz_parser, 0 );
}
msg_Dbg( p_access, "WxH %dx%d", p_sys->i_width,
msg_Dbg( p_demux, "WxH %dx%d", p_sys->i_width,
p_sys->i_height );
}
}
......@@ -853,7 +679,7 @@ static void ParseMRL( access_t *p_access )
}
else
{
msg_Warn( p_access, "unknown option" );
msg_Warn( p_demux, "unknown option" );
}
while( *psz_parser && *psz_parser != ':' )
......@@ -878,9 +704,9 @@ static void ParseMRL( access_t *p_access )
/*****************************************************************************
* OpenVideoDev:
*****************************************************************************/
static int OpenVideoDev( access_t *p_access, char *psz_device )
static int OpenVideoDev( demux_t *p_demux, char *psz_device )
{
access_sys_t *p_sys = p_access->p_sys;
demux_sys_t *p_sys = p_demux->p_sys;
int i_fd;
struct video_channel vid_channel;
......@@ -889,17 +715,17 @@ static int OpenVideoDev( access_t *p_access, char *psz_device )
if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
{
msg_Err( p_access, "cannot open device (%s)", strerror( errno ) );
msg_Err( p_demux, "cannot open device (%s)", strerror( errno ) );