Commit b04e87d0 authored by Laurent Aimar's avatar Laurent Aimar

* m4v: demux -> demux2.

parent 0b4ff2a3
...@@ -60,6 +60,8 @@ vlc_module_begin(); ...@@ -60,6 +60,8 @@ vlc_module_begin();
add_shortcut( "flac" ); add_shortcut( "flac" );
add_shortcut( "m3u" ); add_shortcut( "m3u" );
add_shortcut( "playlist" ); add_shortcut( "playlist" );
add_shortcut( "m4v" );
add_shortcut( "mp4v" );
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
......
/***************************************************************************** /*****************************************************************************
* m4v.c : MPEG-4 Video demuxer * m4v.c : MPEG-4 Video demuxer
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2004 VideoLAN
* $Id: m4v.c,v 1.12 2004/03/03 20:39:52 gbazin Exp $ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * ); static void Close( vlc_object_t * );
vlc_module_begin(); vlc_module_begin();
set_description( _("MPEG-4 video demuxer" ) ); set_description( _("MPEG-4 video demuxer" ) );
set_capability( "demux", 0 ); set_capability( "demux2", 0 );
set_callbacks( Open, Close ); set_callbacks( Open, Close );
add_shortcut( "m4v" ); add_shortcut( "m4v" );
add_shortcut( "mp4v" ); add_shortcut( "mp4v" );
...@@ -47,8 +47,6 @@ vlc_module_end(); ...@@ -47,8 +47,6 @@ vlc_module_end();
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
static int Demux ( input_thread_t * );
struct demux_sys_t struct demux_sys_t
{ {
mtime_t i_dts; mtime_t i_dts;
...@@ -57,6 +55,9 @@ struct demux_sys_t ...@@ -57,6 +55,9 @@ struct demux_sys_t
decoder_t *p_packetizer; decoder_t *p_packetizer;
}; };
static int Demux( demux_t * );
static int Control( demux_t *, int, va_list );
#define M4V_PACKET_SIZE 4096 #define M4V_PACKET_SIZE 4096
/***************************************************************************** /*****************************************************************************
...@@ -64,7 +65,7 @@ struct demux_sys_t ...@@ -64,7 +65,7 @@ struct demux_sys_t
*****************************************************************************/ *****************************************************************************/
static int Open( vlc_object_t * p_this ) static int Open( vlc_object_t * p_this )
{ {
input_thread_t *p_input = (input_thread_t *)p_this; demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys; demux_sys_t *p_sys;
vlc_bool_t b_forced = VLC_FALSE; vlc_bool_t b_forced = VLC_FALSE;
...@@ -72,15 +73,14 @@ static int Open( vlc_object_t * p_this ) ...@@ -72,15 +73,14 @@ static int Open( vlc_object_t * p_this )
es_format_t fmt; es_format_t fmt;
if( stream_Peek( p_input->s, &p_peek, 4 ) < 4 ) if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
{ {
msg_Err( p_input, "cannot peek" ); msg_Err( p_demux, "cannot peek" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( p_input->psz_demux && if( !strncmp( p_demux->psz_demux, "mp4v", 4 ) ||
( !strncmp( p_input->psz_demux, "mp4v", 4 ) || !strncmp( p_demux->psz_demux, "m4v", 4 ) )
!strncmp( p_input->psz_demux, "m4v", 4 ) ) )
{ {
b_forced = VLC_TRUE; b_forced = VLC_TRUE;
} }
...@@ -89,35 +89,23 @@ static int Open( vlc_object_t * p_this ) ...@@ -89,35 +89,23 @@ static int Open( vlc_object_t * p_this )
{ {
if( !b_forced ) if( !b_forced )
{ {
msg_Warn( p_input, "m4v module discarded (no startcode)" ); msg_Warn( p_demux, "m4v module discarded (no startcode)" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
msg_Err( p_input, "this doesn't look like an MPEG-4 ES stream, continuing" ); msg_Err( p_demux, "this doesn't look like an MPEG-4 ES stream, continuing" );
} }
vlc_mutex_lock( &p_input->stream.stream_lock ); p_demux->pf_demux = Demux;
if( input_InitStream( p_input, 0 ) == -1) p_demux->pf_control= Control;
{ p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
vlc_mutex_unlock( &p_input->stream.stream_lock );
msg_Err( p_input, "cannot init stream" );
return VLC_EGENERIC;
}
p_input->stream.i_mux_rate = 0 / 50;
vlc_mutex_unlock( &p_input->stream.stream_lock );
p_input->pf_demux = Demux;
p_input->pf_rewind = NULL;
p_input->pf_demux_control = demux_vaControlDefault;
p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) );
p_sys->p_es = NULL; p_sys->p_es = NULL;
p_sys->i_dts = 0; p_sys->i_dts = 0;
/* /*
* Load the mpegvideo packetizer * Load the mpegvideo packetizer
*/ */
p_sys->p_packetizer = vlc_object_create( p_input, VLC_OBJECT_PACKETIZER ); p_sys->p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_PACKETIZER );
p_sys->p_packetizer->pf_decode_audio = NULL; p_sys->p_packetizer->pf_decode_audio = NULL;
p_sys->p_packetizer->pf_decode_video = NULL; p_sys->p_packetizer->pf_decode_video = NULL;
p_sys->p_packetizer->pf_decode_sub = NULL; p_sys->p_packetizer->pf_decode_sub = NULL;
...@@ -131,7 +119,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -131,7 +119,7 @@ static int Open( vlc_object_t * p_this )
if( p_sys->p_packetizer->p_module == NULL) if( p_sys->p_packetizer->p_module == NULL)
{ {
vlc_object_destroy( p_sys->p_packetizer ); vlc_object_destroy( p_sys->p_packetizer );
msg_Err( p_input, "cannot find mp4v packetizer" ); msg_Err( p_demux, "cannot find mp4v packetizer" );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -140,7 +128,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -140,7 +128,7 @@ static int Open( vlc_object_t * p_this )
* create the output * create the output
*/ */
es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) ); es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) );
p_sys->p_es = es_out_Add( p_input->p_es_out, &fmt ); p_sys->p_es = es_out_Add( p_demux->out, &fmt );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -150,8 +138,8 @@ static int Open( vlc_object_t * p_this ) ...@@ -150,8 +138,8 @@ static int Open( vlc_object_t * p_this )
*****************************************************************************/ *****************************************************************************/
static void Close( vlc_object_t * p_this ) static void Close( vlc_object_t * p_this )
{ {
input_thread_t *p_input = (input_thread_t*)p_this; demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_input->p_demux_data; demux_sys_t *p_sys = p_demux->p_sys;
module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module ); module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
vlc_object_destroy( p_sys->p_packetizer ); vlc_object_destroy( p_sys->p_packetizer );
...@@ -164,12 +152,12 @@ static void Close( vlc_object_t * p_this ) ...@@ -164,12 +152,12 @@ static void Close( vlc_object_t * p_this )
***************************************************************************** *****************************************************************************
* Returns -1 in case of error, 0 in case of EOF, 1 otherwise * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
*****************************************************************************/ *****************************************************************************/
static int Demux( input_thread_t * p_input ) static int Demux( demux_t *p_demux)
{ {
demux_sys_t *p_sys = p_input->p_demux_data; demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_block_in, *p_block_out; block_t *p_block_in, *p_block_out;
if( ( p_block_in = stream_Block( p_input->s, M4V_PACKET_SIZE ) ) == NULL ) if( ( p_block_in = stream_Block( p_demux->s, M4V_PACKET_SIZE ) ) == NULL )
{ {
return 0; return 0;
} }
...@@ -184,16 +172,13 @@ static int Demux( input_thread_t * p_input ) ...@@ -184,16 +172,13 @@ static int Demux( input_thread_t * p_input )
{ {
block_t *p_next = p_block_out->p_next; block_t *p_next = p_block_out->p_next;
input_ClockManageRef( p_input, es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_dts );
p_input->stream.p_selected_program,
p_sys->i_dts ); p_block_out->i_dts = p_sys->i_dts;
p_block_out->i_dts =
input_ClockGetTS( p_input, p_input->stream.p_selected_program,
p_sys->i_dts );
p_block_out->i_pts = 0; p_block_out->i_pts = 0;
p_block_out->p_next = NULL; p_block_out->p_next = NULL;
es_out_Send( p_input->p_es_out, p_sys->p_es, p_block_out ); es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
p_block_out = p_next; p_block_out = p_next;
...@@ -205,3 +190,18 @@ static int Demux( input_thread_t * p_input ) ...@@ -205,3 +190,18 @@ static int Demux( input_thread_t * p_input )
return 1; return 1;
} }
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
/* demux_sys_t *p_sys = p_demux->p_sys; */
/* FIXME calculate the bitrate */
if( i_query == DEMUX_SET_TIME )
return VLC_EGENERIC;
else
return demux2_vaControlHelper( p_demux->s,
0, -1,
0, 1, i_query, args );
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment