Commit 80fca354 authored by vitor's avatar vitor

Rename dec2() function

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13607 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 97238fec
...@@ -297,7 +297,7 @@ static int eval_refl(const int16_t *coefs, int *refl) ...@@ -297,7 +297,7 @@ static int eval_refl(const int16_t *coefs, int *refl)
return retval; 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 copynew, int energy)
{ {
int work[10]; int work[10];
...@@ -355,10 +355,10 @@ static int ra144_decode_frame(AVCodecContext * avctx, ...@@ -355,10 +355,10 @@ static int ra144_decode_frame(AVCodecContext * avctx,
energy = decodeval[get_bits(&gb, 5) << 1]; // Useless table entries? 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[0] = interp(ractx, block_coefs[0], 0, 0, ractx->old_energy);
refl_rms[1] = dec2(ractx, block_coefs[1], 1, energy > ractx->old_energy, refl_rms[1] = interp(ractx, block_coefs[1], 1, energy > ractx->old_energy,
t_sqrt(energy*ractx->old_energy) >> 12); 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); refl_rms[3] = rms(ractx->lpc_refl, energy);
int_to_int16(block_coefs[3], ractx->lpc_coef); int_to_int16(block_coefs[3], ractx->lpc_coef);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment