Merge commit '7c377f0e74de8ab57f6baa64f3ec197c82104764'

[ffmpeg] / libswresample / resample_template.c

diff --git a/libswresample/resample_template.c b/libswresample/resample_template.c
index f42846ac5bc7f77c2bec4dde913268c66d432e3b..becff1265a5fcd010938d6cae7915b2d33e9d9c4 100644 (file)
--- a/libswresample/resample_template.c
+++ b/libswresample/resample_template.c
@@ -25,8 +25,9 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#if defined(TEMPLATE_RESAMPLE_DBL)
-#    define RENAME(N) N ## _double
+#if    defined(TEMPLATE_RESAMPLE_DBL)     \
+    || defined(TEMPLATE_RESAMPLE_DBL_SSE2)
+
 #    define FILTER_SHIFT 0
 #    define DELEM  double
 #    define FELEM  double
@@ -34,8 +35,17 @@
 #    define FELEML double
 #    define OUT(d, v) d = v
 
+#    if defined(TEMPLATE_RESAMPLE_DBL)
+#        define RENAME(N) N ## _double
+#    elif defined(TEMPLATE_RESAMPLE_DBL_SSE2)
+#        define COMMON_CORE COMMON_CORE_DBL_SSE2
+#        define LINEAR_CORE LINEAR_CORE_DBL_SSE2
+#        define RENAME(N) N ## _double_sse2
+#    endif
+
 #elif    defined(TEMPLATE_RESAMPLE_FLT)     \
-      || defined(TEMPLATE_RESAMPLE_FLT_SSE)
+      || defined(TEMPLATE_RESAMPLE_FLT_SSE) \
+      || defined(TEMPLATE_RESAMPLE_FLT_AVX)
 
 #    define FILTER_SHIFT 0
 #    define DELEM  float
@@ -50,6 +60,10 @@
 #        define COMMON_CORE COMMON_CORE_FLT_SSE
 #        define LINEAR_CORE LINEAR_CORE_FLT_SSE
 #        define RENAME(N) N ## _float_sse
+#    elif defined(TEMPLATE_RESAMPLE_FLT_AVX)
+#        define COMMON_CORE COMMON_CORE_FLT_AVX
+#        define LINEAR_CORE LINEAR_CORE_FLT_AVX
+#        define RENAME(N) N ## _float_avx
 #    endif
 
 #elif defined(TEMPLATE_RESAMPLE_S32)