x86: hpeldsp: Use EXTERNAL_SSE2_FAST where appropriate

[ffmpeg] / libavcodec / x86 / fft_init.c

diff --git a/libavcodec/x86/fft_init.c b/libavcodec/x86/fft_init.c
index 77f5ba96f8618b9e4c4a60bed52c46201d72f0a1..ed1290997b3263fca2cc67136b619d4372e2bd72 100644 (file)
--- a/libavcodec/x86/fft_init.c
+++ b/libavcodec/x86/fft_init.c
@@ -16,53 +16,36 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dct.h"
+
 #include "fft.h"
 
 av_cold void ff_fft_init_x86(FFTContext *s)
 {
-    int has_vectors = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
+
 #if ARCH_X86_32
-    if (EXTERNAL_AMD3DNOW(has_vectors)) {
-        /* 3DNow! for K6-2/3 */
-        s->imdct_calc = ff_imdct_calc_3dnow;
-        s->imdct_half = ff_imdct_half_3dnow;
+    if (EXTERNAL_AMD3DNOW(cpu_flags)) {
         s->fft_calc   = ff_fft_calc_3dnow;
     }
-    if (EXTERNAL_AMD3DNOWEXT(has_vectors)) {
-        /* 3DNowEx for K7 */
-        s->imdct_calc = ff_imdct_calc_3dnowext;
-        s->imdct_half = ff_imdct_half_3dnowext;
+
+    if (EXTERNAL_AMD3DNOWEXT(cpu_flags)) {
         s->fft_calc   = ff_fft_calc_3dnowext;
     }
-#endif
-    if (EXTERNAL_SSE(has_vectors)) {
-        /* SSE for P3/P4/K8 */
-        s->imdct_calc  = ff_imdct_calc_sse;
-        s->imdct_half  = ff_imdct_half_sse;
+#endif /* ARCH_X86_32 */
+
+    if (EXTERNAL_SSE(cpu_flags)) {
         s->fft_permute = ff_fft_permute_sse;
         s->fft_calc    = ff_fft_calc_sse;
         s->fft_permutation = FF_FFT_PERM_SWAP_LSBS;
     }
-    if (EXTERNAL_AVX(has_vectors) && s->nbits >= 5) {
-        /* AVX for SB */
-        s->imdct_half      = ff_imdct_half_avx;
+
+    if (EXTERNAL_AVX_FAST(cpu_flags) && s->nbits >= 5) {
         s->fft_calc        = ff_fft_calc_avx;
         s->fft_permutation = FF_FFT_PERM_AVX;
     }
 }
-
-#if CONFIG_DCT
-av_cold void ff_dct_init_x86(DCTContext *s)
-{
-    int has_vectors = av_get_cpu_flags();
-    if (EXTERNAL_SSE(has_vectors))
-        s->dct32 = ff_dct32_float_sse;
-    if (EXTERNAL_SSE2(has_vectors))
-        s->dct32 = ff_dct32_float_sse2;
-    if (EXTERNAL_AVX(has_vectors))
-        s->dct32 = ff_dct32_float_avx;
-}
-#endif