diff options
-rw-r--r-- | apps/codecs/libspeex/bits.c | 6 | ||||
-rw-r--r-- | apps/codecs/libspeex/speex.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/apps/codecs/libspeex/bits.c b/apps/codecs/libspeex/bits.c index 834bf5d78d..b85db6e1a8 100644 --- a/apps/codecs/libspeex/bits.c +++ b/apps/codecs/libspeex/bits.c | |||
@@ -106,6 +106,7 @@ void speex_bits_rewind(SpeexBits *bits) | |||
106 | bits->overflow=0; | 106 | bits->overflow=0; |
107 | } | 107 | } |
108 | 108 | ||
109 | #if 0 | ||
109 | void speex_bits_read_from(SpeexBits *bits, char *chars, int len) | 110 | void speex_bits_read_from(SpeexBits *bits, char *chars, int len) |
110 | { | 111 | { |
111 | int i; | 112 | int i; |
@@ -188,7 +189,9 @@ void speex_bits_read_whole_bytes(SpeexBits *bits, char *chars, int nbytes) | |||
188 | bits->chars[pos+i]=HTOLS(chars[i]); | 189 | bits->chars[pos+i]=HTOLS(chars[i]); |
189 | bits->nbBits+=nchars<<LOG2_BITS_PER_CHAR; | 190 | bits->nbBits+=nchars<<LOG2_BITS_PER_CHAR; |
190 | } | 191 | } |
192 | #endif | ||
191 | 193 | ||
194 | #ifndef SPEEX_DISABLE_ENCODER | ||
192 | int speex_bits_write(SpeexBits *bits, char *chars, int max_nbytes) | 195 | int speex_bits_write(SpeexBits *bits, char *chars, int max_nbytes) |
193 | { | 196 | { |
194 | int i; | 197 | int i; |
@@ -274,6 +277,7 @@ void speex_bits_pack(SpeexBits *bits, int data, int nbBits) | |||
274 | nbBits--; | 277 | nbBits--; |
275 | } | 278 | } |
276 | } | 279 | } |
280 | #endif /* SPEEX_DISABLE_ENCODER */ | ||
277 | 281 | ||
278 | int speex_bits_unpack_signed(SpeexBits *bits, int nbBits) | 282 | int speex_bits_unpack_signed(SpeexBits *bits, int nbBits) |
279 | { | 283 | { |
@@ -369,6 +373,7 @@ int speex_bits_nbytes(SpeexBits *bits) | |||
369 | return ((bits->nbBits+BITS_PER_CHAR-1)>>LOG2_BITS_PER_CHAR); | 373 | return ((bits->nbBits+BITS_PER_CHAR-1)>>LOG2_BITS_PER_CHAR); |
370 | } | 374 | } |
371 | 375 | ||
376 | #ifndef SPEEX_DISABLE_ENCODER | ||
372 | void speex_bits_insert_terminator(SpeexBits *bits) | 377 | void speex_bits_insert_terminator(SpeexBits *bits) |
373 | { | 378 | { |
374 | if (bits->bitPtr) | 379 | if (bits->bitPtr) |
@@ -376,3 +381,4 @@ void speex_bits_insert_terminator(SpeexBits *bits) | |||
376 | while (bits->bitPtr) | 381 | while (bits->bitPtr) |
377 | speex_bits_pack(bits, 1, 1); | 382 | speex_bits_pack(bits, 1, 1); |
378 | } | 383 | } |
384 | #endif /* SPEEX_DISABLE_ENCODER */ | ||
diff --git a/apps/codecs/libspeex/speex.c b/apps/codecs/libspeex/speex.c index 2a42e274a7..6bf362edbb 100644 --- a/apps/codecs/libspeex/speex.c +++ b/apps/codecs/libspeex/speex.c | |||
@@ -84,6 +84,7 @@ int speex_decode_native(void *state, SpeexBits *bits, spx_word16_t *out) | |||
84 | 84 | ||
85 | #ifdef FIXED_POINT | 85 | #ifdef FIXED_POINT |
86 | 86 | ||
87 | #ifndef SPEEX_DISABLE_ENCODER | ||
87 | int speex_encode(void *state, float *in, SpeexBits *bits) | 88 | int speex_encode(void *state, float *in, SpeexBits *bits) |
88 | { | 89 | { |
89 | int i; | 90 | int i; |
@@ -108,7 +109,9 @@ int speex_encode_int(void *state, spx_int16_t *in, SpeexBits *bits) | |||
108 | mode = *(SpeexMode**)state; | 109 | mode = *(SpeexMode**)state; |
109 | return (mode)->enc(state, in, bits); | 110 | return (mode)->enc(state, in, bits); |
110 | } | 111 | } |
112 | #endif /* SPEEX_DISABLE_ENCODER */ | ||
111 | 113 | ||
114 | #if 0 | ||
112 | int speex_decode(void *state, SpeexBits *bits, float *out) | 115 | int speex_decode(void *state, SpeexBits *bits, float *out) |
113 | { | 116 | { |
114 | int i, ret; | 117 | int i, ret; |
@@ -120,6 +123,7 @@ int speex_decode(void *state, SpeexBits *bits, float *out) | |||
120 | out[i] = short_out[i]; | 123 | out[i] = short_out[i]; |
121 | return ret; | 124 | return ret; |
122 | } | 125 | } |
126 | #endif | ||
123 | 127 | ||
124 | int speex_decode_int(void *state, SpeexBits *bits, spx_int16_t *out) | 128 | int speex_decode_int(void *state, SpeexBits *bits, spx_int16_t *out) |
125 | { | 129 | { |