diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-07-26 17:04:54 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-07-26 17:04:54 +0000 |
| commit | 2fa99a7ade8748fae314aeab2fea83e9bc88c36c (patch) | |
| tree | 689c1cb15f7e7304b955e296748c800ce430542d /pjmedia/src/pjmedia-codec/speex/modes.h | |
| parent | d80219f36636faa876c84b586e7b4b4815767be3 (diff) | |
- Bring speex codec up to date with their SVN trunk
- Speex codec should work in FIXED_POINT mode when PJ_HAS_FLOATING_POINT is set to zero.
- ulaw2linear will return zero if zero is given (this would make the VAD works better, and it also fixed click noise when call is established/hangup).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@628 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-codec/speex/modes.h')
| -rw-r--r-- | pjmedia/src/pjmedia-codec/speex/modes.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pjmedia/src/pjmedia-codec/speex/modes.h b/pjmedia/src/pjmedia-codec/speex/modes.h index 945d0046..9828ee61 100644 --- a/pjmedia/src/pjmedia-codec/speex/modes.h +++ b/pjmedia/src/pjmedia-codec/speex/modes.h @@ -55,17 +55,17 @@ typedef void (*lsp_unquant_func)(spx_lsp_t *, int, SpeexBits *); /** Long-term predictor quantization */ -typedef int (*ltp_quant_func)(spx_sig_t *, spx_sig_t *, spx_coef_t *, spx_coef_t *, +typedef int (*ltp_quant_func)(spx_word16_t *, spx_word16_t *, spx_coef_t *, spx_coef_t *, spx_coef_t *, spx_sig_t *, const void *, int, int, spx_word16_t, - int, int, SpeexBits*, char *, spx_sig_t *, spx_word16_t *, int, int, int); + int, int, SpeexBits*, char *, spx_word16_t *, spx_word16_t *, int, int, int, spx_word32_t *); /** Long-term un-quantize */ -typedef void (*ltp_unquant_func)(spx_sig_t *, int, int, spx_word16_t, const void *, int, int *, +typedef void (*ltp_unquant_func)(spx_word16_t *, spx_word32_t *, int, int, spx_word16_t, const void *, int, int *, spx_word16_t *, SpeexBits*, char*, int, int, spx_word16_t, int); /** Innovation quantization function */ -typedef void (*innovation_quant_func)(spx_sig_t *, spx_coef_t *, spx_coef_t *, spx_coef_t *, const void *, int, int, +typedef void (*innovation_quant_func)(spx_word16_t *, spx_coef_t *, spx_coef_t *, spx_coef_t *, const void *, int, int, spx_sig_t *, spx_word16_t *, SpeexBits *, char *, int, int); /** Innovation unquantization function */ @@ -84,17 +84,13 @@ typedef struct SpeexSubmode { /*Lont-term predictor functions*/ ltp_quant_func ltp_quant; /**< Long-term predictor (pitch) quantizer */ ltp_unquant_func ltp_unquant; /**< Long-term predictor (pitch) un-quantizer */ - const void *ltp_params; /**< Pitch parameters (options) */ + const void *ltp_params; /**< Pitch parameters (options) */ /*Quantization of innovation*/ innovation_quant_func innovation_quant; /**< Innovation quantization */ innovation_unquant_func innovation_unquant; /**< Innovation un-quantization */ const void *innovation_params; /**< Innovation quantization parameters*/ - /*Synthesis filter enhancement*/ - spx_word16_t lpc_enh_k1; /**< Enhancer constant */ - spx_word16_t lpc_enh_k2; /**< Enhancer constant */ - spx_word16_t lpc_enh_k3; /**< Enhancer constant */ spx_word16_t comb_gain; /**< Gain of enhancer comb filter */ int bits_per_frame; /**< Number of bits per frame after encoding*/ |