Merge "DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix" into mnc-dev

This commit is contained in:
Marco Nelissen 2017-05-16 15:22:10 +00:00 committed by Android (Google) Code Review
commit cb89747145

View file

@ -2195,9 +2195,8 @@ WORD16 ih264d_get_memory_dec_params(dec_struct_t * ps_dec)
u4_scratch_mem_used = ALIGN64(u4_scratch_mem_used);
ps_dec->pu4_mbaff_wt_mat = (UWORD32 *)(pu1_scratch_mem_base + u4_scratch_mem_used);
u4_scratch_mem_used += (sizeof(UWORD32) * 3
* (MAX_FRAMES * MAX_FRAMES))
<< 3;
u4_scratch_mem_used += (sizeof(UWORD32) * 2 * 3 *
((MAX_FRAMES << 1) * (MAX_FRAMES << 1)) * 2);
u4_scratch_mem_used = ALIGN64(u4_scratch_mem_used);
ps_dec->pu4_wts_ofsts_mat = (UWORD32 *)(pu1_scratch_mem_base + u4_scratch_mem_used);