diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 13:45:49 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 00:41:49 +0200 |
| commit | c5278cb84f92e4be14a1372b35f25485a296d10d (patch) | |
| tree | 77fb165a18c6f38576d5711e9bd5ddbac63f2cf4 /libswresample/swresample_internal.h | |
| parent | 2dd2e429517d98b3bc97a432a699835ccc62e720 (diff) | |
| download | ffmpeg-c5278cb84f92e4be14a1372b35f25485a296d10d.tar.gz | |
Add Dolby/DPLII downmix support to libswresample
Based on code by John Stebbins <jstebbins.hb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample_internal.h')
| -rw-r--r-- | libswresample/swresample_internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h index 0ef5f965e0..a32cf76e13 100644 --- a/libswresample/swresample_internal.h +++ b/libswresample/swresample_internal.h @@ -22,6 +22,9 @@ #define SWR_INTERNAL_H #include "swresample.h" +#include "libavutil/audioconvert.h" + +#define SQRT3_2 1.22474487139158904909 /* sqrt(3/2) */ typedef void (mix_1_1_func_type)(void *out, const void *in, void *coeffp, int index, int len); typedef void (mix_2_1_func_type)(void *out, const void *in1, const void *in2, void *coeffp, int index1, int index2, int len); @@ -54,6 +57,7 @@ struct SwrContext { float clev; ///< center mixing level float lfe_mix_level; ///< LFE mixing level float rematrix_volume; ///< rematrixing volume coefficient + enum AVMatrixEncoding matrix_encoding; /**< matrixed stereo encoding */ const int *channel_map; ///< channel index (or -1 if muted channel) map int used_ch_count; ///< number of used input channels (mapped channel count if channel_map, otherwise in.ch_count) enum SwrDitherType dither_method; |