diff options
author | Thom Johansen <thomj@rockbox.org> | 2007-11-10 01:30:52 +0000 |
---|---|---|
committer | Thom Johansen <thomj@rockbox.org> | 2007-11-10 01:30:52 +0000 |
commit | d3ba403f607b744becbd437a4f193c6bda49b6da (patch) | |
tree | d795e464dd0b5614b63cef01815035dd0fa80481 /apps/codecs | |
parent | f32b7748dddf0146e66af2120ac2cb6bcd363ae8 (diff) | |
download | rockbox-d3ba403f607b744becbd437a4f193c6bda49b6da.tar.gz rockbox-d3ba403f607b744becbd437a4f193c6bda49b6da.zip |
Forgot these.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15552 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/libspeex/sb_celp.c | 5 | ||||
-rw-r--r-- | apps/codecs/libspeex/sb_celp.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/apps/codecs/libspeex/sb_celp.c b/apps/codecs/libspeex/sb_celp.c index cd6da32476..1b648b8c52 100644 --- a/apps/codecs/libspeex/sb_celp.c +++ b/apps/codecs/libspeex/sb_celp.c | |||
@@ -214,7 +214,6 @@ void *sb_encoder_init(const SpeexMode *m) | |||
214 | st->nbSubframes = mode->frameSize/mode->subframeSize; | 214 | st->nbSubframes = mode->frameSize/mode->subframeSize; |
215 | st->windowSize = st->frame_size+st->subframeSize; | 215 | st->windowSize = st->frame_size+st->subframeSize; |
216 | st->lpcSize=mode->lpcSize; | 216 | st->lpcSize=mode->lpcSize; |
217 | st->bufSize=mode->bufSize; | ||
218 | 217 | ||
219 | st->encode_submode = 1; | 218 | st->encode_submode = 1; |
220 | st->submodes=mode->submodes; | 219 | st->submodes=mode->submodes; |
@@ -751,7 +750,7 @@ int sb_encode(void *state, void *vin, SpeexBits *bits) | |||
751 | 750 | ||
752 | return 1; | 751 | return 1; |
753 | } | 752 | } |
754 | #endif | 753 | #endif /* SPEEX_DISABLE_ENCODER */ |
755 | 754 | ||
756 | 755 | ||
757 | 756 | ||
@@ -1363,7 +1362,7 @@ int sb_encoder_ctl(void *state, int request, void *ptr) | |||
1363 | } | 1362 | } |
1364 | return 0; | 1363 | return 0; |
1365 | } | 1364 | } |
1366 | #endif | 1365 | #endif /* SPEEX_DISABLE_ENCODER */ |
1367 | 1366 | ||
1368 | int sb_decoder_ctl(void *state, int request, void *ptr) | 1367 | int sb_decoder_ctl(void *state, int request, void *ptr) |
1369 | { | 1368 | { |
diff --git a/apps/codecs/libspeex/sb_celp.h b/apps/codecs/libspeex/sb_celp.h index 1f9b4daae0..eaf76c94ab 100644 --- a/apps/codecs/libspeex/sb_celp.h +++ b/apps/codecs/libspeex/sb_celp.h | |||
@@ -50,7 +50,6 @@ typedef struct SBEncState { | |||
50 | int nbSubframes; /**< Number of high-band sub-frames*/ | 50 | int nbSubframes; /**< Number of high-band sub-frames*/ |
51 | int windowSize; /**< Length of high-band LPC window*/ | 51 | int windowSize; /**< Length of high-band LPC window*/ |
52 | int lpcSize; /**< Order of high-band LPC analysis */ | 52 | int lpcSize; /**< Order of high-band LPC analysis */ |
53 | int bufSize; /**< Buffer size */ | ||
54 | int first; /**< First frame? */ | 53 | int first; /**< First frame? */ |
55 | float lag_factor; /**< Lag-windowing control parameter */ | 54 | float lag_factor; /**< Lag-windowing control parameter */ |
56 | spx_word16_t lpc_floor; /**< Controls LPC analysis noise floor */ | 55 | spx_word16_t lpc_floor; /**< Controls LPC analysis noise floor */ |