Skip to content

V
vlc-gpu
Commit 0e8f9f2e authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Used VLC_TS_INVALID/0 in PVA demuxer.

parent b4493aeb
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
modules/demux/pva.c
View file @ 0e8f9f2e
...@@ -207,7 +207,7 @@ static int Demux( demux_t *p_demux ) ...@@ -207,7 +207,7 @@ static int Demux( demux_t *p_demux )
if( ( p_frame = p_sys->p_es ) ) if( ( p_frame = p_sys->p_es ) )
{ {
if( p_frame->i_pts > 0 && !p_sys->b_pcr_audio ) if( p_frame->i_pts > VLC_TS_INVALID && !p_sys->b_pcr_audio )
{ {
es_out_Control( p_demux->out, ES_OUT_SET_PCR, (int64_t)p_frame->i_pts); es_out_Control( p_demux->out, ES_OUT_SET_PCR, (int64_t)p_frame->i_pts);
} }
...@@ -221,7 +221,8 @@ static int Demux( demux_t *p_demux ) ...@@ -221,7 +221,8 @@ static int Demux( demux_t *p_demux )
{ {
p_frame->p_buffer += i_skip; p_frame->p_buffer += i_skip;
p_frame->i_buffer -= i_skip; p_frame->i_buffer -= i_skip;
if( i_pts > 0 ) p_frame->i_pts = i_pts * 100 / 9; if( i_pts >= 0 )
p_frame->i_pts = VLC_TS_0 + i_pts * 100 / 9;
block_ChainAppend( &p_sys->p_es, p_frame ); block_ChainAppend( &p_sys->p_es, p_frame );
} }
break; break;
...@@ -427,8 +428,10 @@ static void ParsePES( demux_t *p_demux ) ...@@ -427,8 +428,10 @@ static void ParsePES( demux_t *p_demux )
p_pes->i_buffer -= i_skip; p_pes->i_buffer -= i_skip;
p_pes->p_buffer += i_skip; p_pes->p_buffer += i_skip;
if( i_dts >= 0 ) p_pes->i_dts = i_dts * 100 / 9; if( i_dts >= 0 )
if( i_pts >= 0 ) p_pes->i_pts = i_pts * 100 / 9; p_pes->i_dts = VLC_TS_0 + i_dts * 100 / 9;
if( i_pts >= 0 )
p_pes->i_pts = VLC_TS_0 + i_pts * 100 / 9;
/* Set PCR */ /* Set PCR */
if( p_pes->i_pts > 0 ) if( p_pes->i_pts > 0 )
......
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