From 381d69840ad3af2259f0b7ef49236f9ee9c76b76 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Sun, 9 Sep 2012 11:48:51 -0700
Subject: 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
---
 libAACdec/src/aac_rom.cpp | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'libAACdec/src/aac_rom.cpp')

diff --git a/libAACdec/src/aac_rom.cpp b/libAACdec/src/aac_rom.cpp
index 13da0f6..dd51919 100644
--- a/libAACdec/src/aac_rom.cpp
+++ b/libAACdec/src/aac_rom.cpp
@@ -1729,20 +1729,36 @@ const UCHAR tns_max_bands_tbl[13][2] =
   { 39, 14 }, /*  7350 */
 };
 
-/* TNS_MAX_BANDS for low delay. The array index is sampleRateIndex-3 */
-const UCHAR tns_max_bands_tbl_480[5] = {
-  31, /* 48000  */
+/* TNS_MAX_BANDS for low delay. The array index is the sampleRateIndex */
+const UCHAR tns_max_bands_tbl_480[13] = {
+  31, /* 96000 */
+  31, /* 88200 */
+  31, /* 64000 */
+  31, /* 48000 */
   32, /* 44100 */
   37, /* 32000 */
   30, /* 24000 */
-  30  /* 22050 */
+  30, /* 22050 */
+  30, /* 16000 */
+  30, /* 12000 */
+  30, /* 11025 */
+  30, /*  8000 */
+  30  /*  7350 */
 };
-const UCHAR tns_max_bands_tbl_512[5] = {
-  31, /* 48000  */
+const UCHAR tns_max_bands_tbl_512[13] = {
+  31, /* 96000 */
+  31, /* 88200 */
+  31, /* 64000 */
+  31, /* 48000 */
   32, /* 44100 */
   37, /* 32000 */
   31, /* 24000 */
-  31  /* 22050 */
+  31, /* 22050 */
+  31, /* 16000 */
+  31, /* 12000 */
+  31, /* 11025 */
+  31, /*  8000 */
+  31  /*  7350 */
 };
 
 #define TCC(x) (FIXP_DBL(x))
-- 
cgit v1.2.3