[vlc-commits] demux: ps: add support for PSM-less gen videotype H264 (fix #2709)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Mar 12 21:25:57 2017 +0100| [79c4b42badc71ef8ce87dfde235b5a67a27858af] | committer: Francois Cartegnie

demux: ps: add support for PSM-less gen videotype H264 (fix #2709)

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

 modules/demux/mpeg/ps.c |  2 +-
 modules/demux/mpeg/ps.h | 45 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index de6cb44..fce6df3 100644
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -524,12 +524,12 @@ static int Demux( demux_t *p_demux )
 
                     tk->es = es_out_Add( p_demux->out, &tk->fmt );
                     b_new = true;
+                    tk->b_seen = true;
                 }
                 else
                 {
                     msg_Dbg( p_demux, "es id=0x%x format unknown", i_id );
                 }
-                tk->b_seen = true;
             }
 
             /* The popular VCD/SVCD subtitling WinSubMux does not
diff --git a/modules/demux/mpeg/ps.h b/modules/demux/mpeg/ps.h
index 10bc4e3..e7ecbfe 100644
--- a/modules/demux/mpeg/ps.h
+++ b/modules/demux/mpeg/ps.h
@@ -89,6 +89,39 @@ static inline void ps_track_init( ps_track_t tk[PS_TK_COUNT] )
     }
 }
 
+static inline bool ps_is_H264( const uint8_t *p_data, size_t i_data )
+{
+    const uint8_t startcode[3] = { 0, 0, 1 };
+    int i_flags = 0;
+
+    if( i_data < 9 ||
+       (!memcmp( p_data, startcode, 3 ) &&
+        !memcmp( &p_data[1], startcode, 3 )) )
+        return false;
+
+    /* Shitty H264 probing. We need a centralized way do to this */
+    while( i_data > 5 )
+    {
+        if( !memcmp( p_data, startcode, 3 ) )
+        {
+            if(p_data[3] == 0x67)
+                i_flags ^= 0x01;
+            else if(p_data[3] == 0x68)
+                i_flags ^= 0x02;
+            else if( p_data[3] & 0x80 )
+                return false;
+            else if( (p_data[3] & 0x1F) > 23 || (p_data[3] & 0x1F) < 1 )
+                return false;
+            else if( (p_data[3] & 0x1F) < 6 )
+                return (i_flags == 0x03);
+        }
+        p_data++;
+        i_data--;
+    }
+
+    return false;
+}
+
 /* From id fill i_skip and es_format_t */
 static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id, block_t *p_pkt )
 {
@@ -222,7 +255,15 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id, bloc
             {
                 es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_H264 );
             }
-            else if( tk->fmt.i_cat == UNKNOWN_ES )
+            else if( p_pkt && i_type == 0x00 && /* Not from PSM */
+                     p_pkt->i_buffer > 9 + 5 &&
+                     p_pkt->i_buffer > 9U + 5 + p_pkt->p_buffer[8] &&
+                     ps_is_H264( &p_pkt->p_buffer[ 9 + p_pkt->p_buffer[8] ],
+                                  p_pkt->i_buffer - 9 - p_pkt->p_buffer[8] ) )
+            {
+                es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_H264 );
+            }
+            else if( tk->fmt.i_cat == UNKNOWN_ES && p_pkt != NULL /* Not system */ )
             {
                 es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV );
             }
@@ -266,7 +307,7 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id, bloc
         }
     }
 
-    return VLC_SUCCESS;
+    return (p_pkt) ? VLC_SUCCESS : VLC_EGENERIC;
 }
 
 /* return the id of a PES (should be valid) */