wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev

Browse source
This commit is contained in:
Marco Nelissen 2017-01-18 18:42:47 +00:00 • committed by Android (Google) Code Review
commit d5424f66e3
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
decoder/ih264d_api.c
View file

@ -2210,7 +2210,8 @@ WORD32 ih264d_fill_num_mem_rec(void *pv_api_ip, void *pv_api_op)
u4_mem_size += (sizeof(UWORD32) * 3 * (MAX_REF_BUFS * MAX_REF_BUFS)) << 3;
u4_mem_size = ALIGN64(u4_mem_size);
u4_mem_size += sizeof(UWORD32) * 2 * 3 * (MAX_REF_BUFS * MAX_REF_BUFS);
u4_mem_size += sizeof(UWORD32) * 2 * 3
* ((MAX_FRAMES << 1) * (MAX_FRAMES << 1));
u4_mem_size = ALIGN64(u4_mem_size);
memTab[MEM_REC_INTERNAL_SCRATCH].u4_mem_alignment =

2
decoder/ih264d_utils.c
View file

@ -2197,7 +2197,7 @@ WORD16 ih264d_get_memory_dec_params(dec_struct_t * ps_dec)
ps_dec->pu4_wts_ofsts_mat = (UWORD32 *)(pu1_scratch_mem_base + u4_scratch_mem_used);
u4_scratch_mem_used += sizeof(UWORD32) * 2 * 3
* (MAX_FRAMES * MAX_FRAMES);
* ((MAX_FRAMES << 1) * (MAX_FRAMES << 1));
u4_scratch_mem_used = ALIGN64(u4_scratch_mem_used);
}
/********************************************************************/