RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Convert gain pitch and gain code to arrays

This commit is contained in:
Vladimir Voroshilov 2009-06-12 23:55:06 +07:00 committed by Michael Niedermayer
parent f830d1b7da
commit f7980a7bed
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/g729dec.c
View File

@ -111,11 +111,11 @@ typedef struct {
int16_t quant_energy[4]; ///< (5.10) past quantized energy int16_t quant_energy[4]; ///< (5.10) past quantized energy
/// (1.14) pitch gain of previous subframe /// (1.14) pitch gain of current and five previous subframes
int16_t gain_pitch; int16_t past_gain_pitch[6];
/// (14.1) gain code from previous subframe /// (14.1) gain code from current and previous subframe
int16_t gain_code; int16_t past_gain_code[2];
int16_t was_periodic; ///< whether previous frame was declared as periodic or not (4.4) int16_t was_periodic; ///< whether previous frame was declared as periodic or not (4.4)
uint16_t rand_value; ///< random number generator value (4.4.4) uint16_t rand_value; ///< random number generator value (4.4.4)
@ -406,23 +406,26 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
ff_acelp_weighted_vector_sum(fc + pitch_delay_int, ff_acelp_weighted_vector_sum(fc + pitch_delay_int,
fc + pitch_delay_int, fc + pitch_delay_int,
fc, 1 << 14, fc, 1 << 14,
av_clip(ctx->gain_pitch, SHARP_MIN, SHARP_MAX), av_clip(ctx->past_gain_pitch[0], SHARP_MIN, SHARP_MAX),
0, 14, 0, 14,
SUBFRAME_SIZE - pitch_delay_int); SUBFRAME_SIZE - pitch_delay_int);
memmove(ctx->past_gain_pitch+1, ctx->past_gain_pitch, 5 * sizeof(int16_t));
ctx->past_gain_code[1] = ctx->past_gain_code[0];
if (frame_erasure) { if (frame_erasure) {
ctx->gain_pitch = (29491 * ctx->gain_pitch) >> 15; // 0.90 (0.15) ctx->past_gain_pitch[0] = (29491 * ctx->past_gain_pitch[0]) >> 15; // 0.90 (0.15)
ctx->gain_code = ( 2007 * ctx->gain_code ) >> 11; // 0.98 (0.11) ctx->past_gain_code[0] = ( 2007 * ctx->past_gain_code[0] ) >> 11; // 0.98 (0.11)
gain_corr_factor = 0; gain_corr_factor = 0;
} else { } else {
ctx->gain_pitch = cb_gain_1st_8k[gc_1st_index][0] + ctx->past_gain_pitch[0] = cb_gain_1st_8k[gc_1st_index][0] +
cb_gain_2nd_8k[gc_2nd_index][0]; cb_gain_2nd_8k[gc_2nd_index][0];
gain_corr_factor = cb_gain_1st_8k[gc_1st_index][1] + gain_corr_factor = cb_gain_1st_8k[gc_1st_index][1] +
cb_gain_2nd_8k[gc_2nd_index][1]; cb_gain_2nd_8k[gc_2nd_index][1];
/* Decode the fixed-codebook gain. */ /* Decode the fixed-codebook gain. */
ctx->gain_code = ff_acelp_decode_gain_code(&ctx->dsp, gain_corr_factor, ctx->past_gain_code[0] = ff_acelp_decode_gain_code(&ctx->dsp, gain_corr_factor,
fc, MR_ENERGY, fc, MR_ENERGY,
ctx->quant_energy, ctx->quant_energy,
ma_prediction_coeff, ma_prediction_coeff,
@ -439,8 +442,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
ff_acelp_weighted_vector_sum(ctx->exc + i * SUBFRAME_SIZE, ff_acelp_weighted_vector_sum(ctx->exc + i * SUBFRAME_SIZE,
ctx->exc + i * SUBFRAME_SIZE, fc, ctx->exc + i * SUBFRAME_SIZE, fc,
(!ctx->was_periodic && frame_erasure) ? 0 : ctx->gain_pitch, (!ctx->was_periodic && frame_erasure) ? 0 : ctx->past_gain_pitch[0],
( ctx->was_periodic && frame_erasure) ? 0 : ctx->gain_code, ( ctx->was_periodic && frame_erasure) ? 0 : ctx->past_gain_code[0],
1 << 13, 14, SUBFRAME_SIZE); 1 << 13, 14, SUBFRAME_SIZE);
if (frame_erasure) if (frame_erasure)