# HG changeset patch # User vitor # Date 1217354831 0 # Node ID 16737361e9abf9a7289faab37b18dce1b253955a # Parent a4ebced5d4a2a20ed5291bb2ebab80f06653793a Cosmetics: rename loop counter vars to i,j diff -r a4ebced5d4a2 -r 16737361e9ab ra144.c --- a/ra144.c Tue Jul 29 14:17:13 2008 +0000 +++ b/ra144.c Tue Jul 29 18:07:11 2008 +0000 @@ -85,19 +85,19 @@ int buffer[10]; int *b1 = buffer; int *b2 = coefs; - int x, y; + int i, j; - for (x=0; x < 10; x++) { - b1[x] = refl[x] << 4; + for (i=0; i < 10; i++) { + b1[i] = refl[i] << 4; - for (y=0; y < x; y++) - b1[y] = ((refl[x] * b2[x-y-1]) >> 12) + b2[y]; + for (j=0; j < i; j++) + b1[j] = ((refl[i] * b2[i-j-1]) >> 12) + b2[j]; FFSWAP(int *, b1, b2); } - for (x=0; x < 10; x++) - coefs[x] >>= 4; + for (i=0; i < 10; i++) + coefs[i] >>= 4; } /** @@ -151,12 +151,12 @@ static unsigned int rms(const int *data) { - int x; + int i; unsigned int res = 0x10000; int b = 0; - for (x=0; x<10; x++) { - res = (((0x1000000 - data[x]*data[x]) >> 12) * res) >> 12; + for (i=0; i < 10; i++) { + res = (((0x1000000 - data[i]*data[i]) >> 12) * res) >> 12; if (res == 0) return 0; @@ -220,7 +220,7 @@ { int i; - for (i=0; i<30; i++) + for (i=0; i < 30; i++) *(out++) = *(inp++); } @@ -282,12 +282,12 @@ int work[10]; int a = block_num + 1; int b = NBLOCKS - a; - int x; + int i; // Interpolate block coefficients from the this frame forth block and // last frame forth block - for (x=0; x<30; x++) - out[x] = (a * ractx->lpc_coef[0][x] + b * ractx->lpc_coef[1][x])>> 2; + for (i=0; i<30; i++) + out[i] = (a * ractx->lpc_coef[0][i] + b * ractx->lpc_coef[1][i])>> 2; if (eval_refl(work, out, ractx)) { // The interpolated coefficients are unstable, copy either new or old @@ -307,7 +307,7 @@ unsigned int refl_rms[4]; // RMS of the reflection coefficients uint16_t block_coefs[4][30]; // LPC coefficients of each sub-block unsigned int lpc_refl[10]; // LPC reflection coefficients of the frame - int i, c; + int i, j; int16_t *data = vdata; unsigned int energy; @@ -338,11 +338,11 @@ int_to_int16(block_coefs[3], ractx->lpc_coef[0]); - for (c=0; c<4; c++) { - do_output_subblock(ractx, block_coefs[c], refl_rms[c], &gb); + for (i=0; i < 4; i++) { + do_output_subblock(ractx, block_coefs[i], refl_rms[i], &gb); - for (i=0; icurr_sblock[i + 10] << 2); + for (j=0; j < BLOCKSIZE; j++) + *data++ = av_clip_int16(ractx->curr_sblock[j + 10] << 2); } ractx->old_energy = energy;