diff options
Diffstat (limited to 'libspeex/sb_celp.h')
| -rw-r--r-- | libspeex/sb_celp.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libspeex/sb_celp.h b/libspeex/sb_celp.h index a0dc3af..e8c3761 100644 --- a/libspeex/sb_celp.h +++ b/libspeex/sb_celp.h @@ -50,9 +50,7 @@ typedef struct SBEncState { int nbSubframes; /**< Number of high-band sub-frames*/ int windowSize; /**< Length of high-band LPC window*/ int lpcSize; /**< Order of high-band LPC analysis */ - int bufSize; /**< Buffer size */ int first; /**< First frame? */ - float lag_factor; /**< Lag-windowing control parameter */ spx_word16_t lpc_floor; /**< Controls LPC analysis noise floor */ spx_word16_t gamma1; /**< Perceptual weighting coef 1 */ spx_word16_t gamma2; /**< Perceptual weighting coef 2 */ @@ -62,7 +60,7 @@ typedef struct SBEncState { spx_word16_t *h0_mem, *h1_mem; const spx_word16_t *window; /**< LPC analysis window */ - spx_word16_t *lagWindow; /**< Auto-correlation window */ + const spx_word16_t *lagWindow; /**< Auto-correlation window */ spx_lsp_t *old_lsp; /**< LSPs of previous frame */ spx_lsp_t *old_qlsp; /**< Quantized LSPs of previous frame */ spx_coef_t *interp_qlpc; /**< Interpolated quantized LPCs for current sub-frame */ @@ -74,6 +72,7 @@ typedef struct SBEncState { spx_word16_t *exc_rms; spx_word16_t *innov_rms_save; /**< If non-NULL, innovation is copied here */ +#ifndef DISABLE_VBR float vbr_quality; /**< Quality setting for VBR encoding */ int vbr_enabled; /**< 1 for enabling VBR, 0 otherwise */ spx_int32_t vbr_max; /**< Max bit-rate allowed in VBR mode (total) */ @@ -84,7 +83,8 @@ typedef struct SBEncState { float abr_count; int vad_enabled; /**< 1 for enabling VAD, 0 otherwise */ float relative_quality; - +#endif /* #ifndef DISABLE_VBR */ + int encode_submode; const SpeexSubmode * const *submodes; int submodeID; @@ -109,7 +109,7 @@ typedef struct SBDecState { int lpc_enh_enabled; char *stack; - spx_word32_t *g0_mem, *g1_mem; + spx_word16_t *g0_mem, *g1_mem; spx_word16_t *excBuf; spx_lsp_t *old_qlsp; |