From b893a280997f8dbefe5760fe4cb0daf189a143c7 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Tue, 7 Mar 2017 11:16:21 +0100
Subject: [PATCH] demux: ps: use defines for stream id

---
 modules/demux/mpeg/ps.c | 16 ++++++++--------
 modules/demux/mpeg/ps.h | 10 ++++++++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index 3c67248da7..3922716ef2 100644
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -330,11 +330,11 @@ static int Demux( demux_t *p_demux )
 
     switch( i_code )
     {
-    case 0x1b9:
+    case PS_STREAM_ID_END_STREAM|0x100:
         block_Release( p_pkt );
         break;
 
-    case 0x1ba:
+    case PS_STREAM_ID_PACK_HEADER|0x100:
         if( !ps_pkt_parse_pack( p_pkt, &p_sys->i_scr, &i_mux_rate ) )
         {
             p_sys->i_last_scr = p_sys->i_scr;
@@ -346,7 +346,7 @@ static int Demux( demux_t *p_demux )
         block_Release( p_pkt );
         break;
 
-    case 0x1bb:
+    case PS_STREAM_ID_SYSTEM_HEADER|0x100:
         if( !ps_pkt_parse_system( p_pkt, &p_sys->psm, p_sys->tk ) )
         {
             int i;
@@ -363,7 +363,7 @@ static int Demux( demux_t *p_demux )
         block_Release( p_pkt );
         break;
 
-    case 0x1bc:
+    case PS_STREAM_ID_MAP|0x100:
         if( p_sys->psm.i_version == 0xFFFF )
             msg_Dbg( p_demux, "contains a PSM");
 
@@ -613,7 +613,7 @@ static int ps_pkt_resynch( stream_t *s, uint32_t *pi_code )
         return -1;
     }
     if( p_peek[0] == 0 && p_peek[1] == 0 && p_peek[2] == 1 &&
-        p_peek[3] >= 0xb9 )
+        p_peek[3] >= PS_STREAM_ID_END_STREAM )
     {
         *pi_code = 0x100 | p_peek[3];
         return 1;
@@ -632,7 +632,7 @@ static int ps_pkt_resynch( stream_t *s, uint32_t *pi_code )
             break;
         }
         if( p_peek[0] == 0 && p_peek[1] == 0 && p_peek[2] == 1 &&
-            p_peek[3] >= 0xb9 )
+            p_peek[3] >= PS_STREAM_ID_END_STREAM )
         {
             *pi_code = 0x100 | p_peek[3];
             return vlc_stream_Read( s, NULL, i_skip ) == i_skip ? 1 : -1;
@@ -653,7 +653,7 @@ static block_t *ps_pkt_read( stream_t *s, uint32_t i_code )
         return NULL;
 
     int i_size = ps_pkt_size( p_peek, i_peek );
-    if( i_size <= 6 && p_peek[3] > 0xba )
+    if( i_size <= 6 && p_peek[3] > PS_STREAM_ID_PACK_HEADER )
     {
         /* Special case, search the next start code */
         i_size = 6;
@@ -667,7 +667,7 @@ static block_t *ps_pkt_read( stream_t *s, uint32_t i_code )
             while( i_size <= i_peek - 4 )
             {
                 if( p_peek[i_size] == 0x00 && p_peek[i_size+1] == 0x00 &&
-                    p_peek[i_size+2] == 0x01 && p_peek[i_size+3] >= 0xb9 )
+                    p_peek[i_size+2] == 0x01 && p_peek[i_size+3] >= PS_STREAM_ID_END_STREAM )
                 {
                     return vlc_stream_Block( s, i_size );
                 }
diff --git a/modules/demux/mpeg/ps.h b/modules/demux/mpeg/ps.h
index 6eee287a3e..e9c3788b07 100644
--- a/modules/demux/mpeg/ps.h
+++ b/modules/demux/mpeg/ps.h
@@ -26,6 +26,12 @@
 #include <vlc_memory.h>
 #include "timestamps.h"
 
+#define PS_STREAM_ID_END_STREAM       0xB9
+#define PS_STREAM_ID_PACK_HEADER      0xBA
+#define PS_STREAM_ID_SYSTEM_HEADER    0xBB
+#define PS_STREAM_ID_MAP              0xBC
+#define PS_STREAM_ID_DIRECTORY        0xFF
+
 /* 256-0xC0 for normal stream, 256 for 0xbd stream, 256 for 0xfd stream, 8 for 0xa0 AOB stream */
 #define PS_TK_COUNT (256+256+256+8 - 0xc0)
 #if 0
@@ -339,11 +345,11 @@ static inline int ps_pkt_size( const uint8_t *p, int i_peek )
     {
         return -1;
     }
-    else if( p[3] == 0xb9 )
+    else if( p[3] == PS_STREAM_ID_END_STREAM )
     {
         return 4;
     }
-    else if( p[3] == 0xba )
+    else if( p[3] == PS_STREAM_ID_PACK_HEADER )
     {
         if( i_peek >= 14 && (p[4] >> 6) == 0x01 )
         {
-- 
GitLab