comparison ra144.c @ 6948:1d8e1ee1a572 libavcodec

Rename variable
author vitor
date Sat, 31 May 2008 14:36:46 +0000
parents 080e7ee48ed1
children 8e907d8094f5
comparison
equal deleted inserted replaced
6947:080e7ee48ed1 6948:1d8e1ee1a572
318 static int ra144_decode_frame(AVCodecContext * avctx, 318 static int ra144_decode_frame(AVCodecContext * avctx,
319 void *vdata, int *data_size, 319 void *vdata, int *data_size,
320 const uint8_t * buf, int buf_size) 320 const uint8_t * buf, int buf_size)
321 { 321 {
322 static const uint8_t sizes[10] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2}; 322 static const uint8_t sizes[10] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2};
323 unsigned int gbuf1[4]; 323 unsigned int refl_rms[4]; // RMS of the reflection coefficients
324 uint16_t gbuf2[4][30]; 324 uint16_t gbuf2[4][30];
325 unsigned int c; 325 unsigned int c;
326 int i; 326 int i;
327 int16_t *data = vdata; 327 int16_t *data = vdata;
328 unsigned int energy; 328 unsigned int energy;
343 343
344 do_voice(ractx->lpc_refl, ractx->lpc_coef); 344 do_voice(ractx->lpc_refl, ractx->lpc_coef);
345 345
346 energy = decodeval[get_bits(&gb, 5) << 1]; // Useless table entries? 346 energy = decodeval[get_bits(&gb, 5) << 1]; // Useless table entries?
347 347
348 gbuf1[0] = dec2(ractx, gbuf2[0], 0, 0, ractx->old_energy); 348 refl_rms[0] = dec2(ractx, gbuf2[0], 0, 0, ractx->old_energy);
349 gbuf1[1] = dec2(ractx, gbuf2[1], 1, energy > ractx->old_energy, 349 refl_rms[1] = dec2(ractx, gbuf2[1], 1, energy > ractx->old_energy,
350 t_sqrt(energy*ractx->old_energy) >> 12); 350 t_sqrt(energy*ractx->old_energy) >> 12);
351 gbuf1[2] = dec2(ractx, gbuf2[2], 2, 1, energy); 351 refl_rms[2] = dec2(ractx, gbuf2[2], 2, 1, energy);
352 gbuf1[3] = dec1(gbuf2[3], ractx->lpc_refl, ractx->lpc_coef, energy); 352 refl_rms[3] = dec1(gbuf2[3], ractx->lpc_refl, ractx->lpc_coef, energy);
353 353
354 /* do output */ 354 /* do output */
355 for (c=0; c<4; c++) { 355 for (c=0; c<4; c++) {
356 do_output_subblock(ractx, gbuf2[c], gbuf1[c], data, &gb); 356 do_output_subblock(ractx, gbuf2[c], refl_rms[c], data, &gb);
357 357
358 for (i=0; i<BLOCKSIZE; i++) { 358 for (i=0; i<BLOCKSIZE; i++) {
359 *data = av_clip_int16(*data << 2); 359 *data = av_clip_int16(*data << 2);
360 data++; 360 data++;
361 } 361 }