diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 21:13:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 21:13:53 +0200 |
commit | 30cdf384d143ffdfb95d27191537c3f671741b91 (patch) | |
tree | 3ee3a7c7e8ea25cfc358cf3a68f9aa2966a85de7 /libavcodec/opus_celt.c | |
parent | 91d7d790d176feb120da8b4c85445352492ff3cc (diff) | |
parent | d3f5b94762fb803c0f3b29f9ad6c5eaa813998ba (diff) | |
download | ffmpeg-30cdf384d143ffdfb95d27191537c3f671741b91.tar.gz |
Merge commit 'd3f5b94762fb803c0f3b29f9ad6c5eaa813998ba'
* commit 'd3f5b94762fb803c0f3b29f9ad6c5eaa813998ba':
aarch64: opus NEON iMDCT and FFT
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/opus_celt.c')
-rw-r--r-- | libavcodec/opus_celt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/opus_celt.c b/libavcodec/opus_celt.c index 0a6429ed88..26d15392f2 100644 --- a/libavcodec/opus_celt.c +++ b/libavcodec/opus_celt.c @@ -29,6 +29,7 @@ #include "libavutil/float_dsp.h" #include "opus.h" +#include "opus_imdct.h" enum CeltSpread { CELT_SPREAD_NONE, @@ -2095,8 +2096,8 @@ int ff_celt_decode_frame(CeltContext *s, OpusRangeCoder *rc, for (j = 0; j < s->blocks; j++) { float *dst = frame->buf + 1024 + j * s->blocksize; - ff_celt_imdct_half(imdct, dst + CELT_OVERLAP / 2, s->coeffs[i] + j, - s->blocks, imdct_scale); + imdct->imdct_half(imdct, dst + CELT_OVERLAP / 2, s->coeffs[i] + j, + s->blocks, imdct_scale); s->dsp.vector_fmul_window(dst, dst, dst + CELT_OVERLAP / 2, celt_window, CELT_OVERLAP / 2); } |