summaryrefslogtreecommitdiffstats
path: root/libAACenc/src/psy_const.h
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2013-08-08 17:32:50 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2013-08-20 14:51:53 -0700
commit577fcbb570d023be4cea9564292dd2bd95f40c3b (patch)
treee085192cbca5f68a6d7897d3869b46a5fc5f83c7 /libAACenc/src/psy_const.h
parent4f0d97057c5c640b25518358886f8c47da9fc052 (diff)
downloadfdk-aac-dabplus-577fcbb570d023be4cea9564292dd2bd95f40c3b.tar.gz
fdk-aac-dabplus-577fcbb570d023be4cea9564292dd2bd95f40c3b.tar.bz2
fdk-aac-dabplus-577fcbb570d023be4cea9564292dd2bd95f40c3b.zip
Decode and SYS lib cleanup
* AAC-Encoder - Remove source snippets related to unsupported frame length of 960. - Adjust minBits initialization for disabled VBR configuration. Modified file(s): libAACenc/src/aacenc.h libAACenc/src/aacenc_lib.cpp libAACenc/src/aacenc_tns.cpp libAACenc/src/bandwidth.cpp libAACenc/src/psy_const.h libAACenc/src/transform.h - Revise encoder parameter restrictions: "Error Resilient(ER) AAC Low Complexity" is not supported. Where the AAC part of the FDK encoder threw an initialization error, now the aacEncoder_SetParam() returns an error before initialization if the application tries to configure this audio object type. Modified file(s): libAACenc/src/aacenc_lib.cpp * SYS-Library - Portability fix for Mingw32. Modified file(s): libSYS/include/machine_type.h - Minor changes. Modified file(s): libSYS/include/wav_file.h libSYS/src/wav_file.cpp libSYS/src/cmdl_parser.cpp libSYS/src/genericStds.cpp Bug 9428126 Change-Id: I9fa44923d34f033d0dc607f2b85abacb8a85eb61
Diffstat (limited to 'libAACenc/src/psy_const.h')
-rw-r--r--libAACenc/src/psy_const.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/libAACenc/src/psy_const.h b/libAACenc/src/psy_const.h
index 42bef79..d9c9f43 100644
--- a/libAACenc/src/psy_const.h
+++ b/libAACenc/src/psy_const.h
@@ -98,7 +98,6 @@ amm-info@iis.fraunhofer.de
#define FRAME_MAXLEN_SHORT ((1024)/TRANS_FAC)
#define FRAME_LEN_SHORT_128 ((1024)/TRANS_FAC)
-#define FRAME_LEN_SHORT_120 (FRAME_LEN_LONG_960/TRANS_FAC)
/* Filterbank type*/
enum FB_TYPE {