aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec/src/aacdecoder.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2016-04-05 17:43:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-05 17:43:33 +0000
commit65750eae6583754ea9d84fed41dc12d1fc3d73d0 (patch)
treea8dc54ef8dba931c72627e7bbebf1844b81a31f7 /libAACdec/src/aacdecoder.cpp
parent0713b4acff1a489e7d49725dc7c5e3dad370b5c8 (diff)
parente1c78ed73faa51f2c7fcb0c4a17a92be9cc747f5 (diff)
downloadfdk-aac-65750eae6583754ea9d84fed41dc12d1fc3d73d0.tar.gz
fdk-aac-65750eae6583754ea9d84fed41dc12d1fc3d73d0.tar.bz2
fdk-aac-65750eae6583754ea9d84fed41dc12d1fc3d73d0.zip
SBR/AAC encoder updates, code clean up
am: e1c78ed * commit 'e1c78ed73faa51f2c7fcb0c4a17a92be9cc747f5': SBR/AAC encoder updates, code clean up Change-Id: I908adc47823de593c3e258c67f360da9321780f5
Diffstat (limited to 'libAACdec/src/aacdecoder.cpp')
-rw-r--r--libAACdec/src/aacdecoder.cpp17
1 files changed, 1 insertions, 16 deletions
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index e19c501..8270f69 100644
--- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp
@@ -2,7 +2,7 @@
/* -----------------------------------------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
+© Copyright 1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
All rights reserved.
1. INTRODUCTION
@@ -159,21 +159,6 @@ amm-info@iis.fraunhofer.de
-#define CAN_DO_PS(aot) \
- ((aot) == AOT_AAC_LC \
-|| (aot) == AOT_SBR \
-|| (aot) == AOT_PS \
-|| (aot) == AOT_ER_BSAC \
-|| (aot) == AOT_DRM_AAC)
-
-#define IS_USAC(aot) \
- ((aot) == AOT_USAC \
-|| (aot) == AOT_RSVD50)
-
-#define IS_LOWDELAY(aot) \
- ((aot) == AOT_ER_AAC_LD \
-|| (aot) == AOT_ER_AAC_ELD)
-
void CAacDecoder_SyncQmfMode(HANDLE_AACDECODER self)
{