diff options
Diffstat (limited to 'apps/codecs/libspeex/modes_wb.c')
-rw-r--r-- | apps/codecs/libspeex/modes_wb.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/codecs/libspeex/modes_wb.c b/apps/codecs/libspeex/modes_wb.c index af16cdd775..8e351db60d 100644 --- a/apps/codecs/libspeex/modes_wb.c +++ b/apps/codecs/libspeex/modes_wb.c | |||
@@ -52,7 +52,11 @@ | |||
52 | #define NULL 0 | 52 | #define NULL 0 |
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | #ifndef ROCKBOX_VOICE_CODEC | ||
55 | const SpeexMode * const speex_mode_list[SPEEX_NB_MODES] = {&speex_nb_mode, &speex_wb_mode, &speex_uwb_mode}; | 56 | const SpeexMode * const speex_mode_list[SPEEX_NB_MODES] = {&speex_nb_mode, &speex_wb_mode, &speex_uwb_mode}; |
57 | #else | ||
58 | const SpeexMode * const speex_mode_list[SPEEX_NB_MODES] = {&speex_nb_mode, &speex_wb_mode, NULL}; | ||
59 | #endif | ||
56 | 60 | ||
57 | extern const signed char hexc_table[]; | 61 | extern const signed char hexc_table[]; |
58 | extern const signed char hexc_10_32_table[]; | 62 | extern const signed char hexc_10_32_table[]; |
@@ -279,6 +283,7 @@ const SpeexMode speex_wb_mode = { | |||
279 | 283 | ||
280 | 284 | ||
281 | 285 | ||
286 | #ifndef ROCKBOX_VOICE_CODEC | ||
282 | /* Split-band "ultra-wideband" (32 kbps) CELP mode*/ | 287 | /* Split-band "ultra-wideband" (32 kbps) CELP mode*/ |
283 | static const SpeexSBMode sb_uwb_mode = { | 288 | static const SpeexSBMode sb_uwb_mode = { |
284 | &speex_wb_mode, | 289 | &speex_wb_mode, |
@@ -303,6 +308,7 @@ static const SpeexSBMode sb_uwb_mode = { | |||
303 | #endif | 308 | #endif |
304 | 2 | 309 | 2 |
305 | }; | 310 | }; |
311 | #endif | ||
306 | 312 | ||
307 | int wb_mode_query(const void *mode, int request, void *ptr) | 313 | int wb_mode_query(const void *mode, int request, void *ptr) |
308 | { | 314 | { |
@@ -329,6 +335,7 @@ int wb_mode_query(const void *mode, int request, void *ptr) | |||
329 | } | 335 | } |
330 | 336 | ||
331 | 337 | ||
338 | #ifndef ROCKBOX_VOICE_CODEC | ||
332 | const SpeexMode speex_uwb_mode = { | 339 | const SpeexMode speex_uwb_mode = { |
333 | &sb_uwb_mode, | 340 | &sb_uwb_mode, |
334 | wb_mode_query, | 341 | wb_mode_query, |
@@ -355,6 +362,7 @@ const SpeexMode speex_uwb_mode = { | |||
355 | &sb_decoder_ctl, | 362 | &sb_decoder_ctl, |
356 | #endif | 363 | #endif |
357 | }; | 364 | }; |
365 | #endif | ||
358 | 366 | ||
359 | /* We have defined speex_lib_get_mode() as a macro in speex.h */ | 367 | /* We have defined speex_lib_get_mode() as a macro in speex.h */ |
360 | #undef speex_lib_get_mode | 368 | #undef speex_lib_get_mode |