[vlc-commits] demux: ps: fix regression with extended stream id

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Mar  9 19:49:13 2017 +0100| [f9b6a994c5603192b16bd2cd67ac47fba678c2ae] | committer: Francois Cartegnie

demux: ps: fix regression with extended stream id

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

 modules/demux/mpeg/ps.c | 4 +++-
 modules/demux/mpeg/ps.h | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index 56b292b..acd1f07 100644
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -182,7 +182,8 @@ static int OpenCommon( vlc_object_t *p_this, bool b_force )
         if( memcmp( p_header, startcode, 3 ) ||
            ( (p_header[3] & 0xB0) != 0xB0 &&
             !(p_header[3] >= 0xC0 && p_header[3] <= 0xEF) &&
-              p_header[3] != 0xFF ) )
+              p_header[3] != PS_STREAM_ID_EXTENDED &&
+              p_header[3] != PS_STREAM_ID_DIRECTORY ) )
             return VLC_EGENERIC;
 
         ssize_t i_pessize = ps_pkt_size( p_header, 16 );
@@ -481,6 +482,7 @@ static int Demux( demux_t *p_demux )
         }
         //ft
     case PS_STREAM_ID_PRIVATE_STREAM1:
+    case PS_STREAM_ID_EXTENDED:
         {
             int i_id = ps_pkt_id( p_pkt );
             /* Small heuristic to improve MLP detection from AOB */
diff --git a/modules/demux/mpeg/ps.h b/modules/demux/mpeg/ps.h
index 211499b..1a93fd7 100644
--- a/modules/demux/mpeg/ps.h
+++ b/modules/demux/mpeg/ps.h
@@ -32,6 +32,7 @@
 #define PS_STREAM_ID_MAP              0xBC
 #define PS_STREAM_ID_PRIVATE_STREAM1  0xBD
 #define PS_STREAM_ID_PADDING          0xBE
+#define PS_STREAM_ID_EXTENDED         0xFD
 #define PS_STREAM_ID_DIRECTORY        0xFF
 
 /* 256-0xC0 for normal stream, 256 for 0xbd stream, 256 for 0xfd stream, 8 for 0xa0 AOB stream */