Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev am: db8f1ae73f am: dcbf996666 am: 8b4c87943a am: 672cb37cc6 am: ad69241f3a am: 7ba9ed2338

am: fed8ee727b

Change-Id: I6a68a46f9badd1b0bd86ef7b8bfb622c0b651435
This commit is contained in:
Marco Nelissen 2017-05-16 15:46:23 +00:00 committed by android-build-merger
commit 5ed090d7d8

View file

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