summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHamsalekha S <hamsalekha.s@ittiam.com>2017-05-08 17:21:56 +0530
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-06-15 18:55:47 +0000
commitb31a137e13fc724eb9d05782aac6ea0ab1f3615e (patch)
tree45d0de1bd7792979cdef15097118e68b2504029e
parent715b398ab821907bdd1e46b20f53a241c99c510d (diff)
downloadandroid_external_libavc-b31a137e13fc724eb9d05782aac6ea0ab1f3615e.tar.gz
android_external_libavc-b31a137e13fc724eb9d05782aac6ea0ab1f3615e.tar.bz2
android_external_libavc-b31a137e13fc724eb9d05782aac6ea0ab1f3615e.zip
Decoder: Fixed allocation size of pred info buffer
Buffer allocation size for pred info was increased in the case number reference frames equal to 1. Bug: 36998372 Change-Id: I1f84a16703422109d40bed8436f35d0c2069c088 (cherry picked from commit 9008aed514f7211f6fcad328277ce464b042f622)
-rw-r--r--decoder/ih264d_utils.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/decoder/ih264d_utils.c b/decoder/ih264d_utils.c
index c64ee8a..4f6deca 100644
--- a/decoder/ih264d_utils.c
+++ b/decoder/ih264d_utils.c
@@ -1999,10 +1999,7 @@ WORD16 ih264d_allocate_dynamic_bufs(dec_struct_t * ps_dec)
/* Allocate memory for packed pred info */
num_entries = u4_total_mbs;
- if(1 == ps_dec->ps_cur_sps->u1_num_ref_frames)
- num_entries *= 16;
- else
- num_entries *= 16 * 2;
+ num_entries *= 16 * 2;
size = sizeof(pred_info_pkd_t) * num_entries;
pv_buf = ps_dec->pf_aligned_alloc(pv_mem_ctxt, 128, size);