[vlc-commits] packetizer: h264: rename profile compatibility

Francois Cartegnie git at videolan.org
Sat Jun 11 21:22:46 CEST 2016


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Jun 11 13:20:10 2016 +0200| [1e4467ce43553debef5df1f012daa728d8a73657] | committer: Francois Cartegnie

packetizer: h264: rename profile compatibility

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

 modules/packetizer/h264_nal.c |    4 +++-
 modules/packetizer/h264_nal.h |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/packetizer/h264_nal.c b/modules/packetizer/h264_nal.c
index 351fb24..3be76cd 100644
--- a/modules/packetizer/h264_nal.c
+++ b/modules/packetizer/h264_nal.c
@@ -253,6 +253,8 @@ void h264_release_sps( h264_sequence_parameter_set_t *p_sps )
     free( p_sps );
 }
 
+#define H264_CONSTRAINT_SET_FLAG(N) (0x80 >> N)
+
 static bool h264_parse_sequence_parameter_set_rbsp( bs_t *p_bs,
                                                     h264_sequence_parameter_set_t *p_sps )
 {
@@ -260,7 +262,7 @@ static bool h264_parse_sequence_parameter_set_rbsp( bs_t *p_bs,
 
     int i_profile_idc = bs_read( p_bs, 8 );
     p_sps->i_profile = i_profile_idc;
-    p_sps->i_profile_compatibility = bs_read( p_bs, 8 );
+    p_sps->i_constraint_set_flags = bs_read( p_bs, 8 );
     p_sps->i_level = bs_read( p_bs, 8 );
     /* sps id */
     p_sps->i_id = bs_read_ue( p_bs );
diff --git a/modules/packetizer/h264_nal.h b/modules/packetizer/h264_nal.h
index 87f4751..f10ba97 100644
--- a/modules/packetizer/h264_nal.h
+++ b/modules/packetizer/h264_nal.h
@@ -93,7 +93,8 @@ void h264_release_pps( h264_picture_parameter_set_t * );
 struct h264_sequence_parameter_set_t
 {
     int i_id;
-    int i_profile, i_profile_compatibility, i_level;
+    int i_profile, i_level;
+    uint8_t i_constraint_set_flags;
     /* according to avcC, 3 bits max for those */
     uint8_t i_chroma_idc;
     uint8_t i_bit_depth_luma;



More information about the vlc-commits mailing list