diff options
author | Nils Wallménius <nils@rockbox.org> | 2014-01-19 16:31:59 +0100 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2014-07-13 11:12:40 +0200 |
commit | 9b7ec42403073ee887efc531c153e6b1b6c15bab (patch) | |
tree | 07e72fe9d817c65a6fede22955344a870842d5e6 /lib/rbcodec/codecs/libopus/celt/kiss_fft.h | |
parent | e557951c94c1efa769900257e466900f0ffeb53b (diff) | |
download | rockbox-9b7ec42403073ee887efc531c153e6b1b6c15bab.tar.gz rockbox-9b7ec42403073ee887efc531c153e6b1b6c15bab.zip |
Sync to upstream libopus
Sync to commit bb4b6885a139644cf3ac14e7deda9f633ec2d93c
This brings in a bunch of optimizations to decode speed
and memory usage. Allocations are switched from using
the pseudostack to using the real stack. Enabled hacks
to reduce stack usage.
This should fix crashes on sansa clip, although some
files will not play due to failing allocations in the
codec buffer.
Speeds up decoding of the following test files:
H300 (cf) C200 (arm7tdmi) ipod classic (arm9e)
16 kbps (silk) 14.28 MHz 4.00 MHz 2.61 MHz
64 kbps (celt) 4.09 MHz 8.08 MHz 6.24 MHz
128 kbps (celt) 1.93 MHz 8.83 MHz 6.53 MHz
Change-Id: I851733a8a5824b61feb363a173091bc7e6629b58
Diffstat (limited to 'lib/rbcodec/codecs/libopus/celt/kiss_fft.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/kiss_fft.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/kiss_fft.h b/lib/rbcodec/codecs/libopus/celt/kiss_fft.h index 66cf1f2126..390b54d948 100644 --- a/lib/rbcodec/codecs/libopus/celt/kiss_fft.h +++ b/lib/rbcodec/codecs/libopus/celt/kiss_fft.h | |||
@@ -79,8 +79,9 @@ typedef struct { | |||
79 | 79 | ||
80 | typedef struct kiss_fft_state{ | 80 | typedef struct kiss_fft_state{ |
81 | int nfft; | 81 | int nfft; |
82 | #ifndef FIXED_POINT | 82 | opus_val16 scale; |
83 | kiss_fft_scalar scale; | 83 | #ifdef FIXED_POINT |
84 | int scale_shift; | ||
84 | #endif | 85 | #endif |
85 | int shift; | 86 | int shift; |
86 | opus_int16 factors[2*MAXFACTORS]; | 87 | opus_int16 factors[2*MAXFACTORS]; |
@@ -128,14 +129,10 @@ kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem); | |||
128 | f[k].r and f[k].i | 129 | f[k].r and f[k].i |
129 | * */ | 130 | * */ |
130 | void opus_fft(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); | 131 | void opus_fft(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); |
132 | void opus_ifft(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); | ||
131 | 133 | ||
132 | #if defined(CPU_COLDFIRE) | 134 | void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout); |
133 | #define IFFT_ICODE ICODE_ATTR | 135 | void opus_ifft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout); |
134 | #else | ||
135 | #define IFFT_ICODE | ||
136 | #endif | ||
137 | |||
138 | void opus_ifft(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout) IFFT_ICODE; | ||
139 | 136 | ||
140 | void opus_fft_free(const kiss_fft_state *cfg); | 137 | void opus_fft_free(const kiss_fft_state *cfg); |
141 | 138 | ||