This avoids using dct.c and will allow removing it.
Unified · Split
| @@ -2790,7 +2790,6 @@ mdct_select="fft" · 2789 unmodified lines | |||
| 2790 | me_cmp_select="idctdsp" | 2790 | me_cmp_select="idctdsp" |
| 2791 | mpeg_er_select="error_resilience" | 2791 | mpeg_er_select="error_resilience" |
| 2792 | mpegaudio_select="mpegaudiodsp mpegaudioheader" | 2792 | mpegaudio_select="mpegaudiodsp mpegaudioheader" |
| 2793 | mpegaudiodsp_select="dct" | ||
| 2794 | mpegvideo_select="blockdsp hpeldsp idctdsp videodsp" | 2793 | mpegvideo_select="blockdsp hpeldsp idctdsp videodsp" |
| 2795 | mpegvideodec_select="h264chroma mpegvideo mpeg_er" | 2794 | mpegvideodec_select="h264chroma mpegvideo mpeg_er" |
| 2796 | mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp" | 2795 | mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp" |
| @@ -134,7 +134,8 @@ OBJS-$(CONFIG_MPEGAUDIO) += mpegaudio.o mpegaudiodec_common.o \ · 133 unmodified lines | |||
| 134 | OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ | 134 | OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ |
| 135 | mpegaudiodsp_data.o \ | 135 | mpegaudiodsp_data.o \ |
| 136 | mpegaudiodsp_fixed.o \ | 136 | mpegaudiodsp_fixed.o \ |
| 137 | mpegaudiodsp_float.o | 137 | mpegaudiodsp_float.o \ |
| 138 | dct32_fixed.o dct32_float.o | ||
| 138 | OBJS-$(CONFIG_MPEGAUDIOHEADER) += mpegaudiodecheader.o mpegaudiotabs.o | 139 | OBJS-$(CONFIG_MPEGAUDIOHEADER) += mpegaudiodecheader.o mpegaudiotabs.o |
| 139 | OBJS-$(CONFIG_MPEG4AUDIO) += mpeg4audio.o mpeg4audio_sample_rates.o | 140 | OBJS-$(CONFIG_MPEG4AUDIO) += mpeg4audio.o mpeg4audio_sample_rates.o |
| 140 | OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o rl.o \ | 141 | OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o rl.o \ |
| @@ -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 | ||
| 29 | static AVOnce mpadsp_table_init = AV_ONCE_INIT; | 28 | static AVOnce mpadsp_table_init = AV_ONCE_INIT; |
| @@ -81,15 +80,12 @@ static av_cold void mpadsp_init_tabs(void) · 51 unmodified lines | |||
| 81 | 80 | ||
| 82 | av_cold void ff_mpadsp_init(MPADSPContext *s) | 81 | av_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; |
| @@ -126,7 +126,7 @@ X86ASM-OBJS-$(CONFIG_LLVIDDSP) += x86/lossless_videodsp.o · 125 unmodified lines | |||
| 126 | X86ASM-OBJS-$(CONFIG_LLVIDENCDSP) += x86/lossless_videoencdsp.o | 126 | X86ASM-OBJS-$(CONFIG_LLVIDENCDSP) += x86/lossless_videoencdsp.o |
| 127 | X86ASM-OBJS-$(CONFIG_LPC) += x86/lpc.o | 127 | X86ASM-OBJS-$(CONFIG_LPC) += x86/lpc.o |
| 128 | X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o | 128 | X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o |
| 129 | X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o | 129 | X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/dct32.o x86/imdct36.o |
| 130 | X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o | 130 | X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o |
| 131 | X86ASM-OBJS-$(CONFIG_OPUS_DECODER) += x86/opusdsp.o | 131 | X86ASM-OBJS-$(CONFIG_OPUS_DECODER) += x86/opusdsp.o |
| 132 | X86ASM-OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_search.o | 132 | X86ASM-OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_search.o |
| @@ -45,6 +45,9 @@ void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win, · 44 unmodified lines | |||
| 45 | void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win, | 45 | void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win, |
| 46 | float *tmpbuf); | 46 | float *tmpbuf); |
| 47 | 47 | ||
| 48 | void ff_dct32_float_sse2(float *out, const float *in); | ||
| 49 | void ff_dct32_float_avx (float *out, const float *in); | ||
| 50 | |||
| 48 | DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40]; | 51 | DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40]; |
| 49 | 52 | ||
| 50 | #if HAVE_6REGS && HAVE_SSE_INLINE | 53 | #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_SSE | 270 | #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 | #endif | 288 | #endif |
| 283 | #endif /* HAVE_X86ASM */ | 289 | #endif /* HAVE_X86ASM */ |
| 284 | } | 290 | } |