[FFmpeg-cvslog] avcodec/x86/sbrdsp: Remove obsolete SSE function

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Jun 10 20:10:45 2022 +0200| [3d151bab323271f476b21d5d84a8cdd6dc20a760] | committer: Andreas Rheinhardt

avcodec/x86/sbrdsp: Remove obsolete SSE function

x64 always has MMX, MMXEXT, SSE and SSE2 and this means
that some functions for MMX, MMXEXT and 3dnow are always
overridden by other functions (unless one e.g. explicitly
disables SSE2) for x64. So given that the only systems that
benefit from ff_sbr_qmf_deint_bfly_sse are truely ancient 32bit x86s
it is removed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d151bab323271f476b21d5d84a8cdd6dc20a760
---

 libavcodec/x86/sbrdsp.asm    | 16 +---------------
 libavcodec/x86/sbrdsp_init.c |  2 --
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/libavcodec/x86/sbrdsp.asm b/libavcodec/x86/sbrdsp.asm
index 62bbe512ec..87dcdc43ce 100644
--- a/libavcodec/x86/sbrdsp.asm
+++ b/libavcodec/x86/sbrdsp.asm
@@ -251,7 +251,7 @@ cglobal sbr_neg_odd_64, 1,2,4,z
     REP_RET
 
 ; void ff_sbr_qmf_deint_bfly_sse2(float *v, const float *src0, const float *src1)
-%macro SBR_QMF_DEINT_BFLY  0
+INIT_XMM sse2
 cglobal sbr_qmf_deint_bfly, 3,5,8, v,src0,src1,vrev,c
     mov               cq, 64*4-2*mmsize
     lea            vrevq, [vq + 64*4]
@@ -260,17 +260,10 @@ cglobal sbr_qmf_deint_bfly, 3,5,8, v,src0,src1,vrev,c
     mova              m1, [src1q]
     mova              m4, [src0q+cq+mmsize]
     mova              m5, [src1q+mmsize]
-%if cpuflag(sse2)
     pshufd            m2, m0, q0123
     pshufd            m3, m1, q0123
     pshufd            m6, m4, q0123
     pshufd            m7, m5, q0123
-%else
-    shufps            m2, m0, m0, q0123
-    shufps            m3, m1, m1, q0123
-    shufps            m6, m4, m4, q0123
-    shufps            m7, m5, m5, q0123
-%endif
     addps             m5, m2
     subps             m0, m7
     addps             m1, m6
@@ -284,13 +277,6 @@ cglobal sbr_qmf_deint_bfly, 3,5,8, v,src0,src1,vrev,c
     sub               cq, 2*mmsize
     jge            .loop
     REP_RET
-%endmacro
-
-INIT_XMM sse
-SBR_QMF_DEINT_BFLY
-
-INIT_XMM sse2
-SBR_QMF_DEINT_BFLY
 
 INIT_XMM sse2
 cglobal sbr_qmf_pre_shuffle, 1,4,6,z
diff --git a/libavcodec/x86/sbrdsp_init.c b/libavcodec/x86/sbrdsp_init.c
index 6911a1a515..999f681220 100644
--- a/libavcodec/x86/sbrdsp_init.c
+++ b/libavcodec/x86/sbrdsp_init.c
@@ -34,7 +34,6 @@ void ff_sbr_hf_gen_sse(float (*X_high)[2], const float (*X_low)[2],
                        float bw, int start, int end);
 void ff_sbr_neg_odd_64_sse(float *z);
 void ff_sbr_qmf_post_shuffle_sse(float W[32][2], const float *z);
-void ff_sbr_qmf_deint_bfly_sse(float *v, const float *src0, const float *src1);
 void ff_sbr_qmf_deint_bfly_sse2(float *v, const float *src0, const float *src1);
 void ff_sbr_qmf_pre_shuffle_sse2(float *z);
 
@@ -67,7 +66,6 @@ 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;
-        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;
     }