int64_t i_current_pos = -1, i_size = 0, i_end = 0;
int i;
- if( !var_CreateGetInteger( p_demux, "ps-trust-timestamps" ) )
+ if( !var_CreateGetBool( p_demux, "ps-trust-timestamps" ) )
return;
if( p_sys->i_length == -1 ) /* First time */
/* The popular VCD/SVCD subtitling WinSubMux does not
* renumber the SCRs when merging subtitles into the PES */
if( tk->b_seen &&
- ( tk->fmt.i_codec == VLC_FOURCC('o','g','t',' ') ||
- tk->fmt.i_codec == VLC_FOURCC('c','v','d',' ') ) )
+ ( tk->fmt.i_codec == VLC_CODEC_OGT ||
+ tk->fmt.i_codec == VLC_CODEC_CVD ) )
{
p_sys->i_scr = -1;
}
- if( p_sys->i_scr > 0 )
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_scr );
+ if( p_sys->i_scr >= 0 )
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_scr );
p_sys->i_scr = -1;
{
if( !b_new && !p_sys->b_have_pack &&
(tk->fmt.i_cat == AUDIO_ES) &&
- (p_pkt->i_pts > 0) )
+ (p_pkt->i_pts > VLC_TS_INVALID) )
{
/* A hack to sync the A/V on PES files. */
msg_Dbg( p_demux, "force SCR: %"PRId64, p_pkt->i_pts );
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
{
if( !i_now )
return i64 ? VLC_EGENERIC : VLC_SUCCESS;
+ p_sys->i_current_pts = 0;
i_pos *= (float)i64 / (float)i_now;
stream_Seek( p_demux->s, i_pos );
return VLC_SUCCESS;