[vlc-commits] demux: hls: skip ID3 footer

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Apr 15 14:00:05 2016 +0200| [1962f67ba9e9b3aeb46614cd30bde276c7fa3f24] | committer: Francois Cartegnie

demux: hls: skip ID3 footer

likely not to happen, but who knows with hls

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

 modules/demux/hls/HLSStreams.cpp |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/demux/hls/HLSStreams.cpp b/modules/demux/hls/HLSStreams.cpp
index 308d8f3..26c4711 100644
--- a/modules/demux/hls/HLSStreams.cpp
+++ b/modules/demux/hls/HLSStreams.cpp
@@ -106,9 +106,9 @@ static uint32_t ReadID3Size(const uint8_t *p_buffer)
           (( (uint32_t)p_buffer[0] & 0x7F ) << 21);
 }
 
-static bool IsID3Tag(const uint8_t *p_buffer)
+static bool IsID3Tag(const uint8_t *p_buffer, bool b_footer)
 {
-    return( memcmp(p_buffer, "ID3", 3) == 0 &&
+    return( memcmp(p_buffer, (b_footer) ? "3DI" : "ID3", 3) == 0 &&
             p_buffer[3] < 0xFF &&
             p_buffer[4] < 0xFF &&
            ((GetDWBE(&p_buffer[6]) & 0x80808080) == 0) );
@@ -117,7 +117,7 @@ static bool IsID3Tag(const uint8_t *p_buffer)
 block_t * HLSStream::checkBlock(block_t *p_block, bool b_first)
 {
     if(b_first && p_block &&
-       p_block->i_buffer >= 10 && IsID3Tag(p_block->p_buffer))
+       p_block->i_buffer >= 10 && IsID3Tag(p_block->p_buffer, false))
     {
         uint32_t size = ReadID3Size(&p_block->p_buffer[6]);
         size = __MIN(p_block->i_buffer, size + 10);
@@ -143,6 +143,13 @@ block_t * HLSStream::checkBlock(block_t *p_block, bool b_first)
         /* Skip ID3 for demuxer */
         p_block->p_buffer += size;
         p_block->i_buffer -= size;
+
+        /* Skip ID3 footer */
+        if(p_block->i_buffer >= 10 && IsID3Tag(p_block->p_buffer, true))
+        {
+            p_block->p_buffer += 10;
+            p_block->i_buffer -= 10;
+        }
     }
 
     return p_block;