diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 03:48:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 03:48:29 +0100 |
| commit | 7ea9c4a94c139aafabba8fe9746e1a8d71e656d3 (patch) | |
| tree | b171e69c0a62e8b4943feb4d5820e0c5dfcd0565 /libavcodec/dcadata.h | |
| parent | 12235a3ed29c11b7983d43b843696297efb01249 (diff) | |
| parent | 149438cfe5d233c46bb18341b7c574fe643dd5f2 (diff) | |
| download | ffmpeg-7ea9c4a94c139aafabba8fe9746e1a8d71e656d3.tar.gz | |
Merge commit '149438cfe5d233c46bb18341b7c574fe643dd5f2'
* commit '149438cfe5d233c46bb18341b7c574fe643dd5f2':
dca: improve default stereo downmix coefficients.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadata.h')
| -rw-r--r-- | libavcodec/dcadata.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h index 90a46aaf65..6458ea174f 100644 --- a/libavcodec/dcadata.h +++ b/libavcodec/dcadata.h @@ -7552,16 +7552,16 @@ static const float dca_dmixtable[241] = { }; static const float dca_default_coeffs[10][5][2] = { - { { 0.707946, 0.707946 }, }, // A + { { 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.865964, 0.865964 }, { 1.000000, 0.501187 }, { 0.501187, 1.000000 }, }, // C + L + R - { { 1.000000, 0.501187 }, { 0.501187, 1.000000 }, { 0.707946, 0.707946 }, }, // L + R + S - { { 0.865964, 0.865964 }, { 1.000000, 0.501187 }, { 0.501187, 1.000000 }, { 0.707946, 0.707946 }, }, // C + L + R + S - { { 1.000000, 0.501187 }, { 0.501187, 1.000000 }, { 1.000000, 0.707946 }, { 0.707946, 1.000000 }, }, // L + R + SL + SR - { { 0.865964, 0.865964 }, { 1.000000, 0.501187 }, { 0.501187, 1.000000 }, { 1.000000, 0.707946 }, { 0.707946, 1.000000 }, }, // C + L + R + SL + SR + { { 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 }; /* downmix coeffs |