diff options
| author | Marco Nelissen <marcone@google.com> | 2017-01-18 18:42:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-18 18:42:47 +0000 |
| commit | d5424f66e3bafea7112d6e864cb9f5ea64cbeef3 (patch) | |
| tree | efd954a050b691e3e5113cba316e11ef9a48948a /decoder/ih264d_api.c | |
| parent | 78523d557ae7948cd266f595f2a3fec639fd1bab (diff) | |
| parent | 74f03b639e48a31c1c7e21583a244d6e1db1b97f (diff) | |
| download | android_external_libavc-d5424f66e3bafea7112d6e864cb9f5ea64cbeef3.tar.gz android_external_libavc-d5424f66e3bafea7112d6e864cb9f5ea64cbeef3.tar.bz2 android_external_libavc-d5424f66e3bafea7112d6e864cb9f5ea64cbeef3.zip | |
Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev
Diffstat (limited to 'decoder/ih264d_api.c')
| -rw-r--r-- | decoder/ih264d_api.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index ca74b5e..8d73fbe 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 = |