Merge commit '2d2a92f72199823a92e4e226c32e42a27ec801c0'

[ffmpeg] / libavcodec / hevc_sei.c

diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index 24f27c88b58b72eb7bc39dd9f0df4d6b11c28521..1770eb52c45afe3e85492de213f416baa85bb371 100644 (file)
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -38,10 +38,9 @@ static void decode_nal_sei_decoded_picture_hash(HEVCContext *s,
     for (cIdx = 0; cIdx < 3/*((s->sps->chroma_format_idc == 0) ? 1 : 3)*/; cIdx++) {
         if (hash_type == 0) {
             s->is_md5 = 1;
-            for (i = 0; i < 16; i++) {
+            for (i = 0; i < 16; i++)
                 s->md5[cIdx][i] = get_bits(gb, 8);
-        }
-        } else if( hash_type == 1) {
+        } else if (hash_type == 1) {
             // picture_crc = get_bits(gb, 16);
             skip_bits(gb, 16);
         } else if (hash_type == 2) {
@@ -56,34 +55,34 @@ static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s)
     GetBitContext *gb = &s->HEVClc->gb;
     int cancel, type, quincunx;
 
-    get_ue_golomb(gb);                      // frame_packing_arrangement_id
-    cancel = get_bits1(gb);                 // frame_packing_cancel_flag
-    if ( cancel == 0 )
-    {
-        type = get_bits(gb, 7);             // frame_packing_arrangement_type
-        quincunx = get_bits1(gb);           // quincunx_sampling_flag
-        skip_bits(gb, 6);                   // content_interpretation_type
+    get_ue_golomb(gb);                  // frame_packing_arrangement_id
+    cancel = get_bits1(gb);             // frame_packing_cancel_flag
+    if (cancel == 0) {
+        type     = get_bits(gb, 7);     // frame_packing_arrangement_type
+        quincunx = get_bits1(gb);       // quincunx_sampling_flag
+        skip_bits(gb, 6);               // content_interpretation_type
 
         // the following skips spatial_flipping_flag frame0_flipped_flag
         // field_views_flag current_frame_is_frame0_flag
         // frame0_self_contained_flag frame1_self_contained_flag
         skip_bits(gb, 6);
 
-        if ( quincunx == 0 && type != 5 )
-            skip_bits(gb, 16);              // frame[01]_grid_position_[xy]
-        skip_bits(gb, 8);                   // frame_packing_arrangement_reserved_byte
-        skip_bits1(gb);                     // frame_packing_arrangement_persistance_flag
+        if (quincunx == 0 && type != 5)
+            skip_bits(gb, 16);  // frame[01]_grid_position_[xy]
+        skip_bits(gb, 8);       // frame_packing_arrangement_reserved_byte
+        skip_bits1(gb);         // frame_packing_arrangement_persistance_flag
     }
-    skip_bits1(gb);                         // upsampled_aspect_ratio_flag
+    skip_bits1(gb);             // upsampled_aspect_ratio_flag
 }
 
 static int decode_pic_timing(HEVCContext *s)
 {
     GetBitContext *gb = &s->HEVClc->gb;
-    HEVCSPS *sps = (HEVCSPS*)s->sps_list[s->active_seq_parameter_set_id]->data;
+    HEVCSPS *sps;
 
-    if (!sps)
+    if (!s->sps_list[s->active_seq_parameter_set_id])
         return(AVERROR(ENOMEM));
+    sps = (HEVCSPS*)s->sps_list[s->active_seq_parameter_set_id]->data;
 
     if (sps->vui.frame_field_info_present_flag) {
         int pic_struct = get_bits(gb, 4);
@@ -101,21 +100,29 @@ static int decode_pic_timing(HEVCContext *s)
     return 1;
 }
 
-static void active_parameter_sets(HEVCContext *s)
+static int active_parameter_sets(HEVCContext *s)
 {
     GetBitContext *gb = &s->HEVClc->gb;
     int num_sps_ids_minus1;
     int i;
+    unsigned active_seq_parameter_set_id;
 
     get_bits(gb, 4); // active_video_parameter_set_id
     get_bits(gb, 1); // self_contained_cvs_flag
     get_bits(gb, 1); // num_sps_ids_minus1
     num_sps_ids_minus1 = get_ue_golomb_long(gb); // num_sps_ids_minus1
 
-    s->active_seq_parameter_set_id = get_ue_golomb_long(gb);
+    active_seq_parameter_set_id = get_ue_golomb_long(gb);
+    if (active_seq_parameter_set_id >= MAX_SPS_COUNT) {
+        av_log(s->avctx, AV_LOG_ERROR, "active_parameter_set_id %d invalid\n", active_seq_parameter_set_id);
+        return AVERROR_INVALIDDATA;
+    }
+    s->active_seq_parameter_set_id = active_seq_parameter_set_id;
 
     for (i = 1; i <= num_sps_ids_minus1; i++)
         get_ue_golomb_long(gb); // active_seq_parameter_set_id[i]
+
+    return 0;
 }
 
 static int decode_nal_sei_message(HEVCContext *s)
@@ -128,12 +135,12 @@ static int decode_nal_sei_message(HEVCContext *s)
     av_log(s->avctx, AV_LOG_DEBUG, "Decoding SEI\n");
 
     while (byte == 0xFF) {
-        byte = get_bits(gb, 8);
+        byte          = get_bits(gb, 8);
         payload_type += byte;
     }
     byte = 0xFF;
     while (byte == 0xFF) {
-        byte = get_bits(gb, 8);
+        byte          = get_bits(gb, 8);
         payload_size += byte;
     }
     if (s->nal_unit_type == NAL_SEI_PREFIX) {
@@ -146,7 +153,7 @@ static int decode_nal_sei_message(HEVCContext *s)
         } else if (payload_type == 1){
             int ret = decode_pic_timing(s);
             av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
-            skip_bits(gb, 8*payload_size);
+            skip_bits(gb, 8 * payload_size);
             return ret;
         } else if (payload_type == 129){
             active_parameter_sets(s);
@@ -162,7 +169,7 @@ static int decode_nal_sei_message(HEVCContext *s)
             decode_nal_sei_decoded_picture_hash(s, payload_size);
         else {
             av_log(s->avctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", payload_type);
-            skip_bits(gb, 8*payload_size);
+            skip_bits(gb, 8 * payload_size);
         }
         return 1;
     }