/*****************************************************************************
* 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 <fenrir@via.ecp.fr>
add_bool( "ps-trust-timestamps", true, NULL, TIME_TEXT,
TIME_LONGTEXT, true )
+ change_safe ()
add_submodule ()
set_description( N_("MPEG-PS demuxer") )
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;
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;
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)];
i64 = stream_Size( p_demux->s );
if( i64 > 0 )
{
- *pf = (double)stream_Tell( p_demux->s ) / (double)i64;
+ double current = stream_Tell( p_demux->s );
+ *pf = current / (double)i64;
}
else
{