changeset 7830:3da762190370 libavcodec

Pass directly variable 'a' to interp instead of evaluating it from num_blocks
author vitor
date Mon, 08 Sep 2008 18:18:29 +0000
parents 7640294af313
children 8195c970d077
files ra144.c
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ra144.c	Mon Sep 08 18:16:00 2008 +0000
+++ b/ra144.c	Mon Sep 08 18:18:29 2008 +0000
@@ -258,11 +258,10 @@
     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 @@
 
     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]);