Imported Upstream version 6.1

[platform/upstream/ffmpeg.git] / libavcodec / x86 / audiodsp_init.c

diff --git a/libavcodec/x86/audiodsp_init.c b/libavcodec/x86/audiodsp_init.c
index 98e296c..68aa3b2 100644 (file)
--- a/libavcodec/x86/audiodsp_init.c
+++ b/libavcodec/x86/audiodsp_init.c
@@ -24,13 +24,12 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/audiodsp.h"
 
-int32_t ff_scalarproduct_int16_mmxext(const int16_t *v1, const int16_t *v2,
-                                      int order);
+int32_t ff_scalarproduct_int16_avx2(const int16_t *v1, const int16_t *v2,
+                                    int order);
+
 int32_t ff_scalarproduct_int16_sse2(const int16_t *v1, const int16_t *v2,
                                     int order);
 
-void ff_vector_clip_int32_mmx(int32_t *dst, const int32_t *src,
-                              int32_t min, int32_t max, unsigned int len);
 void ff_vector_clip_int32_sse2(int32_t *dst, const int32_t *src,
                                int32_t min, int32_t max, unsigned int len);
 void ff_vector_clip_int32_int_sse2(int32_t *dst, const int32_t *src,
@@ -44,12 +43,6 @@ av_cold void ff_audiodsp_init_x86(AudioDSPContext *c)
 {
     int cpu_flags = av_get_cpu_flags();
 
-    if (EXTERNAL_MMX(cpu_flags))
-        c->vector_clip_int32 = ff_vector_clip_int32_mmx;
-
-    if (EXTERNAL_MMXEXT(cpu_flags))
-        c->scalarproduct_int16 = ff_scalarproduct_int16_mmxext;
-
     if (EXTERNAL_SSE(cpu_flags))
         c->vector_clipf = ff_vector_clipf_sse;
 
@@ -63,4 +56,7 @@ av_cold void ff_audiodsp_init_x86(AudioDSPContext *c)
 
     if (EXTERNAL_SSE4(cpu_flags))
         c->vector_clip_int32 = ff_vector_clip_int32_sse4;
+
+    if (EXTERNAL_AVX2_FAST(cpu_flags))
+        c->scalarproduct_int16 = ff_scalarproduct_int16_avx2;
 }