diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 12:28:31 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 12:28:31 +0100 |
commit | ac021fdc40631f77a727f076f8748f89109c785b (patch) | |
tree | a51ba691da5f29c81d3ea61848b2938236f88ec2 /libavcodec/metasound_data.c | |
parent | 0290a646ac662a8552dfdb2de4887cac7a79acd1 (diff) | |
parent | 56d061ce9da954560892e3551513d5ecc0439846 (diff) |
Merge commit '56d061ce9da954560892e3551513d5ecc0439846'
* commit '56d061ce9da954560892e3551513d5ecc0439846':
metasound: add last missing modes (8kHz @ 6kbps per channel)
Conflicts:
Changelog
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/metasound_data.c')
-rw-r--r-- | libavcodec/metasound_data.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libavcodec/metasound_data.c b/libavcodec/metasound_data.c index 891391b4e0..ed23cdf34d 100644 --- a/libavcodec/metasound_data.c +++ b/libavcodec/metasound_data.c @@ -15198,6 +15198,24 @@ static const uint16_t bark_tab_s44_128[] = { 1, 2, 1, 2, 3, 4, 6, 10, 23, 76 }; +const TwinVQModeTab ff_metasound_mode0806 = { + { + { 8, bark_tab_s8_64, 10, fcb8s, 1, 5, cb0806ss0, cb0806ss1, 27 }, + { 2, bark_tab_m8_256, 20, fcb8m, 2, 5, cb0806sm0, cb0806sm1, 22 }, + { 1, bark_tab_l8_512, 30, fcb8l, 3, 6, cb0806sl0, cb0806sl1, 24 } + }, + 512, 12, lsp8, 1, 5, 3, 3, shape8, 8, 28, 20, 6, 200 +}; + +const TwinVQModeTab ff_metasound_mode0806s = { + { + { 8, bark_tab_s8s_64, 10, fcb8ss, 1, 5, cb0806ss0, cb0806ss1, 27 }, + { 2, bark_tab_m8s_256, 20, fcb8sm, 2, 5, cb0806sm0, cb0806sm1, 22 }, + { 1, bark_tab_l8s_512, 30, fcb8sl, 3, 6, cb0806sl0, cb0806sl1, 24 } + }, + 512, 12, lsp8s, 1, 5, 3, 3, shape8s, 8, 28, 20, 6, 200 +}; + const TwinVQModeTab ff_metasound_mode0808 = { { { 8, bark_tab_s8_64, 10, fcb8s, 1, 5, cb0808s0, cb0808s1, 18 }, |