diff mbox series

[FFmpeg-devel,23/41] avcodec/x86/sbrdsp_init: Disable overridden functions on x64

Message ID DB6PR0101MB22144908BA9257ECCD2AD6528FA79@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com
State Superseded
Headers show
Series Stop including superseded functions for x64 | expand


Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt June 9, 2022, 11:55 p.m. UTC
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). This commit therefore disables
ff_sbr_qmf_deint_bfly_sse (which is overridden by an SSE2 function)
at compile-time for x64.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 libavcodec/x86/sbrdsp.asm    | 2 ++
 libavcodec/x86/sbrdsp_init.c | 2 ++
 2 files changed, 4 insertions(+)
diff mbox series


diff --git a/libavcodec/x86/sbrdsp.asm b/libavcodec/x86/sbrdsp.asm
index 62bbe512ec..ea5099a5d1 100644
--- a/libavcodec/x86/sbrdsp.asm
+++ b/libavcodec/x86/sbrdsp.asm
@@ -286,8 +286,10 @@  cglobal sbr_qmf_deint_bfly, 3,5,8, v,src0,src1,vrev,c
+%if ARCH_X86_32
 INIT_XMM sse2
diff --git a/libavcodec/x86/sbrdsp_init.c b/libavcodec/x86/sbrdsp_init.c
index 6911a1a515..a710f10dc1 100644
--- a/libavcodec/x86/sbrdsp_init.c
+++ b/libavcodec/x86/sbrdsp_init.c
@@ -67,7 +67,9 @@  av_cold void ff_sbrdsp_init_x86(SBRDSPContext *s)
         s->hf_g_filt  = ff_sbr_hf_g_filt_sse;
         s->hf_gen     = ff_sbr_hf_gen_sse;
         s->qmf_post_shuffle = ff_sbr_qmf_post_shuffle_sse;
+#if ARCH_X86_32
         s->qmf_deint_bfly   = ff_sbr_qmf_deint_bfly_sse;
         s->qmf_deint_neg    = ff_sbr_qmf_deint_neg_sse;
         s->autocorrelate    = ff_sbr_autocorrelate_sse;