diff options
| author | Diego Biurrun <diego@biurrun.de> | 2015-02-01 11:08:17 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2015-02-02 16:07:33 +0100 |
| commit | 3d5d46233cd81f78138a6d7418d480af04d3f6c8 (patch) | |
| tree | 91f6729566b67ee3baf1df0e695a0c5f32a2f07d /libavcodec/aarch64 | |
| parent | 28df0151b6618226b05ee52e031af0b11ca531b0 (diff) | |
| download | ffmpeg-3d5d46233cd81f78138a6d7418d480af04d3f6c8.tar.gz | |
opus: Factor out imdct15 into a standalone component
It will be reused by the AAC decoder.
Diffstat (limited to 'libavcodec/aarch64')
| -rw-r--r-- | libavcodec/aarch64/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/aarch64/imdct15_init.c (renamed from libavcodec/aarch64/opus_imdct_init.c) | 19 | ||||
| -rw-r--r-- | libavcodec/aarch64/imdct15_neon.S (renamed from libavcodec/aarch64/opus_imdct_neon.S) | 0 |
3 files changed, 12 insertions, 11 deletions
diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index 964428e35d..2afff297dc 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -3,11 +3,11 @@ OBJS-$(CONFIG_H264CHROMA) += aarch64/h264chroma_init_aarch64.o OBJS-$(CONFIG_H264DSP) += aarch64/h264dsp_init_aarch64.o OBJS-$(CONFIG_H264QPEL) += aarch64/h264qpel_init_aarch64.o OBJS-$(CONFIG_HPELDSP) += aarch64/hpeldsp_init_aarch64.o +OBJS-$(CONFIG_IMDCT15) += aarch64/imdct15_init.o OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_init.o OBJS-$(CONFIG_NEON_CLOBBER_TEST) += aarch64/neontest.o OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp_init.o -OBJS-$(CONFIG_OPUS_DECODER) += aarch64/opus_imdct_init.o OBJS-$(CONFIG_RV40_DECODER) += aarch64/rv40dsp_init_aarch64.o OBJS-$(CONFIG_VC1_DECODER) += aarch64/vc1dsp_init_aarch64.o OBJS-$(CONFIG_VORBIS_DECODER) += aarch64/vorbisdsp_init.o @@ -21,8 +21,8 @@ NEON-OBJS-$(CONFIG_H264DSP) += aarch64/h264dsp_neon.o \ NEON-OBJS-$(CONFIG_H264QPEL) += aarch64/h264qpel_neon.o \ aarch64/hpeldsp_neon.o NEON-OBJS-$(CONFIG_HPELDSP) += aarch64/hpeldsp_neon.o +NEON-OBJS-$(CONFIG_IMDCT15) += aarch64/imdct15_neon.o NEON-OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_neon.o NEON-OBJS-$(CONFIG_MDCT) += aarch64/mdct_neon.o -NEON-OBJS-$(CONFIG_OPUS_DECODER) += aarch64/opus_imdct_neon.o NEON-OBJS-$(CONFIG_VORBIS_DECODER) += aarch64/vorbisdsp_neon.o diff --git a/libavcodec/aarch64/opus_imdct_init.c b/libavcodec/aarch64/imdct15_init.c index 1a776dca00..38018f2b4a 100644 --- a/libavcodec/aarch64/opus_imdct_init.c +++ b/libavcodec/aarch64/imdct15_init.c @@ -21,21 +21,22 @@ #include "libavutil/cpu.h" #include "libavutil/aarch64/cpu.h" #include "libavutil/internal.h" -#include "libavcodec/opus_imdct.h" + +#include "libavcodec/imdct15.h" #include "asm-offsets.h" -AV_CHECK_OFFSET(CeltIMDCTContext, exptab, CELT_EXPTAB); -AV_CHECK_OFFSET(CeltIMDCTContext, fft_n, CELT_FFT_N); -AV_CHECK_OFFSET(CeltIMDCTContext, len2, CELT_LEN2); -AV_CHECK_OFFSET(CeltIMDCTContext, len4, CELT_LEN4); -AV_CHECK_OFFSET(CeltIMDCTContext, tmp, CELT_TMP); -AV_CHECK_OFFSET(CeltIMDCTContext, twiddle_exptab, CELT_TWIDDLE); +AV_CHECK_OFFSET(IMDCT15Context, exptab, CELT_EXPTAB); +AV_CHECK_OFFSET(IMDCT15Context, fft_n, CELT_FFT_N); +AV_CHECK_OFFSET(IMDCT15Context, len2, CELT_LEN2); +AV_CHECK_OFFSET(IMDCT15Context, len4, CELT_LEN4); +AV_CHECK_OFFSET(IMDCT15Context, tmp, CELT_TMP); +AV_CHECK_OFFSET(IMDCT15Context, twiddle_exptab, CELT_TWIDDLE); -void ff_celt_imdct_half_neon(CeltIMDCTContext *s, float *dst, const float *src, +void ff_celt_imdct_half_neon(IMDCT15Context *s, float *dst, const float *src, ptrdiff_t stride, float scale); -void ff_celt_imdct_init_aarch64(CeltIMDCTContext *s) +void ff_imdct15_init_aarch64(IMDCT15Context *s) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavcodec/aarch64/opus_imdct_neon.S b/libavcodec/aarch64/imdct15_neon.S index d99edf4108..d99edf4108 100644 --- a/libavcodec/aarch64/opus_imdct_neon.S +++ b/libavcodec/aarch64/imdct15_neon.S |