Commit 68712ce8 authored by Michael Niedermayer's avatar Michael Niedermayer

swr/x86: 16bit integer mix functions need SSE2 not SSE

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 3245c8b6
...@@ -236,6 +236,8 @@ MIX2_FLT u ...@@ -236,6 +236,8 @@ MIX2_FLT u
MIX2_FLT a MIX2_FLT a
MIX1_FLT u MIX1_FLT u
MIX1_FLT a MIX1_FLT a
INIT_XMM sse2
MIX1_INT16 u MIX1_INT16 u
MIX1_INT16 a MIX1_INT16 a
MIX2_INT16 u MIX2_INT16 u
......
...@@ -146,7 +146,7 @@ mix_2_1_func_type ff_mix_2_1_a_## type ## _ ## simd; ...@@ -146,7 +146,7 @@ mix_2_1_func_type ff_mix_2_1_a_## type ## _ ## simd;
D(float, sse) D(float, sse)
D(float, avx) D(float, avx)
D(int16, mmx) D(int16, mmx)
D(int16, sse) D(int16, sse2)
void swri_rematrix_init_x86(struct SwrContext *s){ void swri_rematrix_init_x86(struct SwrContext *s){
...@@ -164,9 +164,9 @@ void swri_rematrix_init_x86(struct SwrContext *s){ ...@@ -164,9 +164,9 @@ void swri_rematrix_init_x86(struct SwrContext *s){
s->mix_1_1_simd = ff_mix_1_1_a_int16_mmx; s->mix_1_1_simd = ff_mix_1_1_a_int16_mmx;
s->mix_2_1_simd = ff_mix_2_1_a_int16_mmx; s->mix_2_1_simd = ff_mix_2_1_a_int16_mmx;
} }
if(mm_flags & AV_CPU_FLAG_SSE) { if(mm_flags & AV_CPU_FLAG_SSE2) {
s->mix_1_1_simd = ff_mix_1_1_a_int16_sse; s->mix_1_1_simd = ff_mix_1_1_a_int16_sse2;
s->mix_2_1_simd = ff_mix_2_1_a_int16_sse; s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2;
} }
s->native_simd_matrix = av_mallocz(2 * num * sizeof(int16_t)); s->native_simd_matrix = av_mallocz(2 * num * sizeof(int16_t));
for(i=0; i<nb_out; i++){ for(i=0; i<nb_out; i++){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment