[FFmpeg-devel] [PATCH 04/14] avcodec/mpegaudiodsp: Init dct32 directly

[Andreas Rheinhardt <andreas.rheinhardt@outlook.com>]

This avoids using dct.c and will allow removing it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 configure                     | 1 -
 libavcodec/Makefile           | 3 ++-
 libavcodec/mpegaudiodsp.c     | 6 +-----
 libavcodec/x86/Makefile       | 2 +-
 libavcodec/x86/mpegaudiodsp.c | 6 ++++++
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 28f1753ecb..f64086186c 100755
--- a/configure
+++ b/configure
@@ -2790,7 +2790,6 @@ mdct_select="fft"
 me_cmp_select="idctdsp"
 mpeg_er_select="error_resilience"
 mpegaudio_select="mpegaudiodsp mpegaudioheader"
-mpegaudiodsp_select="dct"
 mpegvideo_select="blockdsp hpeldsp idctdsp videodsp"
 mpegvideodec_select="h264chroma mpegvideo mpeg_er"
 mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index cae2e773a1..0a3a8fcdf9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -134,7 +134,8 @@ OBJS-$(CONFIG_MPEGAUDIO)               += mpegaudio.o mpegaudiodec_common.o \
 OBJS-$(CONFIG_MPEGAUDIODSP)            += mpegaudiodsp.o                \
                                           mpegaudiodsp_data.o           \
                                           mpegaudiodsp_fixed.o          \
-                                          mpegaudiodsp_float.o
+                                          mpegaudiodsp_float.o          \
+                                          dct32_fixed.o dct32_float.o
 OBJS-$(CONFIG_MPEGAUDIOHEADER)         += mpegaudiodecheader.o mpegaudiotabs.o
 OBJS-$(CONFIG_MPEG4AUDIO)              += mpeg4audio.o mpeg4audio_sample_rates.o
 OBJS-$(CONFIG_MPEGVIDEO)               += mpegvideo.o rl.o \
diff --git a/libavcodec/mpegaudiodsp.c b/libavcodec/mpegaudiodsp.c
index 5a5a679d91..0971c28734 100644
--- a/libavcodec/mpegaudiodsp.c
+++ b/libavcodec/mpegaudiodsp.c
@@ -23,7 +23,6 @@
 #include "libavutil/thread.h"
 #include "mpegaudio.h"
 #include "mpegaudiodsp.h"
-#include "dct.h"
 #include "dct32.h"
 
 static AVOnce mpadsp_table_init = AV_ONCE_INIT;
@@ -81,15 +80,12 @@ static av_cold void mpadsp_init_tabs(void)
 
 av_cold void ff_mpadsp_init(MPADSPContext *s)
 {
-    DCTContext dct;
-
-    ff_dct_init(&dct, 5, DCT_II);
     ff_thread_once(&mpadsp_table_init, &mpadsp_init_tabs);
 
     s->apply_window_float = ff_mpadsp_apply_window_float;
     s->apply_window_fixed = ff_mpadsp_apply_window_fixed;
 
-    s->dct32_float = dct.dct32;
+    s->dct32_float = ff_dct32_float;
     s->dct32_fixed = ff_dct32_fixed;
 
     s->imdct36_blocks_float = ff_imdct36_blocks_float;
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index b4cc5e0d08..2ceb88968f 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -126,7 +126,7 @@ X86ASM-OBJS-$(CONFIG_LLVIDDSP)         += x86/lossless_videodsp.o
 X86ASM-OBJS-$(CONFIG_LLVIDENCDSP)      += x86/lossless_videoencdsp.o
 X86ASM-OBJS-$(CONFIG_LPC)              += x86/lpc.o
 X86ASM-OBJS-$(CONFIG_ME_CMP)           += x86/me_cmp.o
-X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP)     += x86/imdct36.o
+X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP)     += x86/dct32.o x86/imdct36.o
 X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC)     += x86/mpegvideoencdsp.o
 X86ASM-OBJS-$(CONFIG_OPUS_DECODER)     += x86/opusdsp.o
 X86ASM-OBJS-$(CONFIG_OPUS_ENCODER)     += x86/celt_pvq_search.o
diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c
index 6586fe0726..43662cd279 100644
--- a/libavcodec/x86/mpegaudiodsp.c
+++ b/libavcodec/x86/mpegaudiodsp.c
@@ -45,6 +45,9 @@ void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win,
 void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win,
                                float *tmpbuf);
 
+void ff_dct32_float_sse2(float *out, const float *in);
+void ff_dct32_float_avx (float *out, const float *in);
+
 DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40];
 
 #if HAVE_6REGS && HAVE_SSE_INLINE
@@ -267,6 +270,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
 #if HAVE_SSE
     if (EXTERNAL_SSE2(cpu_flags)) {
         s->imdct36_blocks_float = imdct36_blocks_sse2;
+        s->dct32_float          = ff_dct32_float_sse2;
     }
     if (EXTERNAL_SSE3(cpu_flags)) {
         s->imdct36_blocks_float = imdct36_blocks_sse3;
@@ -279,6 +283,8 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
     if (EXTERNAL_AVX(cpu_flags)) {
         s->imdct36_blocks_float = imdct36_blocks_avx;
     }
+    if (EXTERNAL_AVX_FAST(cpu_flags))
+        s->dct32_float          = ff_dct32_float_avx;
 #endif
 #endif /* HAVE_X86ASM */
 }
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".