[vlc-commits] demux: ogg: remove chained ogg boundary PTS handling

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Dec 27 17:02:11 2013 +0100| [b77904f5ad6ca6a6002a92afd7f0f23992923f9d] | committer: Francois Cartegnie

demux: ogg: remove chained ogg boundary PTS handling

Shouldn't be needed anymore as we continue chain with offsetted PCR/PTS

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

 modules/demux/ogg.c |   29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 699da6e..099b6ab 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -1086,19 +1086,7 @@ static void Ogg_DecodePacket( demux_t *p_demux,
     {
         if( p_stream->i_pcr >= 0 )
         {
-            /* This is for streams where the granulepos of the header packets
-             * doesn't match these of the data packets (eg. ogg web radios). */
-            if( p_stream->i_previous_pcr == 0 &&
-                p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
-            {
-
-                /* Call the pace control */
-                es_out_Control( p_demux->out, ES_OUT_SET_PCR,
-                                VLC_TS_0 + p_stream->i_pcr );
-            }
-
             p_stream->i_previous_pcr = p_stream->i_pcr;
-
             /* The granulepos is the end date of the sample */
             i_pts = p_stream->i_pcr;
         }
@@ -1108,23 +1096,6 @@ static void Ogg_DecodePacket( demux_t *p_demux,
     i_interpolated_pts = p_stream->i_interpolated_pcr;
     Ogg_UpdatePCR( p_demux, p_stream, p_oggpacket );
 
-    /* SPU streams are typically discontinuous, do not mind large gaps */
-    if( p_stream->fmt.i_cat != SPU_ES )
-    {
-        if( p_stream->i_pcr >= 0 )
-        {
-            /* This is for streams where the granulepos of the header packets
-             * doesn't match these of the data packets (eg. ogg web radios). */
-            if( p_stream->i_previous_pcr == 0 &&
-                p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
-            {
-
-                /* Call the pace control */
-                es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_stream->i_pcr );
-            }
-        }
-    }
-
     if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS &&
         p_stream->fmt.i_codec != VLC_CODEC_SPEEX &&
         p_stream->fmt.i_codec != VLC_CODEC_OPUS &&