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/pitch.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/pitch.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/pitch.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/pitch.h b/lib/rbcodec/codecs/libopus/celt/pitch.h index df317ecc1d..96dbc0d794 100644 --- a/lib/rbcodec/codecs/libopus/celt/pitch.h +++ b/lib/rbcodec/codecs/libopus/celt/pitch.h | |||
@@ -41,8 +41,12 @@ | |||
41 | #include "x86/pitch_sse.h" | 41 | #include "x86/pitch_sse.h" |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | #if defined(MIPSr1_ASM) | ||
45 | #include "mips/pitch_mipsr1.h" | ||
46 | #endif | ||
47 | |||
44 | #if defined(OPUS_ARM_ASM) && defined(FIXED_POINT) | 48 | #if defined(OPUS_ARM_ASM) && defined(FIXED_POINT) |
45 | # include "arm/pitch_arm.h" | 49 | //# include "arm/pitch_arm.h" |
46 | #endif | 50 | #endif |
47 | 51 | ||
48 | void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x_lp, | 52 | void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x_lp, |
@@ -141,6 +145,18 @@ static OPUS_INLINE void dual_inner_prod(const opus_val16 *x, const opus_val16 *y | |||
141 | } | 145 | } |
142 | #endif | 146 | #endif |
143 | 147 | ||
148 | #ifndef OVERRIDE_CELT_INNER_PROD | ||
149 | static OPUS_INLINE opus_val32 celt_inner_prod(const opus_val16 *x, const opus_val16 *y, | ||
150 | int N) | ||
151 | { | ||
152 | int i; | ||
153 | opus_val32 xy=0; | ||
154 | for (i=0;i<N;i++) | ||
155 | xy = MAC16_16(xy, x[i], y[i]); | ||
156 | return xy; | ||
157 | } | ||
158 | #endif | ||
159 | |||
144 | #ifdef FIXED_POINT | 160 | #ifdef FIXED_POINT |
145 | opus_val32 | 161 | opus_val32 |
146 | #else | 162 | #else |