diff options
| author | Thom Johansen <thomj@rockbox.org> | 2007-10-22 12:03:03 +0000 |
|---|---|---|
| committer | Thom Johansen <thomj@rockbox.org> | 2007-10-22 12:03:03 +0000 |
| commit | ba482642f2aeeeaa39fd22f68b908fc09b6f63ac (patch) | |
| tree | ce73c66341f23a23d6c8b481dacced04349e5dc0 /apps/codecs/libspeex/sb_celp.c | |
| parent | 12d1ff912c1f1d292bf91f29f7896882360424aa (diff) | |
| download | rockbox-ba482642f2aeeeaa39fd22f68b908fc09b6f63ac.zip rockbox-ba482642f2aeeeaa39fd22f68b908fc09b6f63ac.tar.gz rockbox-ba482642f2aeeeaa39fd22f68b908fc09b6f63ac.tar.bz2 rockbox-ba482642f2aeeeaa39fd22f68b908fc09b6f63ac.tar.xz | |
Fix ultra-wideband mode. Disable big parts of the encoder stuff for a smaller binary.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15263 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libspeex/sb_celp.c')
| -rw-r--r-- | apps/codecs/libspeex/sb_celp.c | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/apps/codecs/libspeex/sb_celp.c b/apps/codecs/libspeex/sb_celp.c index dc88ca4..766fe57 100644 --- a/apps/codecs/libspeex/sb_celp.c +++ b/apps/codecs/libspeex/sb_celp.c @@ -184,7 +184,7 @@ static const float h0[64] = { extern const spx_word16_t lpc_window[]; - +#if 0 void *sb_encoder_init(const SpeexMode *m) { int i; @@ -750,20 +750,39 @@ int sb_encode(void *state, void *vin, SpeexBits *bits) return 1; } +#else +void *sb_encoder_init(const SpeexMode *m) +{ + return NULL; +} +void sb_encoder_destroy(void *state) +{ +} +int sb_encode(void *state, void *vin, SpeexBits *bits) +{ + return 1; +} +#endif - -static SBDecState global_decstate IBSS_ATTR; +static SBDecState global_decstate_wb IBSS_ATTR; +static SBDecState global_decstate_uwb IBSS_ATTR; void *sb_decoder_init(const SpeexMode *m) { spx_int32_t tmp; - SBDecState *st = &global_decstate; + SBDecState *st; const SpeexSBMode *mode; - /* st = (SBDecState*)speex_alloc(sizeof(SBDecState)); */ +/* + st = (SBDecState*)speex_alloc(sizeof(SBDecState)); if (!st) return NULL; +*/ + if (m->modeID == SPEEX_MODEID_UWB) + st = &global_decstate_uwb; + else + st = &global_decstate_wb; st->mode = m; mode=(const SpeexSBMode*)m->mode; st->encode_submode = 1; @@ -1107,7 +1126,7 @@ int sb_decode(void *state, SpeexBits *bits, void *vout) return 0; } - +#if 0 int sb_encoder_ctl(void *state, int request, void *ptr) { SBEncState *st; @@ -1355,6 +1374,12 @@ int sb_encoder_ctl(void *state, int request, void *ptr) } return 0; } +#else +int sb_encoder_ctl(void *state, int request, void *ptr) +{ + return 0; +} +#endif int sb_decoder_ctl(void *state, int request, void *ptr) { |