diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2008-06-01 19:36:43 +0000 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2008-06-01 19:36:43 +0000 |
| commit | a00dc25547d478e292439f08906da7ec18bd2ac0 (patch) | |
| tree | 00aab15ed3389c63fd1443e967227d8d6e541659 | |
| parent | 07aee1a1f92e4889dbf74a589301fab19f3be7ee (diff) | |
| download | ffmpeg-a00dc25547d478e292439f08906da7ec18bd2ac0.tar.gz | |
Rename dec2() function
Originally committed as revision 13607 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/ra144.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index 200000600b..36308286ad 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -297,7 +297,7 @@ static int eval_refl(const int16_t *coefs, int *refl) return retval; } -static int dec2(RA144Context *ractx, int16_t *decsp, int block_num, +static int interp(RA144Context *ractx, int16_t *decsp, int block_num, int copynew, int energy) { int work[10]; @@ -355,10 +355,10 @@ static int ra144_decode_frame(AVCodecContext * avctx, energy = decodeval[get_bits(&gb, 5) << 1]; // Useless table entries? - refl_rms[0] = dec2(ractx, block_coefs[0], 0, 0, ractx->old_energy); - refl_rms[1] = dec2(ractx, block_coefs[1], 1, energy > ractx->old_energy, + refl_rms[0] = interp(ractx, block_coefs[0], 0, 0, ractx->old_energy); + refl_rms[1] = interp(ractx, block_coefs[1], 1, energy > ractx->old_energy, t_sqrt(energy*ractx->old_energy) >> 12); - refl_rms[2] = dec2(ractx, block_coefs[2], 2, 1, energy); + refl_rms[2] = interp(ractx, block_coefs[2], 2, 1, energy); refl_rms[3] = rms(ractx->lpc_refl, energy); int_to_int16(block_coefs[3], ractx->lpc_coef); |