[vlc-commits] demux: ps: add mapping for HEVC

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Oct 26 12:12:37 2017 +0200| [d50205076f99720ffa693b57098a7d9281e57856] | committer: Francois Cartegnie

demux: ps: add mapping for HEVC

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

 modules/demux/mpeg/ps.h | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/demux/mpeg/ps.h b/modules/demux/mpeg/ps.h
index 8af30dfb0e..6d3d5c4662 100644
--- a/modules/demux/mpeg/ps.h
+++ b/modules/demux/mpeg/ps.h
@@ -233,22 +233,26 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm,
 
         if( (i_id&0xf0) == 0xe0 ) /* 0xe0 -> 0xef */
         {
-            if( i_type == 0x1b )
+            if( i_type == 0x01 )
             {
-                es_format_Change( &tk->fmt, VIDEO_ES, VLC_CODEC_H264 );
+                es_format_Change( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV );
+                tk->fmt.i_original_fourcc = VLC_CODEC_MP1V;
+            }
+            else if( i_type == 0x02 )
+            {
+                es_format_Change( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV );
             }
             else if( i_type == 0x10 )
             {
                 es_format_Change( &tk->fmt, VIDEO_ES, VLC_CODEC_MP4V );
             }
-            else if( i_type == 0x01 )
+            else if( i_type == 0x1b )
             {
-                es_format_Change( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV );
-                tk->fmt.i_original_fourcc = VLC_CODEC_MP1V;
+                es_format_Change( &tk->fmt, VIDEO_ES, VLC_CODEC_H264 );
             }
-            else if( i_type == 0x02 )
+            else if( i_type == 0x24 )
             {
-                es_format_Change( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV );
+                es_format_Change( &tk->fmt, VIDEO_ES, VLC_CODEC_HEVC );
             }
             else if( i_id == 0xe2 || /* Primary H.264 in evob */
                      i_id == 0xe3 )  /* Seconday H.264 in evob */