diff options
Diffstat (limited to 'libavresample/x86/audio_mix_init.c')
| -rw-r--r-- | libavresample/x86/audio_mix_init.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libavresample/x86/audio_mix_init.c b/libavresample/x86/audio_mix_init.c index 1b472afc2f..72b2397ad6 100644 --- a/libavresample/x86/audio_mix_init.c +++ b/libavresample/x86/audio_mix_init.c @@ -20,6 +20,7 @@ #include "config.h" #include "libavutil/cpu.h" +#include "libavutil/x86/cpu.h" #include "libavresample/audio_mix.h" extern void ff_mix_2_to_1_fltp_flt_sse(float **src, float **matrix, int len, @@ -105,7 +106,7 @@ DEFINE_MIX_3_8_TO_1_2(7) DEFINE_MIX_3_8_TO_1_2(8) #define SET_MIX_3_8_TO_1_2(chan) \ - if (mm_flags & AV_CPU_FLAG_SSE && HAVE_SSE) { \ + if (EXTERNAL_SSE(mm_flags)) { \ ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT,\ chan, 1, 16, 4, "SSE", \ ff_mix_ ## chan ## _to_1_fltp_flt_sse); \ @@ -113,7 +114,7 @@ DEFINE_MIX_3_8_TO_1_2(8) chan, 2, 16, 4, "SSE", \ ff_mix_## chan ##_to_2_fltp_flt_sse); \ } \ - if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE) { \ + if (EXTERNAL_SSE2(mm_flags)) { \ ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,\ chan, 1, 16, 8, "SSE2", \ ff_mix_ ## chan ## _to_1_s16p_flt_sse2); \ @@ -121,7 +122,7 @@ DEFINE_MIX_3_8_TO_1_2(8) chan, 2, 16, 8, "SSE2", \ ff_mix_ ## chan ## _to_2_s16p_flt_sse2); \ } \ - if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE) { \ + if (EXTERNAL_SSE4(mm_flags)) { \ ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,\ chan, 1, 16, 8, "SSE4", \ ff_mix_ ## chan ## _to_1_s16p_flt_sse4); \ @@ -129,7 +130,7 @@ DEFINE_MIX_3_8_TO_1_2(8) chan, 2, 16, 8, "SSE4", \ ff_mix_ ## chan ## _to_2_s16p_flt_sse4); \ } \ - if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) { \ + if (EXTERNAL_AVX(mm_flags)) { \ int ptr_align = 32; \ int smp_align = 8; \ if (ARCH_X86_32 || chan >= 6) { \ @@ -149,7 +150,7 @@ DEFINE_MIX_3_8_TO_1_2(8) chan, 2, 16, 8, "AVX", \ ff_mix_ ## chan ## _to_2_s16p_flt_avx); \ } \ - if (mm_flags & AV_CPU_FLAG_FMA4 && HAVE_FMA4) { \ + if (EXTERNAL_FMA4(mm_flags)) { \ int ptr_align = 32; \ int smp_align = 8; \ if (ARCH_X86_32 || chan >= 6) { \ @@ -175,13 +176,13 @@ av_cold void ff_audio_mix_init_x86(AudioMix *am) #if HAVE_YASM int mm_flags = av_get_cpu_flags(); - if (mm_flags & AV_CPU_FLAG_SSE && HAVE_SSE) { + if (EXTERNAL_SSE(mm_flags)) { ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT, 2, 1, 16, 8, "SSE", ff_mix_2_to_1_fltp_flt_sse); ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT, 1, 2, 16, 4, "SSE", ff_mix_1_to_2_fltp_flt_sse); } - if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE) { + if (EXTERNAL_SSE2(mm_flags)) { ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT, 2, 1, 16, 8, "SSE2", ff_mix_2_to_1_s16p_flt_sse2); ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_Q8, @@ -189,13 +190,13 @@ av_cold void ff_audio_mix_init_x86(AudioMix *am) ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT, 1, 2, 16, 8, "SSE2", ff_mix_1_to_2_s16p_flt_sse2); } - if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE) { + if (EXTERNAL_SSE4(mm_flags)) { ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT, 2, 1, 16, 8, "SSE4", ff_mix_2_to_1_s16p_flt_sse4); ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT, 1, 2, 16, 8, "SSE4", ff_mix_1_to_2_s16p_flt_sse4); } - if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) { + if (EXTERNAL_AVX(mm_flags)) { ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT, 2, 1, 32, 16, "AVX", ff_mix_2_to_1_fltp_flt_avx); ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT, |