Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev

am: db8f1ae73f

Change-Id: I51d0a8db1db66e5246d8f80441a19949e7138d22
This commit is contained in:
Marco Nelissen 2017-05-16 15:27:22 +00:00 committed by android-build-merger
commit dcbf996666

View file

@ -1376,9 +1376,8 @@ WORD32 ih264d_allocate_static_bufs(iv_obj_t **dec_hdl, void *pv_api_ip, void *pv
pu1_buf += size / 2;
ps_dec->ps_dpb_mgr->ps_init_dpb[1][0] = (struct pic_buffer_t *)pu1_buf;
size = (sizeof(UWORD32) * 3
* (MAX_FRAMES * MAX_FRAMES))
<< 3;
size = (sizeof(UWORD32) * 2 * 3
* ((MAX_FRAMES << 1) * (MAX_FRAMES << 1)) * 2);
pv_buf = pf_aligned_alloc(pv_mem_ctxt, 128, size);
RETURN_IF((NULL == pv_buf), IV_FAIL);
ps_dec->pu4_mbaff_wt_mat = pv_buf;