diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-08-11 12:16:53 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-08-13 01:03:25 +0100 |
| commit | 783da0d6961c6de4ecc3f56fb291738f460782da (patch) | |
| tree | b82c63dd3e41daf5eefacc2866d4fe8dd760ce3f /libavcodec/g723_1.c | |
| parent | 371610510361f89948b87f57799ee56deab02503 (diff) | |
| download | ffmpeg-783da0d6961c6de4ecc3f56fb291738f460782da.tar.gz | |
g723.1: make autocorr_max() work on an arbitrary buffer
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/g723_1.c')
| -rw-r--r-- | libavcodec/g723_1.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index 8d5ac71ccd..e1d8591920 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -615,18 +615,17 @@ static void gen_acb_excitation(int16_t *vector, int16_t *prev_excitation, /** * Estimate maximum auto-correlation around pitch lag. * - * @param p the context + * @param buf buffer with offset applied * @param offset offset of the excitation vector * @param ccr_max pointer to the maximum auto-correlation * @param pitch_lag decoded pitch lag * @param length length of autocorrelation * @param dir forward lag(1) / backward lag(-1) */ -static int autocorr_max(G723_1_Context *p, int offset, int *ccr_max, +static int autocorr_max(const int16_t *buf, int offset, int *ccr_max, int pitch_lag, int length, int dir) { int limit, ccr, lag = 0; - int16_t *buf = p->excitation + offset; int i; pitch_lag = FFMIN(PITCH_MAX - 3, pitch_lag); @@ -721,9 +720,9 @@ static void comp_ppf_coeff(G723_1_Context *p, int offset, int pitch_lag, */ int energy[5] = {0, 0, 0, 0, 0}; int16_t *buf = p->excitation + offset; - int fwd_lag = autocorr_max(p, offset, &energy[1], pitch_lag, + int fwd_lag = autocorr_max(buf, offset, &energy[1], pitch_lag, SUBFRAME_LEN, 1); - int back_lag = autocorr_max(p, offset, &energy[3], pitch_lag, + int back_lag = autocorr_max(buf, offset, &energy[3], pitch_lag, SUBFRAME_LEN, -1); ppf->index = 0; @@ -800,7 +799,7 @@ static int comp_interp_index(G723_1_Context *p, int pitch_lag, /* Compute maximum backward cross-correlation */ ccr = 0; - index = autocorr_max(p, offset, &ccr, pitch_lag, SUBFRAME_LEN * 2, -1); + index = autocorr_max(buf, offset, &ccr, pitch_lag, SUBFRAME_LEN * 2, -1); ccr = av_sat_add32(ccr, 1 << 15) >> 16; /* Compute target energy */ |