Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'

[ffmpeg] / libswresample / resample.c

diff --git a/libswresample/resample.c b/libswresample/resample.c
index 8b1b6ca9aff3b525f7952bd5019ea7f767302b42..581382faa69dea0777cfc9a2c61aa4c838193cf6 100644 (file)
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -302,10 +302,16 @@ static int set_compensation(ResampleContext *c, int sample_delta, int compensati
 #include "resample_template.c"
 #undef TEMPLATE_RESAMPLE_S16_MMX2
 
-#if HAVE_SSSE3_INLINE
-#define TEMPLATE_RESAMPLE_S16_SSSE3
+#if HAVE_SSE_INLINE
+#define TEMPLATE_RESAMPLE_FLT_SSE
 #include "resample_template.c"
-#undef TEMPLATE_RESAMPLE_S16_SSSE3
+#undef TEMPLATE_RESAMPLE_FLT_SSE
+#endif
+
+#if HAVE_SSE2_INLINE
+#define TEMPLATE_RESAMPLE_S16_SSE2
+#include "resample_template.c"
+#undef TEMPLATE_RESAMPLE_S16_SSE2
 #endif
 
 #endif // HAVE_MMXEXT_INLINE
@@ -317,8 +323,8 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A
 
     for(i=0; i<dst->ch_count; i++){
 #if HAVE_MMXEXT_INLINE
-#if HAVE_SSSE3_INLINE
-             if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_SSSE3)) ret= swri_resample_int16_ssse3(c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
+#if HAVE_SSE2_INLINE
+             if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_SSE2)) ret= swri_resample_int16_sse2 (c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
         else
 #endif
              if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_MMX2 )){
@@ -328,6 +334,10 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A
 #endif
              if(c->format == AV_SAMPLE_FMT_S16P) ret= swri_resample_int16(c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
         else if(c->format == AV_SAMPLE_FMT_S32P) ret= swri_resample_int32(c, (int32_t*)dst->ch[i], (const int32_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
+#if HAVE_SSE_INLINE
+        else if(c->format == AV_SAMPLE_FMT_FLTP && (mm_flags&AV_CPU_FLAG_SSE))
+                                                 ret= swri_resample_float_sse (c, (float*)dst->ch[i], (const float*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
+#endif
         else if(c->format == AV_SAMPLE_FMT_FLTP) ret= swri_resample_float(c, (float  *)dst->ch[i], (const float  *)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
         else if(c->format == AV_SAMPLE_FMT_DBLP) ret= swri_resample_double(c,(double *)dst->ch[i], (const double *)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
     }