diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
| commit | 1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch) | |
| tree | 89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/libavcodec/dcadata.h | |
| parent | 09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff) | |
| download | xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2 | |
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/libavcodec/dcadata.h')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/dcadata.h | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/contrib/ffmpeg/libavcodec/dcadata.h b/contrib/ffmpeg/libavcodec/dcadata.h index c9f2ca747..40e78360d 100644 --- a/contrib/ffmpeg/libavcodec/dcadata.h +++ b/contrib/ffmpeg/libavcodec/dcadata.h @@ -24,6 +24,11 @@ * @file dcadata.c */ +#ifndef FFMPEG_DCADATA_H +#define FFMPEG_DCADATA_H + +#include <stdint.h> + /* Generic tables */ static const uint32_t dca_sample_rates[16] = @@ -7309,7 +7314,7 @@ static const float fir_32bands_nonperfect[] = +1.390191784E-007 }; -//FIXME the coeffs are symetric +//FIXME the coeffs are symmetric static const float lfe_fir_64[] = { 2.6584343868307770E-004, @@ -7826,7 +7831,7 @@ static const float lfe_fir_64[] = 2.6584343868307770E-004 }; -//FIXME the coeffs are symetric +//FIXME the coeffs are symmetric static const float lfe_fir_128[] = { @@ -8344,7 +8349,7 @@ static const float lfe_fir_128[] = 0.00053168571 }; -/* 10^-(dB/20), with dB beeing a list of dB values rangeing from 0 to -72 */ +/* 10^-(dB/20), with dB being a list of dB values ranging from 0 to -72 */ /* do a 20*log10(dca_downmix_coeffs) to reconvert the values */ static const float dca_downmix_coeffs[65] = { @@ -8361,6 +8366,19 @@ static const float dca_downmix_coeffs[65] = { 0.001412537544623, 0.001000000000000, 0.000501187233627, 0.000251188643151, 0.000000000000000, }; +static const uint8_t dca_default_coeffs[16][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 }, }, +}; + /* downmix coeffs TABLE 9 @@ -8452,3 +8470,5 @@ where Ch(n) represents the subband samples in the (n)th audio channel. */ + +#endif /* FFMPEG_DCADATA_H */ |