Skip to content

V
vlc
Commit 880d2ee8 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

TS Demux: PCRHandle(): simplify

parent 089af106
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 19 deletions
modules/demux/ts.c
View file @ 880d2ee8
...@@ -1944,28 +1944,22 @@ static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) ...@@ -1944,28 +1944,22 @@ static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
return; return;
mtime_t i_pcr = GetPCR( p_bk ); mtime_t i_pcr = GetPCR( p_bk );
if( i_pcr >= 0 ) if( i_pcr < 0 )
{ return;
if( p_sys->i_pid_ref_pcr == pid->i_pid )
{
p_sys->i_current_pcr = AdjustPCRWrapAround( p_demux, i_pcr );
}
/* Search program and set the PCR */ if( p_sys->i_pid_ref_pcr == pid->i_pid )
for( int i = 0; i < p_sys->i_pmt; i++ ) p_sys->i_current_pcr = AdjustPCRWrapAround( p_demux, i_pcr );
{
for( int i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ ) /* Search program and set the PCR */
for( int i = 0; i < p_sys->i_pmt; i++ )
for( int i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr )
{ {
if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr ) p_sys->pmt[i]->psi->prg[i_prg]->i_pcr_value = i_pcr;
{ es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
p_sys->pmt[i]->psi->prg[i_prg]->i_pcr_value = i_pcr; (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number,
es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR, (int64_t)(VLC_TS_0 + i_pcr * 100 / 9) );
(int)p_sys->pmt[i]->psi->prg[i_prg]->i_number,
(int64_t)(VLC_TS_0 + i_pcr * 100 / 9) );
}
} }
}
}
} }
static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
......
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