commit 503834152d534441d0645bb86d4245e250a22bec
author gitbuildkicker <android-build@google.com> Tue Feb 21 17:12:15 2017 -0800
committer gitbuildkicker <android-build@google.com> Tue Feb 21 17:12:15 2017 -0800
tree c2d07a57423f86566924653345f976d9bb29e4d1
parent 88cc37f4d45a82c1338014d42519e90eac20a427
parent ee9cf03cd6098f59f925543db6c401487ecbb148

merge in nyc-bugfix-release history after reset to nyc-dev

decoder/ihevcd_cabac.c

diff --git a/decoder/ihevcd_cabac.c b/decoder/ihevcd_cabac.c
index 3a03aa8..fa249c4 100644
--- a/decoder/ihevcd_cabac.c
+++ b/decoder/ihevcd_cabac.c
@@ -669,13 +669,14 @@
     numones = k;
     bin = 1;
     u4_sym = 0;
-    while(bin && (numones <= 16))
+    while(bin)
     {
         IHEVCD_CABAC_DECODE_BYPASS_BIN(bin, ps_cabac, ps_bitstrm);
         u4_sym += bin << numones++;
     }
 
     numones -= 1;
+    numones = CLIP3(numones, 0, 16);
 
     if(numones)
     {

decoder/ihevcd_parse_headers.c

diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c
index 3cae4e5..17de2a2 100644
--- a/decoder/ihevcd_parse_headers.c
+++ b/decoder/ihevcd_parse_headers.c
@@ -1312,19 +1312,9 @@
         UEV_PARSE("max_dec_pic_buffering", value, ps_bitstrm);
         ps_sps->ai1_sps_max_dec_pic_buffering[i] = value + 1;
 
-        if(ps_sps->ai1_sps_max_dec_pic_buffering[i] > MAX_DPB_SIZE)
-        {
-            return IHEVCD_INVALID_PARAMETER;
-        }
-
         UEV_PARSE("num_reorder_pics", value, ps_bitstrm);
         ps_sps->ai1_sps_max_num_reorder_pics[i] = value;
 
-        if(ps_sps->ai1_sps_max_num_reorder_pics[i] > ps_sps->ai1_sps_max_dec_pic_buffering[i])
-        {
-            return IHEVCD_INVALID_PARAMETER;
-        }
-
         UEV_PARSE("max_latency_increase", value, ps_bitstrm);
         ps_sps->ai1_sps_max_latency_increase[i] = value;
     }

decoder/ihevcd_parse_slice.c

diff --git a/decoder/ihevcd_parse_slice.c b/decoder/ihevcd_parse_slice.c
index f56ba8e..3bb658e 100644
--- a/decoder/ihevcd_parse_slice.c
+++ b/decoder/ihevcd_parse_slice.c
@@ -82,9 +82,6 @@
 /* Bit stream offset threshold */
 #define BITSTRM_OFF_THRS 8
 
-#define MIN_CU_QP_DELTA_ABS(x) (-26 + ((x) * 6) / 2)
-#define MAX_CU_QP_DELTA_ABS(x) (25 + ((x) * 6) / 2)
-
 /**
  * Table used to decode part_mode if AMP is enabled and current CU is not min CU
  */
@@ -305,6 +302,7 @@
                     }
                     AEV_TRACE("cu_qp_delta_abs", cu_qp_delta_abs, ps_cabac->u4_range);
 
+
                     ps_codec->s_parse.i4_is_cu_qp_delta_coded = 1;
 
 
@@ -317,13 +315,6 @@
                             cu_qp_delta_abs = -cu_qp_delta_abs;
 
                     }
-
-                    if (cu_qp_delta_abs < MIN_CU_QP_DELTA_ABS(ps_sps->i1_bit_depth_luma_minus8)
-                                    || cu_qp_delta_abs > MAX_CU_QP_DELTA_ABS(ps_sps->i1_bit_depth_luma_minus8))
-                    {
-                        return IHEVCD_INVALID_PARAMETER;
-                    }
-
                     ps_codec->s_parse.s_cu.i4_cu_qp_delta = cu_qp_delta_abs;
 
                 }