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/entcode.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/entcode.c')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/entcode.c | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/entcode.c b/lib/rbcodec/codecs/libopus/celt/entcode.c index fa5d7c7c2c..461a36dd55 100644 --- a/lib/rbcodec/codecs/libopus/celt/entcode.c +++ b/lib/rbcodec/codecs/libopus/celt/entcode.c | |||
@@ -62,6 +62,27 @@ int ec_ilog(opus_uint32 _v){ | |||
62 | } | 62 | } |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | #if 1 | ||
66 | /* This is a faster version of ec_tell_frac() that takes advantage | ||
67 | of the low (1/8 bit) resolution to use just a linear function | ||
68 | followed by a lookup to determine the exact transition thresholds. */ | ||
69 | opus_uint32 ec_tell_frac(ec_ctx *_this){ | ||
70 | static const unsigned correction[8] = | ||
71 | {35733, 38967, 42495, 46340, | ||
72 | 50535, 55109, 60097, 65535}; | ||
73 | opus_uint32 nbits; | ||
74 | opus_uint32 r; | ||
75 | int l; | ||
76 | unsigned b; | ||
77 | nbits=_this->nbits_total<<BITRES; | ||
78 | l=EC_ILOG(_this->rng); | ||
79 | r=_this->rng>>(l-16); | ||
80 | b = (r>>12)-8; | ||
81 | b += r>correction[b]; | ||
82 | l = (l<<3)+b; | ||
83 | return nbits-l; | ||
84 | } | ||
85 | #else | ||
65 | opus_uint32 ec_tell_frac(ec_ctx *_this){ | 86 | opus_uint32 ec_tell_frac(ec_ctx *_this){ |
66 | opus_uint32 nbits; | 87 | opus_uint32 nbits; |
67 | opus_uint32 r; | 88 | opus_uint32 r; |
@@ -91,3 +112,42 @@ opus_uint32 ec_tell_frac(ec_ctx *_this){ | |||
91 | } | 112 | } |
92 | return nbits-l; | 113 | return nbits-l; |
93 | } | 114 | } |
115 | #endif | ||
116 | |||
117 | #ifdef USE_SMALL_DIV_TABLE | ||
118 | /* Result of 2^32/(2*i+1), except for i=0. */ | ||
119 | const opus_uint32 SMALL_DIV_TABLE[129] ICONST_ATTR = { | ||
120 | 0xFFFFFFFF, 0x55555555, 0x33333333, 0x24924924, | ||
121 | 0x1C71C71C, 0x1745D174, 0x13B13B13, 0x11111111, | ||
122 | 0x0F0F0F0F, 0x0D79435E, 0x0C30C30C, 0x0B21642C, | ||
123 | 0x0A3D70A3, 0x097B425E, 0x08D3DCB0, 0x08421084, | ||
124 | 0x07C1F07C, 0x07507507, 0x06EB3E45, 0x06906906, | ||
125 | 0x063E7063, 0x05F417D0, 0x05B05B05, 0x0572620A, | ||
126 | 0x05397829, 0x05050505, 0x04D4873E, 0x04A7904A, | ||
127 | 0x047DC11F, 0x0456C797, 0x04325C53, 0x04104104, | ||
128 | 0x03F03F03, 0x03D22635, 0x03B5CC0E, 0x039B0AD1, | ||
129 | 0x0381C0E0, 0x0369D036, 0x03531DEC, 0x033D91D2, | ||
130 | 0x0329161F, 0x03159721, 0x03030303, 0x02F14990, | ||
131 | 0x02E05C0B, 0x02D02D02, 0x02C0B02C, 0x02B1DA46, | ||
132 | 0x02A3A0FD, 0x0295FAD4, 0x0288DF0C, 0x027C4597, | ||
133 | 0x02702702, 0x02647C69, 0x02593F69, 0x024E6A17, | ||
134 | 0x0243F6F0, 0x0239E0D5, 0x02302302, 0x0226B902, | ||
135 | 0x021D9EAD, 0x0214D021, 0x020C49BA, 0x02040810, | ||
136 | 0x01FC07F0, 0x01F44659, 0x01ECC07B, 0x01E573AC, | ||
137 | 0x01DE5D6E, 0x01D77B65, 0x01D0CB58, 0x01CA4B30, | ||
138 | 0x01C3F8F0, 0x01BDD2B8, 0x01B7D6C3, 0x01B20364, | ||
139 | 0x01AC5701, 0x01A6D01A, 0x01A16D3F, 0x019C2D14, | ||
140 | 0x01970E4F, 0x01920FB4, 0x018D3018, 0x01886E5F, | ||
141 | 0x0183C977, 0x017F405F, 0x017AD220, 0x01767DCE, | ||
142 | 0x01724287, 0x016E1F76, 0x016A13CD, 0x01661EC6, | ||
143 | 0x01623FA7, 0x015E75BB, 0x015AC056, 0x01571ED3, | ||
144 | 0x01539094, 0x01501501, 0x014CAB88, 0x0149539E, | ||
145 | 0x01460CBC, 0x0142D662, 0x013FB013, 0x013C995A, | ||
146 | 0x013991C2, 0x013698DF, 0x0133AE45, 0x0130D190, | ||
147 | 0x012E025C, 0x012B404A, 0x01288B01, 0x0125E227, | ||
148 | 0x01234567, 0x0120B470, 0x011E2EF3, 0x011BB4A4, | ||
149 | 0x01194538, 0x0116E068, 0x011485F0, 0x0112358E, | ||
150 | 0x010FEF01, 0x010DB20A, 0x010B7E6E, 0x010953F3, | ||
151 | 0x01073260, 0x0105197F, 0x0103091B, 0x01010101 | ||
152 | }; | ||
153 | #endif | ||