[vlc-commits] packetizer: h264: update parsing/add more profiles

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Nov 30 14:22:17 2015 +0100| [70239ac0f0810e701fa43e7b460747448aee08b8] | committer: Francois Cartegnie

packetizer: h264: update parsing/add more profiles

New profiles that might break packetization.
(ITU-T H264 2014/02)

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

 modules/packetizer/h264_nal.c |    5 ++++-
 modules/packetizer/h264_nal.h |    4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/packetizer/h264_nal.c b/modules/packetizer/h264_nal.c
index 437cefa..0577277 100644
--- a/modules/packetizer/h264_nal.c
+++ b/modules/packetizer/h264_nal.c
@@ -429,7 +429,10 @@ int h264_parse_sps( const uint8_t *p_sps_buf, int i_sps_size,
         i_profile_idc == PROFILE_H264_SVC_BASELINE ||
         i_profile_idc == PROFILE_H264_SVC_HIGH ||
         i_profile_idc == PROFILE_H264_MVC_MULTIVIEW_HIGH ||
-        i_profile_idc == PROFILE_H264_MVC_STEREO_HIGH )
+        i_profile_idc == PROFILE_H264_MVC_STEREO_HIGH ||
+        i_profile_idc == PROFILE_H264_MVC_MULTIVIEW_DEPTH_HIGH ||
+        i_profile_idc == PROFILE_H264_MVC_ENHANCED_MULTIVIEW_DEPTH_HIGH ||
+        i_profile_idc == PROFILE_H264_MFC_HIGH )
     {
         /* chroma_format_idc */
         const int i_chroma_format_idc = bs_read_ue( &s );
diff --git a/modules/packetizer/h264_nal.h b/modules/packetizer/h264_nal.h
index 286c6de..38b2750 100644
--- a/modules/packetizer/h264_nal.h
+++ b/modules/packetizer/h264_nal.h
@@ -45,6 +45,10 @@
 #define PROFILE_H264_MVC_STEREO_HIGH      128
 #define PROFILE_H264_MVC_MULTIVIEW_HIGH   118
 
+#define PROFILE_H264_MFC_HIGH                          134
+#define PROFILE_H264_MVC_MULTIVIEW_DEPTH_HIGH          138
+#define PROFILE_H264_MVC_ENHANCED_MULTIVIEW_DEPTH_HIGH 139
+
 #define SPS_MAX (32)
 #define PPS_MAX (256)