summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/libopus/opus.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/opus.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/opus.c')
-rw-r--r--lib/rbcodec/codecs/libopus/opus.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/lib/rbcodec/codecs/libopus/opus.c b/lib/rbcodec/codecs/libopus/opus.c
index 989c6537cb..0526f8b414 100644
--- a/lib/rbcodec/codecs/libopus/opus.c
+++ b/lib/rbcodec/codecs/libopus/opus.c
@@ -168,6 +168,27 @@ static int parse_size(const unsigned char *data, opus_int32 len, opus_int16 *siz
168 } 168 }
169} 169}
170 170
171int opus_packet_get_samples_per_frame(const unsigned char *data,
172 opus_int32 Fs)
173{
174 int audiosize;
175 if (data[0]&0x80)
176 {
177 audiosize = ((data[0]>>3)&0x3);
178 audiosize = (Fs<<audiosize)/400;
179 } else if ((data[0]&0x60) == 0x60)
180 {
181 audiosize = (data[0]&0x08) ? Fs/50 : Fs/100;
182 } else {
183 audiosize = ((data[0]>>3)&0x3);
184 if (audiosize == 3)
185 audiosize = Fs*60/1000;
186 else
187 audiosize = (Fs<<audiosize)/100;
188 }
189 return audiosize;
190}
191
171int opus_packet_parse_impl(const unsigned char *data, opus_int32 len, 192int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
172 int self_delimited, unsigned char *out_toc, 193 int self_delimited, unsigned char *out_toc,
173 const unsigned char *frames[48], opus_int16 size[48], 194 const unsigned char *frames[48], opus_int16 size[48],