diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-12-14 17:32:17 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-12-14 17:32:17 +0100 |
commit | ee7be955947a0a591f42641419bf4a88953a77fb (patch) | |
tree | ef422756ae45ec9db4280bb0585f66a7beca72ef /libAACenc/src/aacenc_tns.cpp | |
parent | 2f29dd48d02d402169246e3c7f9256869817392a (diff) | |
download | fdk-aac-dabplus-ee7be955947a0a591f42641419bf4a88953a77fb.tar.gz fdk-aac-dabplus-ee7be955947a0a591f42641419bf4a88953a77fb.tar.bz2 fdk-aac-dabplus-ee7be955947a0a591f42641419bf4a88953a77fb.zip |
Apply piratfm's first commit
It's the patch from commit
e969ea8 AAC960 works now. All modes: LC/SBR/PS. Only for DAB+, not DRM.
without the copyright headers that create a ton of merge conficts
Diffstat (limited to 'libAACenc/src/aacenc_tns.cpp')
-rw-r--r-- | libAACenc/src/aacenc_tns.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libAACenc/src/aacenc_tns.cpp b/libAACenc/src/aacenc_tns.cpp index 85aea65..10586f5 100644 --- a/libAACenc/src/aacenc_tns.cpp +++ b/libAACenc/src/aacenc_tns.cpp @@ -186,6 +186,17 @@ static const TNS_MAX_TAB_ENTRY tnsMaxBandsTab1024[] = { 8000, { 39, 14}} }; +static const TNS_MAX_TAB_ENTRY tnsMaxBandsTab960[] = +{ + { 48000, { 49, 14}}, + { 44100, { 49, 14}}, + { 32000, { 49, 14}}, + { 24000, { 46, 15}}, + { 22050, { 46, 15}}, + { 16000, { 42, 15}}, + { 8000, { 40, 15}} +}; + static const TNS_MAX_TAB_ENTRY tnsMaxBandsTab480[] = { { 48000, { 31, -1}}, @@ -281,6 +292,10 @@ static INT getTnsMaxBands( int maxBandsTabSize = 0; switch (granuleLength) { + case 960: + pMaxBandsTab = tnsMaxBandsTab960; + maxBandsTabSize = sizeof(tnsMaxBandsTab960)/sizeof(TNS_MAX_TAB_ENTRY); + break; case 1024: pMaxBandsTab = tnsMaxBandsTab1024; maxBandsTabSize = sizeof(tnsMaxBandsTab1024)/sizeof(TNS_MAX_TAB_ENTRY); |