summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2016-04-20 16:06:51 +0530
committerJessica Wagantall <jwagantall@cyngn.com>2016-07-07 09:41:34 -0700
commitfe7eb2722bd1e2c858d4fe89fd71a93b38e99dc7 (patch)
treea52989d5806ad7e5d62352ca0e565234c7103087
parentc13a634044bd4df42f04f26f1e3475f702cbc2ab (diff)
downloadandroid_external_libavc-fe7eb2722bd1e2c858d4fe89fd71a93b38e99dc7.tar.gz
android_external_libavc-fe7eb2722bd1e2c858d4fe89fd71a93b38e99dc7.tar.bz2
android_external_libavc-fe7eb2722bd1e2c858d4fe89fd71a93b38e99dc7.zip
Decoder: Fix for handling invalid intra mode
Bug: 28165659 Ticket: CYNGNOS-3020 Change-Id: I2291a287c27291695f4f3d6e753b6bbd7dfd9e42 (cherry picked from commit f38d14c5d9b3bd909dc2eecf7a0ac07dee4d75fe)
-rw-r--r--decoder/ih264d_process_intra_mb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/decoder/ih264d_process_intra_mb.c b/decoder/ih264d_process_intra_mb.c
index dde2a7e..279ff87 100644
--- a/decoder/ih264d_process_intra_mb.c
+++ b/decoder/ih264d_process_intra_mb.c
@@ -1242,6 +1242,7 @@ WORD32 ih264d_process_intra_mb(dec_struct_t * ps_dec,
+ (pu1_rem_intra4x4_pred_mode[u1_cur_sub_block]
>= i1_intra_pred);
}
+ i1_intra_pred = CLIP3(0, 8, i1_intra_pred);
{
UWORD8 u1_err_code = pu1_intra_err_codes[i1_intra_pred];
@@ -1650,6 +1651,7 @@ WORD32 ih264d_process_intra_mb(dec_struct_t * ps_dec,
+ (pu1_rem_intra4x4_pred_mode[u1_sub_mb_num]
>= i1_intra_pred);
}
+ i1_intra_pred = CLIP3(0, 8, i1_intra_pred);
{
UWORD8 u1_err_code = pu1_intra_err_codes[i1_intra_pred];