diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2013-11-22 20:19:55 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-28 21:38:22 +0100 |
| commit | b6d5e6aa10a2f09351f287e876f7ed4504e1f75d (patch) | |
| tree | ad450452a739a5cf2bacdf2cbe33f879d0e19f15 /libavcodec/dcadata.h | |
| parent | 25609b63d2e07d26d610f485a22082d32c96c0f5 (diff) | |
| download | ffmpeg-b6d5e6aa10a2f09351f287e876f7ed4504e1f75d.tar.gz | |
dca: convert dca_default_coeffs to float.
Easier to read, modify, and avoids relying on an outdated table.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
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 324e40f104..e8f07e8beb 100644 --- a/libavcodec/dcadata.h +++ b/libavcodec/dcadata.h @@ -7522,17 +7522,17 @@ static const float dca_downmix_coeffs[65] = { 0.001412537544623, 0.001000000000000, 0.000501187233627, 0.000251188643151, 0.000000000000000, }; -static const uint8_t dca_default_coeffs[10][5][2] = { - { { 13, 13 }, }, - { { 0, 64 }, { 64, 0 }, }, - { { 0, 64 }, { 64, 0 }, }, - { { 0, 64 }, { 64, 0 }, }, - { { 0, 64 }, { 64, 0 }, }, - { { 6, 6 }, { 0, 25 }, { 25, 0 }, }, - { { 0, 25 }, { 25, 0 }, { 13, 13 }, }, - { { 6, 6 }, { 0, 25 }, { 25, 0 }, { 13, 13 }, }, - { { 0, 25 }, { 25, 0 }, { 0, 13 }, { 13, 0 }, }, - { { 6, 6 }, { 0, 25 }, { 25, 0 }, { 0, 13 }, { 13, 0 }, }, +static const float dca_default_coeffs[10][5][2] = { + { { 0.707946, 0.707946 }, }, // 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 }; /* downmix coeffs |