/*****************************************************************************
* m4v.c : MPEG-4 Video demuxer
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: m4v.c,v 1.11 2003/12/22 02:24:52 sam Exp $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_demux.h>
#include "vlc_codec.h"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
vlc_module_begin();
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
set_description( _("MPEG-4 video demuxer" ) );
- set_capability( "demux", 0 );
+ set_capability( "demux2", 0 );
set_callbacks( Open, Close );
add_shortcut( "m4v" );
add_shortcut( "mp4v" );
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int Demux ( input_thread_t * );
-
struct demux_sys_t
{
mtime_t i_dts;
decoder_t *p_packetizer;
};
+static int Demux( demux_t * );
+static int Control( demux_t *, int, va_list );
+
#define M4V_PACKET_SIZE 4096
/*****************************************************************************
*****************************************************************************/
static int Open( vlc_object_t * p_this )
{
- input_thread_t *p_input = (input_thread_t *)p_this;
- demux_sys_t *p_sys;
- vlc_bool_t b_forced = VLC_FALSE;
-
- uint8_t *p_peek;
-
- es_format_t fmt;
-
- if( stream_Peek( p_input->s, &p_peek, 4 ) < 4 )
- {
- msg_Err( p_input, "cannot peek" );
- return VLC_EGENERIC;
- }
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys;
+ uint8_t *p_peek;
- if( p_input->psz_demux &&
- ( !strncmp( p_input->psz_demux, "mp4v", 4 ) ||
- !strncmp( p_input->psz_demux, "m4v", 4 ) ) )
- {
- b_forced = VLC_TRUE;
- }
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
- if( p_peek[0] != 0x00 || p_peek[1] != 0x00 || p_peek[2] != 0x01 || p_peek[3] > 0x2f )
+ if( p_peek[0] != 0x00 || p_peek[1] != 0x00 || p_peek[2] != 0x01 )
{
- if( !b_forced )
+ if( !p_demux->b_force )
{
- msg_Warn( p_input, "m4v module discarded (no startcode)" );
+ msg_Warn( p_demux, "m4v module discarded (no startcode)" );
return VLC_EGENERIC;
}
- msg_Err( p_input, "this doesn't look like an MPEG-4 ES stream, continuing" );
+ msg_Warn( p_demux, "this doesn't look like an MPEG-4 ES stream, "
+ "continuing anyway" );
}
- vlc_mutex_lock( &p_input->stream.stream_lock );
- if( input_InitStream( p_input, 0 ) == -1)
- {
- 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->i_dts = 0;
-
- /*
- * Load the mpegvideo packetizer
- */
- p_sys->p_packetizer = vlc_object_create( p_input, VLC_OBJECT_PACKETIZER );
- p_sys->p_packetizer->pf_decode_audio = NULL;
- p_sys->p_packetizer->pf_decode_video = NULL;
- p_sys->p_packetizer->pf_decode_sub = NULL;
- p_sys->p_packetizer->pf_packetize = NULL;
- es_format_Init( &p_sys->p_packetizer->fmt_in, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) );
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control= Control;
+ p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ p_sys->p_es = NULL;
+ p_sys->i_dts = 1;
+
+ /* Load the mpeg4video packetizer */
+ INIT_VPACKETIZER( p_sys->p_packetizer, 'm', 'p', '4', 'v' );
es_format_Init( &p_sys->p_packetizer->fmt_out, UNKNOWN_ES, 0 );
- p_sys->p_packetizer->p_module =
- module_Need( p_sys->p_packetizer, "packetizer", NULL );
- if( p_sys->p_packetizer->p_module == NULL)
- {
- vlc_object_destroy( p_sys->p_packetizer );
- msg_Err( p_input, "cannot find mp4v packetizer" );
- free( p_sys );
- return VLC_EGENERIC;
- }
+ LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "mpeg4 video" );
- /*
- * create the output
- */
- 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 );
+ /* We need to wait until we get p_extra (VOL header) from the packetizer
+ * before we create the output */
return VLC_SUCCESS;
}
*****************************************************************************/
static void Close( vlc_object_t * p_this )
{
- input_thread_t *p_input = (input_thread_t*)p_this;
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys = p_demux->p_sys;
- module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
- vlc_object_destroy( p_sys->p_packetizer );
+ DESTROY_PACKETIZER( p_sys->p_packetizer) ;
free( p_sys );
}
*****************************************************************************
* 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;
- 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;
}
/* m4v demuxer doesn't set pts/dts at all */
- p_block_in->i_pts =
- p_block_in->i_dts = 1;
+ p_block_in->i_dts = p_sys->i_dts;
+ p_block_in->i_pts = 0;
while( (p_block_out = p_sys->p_packetizer->pf_packetize( p_sys->p_packetizer, &p_block_in )) )
{
{
block_t *p_next = p_block_out->p_next;
- input_ClockManageRef( p_input,
- p_input->stream.p_selected_program,
- 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;
+ if( p_sys->p_es == NULL )
+ {
+ p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
+ p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
+ }
+
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_dts );
p_block_out->p_next = NULL;
- es_out_Send( p_input->p_es_out, p_sys->p_es, p_block_out );
+ if( p_block_out->i_pts == p_block_out->i_dts )
+ {
+ p_block_out->i_pts = p_sys->i_dts;
+ }
+ else
+ {
+ p_block_out->i_pts = 0;
+ }
+ p_block_out->i_dts = p_sys->i_dts;
+
+ es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
p_block_out = p_next;
/* FIXME FIXME FIXME FIXME */
- p_sys->i_dts += (mtime_t)90000 / 25;
+ p_sys->i_dts += (mtime_t)1000000 / 25;
/* FIXME FIXME FIXME FIXME */
}
}
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 );
+}
+
projects / vlc / blobdiff