summaryrefslogtreecommitdiffstats
path: root/libAACenc/src/aacenc_tns.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-12-23 17:40:43 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-12-23 17:40:43 +0100
commit9610ae6cb3fdca806d92eaea20f2fff33c4915c9 (patch)
treeabcb2ff21e307d51f445f88ec3129ec7e35bd1d7 /libAACenc/src/aacenc_tns.cpp
parentb7b1129d65218b63045e1518b11bd1faa46f72af (diff)
parentbe56dcde84b8d25ff7c06ab464afdb06f3c0e832 (diff)
downloadODR-AudioEnc-9610ae6cb3fdca806d92eaea20f2fff33c4915c9.tar.gz
ODR-AudioEnc-9610ae6cb3fdca806d92eaea20f2fff33c4915c9.tar.bz2
ODR-AudioEnc-9610ae6cb3fdca806d92eaea20f2fff33c4915c9.zip
Merge remote-tracking branch 'coinchon/next' into next
Diffstat (limited to 'libAACenc/src/aacenc_tns.cpp')
-rw-r--r--libAACenc/src/aacenc_tns.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/libAACenc/src/aacenc_tns.cpp b/libAACenc/src/aacenc_tns.cpp
index eca892e..76de985 100644
--- a/libAACenc/src/aacenc_tns.cpp
+++ b/libAACenc/src/aacenc_tns.cpp
@@ -188,12 +188,17 @@ static const TNS_MAX_TAB_ENTRY tnsMaxBandsTab1024[] =
static const TNS_MAX_TAB_ENTRY tnsMaxBandsTab960[] =
{
+ { 96000, { 31, 9}},
+ { 88200, { 31, 9}},
+ { 64000, { 34, 10}},
{ 48000, { 49, 14}},
{ 44100, { 49, 14}},
{ 32000, { 49, 14}},
{ 24000, { 46, 15}},
- { 22050, { 46, 15}},
- { 16000, { 42, 15}},
+ { 22050, { 46, 14}},
+ { 16000, { 46, 15}},
+ { 12000, { 42, 15}},
+ { 11025, { 42, 15}},
{ 8000, { 40, 15}}
};
@@ -202,7 +207,7 @@ static const TNS_MAX_TAB_ENTRY tnsMaxBandsTab480[] =
{ 48000, { 31, -1}},
{ 44100, { 32, -1}},
{ 32000, { 37, -1}},
- { 24000, { 30, -1}},
+ { 24001, { 30, -1}},
{ 22050, { 30, -1}}
};