diff options
author | Nils Wallménius <nils@rockbox.org> | 2011-06-02 20:52:54 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2011-06-02 20:52:54 +0000 |
commit | 73d0e14f4494b98e0c781934fbf19efa8d6d8418 (patch) | |
tree | cd3a80eb069dc81178a5b50020356c741116f103 /apps/codecs/libspeex/bits.c | |
parent | d860c878003142128f7beb3e38dae38007822364 (diff) | |
download | rockbox-73d0e14f4494b98e0c781934fbf19efa8d6d8418.tar.gz rockbox-73d0e14f4494b98e0c781934fbf19efa8d6d8418.zip |
Disable some unused code in speex to save binsize.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29949 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libspeex/bits.c')
-rw-r--r-- | apps/codecs/libspeex/bits.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/apps/codecs/libspeex/bits.c b/apps/codecs/libspeex/bits.c index cc63ce0d16..c7a5c14ede 100644 --- a/apps/codecs/libspeex/bits.c +++ b/apps/codecs/libspeex/bits.c | |||
@@ -60,6 +60,8 @@ void speex_bits_init(SpeexBits *bits) | |||
60 | } | 60 | } |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | #if 0 | ||
64 | /* Rockbox: unused */ | ||
63 | void speex_bits_init_buffer(SpeexBits *bits, void *buff, int buf_size) | 65 | void speex_bits_init_buffer(SpeexBits *bits, void *buff, int buf_size) |
64 | { | 66 | { |
65 | bits->chars = (char*)buff; | 67 | bits->chars = (char*)buff; |
@@ -69,6 +71,7 @@ void speex_bits_init_buffer(SpeexBits *bits, void *buff, int buf_size) | |||
69 | 71 | ||
70 | speex_bits_reset(bits); | 72 | speex_bits_reset(bits); |
71 | } | 73 | } |
74 | #endif | ||
72 | 75 | ||
73 | void speex_bits_set_bit_buffer(SpeexBits *bits, void *buff, int buf_size) | 76 | void speex_bits_set_bit_buffer(SpeexBits *bits, void *buff, int buf_size) |
74 | { | 77 | { |
@@ -93,6 +96,7 @@ void speex_bits_destroy(SpeexBits *bits) | |||
93 | } | 96 | } |
94 | #endif | 97 | #endif |
95 | 98 | ||
99 | #ifdef ROCKBOX_VOICE_ENCODER | ||
96 | void speex_bits_reset(SpeexBits *bits) | 100 | void speex_bits_reset(SpeexBits *bits) |
97 | { | 101 | { |
98 | /* We only need to clear the first byte now */ | 102 | /* We only need to clear the first byte now */ |
@@ -102,13 +106,17 @@ void speex_bits_reset(SpeexBits *bits) | |||
102 | bits->bitPtr=0; | 106 | bits->bitPtr=0; |
103 | bits->overflow=0; | 107 | bits->overflow=0; |
104 | } | 108 | } |
109 | #endif | ||
105 | 110 | ||
111 | #if 0 | ||
112 | /* Rockbox: unused */ | ||
106 | void speex_bits_rewind(SpeexBits *bits) | 113 | void speex_bits_rewind(SpeexBits *bits) |
107 | { | 114 | { |
108 | bits->charPtr=0; | 115 | bits->charPtr=0; |
109 | bits->bitPtr=0; | 116 | bits->bitPtr=0; |
110 | bits->overflow=0; | 117 | bits->overflow=0; |
111 | } | 118 | } |
119 | #endif | ||
112 | 120 | ||
113 | #if !defined(SPEEX_VOICE_ENCODER) && !defined(ROCKBOX_VOICE_CODEC) | 121 | #if !defined(SPEEX_VOICE_ENCODER) && !defined(ROCKBOX_VOICE_CODEC) |
114 | void speex_bits_read_from(SpeexBits *bits, char *chars, int len) | 122 | void speex_bits_read_from(SpeexBits *bits, char *chars, int len) |
@@ -277,6 +285,8 @@ void speex_bits_pack(SpeexBits *bits, int data, int nbBits) | |||
277 | } | 285 | } |
278 | #endif /* SPEEX_DISABLE_ENCODER */ | 286 | #endif /* SPEEX_DISABLE_ENCODER */ |
279 | 287 | ||
288 | #if 0 | ||
289 | /* Rockbox: unused */ | ||
280 | int speex_bits_unpack_signed(SpeexBits *bits, int nbBits) | 290 | int speex_bits_unpack_signed(SpeexBits *bits, int nbBits) |
281 | { | 291 | { |
282 | unsigned int d=speex_bits_unpack_unsigned(bits,nbBits); | 292 | unsigned int d=speex_bits_unpack_unsigned(bits,nbBits); |
@@ -287,6 +297,7 @@ int speex_bits_unpack_signed(SpeexBits *bits, int nbBits) | |||
287 | } | 297 | } |
288 | return d; | 298 | return d; |
289 | } | 299 | } |
300 | #endif | ||
290 | 301 | ||
291 | unsigned int speex_bits_unpack_unsigned(SpeexBits *bits, int nbBits) | 302 | unsigned int speex_bits_unpack_unsigned(SpeexBits *bits, int nbBits) |
292 | { | 303 | { |
@@ -310,6 +321,8 @@ unsigned int speex_bits_unpack_unsigned(SpeexBits *bits, int nbBits) | |||
310 | return d; | 321 | return d; |
311 | } | 322 | } |
312 | 323 | ||
324 | #if 0 | ||
325 | /* Rockbox: unused */ | ||
313 | unsigned int speex_bits_peek_unsigned(SpeexBits *bits, int nbBits) | 326 | unsigned int speex_bits_peek_unsigned(SpeexBits *bits, int nbBits) |
314 | { | 327 | { |
315 | unsigned int d=0; | 328 | unsigned int d=0; |
@@ -338,6 +351,7 @@ unsigned int speex_bits_peek_unsigned(SpeexBits *bits, int nbBits) | |||
338 | } | 351 | } |
339 | return d; | 352 | return d; |
340 | } | 353 | } |
354 | #endif | ||
341 | 355 | ||
342 | int speex_bits_peek(SpeexBits *bits) | 356 | int speex_bits_peek(SpeexBits *bits) |
343 | { | 357 | { |
@@ -366,10 +380,13 @@ int speex_bits_remaining(SpeexBits *bits) | |||
366 | return bits->nbBits-((bits->charPtr<<LOG2_BITS_PER_CHAR)+bits->bitPtr); | 380 | return bits->nbBits-((bits->charPtr<<LOG2_BITS_PER_CHAR)+bits->bitPtr); |
367 | } | 381 | } |
368 | 382 | ||
383 | #if 0 | ||
384 | /* Rockbox: unused */ | ||
369 | int speex_bits_nbytes(SpeexBits *bits) | 385 | int speex_bits_nbytes(SpeexBits *bits) |
370 | { | 386 | { |
371 | return ((bits->nbBits+BITS_PER_CHAR-1)>>LOG2_BITS_PER_CHAR); | 387 | return ((bits->nbBits+BITS_PER_CHAR-1)>>LOG2_BITS_PER_CHAR); |
372 | } | 388 | } |
389 | #endif | ||
373 | 390 | ||
374 | #ifndef SPEEX_DISABLE_ENCODER | 391 | #ifndef SPEEX_DISABLE_ENCODER |
375 | void speex_bits_insert_terminator(SpeexBits *bits) | 392 | void speex_bits_insert_terminator(SpeexBits *bits) |