diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 04:00:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 04:00:59 +0100 |
| commit | 97468463a239a6767a9c7ad0ed2f9f03e61f5d1a (patch) | |
| tree | 754c8ada57061ee5b673fddc1c4ed22974174ed1 /libavcodec/dcadata.h | |
| parent | 7ea9c4a94c139aafabba8fe9746e1a8d71e656d3 (diff) | |
| parent | aaa44d0299338e3bc90128816c21dbfab06cdb48 (diff) | |
| download | ffmpeg-97468463a239a6767a9c7ad0ed2f9f03e61f5d1a.tar.gz | |
Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48'
* commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48':
dca: support mixing LFE in dca_downmix.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadata.h')
| -rw-r--r-- | libavcodec/dcadata.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h index 6458ea174f..5154fbca0c 100644 --- a/libavcodec/dcadata.h +++ b/libavcodec/dcadata.h @@ -7551,17 +7551,17 @@ static const float dca_dmixtable[241] = { 1.000000, }; -static const float dca_default_coeffs[10][5][2] = { - { { 0.707107, 0.707107 }, }, // A - { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, }, // A + B (dual mono) - { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, }, // L + R (stereo) - { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, }, // (L+R) + (L-R) (sum-difference) - { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, }, // LT + RT (left and right total) - { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, }, // C + L + R - { { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.501187 }, }, // L + R + S - { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.501187 }, }, // C + L + R + S - { { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.000000 }, { 0.000000, 0.501187 }, }, // L + R + SL + SR - { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.000000 }, { 0.000000, 0.501187 }, }, // C + L + R + SL + SR +static const float dca_default_coeffs[10][6][2] = { + { { 0.707107, 0.707107 }, { 0.000000, 0.000000 }, }, // A [LFE] + { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 }, }, // A + B (dual mono) [LFE] + { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 }, }, // L + R (stereo) [LFE] + { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 }, }, // (L+R) + (L-R) (sum-difference) [LFE] + { { 1.000000, 0.000000 }, { 0.000000, 1.000000 }, { 0.000000, 0.000000 }, }, // LT + RT (left and right total) [LFE] + { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.000000, 0.000000 }, }, // C + L + R [LFE] + { { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.501187 }, { 0.000000, 0.000000 }, }, // L + R + S [LFE] + { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.501187 }, { 0.000000, 0.000000 }, }, // C + L + R + S [LFE] + { { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.000000 }, { 0.000000, 0.501187 }, { 0.000000, 0.000000 }, }, // L + R + SL + SR [LFE] + { { 0.501187, 0.501187 }, { 0.707107, 0.000000 }, { 0.000000, 0.707107 }, { 0.501187, 0.000000 }, { 0.000000, 0.501187 }, { 0.000000, 0.000000 }, }, // C + L + R + SL + SR [LFE] }; /* downmix coeffs |