summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/libopus/silk/main.h
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/main.h
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/main.h')
-rw-r--r--lib/rbcodec/codecs/libopus/silk/main.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/main.h b/lib/rbcodec/codecs/libopus/silk/main.h
index 2bdf89784d..77524f5b57 100644
--- a/lib/rbcodec/codecs/libopus/silk/main.h
+++ b/lib/rbcodec/codecs/libopus/silk/main.h
@@ -116,7 +116,7 @@ void silk_encode_signs(
116/* Decodes signs of excitation */ 116/* Decodes signs of excitation */
117void silk_decode_signs( 117void silk_decode_signs(
118 ec_dec *psRangeDec, /* I/O Compressor data structure */ 118 ec_dec *psRangeDec, /* I/O Compressor data structure */
119 opus_int pulses[], /* I/O pulse signal */ 119 opus_int16 pulses[], /* I/O pulse signal */
120 opus_int length, /* I length of input */ 120 opus_int length, /* I length of input */
121 const opus_int signalType, /* I Signal type */ 121 const opus_int signalType, /* I Signal type */
122 const opus_int quantOffsetType, /* I Quantization offset type */ 122 const opus_int quantOffsetType, /* I Quantization offset type */
@@ -161,7 +161,7 @@ void silk_shell_encoder(
161 161
162/* Shell decoder, operates on one shell code frame of 16 pulses */ 162/* Shell decoder, operates on one shell code frame of 16 pulses */
163void silk_shell_decoder( 163void silk_shell_decoder(
164 opus_int *pulses0, /* O data: nonnegative pulse amplitudes */ 164 opus_int16 *pulses0, /* O data: nonnegative pulse amplitudes */
165 ec_dec *psRangeDec, /* I/O Compressor data structure */ 165 ec_dec *psRangeDec, /* I/O Compressor data structure */
166 const opus_int pulses4 /* I number of pulses per pulse-subframe */ 166 const opus_int pulses4 /* I number of pulses per pulse-subframe */
167); 167);
@@ -397,13 +397,13 @@ void silk_decode_core(
397 silk_decoder_state *psDec, /* I/O Decoder state */ 397 silk_decoder_state *psDec, /* I/O Decoder state */
398 silk_decoder_control *psDecCtrl, /* I Decoder control */ 398 silk_decoder_control *psDecCtrl, /* I Decoder control */
399 opus_int16 xq[], /* O Decoded speech */ 399 opus_int16 xq[], /* O Decoded speech */
400 const opus_int pulses[ MAX_FRAME_LENGTH ] /* I Pulse signal */ 400 const opus_int16 pulses[ MAX_FRAME_LENGTH ] /* I Pulse signal */
401); 401);
402 402
403/* Decode quantization indices of excitation (Shell coding) */ 403/* Decode quantization indices of excitation (Shell coding) */
404void silk_decode_pulses( 404void silk_decode_pulses(
405 ec_dec *psRangeDec, /* I/O Compressor data structure */ 405 ec_dec *psRangeDec, /* I/O Compressor data structure */
406 opus_int pulses[], /* O Excitation signal */ 406 opus_int16 pulses[], /* O Excitation signal */
407 const opus_int signalType, /* I Sigtype */ 407 const opus_int signalType, /* I Sigtype */
408 const opus_int quantOffsetType, /* I quantOffsetType */ 408 const opus_int quantOffsetType, /* I quantOffsetType */
409 const opus_int frame_length /* I Frame length */ 409 const opus_int frame_length /* I Frame length */