summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/libopus/silk/shell_coder.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2014-01-19 16:31:59 +0100
committerNils Wallménius <nils@rockbox.org>2014-07-13 11:12:40 +0200
commit9b7ec42403073ee887efc531c153e6b1b6c15bab (patch)
tree07e72fe9d817c65a6fede22955344a870842d5e6 /lib/rbcodec/codecs/libopus/silk/shell_coder.c
parente557951c94c1efa769900257e466900f0ffeb53b (diff)
downloadrockbox-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/shell_coder.c')
-rw-r--r--lib/rbcodec/codecs/libopus/silk/shell_coder.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/shell_coder.c b/lib/rbcodec/codecs/libopus/silk/shell_coder.c
index 9d6e1bb366..d80dd51f9e 100644
--- a/lib/rbcodec/codecs/libopus/silk/shell_coder.c
+++ b/lib/rbcodec/codecs/libopus/silk/shell_coder.c
@@ -60,8 +60,8 @@ static OPUS_INLINE void encode_split(
60#endif 60#endif
61 61
62static OPUS_INLINE void decode_split( 62static OPUS_INLINE void decode_split(
63 opus_int *p_child1, /* O pulse amplitude of first child subframe */ 63 opus_int16 *p_child1, /* O pulse amplitude of first child subframe */
64 opus_int *p_child2, /* O pulse amplitude of second child subframe */ 64 opus_int16 *p_child2, /* O pulse amplitude of second child subframe */
65 ec_dec *psRangeDec, /* I/O Compressor data structure */ 65 ec_dec *psRangeDec, /* I/O Compressor data structure */
66 const opus_int p, /* I pulse amplitude of current subframe */ 66 const opus_int p, /* I pulse amplitude of current subframe */
67 const opus_uint8 *shell_table /* I table of shell cdfs */ 67 const opus_uint8 *shell_table /* I table of shell cdfs */
@@ -121,12 +121,12 @@ void silk_shell_encoder(
121 121
122/* Shell decoder, operates on one shell code frame of 16 pulses */ 122/* Shell decoder, operates on one shell code frame of 16 pulses */
123void silk_shell_decoder( 123void silk_shell_decoder(
124 opus_int *pulses0, /* O data: nonnegative pulse amplitudes */ 124 opus_int16 *pulses0, /* O data: nonnegative pulse amplitudes */
125 ec_dec *psRangeDec, /* I/O Compressor data structure */ 125 ec_dec *psRangeDec, /* I/O Compressor data structure */
126 const opus_int pulses4 /* I number of pulses per pulse-subframe */ 126 const opus_int pulses4 /* I number of pulses per pulse-subframe */
127) 127)
128{ 128{
129 opus_int pulses3[ 2 ], pulses2[ 4 ], pulses1[ 8 ]; 129 opus_int16 pulses3[ 2 ], pulses2[ 4 ], pulses1[ 8 ];
130 130
131 /* this function operates on one shell code frame of 16 pulses */ 131 /* this function operates on one shell code frame of 16 pulses */
132 silk_assert( SHELL_CODEC_FRAME_LENGTH == 16 ); 132 silk_assert( SHELL_CODEC_FRAME_LENGTH == 16 );