From dd61d6489bf27942f8d24b7e31b3b140f1d2f0c6 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 12 Jun 2022 00:11:35 +0200 Subject: [PATCH] swresample/x86/resample: Remove obsolete MMXEXT functions x64 always has MMX, MMXEXT, SSE and SSE2 and this means that some functions for MMX, MMXEXT, SSE and 3dnow are always overridden by other functions (unless one e.g. explicitly disables SSE2). So given that the only systems which benefit from the MMXEXT resamplers (which are overridden by SSE2) are truely ancient 32bit x86s they are removed. Signed-off-by: Andreas Rheinhardt --- libswresample/x86/resample.asm | 5 ----- libswresample/x86/resample_init.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/libswresample/x86/resample.asm b/libswresample/x86/resample.asm index 7107cf9d42..6c3dc28703 100644 --- a/libswresample/x86/resample.asm +++ b/libswresample/x86/resample.asm @@ -594,11 +594,6 @@ INIT_XMM fma4 RESAMPLE_FNS float, 4, 2, s, pf_1 %endif -%if ARCH_X86_32 -INIT_MMX mmxext -RESAMPLE_FNS int16, 2, 1 -%endif - INIT_XMM sse2 RESAMPLE_FNS int16, 2, 1 %if HAVE_XOP_EXTERNAL diff --git a/libswresample/x86/resample_init.c b/libswresample/x86/resample_init.c index 32c080ea4c..d13ccd4833 100644 --- a/libswresample/x86/resample_init.c +++ b/libswresample/x86/resample_init.c @@ -35,7 +35,6 @@ int ff_resample_common_##type##_##opt(ResampleContext *c, void *dst, \ int ff_resample_linear_##type##_##opt(ResampleContext *c, void *dst, \ const void *src, int sz, int upd) -RESAMPLE_FUNCS(int16, mmxext); RESAMPLE_FUNCS(int16, sse2); RESAMPLE_FUNCS(int16, xop); RESAMPLE_FUNCS(float, sse); @@ -52,10 +51,6 @@ av_cold void swri_resample_dsp_x86_init(ResampleContext *c) switch(c->format){ case AV_SAMPLE_FMT_S16P: - if (ARCH_X86_32 && EXTERNAL_MMXEXT(mm_flags)) { - c->dsp.resample_linear = ff_resample_linear_int16_mmxext; - c->dsp.resample_common = ff_resample_common_int16_mmxext; - } if (EXTERNAL_SSE2(mm_flags)) { c->dsp.resample_linear = ff_resample_linear_int16_sse2; c->dsp.resample_common = ff_resample_common_int16_sse2;