aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorVitor Sessak <vitor1001@gmail.com>2008-07-06 12:03:21 +0000
committerVitor Sessak <vitor1001@gmail.com>2008-07-06 12:03:21 +0000
commitf803495415ade5de6b09da89e579849dcbc6b326 (patch)
treed94c97a48963a6507725971e785e5728f941d5e5 /libavcodec
parenteb73742d6e19d72bced2bfec6f65cd45e93308d1 (diff)
downloadffmpeg-f803495415ade5de6b09da89e579849dcbc6b326.tar.gz
Remove phasep context var, it is just phase*5
Originally committed as revision 14092 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ra288.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index f6e214cd4d..cfe2c9b736 100644
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -29,7 +29,7 @@ typedef struct {
float output[40];
float pr1[36];
float pr2[10];
- int phase, phasep;
+ int phase;
float st1a[111], st1b[37], st1[37];
float st2a[38], st2b[11], st2[11];
@@ -95,7 +95,7 @@ static void decode(Real288_internal *glob, float gain, int cb_coef)
else if (f < -4095)
f = -4095;
- glob->output[glob->phasep+x] = glob->sb[4-x] = f;
+ glob->output[glob->phase*5+x] = glob->sb[4-x] = f;
}
}
@@ -185,7 +185,7 @@ static void update(Real288_internal *glob)
float buffer1[40], temp1[37];
float buffer2[8], temp2[11];
- y = glob->phasep+5;
+ y = glob->phase*5+5;
for (x=0; x < 40; x++)
buffer1[x] = glob->output[(y++)%40];
@@ -226,11 +226,11 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data,
for (x=0; x < 32; x++) {
float gain = amptable[get_bits(&gb, 3)];
int cb_coef = get_bits(&gb, 6 + (x&1));
- glob->phasep = (glob->phase = x & 7) * 5;
+ glob->phase = x & 7;
decode(glob, gain, cb_coef);
for (y=0; y < 5; y++)
- *(out++) = 8 * glob->output[glob->phasep + y];
+ *(out++) = 8 * glob->output[glob->phase*5 + y];
if (glob->phase == 3)
update(glob);