4 files changed, 28 insertions, 12 deletions
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))
diff --git a/libAACdec/src/aac_rom.h b/libAACdec/src/aac_rom.h
index ca971fe..beec2ee 100644
--- a/libAACdec/src/aac_rom.h
+++ b/libAACdec/src/aac_rom.h
@@ -164,8 +164,8 @@ extern const UINT   aHuffTreeRvlCodewds[];
 
 extern const UCHAR tns_max_bands_tbl[13][2];
 
-extern const UCHAR tns_max_bands_tbl_480[5];
-extern const UCHAR tns_max_bands_tbl_512[5];
+extern const UCHAR tns_max_bands_tbl_480[13];
+extern const UCHAR tns_max_bands_tbl_512[13];
 
 #define FIXP_TCC FIXP_DBL
 
diff --git a/libAACdec/src/aacdec_tns.cpp b/libAACdec/src/aacdec_tns.cpp
index db67c9b..702196f 100644
--- a/libAACdec/src/aacdec_tns.cpp
+++ b/libAACdec/src/aacdec_tns.cpp
@@ -374,10 +374,10 @@ void CTns_Apply (
 
              switch (granuleLength) {
                case 480:
-                 tns_max_bands = tns_max_bands_tbl_480[pSamplingRateInfo->samplingRateIndex-3];
+                 tns_max_bands = tns_max_bands_tbl_480[pSamplingRateInfo->samplingRateIndex];
                  break;
                case 512:
-                 tns_max_bands = tns_max_bands_tbl_512[pSamplingRateInfo->samplingRateIndex-3];
+                 tns_max_bands = tns_max_bands_tbl_512[pSamplingRateInfo->samplingRateIndex];
                  break;
                default:
                  tns_max_bands = GetMaximumTnsBands(pIcsInfo, pSamplingRateInfo->samplingRateIndex);
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp
index 451d659..87f9ab0 100644
--- a/libAACdec/src/aacdecoder_lib.cpp
+++ b/libAACdec/src/aacdecoder_lib.cpp
@@ -110,7 +110,7 @@ amm-info@iis.fraunhofer.de
 /* Decoder library info */
 #define AACDECODER_LIB_VL0 2
 #define AACDECODER_LIB_VL1 4
-#define AACDECODER_LIB_VL2 4
+#define AACDECODER_LIB_VL2 5
 #define AACDECODER_LIB_TITLE "AAC Decoder Lib"
 #define AACDECODER_LIB_BUILD_DATE __DATE__
 #define AACDECODER_LIB_BUILD_TIME __TIME__