summaryrefslogtreecommitdiff
path: root/libavcodec/ra144.c
diff options
context:
space:
mode:
authorVitor Sessak <vitor1001@gmail.com>2008-06-01 13:28:41 +0000
committerVitor Sessak <vitor1001@gmail.com>2008-06-01 13:28:41 +0000
commitd4f0cc1c9f5a11bbe277c60eb2d303c4983005f9 (patch)
tree15f5e9002e5b3cd1211c82bdc34e0285741cdf23 /libavcodec/ra144.c
parent907892ee19a040c244ed3a0c27493c90bf28cf72 (diff)
More variable renaming
Originally committed as revision 13598 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ra144.c')
-rw-r--r--libavcodec/ra144.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index 757b8755c6..d761d419a6 100644
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -331,7 +331,7 @@ static int ra144_decode_frame(AVCodecContext * avctx,
{
static const uint8_t sizes[10] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2};
unsigned int refl_rms[4]; // RMS of the reflection coefficients
- uint16_t gbuf2[4][30];
+ uint16_t block_coefs[4][30]; // LPC coefficients of each sub-block
int i, c;
int16_t *data = vdata;
unsigned int energy;
@@ -354,15 +354,16 @@ static int ra144_decode_frame(AVCodecContext * avctx,
energy = decodeval[get_bits(&gb, 5) << 1]; // Useless table entries?
- refl_rms[0] = dec2(ractx, gbuf2[0], 0, 0, ractx->old_energy);
- refl_rms[1] = dec2(ractx, gbuf2[1], 1, energy > ractx->old_energy,
+ refl_rms[0] = dec2(ractx, block_coefs[0], 0, 0, ractx->old_energy);
+ refl_rms[1] = dec2(ractx, block_coefs[1], 1, energy > ractx->old_energy,
t_sqrt(energy*ractx->old_energy) >> 12);
- refl_rms[2] = dec2(ractx, gbuf2[2], 2, 1, energy);
- refl_rms[3] = dec1(gbuf2[3], ractx->lpc_refl, ractx->lpc_coef, energy);
+ refl_rms[2] = dec2(ractx, block_coefs[2], 2, 1, energy);
+ refl_rms[3] = dec1(block_coefs[3], ractx->lpc_refl, ractx->lpc_coef,
+ energy);
/* do output */
for (c=0; c<4; c++) {
- do_output_subblock(ractx, gbuf2[c], refl_rms[c], data, &gb);
+ do_output_subblock(ractx, block_coefs[c], refl_rms[c], data, &gb);
for (i=0; i<BLOCKSIZE; i++) {
*data = av_clip_int16(*data << 2);