diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-10-09 03:07:06 -0400 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-10-09 03:07:06 -0400 |
commit | 7315b35e13a3a7c504ed6b1fe2d28ad500eb2701 (patch) | |
tree | c6ed1c6869b13c5e2514c3ff7cfda4ce350f3fc8 /celt/mdct.c | |
parent | ca82894ef16bbd74839cb93e35486e5a3b90426d (diff) | |
parent | 317ffc203efc63333fc3b6a42fdb2887321a4325 (diff) | |
download | opus-7315b35e13a3a7c504ed6b1fe2d28ad500eb2701.tar.gz |
Merge branch 'exp_analysis7'
Conflicts:
celt/celt.c
celt/mdct.c
include/opus_defines.h
src/opus_encoder.c
Diffstat (limited to 'celt/mdct.c')
-rw-r--r-- | celt/mdct.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/celt/mdct.c b/celt/mdct.c index 16a36c69..b300b2b5 100644 --- a/celt/mdct.c +++ b/celt/mdct.c @@ -109,12 +109,14 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar int N, N2, N4; kiss_twiddle_scalar sine; VARDECL(kiss_fft_scalar, f); + VARDECL(kiss_fft_scalar, f2); SAVE_STACK; N = l->n; N >>= shift; N2 = N>>1; N4 = N>>2; ALLOC(f, N2, kiss_fft_scalar); + ALLOC(f2, N2, kiss_fft_scalar); /* sin(x) ~= x here */ #ifdef FIXED_POINT sine = TRIG_UPSCALE*(QCONST16(0.7853981f, 15)+N2)/N; @@ -180,12 +182,12 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar } /* N/4 complex FFT, down-scales by 4/N */ - opus_fft(l->kfft[shift], (kiss_fft_cpx *)f, (kiss_fft_cpx *)in); + opus_fft(l->kfft[shift], (kiss_fft_cpx *)f, (kiss_fft_cpx *)f2); /* Post-rotate */ { /* Temp pointers to make it really clear to the compiler what we're doing */ - const kiss_fft_scalar * OPUS_RESTRICT fp = in; + const kiss_fft_scalar * OPUS_RESTRICT fp = f2; kiss_fft_scalar * OPUS_RESTRICT yp1 = out; kiss_fft_scalar * OPUS_RESTRICT yp2 = out+stride*(N2-1); const kiss_twiddle_scalar *t = &l->trig[0]; |