[vlc-commits] packetizer: h264: add more nal unit types

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Dec 20 17:04:58 2015 +0100| [f6384a0d90e8075fa470c502454057249d7866a5] | committer: Francois Cartegnie

packetizer: h264: add more nal unit types

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

 modules/packetizer/h264.c     |    2 +-
 modules/packetizer/h264_nal.h |   16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index 0258aec..3a1001a 100644
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -518,7 +518,7 @@ static block_t *ParseNALBlock( decoder_t *p_dec, bool *pb_ts_used, block_t *p_fr
     }
     else if( i_nal_type == H264_NAL_AU_DELIMITER ||
              i_nal_type == H264_NAL_SEI ||
-             ( i_nal_type >= 13 && i_nal_type <= 18 ) )
+             ( i_nal_type >= H264_NAL_SPS_EXT && i_nal_type <= H264_NAL_RESERVED_18 ) )
     {
         if( p_sys->b_slice )
             p_pic = OutputPicture( p_dec );
diff --git a/modules/packetizer/h264_nal.h b/modules/packetizer/h264_nal.h
index a0ccafb..cb49786 100644
--- a/modules/packetizer/h264_nal.h
+++ b/modules/packetizer/h264_nal.h
@@ -60,8 +60,22 @@ enum h264_nal_unit_type_e
     H264_NAL_SEI         = 6,    /* ref_idc == 0 */
     H264_NAL_SPS         = 7,
     H264_NAL_PPS         = 8,
-    H264_NAL_AU_DELIMITER= 9
+    H264_NAL_AU_DELIMITER= 9,
     /* ref_idc == 0 for 6,9,10,11,12 */
+    H264_NAL_END_OF_SEQ  = 10,
+    H264_NAL_END_OF_STREAM = 11,
+    H264_NAL_FILLER_DATA = 12,
+    H264_NAL_SPS_EXT     = 13,
+    H264_NAL_PREFIX      = 14,
+    H264_NAL_SUBSET_SPS  = 15,
+    H264_NAL_DEPTH_PS    = 16,
+    H264_NAL_RESERVED_17 = 17,
+    H264_NAL_RESERVED_18 = 18,
+    H264_NAL_SLICE_WP    = 19,
+    H264_NAL_SLICE_EXT   = 20,
+    H264_NAL_SLICE_3D_EXT= 21,
+    H264_NAL_RESERVED_22 = 22,
+    H264_NAL_RESERVED_23 = 23,
 };
 
 /* Defined in H.264 annex D */