aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec/src/aac_ram.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-08-27 10:16:06 -0700
committerXin Li <delphij@google.com>2020-08-27 10:16:06 -0700
commit7a0dde5d5dc4d24095c0391e7fa8297de3c7cd45 (patch)
tree0e353968c34e8c9699663a9b252836b70847c30b /libAACdec/src/aac_ram.cpp
parent946a672b0f5b8481eb3a429f854fcb34d847d692 (diff)
parente0624f4c05df8b171555bc8c8748ee93655f5b3e (diff)
downloadfdk-aac-7a0dde5d5dc4d24095c0391e7fa8297de3c7cd45.tar.gz
fdk-aac-7a0dde5d5dc4d24095c0391e7fa8297de3c7cd45.tar.bz2
fdk-aac-7a0dde5d5dc4d24095c0391e7fa8297de3c7cd45.zip
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507 Merged-In: I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f Change-Id: Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77
Diffstat (limited to 'libAACdec/src/aac_ram.cpp')
-rw-r--r--libAACdec/src/aac_ram.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/libAACdec/src/aac_ram.cpp b/libAACdec/src/aac_ram.cpp
index e13167d..aa8f6a6 100644
--- a/libAACdec/src/aac_ram.cpp
+++ b/libAACdec/src/aac_ram.cpp
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
@@ -105,12 +105,7 @@ amm-info@iis.fraunhofer.de
#define WORKBUFFER1_TAG 0
#define WORKBUFFER2_TAG 1
-
-#define WORKBUFFER3_TAG 4
-#define WORKBUFFER4_TAG 5
-
#define WORKBUFFER5_TAG 6
-
#define WORKBUFFER6_TAG 7
/*! The structure AAC_DECODER_INSTANCE is the top level structure holding all
@@ -169,9 +164,6 @@ C_ALLOC_MEM2(TimeDataFlush, INT_PCM, TIME_DATA_FLUSH_SIZE, (8))
C_ALLOC_MEM_OVERLAY(WorkBufferCore2, FIXP_DBL, ((8) * 1024), SECT_DATA_L2,
WORKBUFFER2_TAG)
-C_ALLOC_MEM_OVERLAY(WorkBufferCore3, FIXP_DBL, WB_SECTION_SIZE, SECT_DATA_L2,
- WORKBUFFER3_TAG)
-C_AALLOC_MEM(WorkBufferCore4, FIXP_DBL, WB_SECTION_SIZE)
C_ALLOC_MEM_OVERLAY(WorkBufferCore6, SCHAR,
fMax((INT)(sizeof(FIXP_DBL) * WB_SECTION_SIZE),
(INT)sizeof(CAacDecoderCommonData)),