From 74f03b639e48a31c1c7e21583a244d6e1db1b97f Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Fri, 13 Jan 2017 14:56:49 +0530 Subject: [PATCH] DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips Bug: 33816782 Change-Id: I10f8b2a7691aeb55365901c166e765ab22ec6106 --- decoder/ih264d_api.c | 3 ++- decoder/ih264d_utils.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index 9082c1e..5321ab6 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -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 = diff --git a/decoder/ih264d_utils.c b/decoder/ih264d_utils.c index 3567785..d457aa8 100644 --- a/decoder/ih264d_utils.c +++ b/decoder/ih264d_utils.c @@ -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); } /********************************************************************/