From 4d7128be9a31c7bf6cb79436711ded3cc9767fe8 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 13 Jun 2022 08:34:13 +0200 Subject: [PATCH] avfilter/x86/vf_yadif: Remove obsolete MMXEXT functions The only system which benefit from these are truely ancient 32bit x86s as all other systems use at least the SSE2 versions (this includes all x64 cpus (which is why this code is restricted to x86-32)). Signed-off-by: Andreas Rheinhardt --- libavfilter/x86/vf_yadif.asm | 8 -------- libavfilter/x86/vf_yadif_init.c | 21 --------------------- libavfilter/x86/yadif-10.asm | 4 ---- libavfilter/x86/yadif-16.asm | 4 ---- 4 files changed, 37 deletions(-) diff --git a/libavfilter/x86/vf_yadif.asm b/libavfilter/x86/vf_yadif.asm index a29620ce55..809cebdd3f 100644 --- a/libavfilter/x86/vf_yadif.asm +++ b/libavfilter/x86/vf_yadif.asm @@ -133,12 +133,8 @@ SECTION .text psubusb m2, m3 psubusb m3, m4 pmaxub m2, m3 -%if mmsize == 16 mova m3, m2 psrldq m3, 2 -%else - pshufw m3, m2, q0021 -%endif punpcklbw m2, m7 punpcklbw m3, m7 paddw m0, m2 @@ -237,7 +233,3 @@ INIT_XMM ssse3 YADIF INIT_XMM sse2 YADIF -%if ARCH_X86_32 -INIT_MMX mmxext -YADIF -%endif diff --git a/libavfilter/x86/vf_yadif_init.c b/libavfilter/x86/vf_yadif_init.c index 66cbee8510..257c3f9199 100644 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@ -23,9 +23,6 @@ #include "libavutil/x86/cpu.h" #include "libavfilter/yadif.h" -void ff_yadif_filter_line_mmxext(void *dst, void *prev, void *cur, - void *next, int w, int prefs, - int mrefs, int parity, int mode); void ff_yadif_filter_line_sse2(void *dst, void *prev, void *cur, void *next, int w, int prefs, int mrefs, int parity, int mode); @@ -33,9 +30,6 @@ void ff_yadif_filter_line_ssse3(void *dst, void *prev, void *cur, void *next, int w, int prefs, int mrefs, int parity, int mode); -void ff_yadif_filter_line_16bit_mmxext(void *dst, void *prev, void *cur, - void *next, int w, int prefs, - int mrefs, int parity, int mode); void ff_yadif_filter_line_16bit_sse2(void *dst, void *prev, void *cur, void *next, int w, int prefs, int mrefs, int parity, int mode); @@ -46,9 +40,6 @@ void ff_yadif_filter_line_16bit_sse4(void *dst, void *prev, void *cur, void *next, int w, int prefs, int mrefs, int parity, int mode); -void ff_yadif_filter_line_10bit_mmxext(void *dst, void *prev, void *cur, - void *next, int w, int prefs, - int mrefs, int parity, int mode); void ff_yadif_filter_line_10bit_sse2(void *dst, void *prev, void *cur, void *next, int w, int prefs, int mrefs, int parity, int mode); @@ -63,10 +54,6 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif) : yadif->csp->comp[0].depth; if (bit_depth >= 15) { -#if ARCH_X86_32 - if (EXTERNAL_MMXEXT(cpu_flags)) - yadif->filter_line = ff_yadif_filter_line_16bit_mmxext; -#endif /* ARCH_X86_32 */ if (EXTERNAL_SSE2(cpu_flags)) yadif->filter_line = ff_yadif_filter_line_16bit_sse2; if (EXTERNAL_SSSE3(cpu_flags)) @@ -74,19 +61,11 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif) if (EXTERNAL_SSE4(cpu_flags)) yadif->filter_line = ff_yadif_filter_line_16bit_sse4; } else if ( bit_depth >= 9 && bit_depth <= 14) { -#if ARCH_X86_32 - if (EXTERNAL_MMXEXT(cpu_flags)) - yadif->filter_line = ff_yadif_filter_line_10bit_mmxext; -#endif /* ARCH_X86_32 */ if (EXTERNAL_SSE2(cpu_flags)) yadif->filter_line = ff_yadif_filter_line_10bit_sse2; if (EXTERNAL_SSSE3(cpu_flags)) yadif->filter_line = ff_yadif_filter_line_10bit_ssse3; } else { -#if ARCH_X86_32 - if (EXTERNAL_MMXEXT(cpu_flags)) - yadif->filter_line = ff_yadif_filter_line_mmxext; -#endif /* ARCH_X86_32 */ if (EXTERNAL_SSE2(cpu_flags)) yadif->filter_line = ff_yadif_filter_line_sse2; if (EXTERNAL_SSSE3(cpu_flags)) diff --git a/libavfilter/x86/yadif-10.asm b/libavfilter/x86/yadif-10.asm index 8853e0d2c7..c6952db64b 100644 --- a/libavfilter/x86/yadif-10.asm +++ b/libavfilter/x86/yadif-10.asm @@ -249,7 +249,3 @@ INIT_XMM ssse3 YADIF INIT_XMM sse2 YADIF -%if ARCH_X86_32 -INIT_MMX mmxext -YADIF -%endif diff --git a/libavfilter/x86/yadif-16.asm b/libavfilter/x86/yadif-16.asm index 9053b378a5..09cc543d7e 100644 --- a/libavfilter/x86/yadif-16.asm +++ b/libavfilter/x86/yadif-16.asm @@ -287,7 +287,3 @@ INIT_XMM ssse3 YADIF INIT_XMM sse2 YADIF -%if ARCH_X86_32 -INIT_MMX mmxext -YADIF -%endif