highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetics: rename loop counter vars to i,j

Browse Source 
Originally committed as revision 14467 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-07-29 18:07:11 +00:00
parent 8a37920c9e
commit 6c9c8b06b3
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libavcodec/ra144.c
View File

@ -85,19 +85,19 @@ static void eval_coefs(int *coefs, const int *refl)
int buffer[10]; int buffer[10];
int *b1 = buffer; int *b1 = buffer;
int *b2 = coefs; int *b2 = coefs;
int x, y; int i, j;
for (x=0; x < 10; x++) { for (i=0; i < 10; i++) {
b1[x] = refl[x] << 4; b1[i] = refl[i] << 4;
for (y=0; y < x; y++) for (j=0; j < i; j++)
b1[y] = ((refl[x] * b2[x-y-1]) >> 12) + b2[y]; b1[j] = ((refl[i] * b2[i-j-1]) >> 12) + b2[j];
FFSWAP(int *, b1, b2); FFSWAP(int *, b1, b2);
} }
for (x=0; x < 10; x++) for (i=0; i < 10; i++)
coefs[x] >>= 4; coefs[i] >>= 4;
} }
/** /**
@ -151,12 +151,12 @@ static unsigned int rescale_rms(unsigned int rms, unsigned int energy)
static unsigned int rms(const int *data) static unsigned int rms(const int *data)
{ {
int x; int i;
unsigned int res = 0x10000; unsigned int res = 0x10000;
int b = 0; int b = 0;
for (x=0; x<10; x++) { for (i=0; i < 10; i++) {
res = (((0x1000000 - data[x]*data[x]) >> 12) * res) >> 12; res = (((0x1000000 - data[i]*data[i]) >> 12) * res) >> 12;
if (res == 0) if (res == 0)
return 0; return 0;
@ -220,7 +220,7 @@ static void int_to_int16(int16_t *out, const int *inp)
{ {
int i; int i;
for (i=0; i<30; i++) for (i=0; i < 30; i++)
*(out++) = *(inp++); *(out++) = *(inp++);
} }
@ -282,12 +282,12 @@ static int interp(RA144Context *ractx, int16_t *out, int block_num,
int work[10]; int work[10];
int a = block_num + 1; int a = block_num + 1;
int b = NBLOCKS - a; int b = NBLOCKS - a;
int x; int i;
// Interpolate block coefficients from the this frame forth block and // Interpolate block coefficients from the this frame forth block and
// last frame forth block // last frame forth block
for (x=0; x<30; x++) for (i=0; i<30; i++)
out[x] = (a * ractx->lpc_coef[0][x] + b * ractx->lpc_coef[1][x])>> 2; out[i] = (a * ractx->lpc_coef[0][i] + b * ractx->lpc_coef[1][i])>> 2;
if (eval_refl(work, out, ractx)) { if (eval_refl(work, out, ractx)) {
// The interpolated coefficients are unstable, copy either new or old // The interpolated coefficients are unstable, copy either new or old
@ -307,7 +307,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *vdata,
unsigned int refl_rms[4]; // RMS of the reflection coefficients unsigned int refl_rms[4]; // RMS of the reflection coefficients
uint16_t block_coefs[4][30]; // LPC coefficients of each sub-block uint16_t block_coefs[4][30]; // LPC coefficients of each sub-block
unsigned int lpc_refl[10]; // LPC reflection coefficients of the frame unsigned int lpc_refl[10]; // LPC reflection coefficients of the frame
int i, c; int i, j;
int16_t *data = vdata; int16_t *data = vdata;
unsigned int energy; unsigned int energy;
@ -338,11 +338,11 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *vdata,
int_to_int16(block_coefs[3], ractx->lpc_coef[0]); int_to_int16(block_coefs[3], ractx->lpc_coef[0]);
for (c=0; c<4; c++) { for (i=0; i < 4; i++) {
do_output_subblock(ractx, block_coefs[c], refl_rms[c], &gb); do_output_subblock(ractx, block_coefs[i], refl_rms[i], &gb);
for (i=0; i<BLOCKSIZE; i++) for (j=0; j < BLOCKSIZE; j++)
*data++ = av_clip_int16(ractx->curr_sblock[i + 10] << 2); *data++ = av_clip_int16(ractx->curr_sblock[j + 10] << 2);
} }
ractx->old_energy = energy; ractx->old_energy = energy;