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/decode_pulses.c | |
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/decode_pulses.c')
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/decode_pulses.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/decode_pulses.c b/lib/rbcodec/codecs/libopus/silk/decode_pulses.c index e8a87c2ab7..1e14bc37b4 100644 --- a/lib/rbcodec/codecs/libopus/silk/decode_pulses.c +++ b/lib/rbcodec/codecs/libopus/silk/decode_pulses.c | |||
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
36 | /*********************************************/ | 36 | /*********************************************/ |
37 | void silk_decode_pulses( | 37 | void silk_decode_pulses( |
38 | ec_dec *psRangeDec, /* I/O Compressor data structure */ | 38 | ec_dec *psRangeDec, /* I/O Compressor data structure */ |
39 | opus_int pulses[], /* O Excitation signal */ | 39 | opus_int16 pulses[], /* O Excitation signal */ |
40 | const opus_int signalType, /* I Sigtype */ | 40 | const opus_int signalType, /* I Sigtype */ |
41 | const opus_int quantOffsetType, /* I quantOffsetType */ | 41 | const opus_int quantOffsetType, /* I quantOffsetType */ |
42 | const opus_int frame_length /* I Frame length */ | 42 | const opus_int frame_length /* I Frame length */ |
@@ -44,7 +44,7 @@ void silk_decode_pulses( | |||
44 | { | 44 | { |
45 | opus_int i, j, k, iter, abs_q, nLS, RateLevelIndex; | 45 | opus_int i, j, k, iter, abs_q, nLS, RateLevelIndex; |
46 | opus_int sum_pulses[ MAX_NB_SHELL_BLOCKS ], nLshifts[ MAX_NB_SHELL_BLOCKS ]; | 46 | opus_int sum_pulses[ MAX_NB_SHELL_BLOCKS ], nLshifts[ MAX_NB_SHELL_BLOCKS ]; |
47 | opus_int *pulses_ptr; | 47 | opus_int16 *pulses_ptr; |
48 | const opus_uint8 *cdf_ptr; | 48 | const opus_uint8 *cdf_ptr; |
49 | 49 | ||
50 | /*********************/ | 50 | /*********************/ |
@@ -84,7 +84,7 @@ void silk_decode_pulses( | |||
84 | if( sum_pulses[ i ] > 0 ) { | 84 | if( sum_pulses[ i ] > 0 ) { |
85 | silk_shell_decoder( &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ], psRangeDec, sum_pulses[ i ] ); | 85 | silk_shell_decoder( &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ], psRangeDec, sum_pulses[ i ] ); |
86 | } else { | 86 | } else { |
87 | silk_memset( &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ], 0, SHELL_CODEC_FRAME_LENGTH * sizeof( opus_int ) ); | 87 | silk_memset( &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ], 0, SHELL_CODEC_FRAME_LENGTH * sizeof( pulses[0] ) ); |
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||