diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-12 16:43:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-12 16:43:19 +0200 |
| commit | d504266cef39770cf8d56510319acf9235abd016 (patch) | |
| tree | 5238aa6b6f4641d9f1c5c771e51bb19c27703fed /libswresample | |
| parent | cbeeaf25932aac5923e075ae241fcc5287f7396a (diff) | |
| download | ffmpeg-d504266cef39770cf8d56510319acf9235abd016.tar.gz | |
swr: mix_1_1_int16_sse
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/x86/rematrix.asm | 2 | ||||
| -rw-r--r-- | libswresample/x86/swresample_x86.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libswresample/x86/rematrix.asm b/libswresample/x86/rematrix.asm index c96ce49d9e..4cb790892d 100644 --- 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 ba0f1f131a..3c5fa6de09 100644 --- 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; |