History

avcodec/mpegaudiodsp: Init dct32 directly

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

Andreas Rheinhardt committed 3 years ago

Commit d9464f31 parent 145db385 files · +10 −8Browse files

Unified · Split

5 files
  1. configure +0 −1
  2. libavcodec/Makefile +2 −1
  3. libavcodec/mpegaudiodsp.c +1 −5
  4. libavcodec/x86/Makefile +1 −1
  5. libavcodec/x86/mpegaudiodsp.c +6 −0
configure+0−1
@@ -2790,7 +2790,6 @@ mdct_select="fft" · 2789 unmodified lines
2790me_cmp_select="idctdsp"2790me_cmp_select="idctdsp"
2791mpeg_er_select="error_resilience"2791mpeg_er_select="error_resilience"
2792mpegaudio_select="mpegaudiodsp mpegaudioheader"2792mpegaudio_select="mpegaudiodsp mpegaudioheader"
2793mpegaudiodsp_select="dct"
2794mpegvideo_select="blockdsp hpeldsp idctdsp videodsp"2793mpegvideo_select="blockdsp hpeldsp idctdsp videodsp"
2795mpegvideodec_select="h264chroma mpegvideo mpeg_er"2794mpegvideodec_select="h264chroma mpegvideo mpeg_er"
2796mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp"2795mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp"
libavcodec/Makefile+2−1
@@ -134,7 +134,8 @@ OBJS-$(CONFIG_MPEGAUDIO) += mpegaudio.o mpegaudiodec_common.o \ · 133 unmodified lines
134OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \134OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \
135 mpegaudiodsp_data.o \135 mpegaudiodsp_data.o \
136 mpegaudiodsp_fixed.o \136 mpegaudiodsp_fixed.o \
137 mpegaudiodsp_float.o137 mpegaudiodsp_float.o \
138 dct32_fixed.o dct32_float.o
138OBJS-$(CONFIG_MPEGAUDIOHEADER) += mpegaudiodecheader.o mpegaudiotabs.o139OBJS-$(CONFIG_MPEGAUDIOHEADER) += mpegaudiodecheader.o mpegaudiotabs.o
139OBJS-$(CONFIG_MPEG4AUDIO) += mpeg4audio.o mpeg4audio_sample_rates.o140OBJS-$(CONFIG_MPEG4AUDIO) += mpeg4audio.o mpeg4audio_sample_rates.o
140OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o rl.o \141OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o rl.o \
libavcodec/mpegaudiodsp.c+1−5
@@ -23,7 +23,6 @@ · 22 unmodified lines
23#include "libavutil/thread.h"23#include "libavutil/thread.h"
24#include "mpegaudio.h"24#include "mpegaudio.h"
25#include "mpegaudiodsp.h"25#include "mpegaudiodsp.h"
26#include "dct.h"
27#include "dct32.h"26#include "dct32.h"
28 27
29static AVOnce mpadsp_table_init = AV_ONCE_INIT;28static AVOnce mpadsp_table_init = AV_ONCE_INIT;
@@ -81,15 +80,12 @@ static av_cold void mpadsp_init_tabs(void) · 51 unmodified lines
81 80
82av_cold void ff_mpadsp_init(MPADSPContext *s)81av_cold void ff_mpadsp_init(MPADSPContext *s)
83{82{
84 DCTContext dct;
85
86 ff_dct_init(&dct, 5, DCT_II);
87 ff_thread_once(&mpadsp_table_init, &mpadsp_init_tabs);83 ff_thread_once(&mpadsp_table_init, &mpadsp_init_tabs);
88 84
89 s->apply_window_float = ff_mpadsp_apply_window_float;85 s->apply_window_float = ff_mpadsp_apply_window_float;
90 s->apply_window_fixed = ff_mpadsp_apply_window_fixed;86 s->apply_window_fixed = ff_mpadsp_apply_window_fixed;
91 87
92 s->dct32_float = dct.dct32;88 s->dct32_float = ff_dct32_float;
93 s->dct32_fixed = ff_dct32_fixed;89 s->dct32_fixed = ff_dct32_fixed;
94 90
95 s->imdct36_blocks_float = ff_imdct36_blocks_float;91 s->imdct36_blocks_float = ff_imdct36_blocks_float;
libavcodec/x86/Makefile+1−1
@@ -126,7 +126,7 @@ X86ASM-OBJS-$(CONFIG_LLVIDDSP) += x86/lossless_videodsp.o · 125 unmodified lines
126X86ASM-OBJS-$(CONFIG_LLVIDENCDSP) += x86/lossless_videoencdsp.o126X86ASM-OBJS-$(CONFIG_LLVIDENCDSP) += x86/lossless_videoencdsp.o
127X86ASM-OBJS-$(CONFIG_LPC) += x86/lpc.o127X86ASM-OBJS-$(CONFIG_LPC) += x86/lpc.o
128X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o128X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o
129X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o129X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/dct32.o x86/imdct36.o
130X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o130X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o
131X86ASM-OBJS-$(CONFIG_OPUS_DECODER) += x86/opusdsp.o131X86ASM-OBJS-$(CONFIG_OPUS_DECODER) += x86/opusdsp.o
132X86ASM-OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_search.o132X86ASM-OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_search.o
libavcodec/x86/mpegaudiodsp.c+6−0
@@ -45,6 +45,9 @@ void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win, · 44 unmodified lines
45void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win,45void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win,
46 float *tmpbuf);46 float *tmpbuf);
47 47
48void ff_dct32_float_sse2(float *out, const float *in);
49void ff_dct32_float_avx (float *out, const float *in);
50
48DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40];51DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40];
49 52
50#if HAVE_6REGS && HAVE_SSE_INLINE53#if HAVE_6REGS && HAVE_SSE_INLINE
@@ -267,6 +270,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s) · 216 unmodified lines
267#if HAVE_SSE270#if HAVE_SSE
268 if (EXTERNAL_SSE2(cpu_flags)) {271 if (EXTERNAL_SSE2(cpu_flags)) {
269 s->imdct36_blocks_float = imdct36_blocks_sse2;272 s->imdct36_blocks_float = imdct36_blocks_sse2;
273 s->dct32_float = ff_dct32_float_sse2;
270 }274 }
271 if (EXTERNAL_SSE3(cpu_flags)) {275 if (EXTERNAL_SSE3(cpu_flags)) {
272 s->imdct36_blocks_float = imdct36_blocks_sse3;276 s->imdct36_blocks_float = imdct36_blocks_sse3;
@@ -279,6 +283,8 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s) · 6 unmodified lines
279 if (EXTERNAL_AVX(cpu_flags)) {283 if (EXTERNAL_AVX(cpu_flags)) {
280 s->imdct36_blocks_float = imdct36_blocks_avx;284 s->imdct36_blocks_float = imdct36_blocks_avx;
281 }285 }
286 if (EXTERNAL_AVX_FAST(cpu_flags))
287 s->dct32_float = ff_dct32_float_avx;
282#endif288#endif
283#endif /* HAVE_X86ASM */289#endif /* HAVE_X86ASM */
284}290}

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t