X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fps.c;h=099e6037ec2475275f109013ecb20d76b62c209c;hb=31523f87a2a4cd1a9b8020c031d8de9be1a4e187;hp=f7ffc3e8251732962e7f5e0fce5363b418f2d611;hpb=dd8d083b9220e81aa08963696d60240d5b4b2fce;p=vlc diff --git a/modules/demux/ps.c b/modules/demux/ps.c index f7ffc3e825..099e6037ec 100644 --- a/modules/demux/ps.c +++ b/modules/demux/ps.c @@ -1,7 +1,7 @@ /***************************************************************************** * ps.c: Program Stream demux module for VLC. ***************************************************************************** - * Copyright (C) 2004 the VideoLAN team + * Copyright (C) 2004-2009 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -52,22 +52,25 @@ static int OpenForce( vlc_object_t * ); static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( N_("MPEG-PS demuxer") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 1 ); - set_callbacks( OpenForce, Close ); - add_shortcut( "ps" ); +vlc_module_begin () + set_description( N_("MPEG-PS demuxer") ) + set_shortname( N_("PS") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 1 ) + set_callbacks( OpenForce, Close ) + add_shortcut( "ps" ) add_bool( "ps-trust-timestamps", true, NULL, TIME_TEXT, - TIME_LONGTEXT, true ); + TIME_LONGTEXT, true ) + change_safe () - add_submodule(); - set_description( N_("MPEG-PS demuxer") ); - set_capability( "demux", 8 ); - set_callbacks( Open, Close ); -vlc_module_end(); + add_submodule () + set_description( N_("MPEG-PS demuxer") ) + set_capability( "demux", 8 ) + set_callbacks( Open, Close ) + add_shortcut( "ps" ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -84,6 +87,8 @@ struct demux_sys_t int i_time_track; int64_t i_current_pts; + int i_aob_mlp_count; + bool b_lost_sync; bool b_have_pack; bool b_seekable; @@ -124,6 +129,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_force ) p_demux->pf_demux = Demux; p_demux->pf_control = Control; p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + if( !p_sys ) return VLC_ENOMEM; /* Init p_sys */ p_sys->i_mux_rate = 0; @@ -131,6 +137,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_force ) p_sys->i_length = -1; p_sys->i_current_pts = (mtime_t) 0; p_sys->i_time_track = -1; + p_sys->i_aob_mlp_count = 0; p_sys->b_lost_sync = false; p_sys->b_have_pack = false; @@ -242,14 +249,15 @@ static void FindLength( demux_t *p_demux ) /* Check beginning */ i = 0; i_current_pos = stream_Tell( p_demux->s ); - while( !p_demux->b_die && i < 40 && Demux2( p_demux, false ) > 0 ) i++; + while( vlc_object_alive (p_demux) && i < 40 && Demux2( p_demux, false ) > 0 ) i++; /* Check end */ i_size = stream_Size( p_demux->s ); i_end = __MAX( 0, __MIN( 200000, i_size ) ); stream_Seek( p_demux->s, i_size - i_end ); + i = 0; - while( !p_demux->b_die && Demux2( p_demux, true ) > 0 ); + while( vlc_object_alive (p_demux) && i < 40 && Demux2( p_demux, true ) > 0 ); if( i_current_pos >= 0 ) stream_Seek( p_demux->s, i_current_pos ); } @@ -350,6 +358,19 @@ static int Demux( demux_t *p_demux ) default: if( (i_id = ps_pkt_id( p_pkt )) >= 0xc0 ) { + /* Small heuristic to improve MLP detection from AOB */ + if( i_id == 0xa001 && + p_sys->i_aob_mlp_count < 500 ) + { + p_sys->i_aob_mlp_count++; + } + else if( i_id == 0xbda1 && + p_sys->i_aob_mlp_count > 0 ) + { + p_sys->i_aob_mlp_count--; + i_id = 0xa001; + } + bool b_new = false; ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)]; @@ -384,11 +405,11 @@ static int Demux( demux_t *p_demux ) if( tk->b_seen && tk->es && ( #ifdef ZVBI_COMPILED /* FIXME!! */ - tk->fmt.i_codec == VLC_FOURCC('t','e','l','x') || + tk->fmt.i_codec == VLC_CODEC_TELETEXT || #endif !ps_pkt_parse_pes( p_pkt, tk->i_skip ) ) ) { - if( !b_new && !p_sys->b_have_pack && + if( !b_new && !p_sys->b_have_pack && (tk->fmt.i_cat == AUDIO_ES) && (p_pkt->i_pts > 0) ) { @@ -447,7 +468,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) f = (double) va_arg( args, double ); i64 = stream_Size( p_demux->s ); p_sys->i_current_pts = 0; - es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); return stream_Seek( p_demux->s, (int64_t)(i64 * f) ); @@ -489,10 +509,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { int64_t i_now = p_sys->i_current_pts - p_sys->tk[p_sys->i_time_track].i_first_pts; int64_t i_pos = stream_Tell( p_demux->s ); - int64_t i_offset = i_pos / (i_now / 1000000) * ((i64 - i_now) / 1000000); - stream_Seek( p_demux->s, i_pos + i_offset); - es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + if( !i_now ) + return i64 ? VLC_EGENERIC : VLC_SUCCESS; + + i_pos *= (float)i64 / (float)i_now; + stream_Seek( p_demux->s, i_pos ); return VLC_SUCCESS; } return VLC_EGENERIC; @@ -558,9 +580,15 @@ static block_t *ps_pkt_read( stream_t *s, uint32_t i_code ) { const uint8_t *p_peek; int i_peek = stream_Peek( s, &p_peek, 14 ); - int i_size = ps_pkt_size( p_peek, i_peek ); + int i_size; + VLC_UNUSED(i_code); + + /* Smallest valid packet */ + if( i_peek < 6 ) return NULL; + + i_size = ps_pkt_size( p_peek, i_peek ); - if( i_size <= 6 && p_peek[3] > 0xba ) + if( i_size < 0 || ( i_size <= 6 && p_peek[3] > 0xba ) ) { /* Special case, search the next start code */ i_size = 6;