diff options
author | Nils Wallménius <nils@rockbox.org> | 2010-12-06 17:16:45 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2010-12-06 17:16:45 +0000 |
commit | 2aa76d7a1882d268dc01597df03529dd77488888 (patch) | |
tree | ab63eb0b27d083fc966ae5536b2dfcb7227b0fee /apps/codecs | |
parent | c28778fb5a01b9b70a66e460bef5de82a36c2b96 (diff) | |
download | rockbox-2aa76d7a1882d268dc01597df03529dd77488888.tar.gz rockbox-2aa76d7a1882d268dc01597df03529dd77488888.zip |
libtremor: export a libogg function that is now needed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28749 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/libtremor/bitwise.c | 6 | ||||
-rw-r--r-- | apps/codecs/libtremor/ogg.h | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/apps/codecs/libtremor/bitwise.c b/apps/codecs/libtremor/bitwise.c index 050fb67c60..2ca3c028a6 100644 --- a/apps/codecs/libtremor/bitwise.c +++ b/apps/codecs/libtremor/bitwise.c | |||
@@ -503,11 +503,13 @@ long oggpackB_read1(oggpack_buffer *b){ | |||
503 | b->endbit=1; | 503 | b->endbit=1; |
504 | return -1L; | 504 | return -1L; |
505 | } | 505 | } |
506 | 506 | #endif | |
507 | /* moved to ogg.h for inlining | ||
507 | long oggpack_bytes(oggpack_buffer *b){ | 508 | long oggpack_bytes(oggpack_buffer *b){ |
508 | return(b->endbyte+(b->endbit+7)/8); | 509 | return(b->endbyte+(b->endbit+7)/8); |
509 | } | 510 | } |
510 | 511 | */ | |
512 | #if 0 | ||
511 | long oggpack_bits(oggpack_buffer *b){ | 513 | long oggpack_bits(oggpack_buffer *b){ |
512 | return(b->endbyte*8+b->endbit); | 514 | return(b->endbyte*8+b->endbit); |
513 | } | 515 | } |
diff --git a/apps/codecs/libtremor/ogg.h b/apps/codecs/libtremor/ogg.h index da072184b4..1ed08a5387 100644 --- a/apps/codecs/libtremor/ogg.h +++ b/apps/codecs/libtremor/ogg.h | |||
@@ -128,7 +128,7 @@ extern void oggpack_writeclear(oggpack_buffer *b); */ | |||
128 | extern void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes); | 128 | extern void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes); |
129 | /* extern void oggpack_write(oggpack_buffer *b,unsigned long value,int bits); */ | 129 | /* extern void oggpack_write(oggpack_buffer *b,unsigned long value,int bits); */ |
130 | 130 | ||
131 | //extern long oggpack_look(oggpack_buffer *b,int bits); | 131 | /* extern long oggpack_look(oggpack_buffer *b,int bits); */ |
132 | static inline long oggpack_look(oggpack_buffer *b,int bits){ | 132 | static inline long oggpack_look(oggpack_buffer *b,int bits){ |
133 | unsigned long ret; | 133 | unsigned long ret; |
134 | unsigned long m; | 134 | unsigned long m; |
@@ -162,7 +162,7 @@ static inline long oggpack_look(oggpack_buffer *b,int bits){ | |||
162 | 162 | ||
163 | extern long oggpack_look1(oggpack_buffer *b); | 163 | extern long oggpack_look1(oggpack_buffer *b); |
164 | 164 | ||
165 | //extern void oggpack_adv(oggpack_buffer *b,int bits); | 165 | /* extern void oggpack_adv(oggpack_buffer *b,int bits); */ |
166 | static inline void oggpack_adv(oggpack_buffer *b,int bits){ | 166 | static inline void oggpack_adv(oggpack_buffer *b,int bits){ |
167 | bits+=b->endbit; | 167 | bits+=b->endbit; |
168 | 168 | ||
@@ -182,8 +182,11 @@ static inline void oggpack_adv(oggpack_buffer *b,int bits){ | |||
182 | extern void oggpack_adv1(oggpack_buffer *b); | 182 | extern void oggpack_adv1(oggpack_buffer *b); |
183 | extern long oggpack_read(oggpack_buffer *b,int bits); | 183 | extern long oggpack_read(oggpack_buffer *b,int bits); |
184 | extern long oggpack_read1(oggpack_buffer *b); | 184 | extern long oggpack_read1(oggpack_buffer *b); |
185 | /* extern long oggpack_bytes(oggpack_buffer *b); */ | ||
186 | static inline long oggpack_bytes(oggpack_buffer *b){ | ||
187 | return(b->endbyte+(b->endbit+7)/8); | ||
188 | } | ||
185 | #if 0 | 189 | #if 0 |
186 | extern long oggpack_bytes(oggpack_buffer *b); | ||
187 | extern long oggpack_bits(oggpack_buffer *b); | 190 | extern long oggpack_bits(oggpack_buffer *b); |
188 | extern unsigned char *oggpack_get_buffer(oggpack_buffer *b); | 191 | extern unsigned char *oggpack_get_buffer(oggpack_buffer *b); |
189 | 192 | ||