[vlc-commits] ogg: use ES_OUT_SET_PCR instead of RESET_PCR in demuxing

[Ilkka Ollakka]

vlc/vlc-2.0 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Fri Mar 30 21:52:18 2012 +0300| [5578301cab0379400643b6b5eaeec365c4608b39] | committer: 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: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=5578301cab0379400643b6b5eaeec365c4608b39
---

 modules/demux/ogg.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 96c965a..7e5c627 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -240,7 +240,7 @@ static int Demux( demux_t * p_demux )
             return 0;
 
         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 )
                 ogg_stream_reset_serialno( &p_stream->os, ogg_page_serialno( &p_sys->current_page ) );
 
                 p_stream->b_reinit = true;
-                p_stream->i_pcr = -1;
-                p_stream->i_interpolated_pcr = -1;
-                es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+                p_stream->i_pcr = VLC_TS_0;
+                p_stream->i_interpolated_pcr = VLC_TS_0;
+                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 )
@@ -702,7 +702,6 @@ static void Ogg_DecodePacket( demux_t *p_demux,
             if( p_stream->i_previous_pcr == 0 &&
                 p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
             {
-                es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 
                 /* Call the pace control */
                 es_out_Control( p_demux->out, ES_OUT_SET_PCR,
@@ -741,7 +740,6 @@ static void Ogg_DecodePacket( demux_t *p_demux,
             if( p_stream->i_previous_pcr == 0 &&
                 p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
             {
-                es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 
                 /* Call the pace control */
                 es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_stream->i_pcr );