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/silk/macros.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/silk/macros.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/macros.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/macros.h b/lib/rbcodec/codecs/libopus/silk/macros.h index 482dc3c6eb..05623b5df8 100644 --- a/lib/rbcodec/codecs/libopus/silk/macros.h +++ b/lib/rbcodec/codecs/libopus/silk/macros.h | |||
@@ -79,17 +79,24 @@ POSSIBILITY OF SUCH DAMAGE. | |||
79 | (( (a) & ((b)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a)-(b)) : \ | 79 | (( (a) & ((b)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a)-(b)) : \ |
80 | ((((a)^0x80000000) & (b) & 0x80000000) ? silk_int32_MAX : (a)-(b)) ) | 80 | ((((a)^0x80000000) & (b) & 0x80000000) ? silk_int32_MAX : (a)-(b)) ) |
81 | 81 | ||
82 | #include "ecintrin.h" | 82 | #if defined(MIPSr1_ASM) |
83 | #include "mips/macros_mipsr1.h" | ||
84 | #endif | ||
83 | 85 | ||
86 | #include "ecintrin.h" | ||
87 | #ifndef OVERRIDE_silk_CLZ16 | ||
84 | static OPUS_INLINE opus_int32 silk_CLZ16(opus_int16 in16) | 88 | static OPUS_INLINE opus_int32 silk_CLZ16(opus_int16 in16) |
85 | { | 89 | { |
86 | return 32 - EC_ILOG(in16<<16|0x8000); | 90 | return 32 - EC_ILOG(in16<<16|0x8000); |
87 | } | 91 | } |
92 | #endif | ||
88 | 93 | ||
94 | #ifndef OVERRIDE_silk_CLZ32 | ||
89 | static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32) | 95 | static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32) |
90 | { | 96 | { |
91 | return in32 ? 32 - EC_ILOG(in32) : 32; | 97 | return in32 ? 32 - EC_ILOG(in32) : 32; |
92 | } | 98 | } |
99 | #endif | ||
93 | 100 | ||
94 | /* Row based */ | 101 | /* Row based */ |
95 | #define matrix_ptr(Matrix_base_adr, row, column, N) \ | 102 | #define matrix_ptr(Matrix_base_adr, row, column, N) \ |