summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2016-04-20 16:06:51 +0530
committerThe Android Automerger <android-build@google.com>2016-05-27 11:30:02 -0700
commita583270e1c96d307469c83dc42bd3c5f1b9ef63f (patch)
treed5808f3d9d171dfc42f07b2f2298657fb792261b
parent78c2c6e74258880a2370b0462bdcf7018cab5516 (diff)
downloadandroid_external_libavc-a583270e1c96d307469c83dc42bd3c5f1b9ef63f.tar.gz
android_external_libavc-a583270e1c96d307469c83dc42bd3c5f1b9ef63f.tar.bz2
android_external_libavc-a583270e1c96d307469c83dc42bd3c5f1b9ef63f.zip
Decoder: Fix for handling invalid intra mode
Bug: 28165659 Change-Id: I2291a287c27291695f4f3d6e753b6bbd7dfd9e42
-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];