From c5278cb84f92e4be14a1372b35f25485a296d10d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 9 Jun 2012 13:45:49 -0700 Subject: Add Dolby/DPLII downmix support to libswresample Based on code by John Stebbins Signed-off-by: Michael Niedermayer --- libswresample/swresample_internal.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libswresample/swresample_internal.h') 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; -- cgit v1.2.3