swr: mix_1_1_int16_sse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libswresample/x86/rematrix.asm b/libswresample/x86/rematrix.asm
index c96ce49d9e60ffe3180f0a1dee0cbdf7925f494d..4cb790892d4916800d27b6f61dc940d1d64f53a8 100644 (file)
--- a/libswresample/x86/rematrix.asm
+++ b/libswresample/x86/rematrix.asm
@@ -167,6 +167,8 @@ MIX2_FLT u
 MIX2_FLT a
 MIX1_FLT u
 MIX1_FLT a
+MIX1_INT16 u
+MIX1_INT16 a
 
 %if HAVE_AVX
 INIT_YMM avx

diff --git a/libswresample/x86/swresample_x86.c b/libswresample/x86/swresample_x86.c
index ba0f1f131a01d55a2feeff3a7de03e34ab14fac9..3c5fa6de095b87f292d0c2b0434503ae6294ff60 100644 (file)
--- a/libswresample/x86/swresample_x86.c
+++ b/libswresample/x86/swresample_x86.c
@@ -150,6 +150,7 @@ mix_2_1_func_type ff_mix_2_1_a_## type ## _ ## simd;
 D(float, sse)
 D(float, avx)
 D(int16, mmx)
+D(int16, sse)
 
 
 void swri_rematrix_init_x86(struct SwrContext *s){
@@ -166,6 +167,9 @@ void swri_rematrix_init_x86(struct SwrContext *s){
         if(mm_flags & AV_CPU_FLAG_MMX) {
             s->mix_1_1_simd = ff_mix_1_1_a_int16_mmx;
         }
+        if(mm_flags & AV_CPU_FLAG_SSE) {
+            s->mix_1_1_simd = ff_mix_1_1_a_int16_sse;
+        }
         s->native_simd_matrix = av_mallocz(2 * num * sizeof(int16_t));
         for(i=0; i<nb_out; i++){
             int sh = 0;