From 5e68bf9b927ef377f271a0d12185aac6172e5658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 14 Nov 2012 23:02:12 +0100 Subject: swr/rematrix: move templating parameters to template itself. --- libswresample/rematrix.c | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) (limited to 'libswresample/rematrix.c') diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index e23c45e852..51658cee21 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -22,42 +22,17 @@ #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" -#define ONE (1.0) -#define R(x) x -#define SAMPLE float -#define COEFF float -#define INTER float -#define RENAME(x) x ## _float +#define TEMPLATE_REMATRIX_FLT #include "rematrix_template.c" -#undef SAMPLE -#undef RENAME -#undef R -#undef ONE -#undef COEFF -#undef INTER - -#define ONE (1.0) -#define R(x) x -#define SAMPLE double -#define COEFF double -#define INTER double -#define RENAME(x) x ## _double -#include "rematrix_template.c" -#undef SAMPLE -#undef RENAME -#undef R -#undef ONE -#undef COEFF -#undef INTER - -#define ONE (-32768) -#define R(x) (((x) + 16384)>>15) -#define SAMPLE int16_t -#define COEFF int -#define INTER int -#define RENAME(x) x ## _s16 +#undef TEMPLATE_REMATRIX_FLT + +#define TEMPLATE_REMATRIX_DBL #include "rematrix_template.c" +#undef TEMPLATE_REMATRIX_DBL +#define TEMPLATE_REMATRIX_S16 +#include "rematrix_template.c" +#undef TEMPLATE_REMATRIX_S16 #define FRONT_LEFT 0 #define FRONT_RIGHT 1 -- cgit v1.2.3