diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 04:53:58 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 06:28:15 +0400 |
commit | 43ec456320d03d34d37f9458b0134d8f9d1ed310 (patch) | |
tree | 98d963a5a8b780f9806c61e1d7850ab924691af9 /libavcodec/dcadata.h | |
parent | c122e697fa90c83abfdc729228d736e15a91bcf9 (diff) | |
parent | 44b17d794aa508ae21f438ae80bfe8aaf4b426e1 (diff) |
Merge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1'
* commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1':
dca: extract core substream's embedded downmix coeffcient codes, if present.
Conflicts:
libavcodec/dcadata.h
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadata.h')
-rw-r--r-- | libavcodec/dcadata.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h index 2d3628262f..90a46aaf65 100644 --- a/libavcodec/dcadata.h +++ b/libavcodec/dcadata.h @@ -7505,8 +7505,19 @@ DECLARE_ALIGNED(16, static const float, lfe_fir_128)[] = 0.01724460535, 0.47964480519, 0.48503074050, 0.01805862412, }; - -static const float dca_downmix_scale_factors[241] = { +/* + * D.11 Look-up Table for Downmix Scale Factors + * + * Note that the range of the entries in DmixTable[] is between -60 dB and 0 dB + * with addition of -inf (|DMixCoeff| = 0), which is coded with a DmixCode = 0. + * Furthermore, the range [-60 to 0] is subdivided into 3 regions, each with a + * different grid resolution: + * + * 1) [-60.000 to -30] with resolution of 0.500 dB + * 2) [-29.750 to -15] with resolution of 0.250 dB + * 3) [-14.875 to 0] with resolution of 0.125 dB + */ +static const float dca_dmixtable[241] = { 0.001000, 0.001059, 0.001122, 0.001189, 0.001259, 0.001334, 0.001413, 0.001496, 0.001585, 0.001679, 0.001778, 0.001884, 0.001995, 0.002113, 0.002239, 0.002371, 0.002512, 0.002661, 0.002818, 0.002985, 0.003162, 0.003350, 0.003548, 0.003758, @@ -7537,7 +7548,7 @@ static const float dca_downmix_scale_factors[241] = { 0.707107, 0.718208, 0.728618, 0.739180, 0.749894, 0.760764, 0.771792, 0.782979, 0.794328, 0.805842, 0.817523, 0.829373, 0.841395, 0.853591, 0.865964, 0.878517, 0.891251, 0.904170, 0.917276, 0.930572, 0.944061, 0.957745, 0.971628, 0.985712, - 1.000000 + 1.000000, }; static const float dca_default_coeffs[10][5][2] = { |