diff options
author | Nils Wallménius <nils@rockbox.org> | 2011-08-28 17:28:44 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2011-08-28 17:28:44 +0000 |
commit | 91ba09b099170cbb4b2249301db1539531dd9367 (patch) | |
tree | b8bb4574a55fa55281f2c95919ddfd76eda154cc /apps/codecs | |
parent | 1be2290bfa77d25f5cea2866f475a43b2853d4f4 (diff) | |
download | rockbox-91ba09b099170cbb4b2249301db1539531dd9367.tar.gz rockbox-91ba09b099170cbb4b2249301db1539531dd9367.zip |
libtremor: comment out some more unused functions, make a function param unsigned to simplify generated code, gives a small speedup on cf.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30372 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/libtremor/bitwise.c | 12 | ||||
-rw-r--r-- | apps/codecs/libtremor/ogg.h | 13 |
2 files changed, 14 insertions, 11 deletions
diff --git a/apps/codecs/libtremor/bitwise.c b/apps/codecs/libtremor/bitwise.c index 2ca3c028a6..040384abc6 100644 --- a/apps/codecs/libtremor/bitwise.c +++ b/apps/codecs/libtremor/bitwise.c | |||
@@ -329,12 +329,12 @@ long oggpackB_look(oggpack_buffer *b,int bits){ | |||
329 | } | 329 | } |
330 | return ((ret&0xffffffff)>>(m>>1))>>((m+1)>>1); | 330 | return ((ret&0xffffffff)>>(m>>1))>>((m+1)>>1); |
331 | } | 331 | } |
332 | #endif | 332 | |
333 | long oggpack_look1(oggpack_buffer *b){ | 333 | long oggpack_look1(oggpack_buffer *b){ |
334 | if(b->endbyte>=b->storage)return(-1); | 334 | if(b->endbyte>=b->storage)return(-1); |
335 | return((b->ptr[0]>>b->endbit)&1); | 335 | return((b->ptr[0]>>b->endbit)&1); |
336 | } | 336 | } |
337 | #if 0 | 337 | |
338 | long oggpackB_look1(oggpack_buffer *b){ | 338 | long oggpackB_look1(oggpack_buffer *b){ |
339 | if(b->endbyte>=b->storage)return(-1); | 339 | if(b->endbyte>=b->storage)return(-1); |
340 | return((b->ptr[0]>>(7-b->endbit))&1); | 340 | return((b->ptr[0]>>(7-b->endbit))&1); |
@@ -361,7 +361,7 @@ void oggpack_adv(oggpack_buffer *b,int bits){ | |||
361 | void oggpackB_adv(oggpack_buffer *b,int bits){ | 361 | void oggpackB_adv(oggpack_buffer *b,int bits){ |
362 | oggpack_adv(b,bits); | 362 | oggpack_adv(b,bits); |
363 | } | 363 | } |
364 | #endif | 364 | |
365 | void oggpack_adv1(oggpack_buffer *b){ | 365 | void oggpack_adv1(oggpack_buffer *b){ |
366 | if(++(b->endbit)>7){ | 366 | if(++(b->endbit)>7){ |
367 | b->endbit=0; | 367 | b->endbit=0; |
@@ -369,7 +369,7 @@ void oggpack_adv1(oggpack_buffer *b){ | |||
369 | b->endbyte++; | 369 | b->endbyte++; |
370 | } | 370 | } |
371 | } | 371 | } |
372 | #if 0 | 372 | |
373 | void oggpackB_adv1(oggpack_buffer *b){ | 373 | void oggpackB_adv1(oggpack_buffer *b){ |
374 | oggpack_adv1(b); | 374 | oggpack_adv1(b); |
375 | } | 375 | } |
@@ -461,7 +461,7 @@ long oggpackB_read(oggpack_buffer *b,int bits){ | |||
461 | b->endbit=1; | 461 | b->endbit=1; |
462 | return -1L; | 462 | return -1L; |
463 | } | 463 | } |
464 | #endif | 464 | |
465 | long oggpack_read1(oggpack_buffer *b){ | 465 | long oggpack_read1(oggpack_buffer *b){ |
466 | long ret; | 466 | long ret; |
467 | 467 | ||
@@ -482,7 +482,7 @@ long oggpack_read1(oggpack_buffer *b){ | |||
482 | b->endbit=1; | 482 | b->endbit=1; |
483 | return -1L; | 483 | return -1L; |
484 | } | 484 | } |
485 | #if 0 | 485 | |
486 | long oggpackB_read1(oggpack_buffer *b){ | 486 | long oggpackB_read1(oggpack_buffer *b){ |
487 | long ret; | 487 | long ret; |
488 | 488 | ||
diff --git a/apps/codecs/libtremor/ogg.h b/apps/codecs/libtremor/ogg.h index dcac0c22dd..3ded7fc113 100644 --- a/apps/codecs/libtremor/ogg.h +++ b/apps/codecs/libtremor/ogg.h | |||
@@ -161,14 +161,15 @@ static inline long oggpack_look(oggpack_buffer *b,int bits){ | |||
161 | } | 161 | } |
162 | return(m&ret); | 162 | return(m&ret); |
163 | } | 163 | } |
164 | 164 | /* | |
165 | extern long oggpack_look1(oggpack_buffer *b); | 165 | extern long oggpack_look1(oggpack_buffer *b); |
166 | extern void oggpack_adv(oggpack_buffer *b,int bits); | ||
167 | */ | ||
166 | 168 | ||
167 | /* extern void oggpack_adv(oggpack_buffer *b,int bits); */ | 169 | static inline void oggpack_adv(oggpack_buffer *b, unsigned int bits){ |
168 | static inline void oggpack_adv(oggpack_buffer *b,int bits){ | ||
169 | bits+=b->endbit; | 170 | bits+=b->endbit; |
170 | 171 | ||
171 | if(b->endbyte > b->storage-((bits+7)>>3)) goto overflow; | 172 | if(b->endbyte > b->storage-(int)((bits+7)>>3)) goto overflow; |
172 | 173 | ||
173 | b->ptr+=bits/8; | 174 | b->ptr+=bits/8; |
174 | b->endbyte+=bits/8; | 175 | b->endbyte+=bits/8; |
@@ -181,10 +182,12 @@ static inline void oggpack_adv(oggpack_buffer *b,int bits){ | |||
181 | b->endbit=1; | 182 | b->endbit=1; |
182 | } | 183 | } |
183 | 184 | ||
185 | /* | ||
184 | extern void oggpack_adv1(oggpack_buffer *b); | 186 | extern void oggpack_adv1(oggpack_buffer *b); |
187 | */ | ||
185 | extern long oggpack_read(oggpack_buffer *b,int bits); | 188 | extern long oggpack_read(oggpack_buffer *b,int bits); |
189 | /* | ||
186 | extern long oggpack_read1(oggpack_buffer *b); | 190 | extern long oggpack_read1(oggpack_buffer *b); |
187 | /* | ||
188 | extern long oggpack_bytes(oggpack_buffer *b); | 191 | extern long oggpack_bytes(oggpack_buffer *b); |
189 | */ | 192 | */ |
190 | static inline long oggpack_bytes(oggpack_buffer *b){ | 193 | static inline long oggpack_bytes(oggpack_buffer *b){ |