diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-09-09 11:48:51 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2012-09-09 11:52:09 -0700 |
| commit | 381d69840ad3af2259f0b7ef49236f9ee9c76b76 (patch) | |
| tree | 059754bb7c5ff151506ac52a2962d532a180b5bc /libSYS | |
| parent | fef220869b4e5bf9241369d3379b389136c2f174 (diff) | |
| download | android_external_aac-381d69840ad3af2259f0b7ef49236f9ee9c76b76.tar.gz android_external_aac-381d69840ad3af2259f0b7ef49236f9ee9c76b76.tar.bz2 android_external_aac-381d69840ad3af2259f0b7ef49236f9ee9c76b76.zip | |
Bug fixes in AAC decoder, AAC encoder, FDK library
Latest code drop from Fraunhofer:
* AAC-Decoder
- Expanded AAC-LD/ELD decoder TNS max band tables to avoid wrong data
access for sampling rates <22kHz and >48kHz.
Modified file(s):
libAACdec\src\aacdec_tns.cpp
libAACdec\src\aac_rom.h
libAACdec\src\aac_rom.cpp
- Fixed ELD synthesis QMF filterbank scaling for downsampled SBR.
Modified file(s):
libFDK\src\qmf.cpp
* AAC-Encoder
- Fixed bit rate limiting for lower limit as introduced in the Delivery 2012-05-11.
Modified file(s):
libAACenc\include\aacenc_lib.h
libAACenc\src\aacenc.h
libAACenc\src\aacenc.cpp
libSBRenc\src\sbr_rom.h
libSBRenc\src\sbr_rom.cpp
- Allow negative prediction gain as meaning that there is no coding gain.
Make use of scaleValueSaturate in gauss window calculation.
Modified file(s):
libAACenc\src\aacenc_tns.cpp
- Added energy saturation to prevent overflow in short blocks.
Modified file(s):
libAACenc\src\grp_data.cpp
- Perform scalefactor adaption in case quantized lines are out of valid range.
Modified file(s):
libAACenc\src\quantize.cpp
- Interrupt quantization loop when no spectral data is available.
Adjustments in bitreservoir adaption.
Modified file(s):
libAACenc\src\qc_main.cpp
- Indroduced dynamic scaling in none missing harmonic energy lowering compensation.
Modified file(s):
libSBRenc\src\env_est.cpp
* FDK-Library
- Fixed saturation for negative values in scaleValueSaturate.
Modified file(s):
libFDK\include\scale.h
Change-Id: If830ea65caef6b5554281e4b7a77a8b2e08825ce
Diffstat (limited to 'libSYS')
| -rw-r--r-- | libSYS/include/genericStds.h | 2 | ||||
| -rw-r--r-- | libSYS/include/machine_type.h | 2 | ||||
| -rw-r--r-- | libSYS/src/cmdl_parser.cpp | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/libSYS/include/genericStds.h b/libSYS/include/genericStds.h index 756935b..2d6eea6 100644 --- a/libSYS/include/genericStds.h +++ b/libSYS/include/genericStds.h @@ -96,6 +96,8 @@ amm-info@iis.fraunhofer.de #include "machine_type.h" +/* Work around for broken android toolchain: sys/types.h:137: error: 'uint64_t' does not name a type */ +#define _SYS_TYPES_H_ /* Always increase verbosity of memory allocation in case of a debug built. DEBUG is defined globally in that case. */ diff --git a/libSYS/include/machine_type.h b/libSYS/include/machine_type.h index d04a8e8..b5642b2 100644 --- a/libSYS/include/machine_type.h +++ b/libSYS/include/machine_type.h @@ -173,7 +173,7 @@ amm-info@iis.fraunhofer.de /* Define 64 bit base integer type. */ -#ifdef _MSC_VER +#ifdef _WIN32 typedef __int64 INT64; typedef unsigned __int64 UINT64; #else diff --git a/libSYS/src/cmdl_parser.cpp b/libSYS/src/cmdl_parser.cpp index bf020ee..a93a2f4 100644 --- a/libSYS/src/cmdl_parser.cpp +++ b/libSYS/src/cmdl_parser.cpp @@ -92,6 +92,9 @@ amm-info@iis.fraunhofer.de #define _CRT_SECURE_NO_WARNINGS +/* Work around for broken android toolchain: sys/types.h:137: error: 'uint64_t' does not name a type */ +#define _SYS_TYPES_H_ + #include <stdarg.h> #include <stdio.h> #include <string.h> |