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/celt/rate.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/celt/rate.c')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/rate.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/rate.c b/lib/rbcodec/codecs/libopus/celt/rate.c index e13d839d63..f85c3ee63c 100644 --- a/lib/rbcodec/codecs/libopus/celt/rate.c +++ b/lib/rbcodec/codecs/libopus/celt/rate.c | |||
@@ -333,7 +333,7 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end, | |||
333 | /*Figure out how many left-over bits we would be adding to this band. | 333 | /*Figure out how many left-over bits we would be adding to this band. |
334 | This can include bits we've stolen back from higher, skipped bands.*/ | 334 | This can include bits we've stolen back from higher, skipped bands.*/ |
335 | left = total-psum; | 335 | left = total-psum; |
336 | percoeff = left/(m->eBands[codedBands]-m->eBands[start]); | 336 | percoeff = celt_udiv(left, m->eBands[codedBands]-m->eBands[start]); |
337 | left -= (m->eBands[codedBands]-m->eBands[start])*percoeff; | 337 | left -= (m->eBands[codedBands]-m->eBands[start])*percoeff; |
338 | rem = IMAX(left-(m->eBands[j]-m->eBands[start]),0); | 338 | rem = IMAX(left-(m->eBands[j]-m->eBands[start]),0); |
339 | band_width = m->eBands[codedBands]-m->eBands[j]; | 339 | band_width = m->eBands[codedBands]-m->eBands[j]; |
@@ -414,7 +414,7 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end, | |||
414 | 414 | ||
415 | /* Allocate the remaining bits */ | 415 | /* Allocate the remaining bits */ |
416 | left = total-psum; | 416 | left = total-psum; |
417 | percoeff = left/(m->eBands[codedBands]-m->eBands[start]); | 417 | percoeff = celt_udiv(left, m->eBands[codedBands]-m->eBands[start]); |
418 | left -= (m->eBands[codedBands]-m->eBands[start])*percoeff; | 418 | left -= (m->eBands[codedBands]-m->eBands[start])*percoeff; |
419 | for (j=start;j<codedBands;j++) | 419 | for (j=start;j<codedBands;j++) |
420 | bits[j] += ((int)percoeff*(m->eBands[j+1]-m->eBands[j])); | 420 | bits[j] += ((int)percoeff*(m->eBands[j+1]-m->eBands[j])); |
@@ -465,7 +465,8 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end, | |||
465 | offset += NClogN>>3; | 465 | offset += NClogN>>3; |
466 | 466 | ||
467 | /* Divide with rounding */ | 467 | /* Divide with rounding */ |
468 | ebits[j] = IMAX(0, (bits[j] + offset + (den<<(BITRES-1))) / (den<<BITRES)); | 468 | ebits[j] = IMAX(0, (bits[j] + offset + (den<<(BITRES-1)))); |
469 | ebits[j] = celt_udiv(ebits[j], den)>>BITRES; | ||
469 | 470 | ||
470 | /* Make sure not to bust */ | 471 | /* Make sure not to bust */ |
471 | if (C*ebits[j] > (bits[j]>>BITRES)) | 472 | if (C*ebits[j] > (bits[j]>>BITRES)) |