diff options
| author | Martin Storsjo <martin@martin.st> | 2012-11-01 11:08:03 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-11-01 11:08:03 +0200 |
| commit | 54dfe1ec6972ca0d56dcb671448f84fea5e37e35 (patch) | |
| tree | 5d26aa077f3aa32d3e5113546abc5a4219332640 /libAACdec/src/aac_rom.cpp | |
| parent | fea3c1d0ffaf5975bb15462e11edf9c7a664890d (diff) | |
| parent | 6ab36997af5d5acda4f21d33031f4e45c85f96b7 (diff) | |
| download | fdk-aac-54dfe1ec6972ca0d56dcb671448f84fea5e37e35.tar.gz fdk-aac-54dfe1ec6972ca0d56dcb671448f84fea5e37e35.tar.bz2 fdk-aac-54dfe1ec6972ca0d56dcb671448f84fea5e37e35.zip | |
Merge remote-tracking branch 'aosp/jb-mr1-release' into master
Conflicts:
libAACenc/src/band_nrg.cpp
libAACenc/src/grp_data.cpp
libSBRenc/src/env_est.cpp
Diffstat (limited to 'libAACdec/src/aac_rom.cpp')
| -rw-r--r-- | libAACdec/src/aac_rom.cpp | 30 |
1 files changed, 23 insertions, 7 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)) |