diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2013-08-08 17:32:50 -0700 |
---|---|---|
committer | Jean-Michel Trivi <jmtrivi@google.com> | 2013-08-20 14:51:53 -0700 |
commit | 577fcbb570d023be4cea9564292dd2bd95f40c3b (patch) | |
tree | e085192cbca5f68a6d7897d3869b46a5fc5f83c7 /libAACenc/src/bandwidth.cpp | |
parent | 4f0d97057c5c640b25518358886f8c47da9fc052 (diff) | |
download | fdk-aac-577fcbb570d023be4cea9564292dd2bd95f40c3b.tar.gz fdk-aac-577fcbb570d023be4cea9564292dd2bd95f40c3b.tar.bz2 fdk-aac-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/bandwidth.cpp')
-rw-r--r-- | libAACenc/src/bandwidth.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libAACenc/src/bandwidth.cpp b/libAACenc/src/bandwidth.cpp index b2b8851..da9b850 100644 --- a/libAACenc/src/bandwidth.cpp +++ b/libAACenc/src/bandwidth.cpp @@ -204,7 +204,6 @@ static INT GetBandwidthEntry( INT bwTabSize = 0; switch (frameLength) { - case 960: case 1024: pBwTab = bandWidthTable; bwTabSize = sizeof(bandWidthTable)/sizeof(BANDWIDTH_TAB); @@ -253,7 +252,6 @@ static INT GetBandwidthEntry( chanBitRate < pBwTab[i+1].chanBitRate) { switch (frameLength) { - case 960: case 1024: bandwidth = (entryNo==0) ? pBwTab[i].bandWidthMono |