diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 21:44:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 22:18:41 +0100 |
| commit | 209001073adf190ccf2e578f25d4b3d41b1640a0 (patch) | |
| tree | 11d04d4bd1eb083cfe3019bddd5e99587026fef7 /libavcodec/dcadata.h | |
| parent | e46a7fdc8748c286e391c1e7f2921d98a4486681 (diff) | |
| parent | 217e4ff4d1f845b76e44634e29371cd09313d1c2 (diff) | |
| download | ffmpeg-209001073adf190ccf2e578f25d4b3d41b1640a0.tar.gz | |
Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'
* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
dca: Support for XLL (lossless extension)
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadata.h')
| -rw-r--r-- | libavcodec/dcadata.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h index 4f97117539..1d3d605b9e 100644 --- a/libavcodec/dcadata.h +++ b/libavcodec/dcadata.h @@ -47,8 +47,14 @@ extern const float ff_dca_fir_32bands_nonperfect[512]; extern const float ff_dca_lfe_fir_64[256]; extern const float ff_dca_lfe_fir_128[256]; +extern const float ff_dca_lfe_xll_fir_64[256]; +extern const float ff_dca_fir_64bands[1024]; -extern const uint16_t ff_dca_dmixtable[242]; +#define FF_DCA_DMIXTABLE_SIZE 242 +#define FF_DCA_INV_DMIXTABLE_SIZE 201 + +extern const uint16_t ff_dca_dmixtable[FF_DCA_DMIXTABLE_SIZE]; +extern const uint32_t ff_dca_inv_dmixtable[FF_DCA_INV_DMIXTABLE_SIZE]; extern const float ff_dca_default_coeffs[10][6][2]; @@ -57,6 +63,8 @@ extern const int ff_dca_ext_audio_descr_mask[8]; extern const uint64_t ff_dca_core_channel_layout[16]; +extern const int32_t ff_dca_sampling_freqs[16]; + extern const int8_t ff_dca_lfe_index[16]; extern const int8_t ff_dca_channel_reorder_lfe[16][9]; |