aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ra144.c
diff options
context:
space:
mode:
authorVitor Sessak <vitor1001@gmail.com>2008-09-08 18:18:29 +0000
committerVitor Sessak <vitor1001@gmail.com>2008-09-08 18:18:29 +0000
commit3e30f46f8b40eb5282e0a529bef9bc95d8eea381 (patch)
treef9868b090dbfcc9f4f796fc1d1e37f1b7084dbac /libavcodec/ra144.c
parentb28bdce6889247cd2969a162c263c0def06d5072 (diff)
downloadffmpeg-3e30f46f8b40eb5282e0a529bef9bc95d8eea381.tar.gz
Pass directly variable 'a' to interp instead of evaluating it from num_blocks
Originally committed as revision 15269 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ra144.c')
-rw-r--r--libavcodec/ra144.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index 7646ada797..35d4a50c44 100644
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -258,11 +258,10 @@ static int eval_refl(int *refl, const int16_t *coefs, RA144Context *ractx)
return 0;
}
-static int interp(RA144Context *ractx, int16_t *out, int block_num,
+static int interp(RA144Context *ractx, int16_t *out, int a,
int copyold, int energy)
{
int work[10];
- int a = block_num + 1;
int b = NBLOCKS - a;
int i;
@@ -315,10 +314,10 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *vdata,
energy = energy_tab[get_bits(&gb, 5)];
- refl_rms[0] = interp(ractx, block_coefs[0], 0, 1, ractx->old_energy);
- refl_rms[1] = interp(ractx, block_coefs[1], 1, energy <= ractx->old_energy,
+ refl_rms[0] = interp(ractx, block_coefs[0], 1, 1, ractx->old_energy);
+ refl_rms[1] = interp(ractx, block_coefs[1], 2, energy <= ractx->old_energy,
t_sqrt(energy*ractx->old_energy) >> 12);
- refl_rms[2] = interp(ractx, block_coefs[2], 2, 0, energy);
+ refl_rms[2] = interp(ractx, block_coefs[2], 3, 0, energy);
refl_rms[3] = rescale_rms(ractx->lpc_refl_rms[0], energy);
int_to_int16(block_coefs[3], ractx->lpc_coef[0]);