commit 3da3ec6441c9694391efd9b758473c3f9c33f360
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Nov 18 14:23:34 2016 +0530
committer gitbuildkicker <android-build@google.com> Tue Jan 24 16:39:01 2017 -0800
tree c68b1a84ba1361088c25afff580d72ec70970c90
parent 5e7a6141e9e7a165b1234a3fd24ea4b176c3d016

Fixed handling invalid chroma tu size for error clips

Limit func_idx to valid range to ensure invalid functions are not
called when wrong TU size is signalled for chroma due to error in
parsing

Bug: 32915871
Change-Id: I662212eb2e9b8994e7e85780e667f14df73b5905
(cherry picked from commit a76773ab749bd57f3467c79aa60c16c1f2c87380)

decoder/ihevcd_iquant_itrans_recon_ctb.c

diff --git a/decoder/ihevcd_iquant_itrans_recon_ctb.c b/decoder/ihevcd_iquant_itrans_recon_ctb.c
index 88ace44..6009d09 100644
--- a/decoder/ihevcd_iquant_itrans_recon_ctb.c
+++ b/decoder/ihevcd_iquant_itrans_recon_ctb.c
@@ -886,6 +886,11 @@
                     src_strd = trans_size;
 
                     func_idx = 1 + 4 + log2_uv_trans_size_minus_2; /* DST func + Y funcs + cur func index*/
+
+                    /* Handle error cases where 64x64 TU is signalled which results in 32x32 chroma.
+                     * By limiting func_idx to 7, max of 16x16 chroma is called */
+                    func_idx = MIN(func_idx, 7);
+
                     e_trans_type = (TRANSFORM_TYPE)(log2_uv_trans_size_minus_2 + 1);
                     /* QP for U */
                     i1_chroma_pic_qp_offset = ps_pps->i1_pic_cb_qp_offset;