diff options
author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-07-11 21:29:22 +0100 |
---|---|---|
committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-07-11 21:36:48 +0100 |
commit | aef5f9ab05c3acad2cc5d141686a76c974c8927b (patch) | |
tree | cf2ab26f80878ca5c5076e586d10a54d3741cf67 /libavcodec/mdct15.c | |
parent | 02d248d5828dbbfecfb37597c626900f41448bea (diff) | |
download | ffmpeg-aef5f9ab05c3acad2cc5d141686a76c974c8927b.tar.gz |
mdct15: remove redundant scale argument to imdct_half
The only use of that argument was for Opus downmixing which is very rare
and better done after the mdcts.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec/mdct15.c')
-rw-r--r-- | libavcodec/mdct15.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libavcodec/mdct15.c b/libavcodec/mdct15.c index f93881fbed..cc7d833165 100644 --- a/libavcodec/mdct15.c +++ b/libavcodec/mdct15.c @@ -207,7 +207,7 @@ static void mdct15(MDCT15Context *s, float *dst, const float *src, ptrdiff_t str } static void imdct15_half(MDCT15Context *s, float *dst, const float *src, - ptrdiff_t stride, float scale) + ptrdiff_t stride) { FFTComplex fft15in[15]; FFTComplex *z = (FFTComplex *)dst; @@ -230,16 +230,11 @@ static void imdct15_half(MDCT15Context *s, float *dst, const float *src, /* Reindex again, apply twiddles and output */ for (i = 0; i < len8; i++) { - float re0, im0, re1, im1; const int i0 = len8 + i, i1 = len8 - i - 1; const int s0 = s->pfa_postreindex[i0], s1 = s->pfa_postreindex[i1]; - CMUL(re0, im1, s->tmp[s1].im, s->tmp[s1].re, s->twiddle_exptab[i1].im, s->twiddle_exptab[i1].re); - CMUL(re1, im0, s->tmp[s0].im, s->tmp[s0].re, s->twiddle_exptab[i0].im, s->twiddle_exptab[i0].re); - z[i1].re = scale * re0; - z[i1].im = scale * im0; - z[i0].re = scale * re1; - z[i0].im = scale * im1; + CMUL(z[i1].re, z[i0].im, s->tmp[s1].im, s->tmp[s1].re, s->twiddle_exptab[i1].im, s->twiddle_exptab[i1].re); + CMUL(z[i0].re, z[i1].im, s->tmp[s0].im, s->tmp[s0].re, s->twiddle_exptab[i0].im, s->twiddle_exptab[i0].re); } } |