Commit 5578301c authored by Ilkka Ollakka's avatar Ilkka Ollakka Committed by Jean-Baptiste Kempf

ogg: use ES_OUT_SET_PCR instead of RESET_PCR in demuxing

Only difference seems to be that in ES_OUT_SET_PCR we don't
have msg_Err showing up while playing ogg files
(cherry picked from commit 7ed15b7180e62d9bfdc218ede60f3b5ed4c931a6)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 832c7b27
...@@ -240,7 +240,7 @@ static int Demux( demux_t * p_demux ) ...@@ -240,7 +240,7 @@ static int Demux( demux_t * p_demux )
return 0; return 0;
msg_Dbg( p_demux, "beginning of a group of logical streams" ); msg_Dbg( p_demux, "beginning of a group of logical streams" );
es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 );
} }
/* /*
...@@ -285,9 +285,9 @@ static int Demux( demux_t * p_demux ) ...@@ -285,9 +285,9 @@ static int Demux( demux_t * p_demux )
ogg_stream_reset_serialno( &p_stream->os, ogg_page_serialno( &p_sys->current_page ) ); ogg_stream_reset_serialno( &p_stream->os, ogg_page_serialno( &p_sys->current_page ) );
p_stream->b_reinit = true; p_stream->b_reinit = true;
p_stream->i_pcr = -1; p_stream->i_pcr = VLC_TS_0;
p_stream->i_interpolated_pcr = -1; p_stream->i_interpolated_pcr = VLC_TS_0;
es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0);
} }
if( ogg_stream_pagein( &p_stream->os, &p_sys->current_page ) != 0 ) if( ogg_stream_pagein( &p_stream->os, &p_sys->current_page ) != 0 )
...@@ -702,7 +702,6 @@ static void Ogg_DecodePacket( demux_t *p_demux, ...@@ -702,7 +702,6 @@ static void Ogg_DecodePacket( demux_t *p_demux,
if( p_stream->i_previous_pcr == 0 && if( p_stream->i_previous_pcr == 0 &&
p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY ) p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY )
{ {
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
/* Call the pace control */ /* Call the pace control */
es_out_Control( p_demux->out, ES_OUT_SET_PCR, es_out_Control( p_demux->out, ES_OUT_SET_PCR,
...@@ -741,7 +740,6 @@ static void Ogg_DecodePacket( demux_t *p_demux, ...@@ -741,7 +740,6 @@ static void Ogg_DecodePacket( demux_t *p_demux,
if( p_stream->i_previous_pcr == 0 && if( p_stream->i_previous_pcr == 0 &&
p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY ) p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY )
{ {
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
/* Call the pace control */ /* Call the pace control */
es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_stream->i_pcr ); es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_stream->i_pcr );
......
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