[vlc-commits] demux: ogg: move tarkin hack

Francois Cartegnie git at videolan.org
Sun Dec 17 16:11:29 CET 2017


vlc/vlc-2.2 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Dec 14 19:05:20 2017 +0100| [c073f1142cd47c05aec8d60f18d0e7a502fa9f13] | committer: Francois Cartegnie

demux: ogg: move tarkin hack

(cherry picked from commit 62f87239559b1641f3deb0da3682ac0cc1d59aca)

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

 modules/demux/ogg.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 6f37d9231f..9df9f81a5e 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -1365,6 +1365,13 @@ static void Ogg_DecodePacket( demux_t *p_demux,
             es_out_Del( p_demux->out, p_stream->p_es );
             p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt );
         }
+        else if( p_stream->fmt.i_codec == VLC_CODEC_TARKIN )
+        {
+            /* FIXME: the biggest hack I've ever done */
+            msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64,
+                      p_block->i_pts, p_block->i_dts );
+            msleep(10000);
+        }
 
         /* Blatant abuse of the i_length field. */
         p_block->i_length = p_stream->i_end_trim;
@@ -1445,15 +1452,6 @@ static void Ogg_DecodePacket( demux_t *p_demux,
             p_block->i_buffer = 0;
     }
 
-
-    if( p_stream->fmt.i_codec == VLC_CODEC_TARKIN )
-    {
-        /* FIXME: the biggest hack I've ever done */
-        msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64,
-                  p_block->i_pts, p_block->i_dts );
-        msleep(10000);
-    }
-
     memcpy( p_block->p_buffer, p_oggpacket->packet + i_header_len,
             p_oggpacket->bytes - i_header_len );
 



More information about the vlc-commits mailing list