virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Simplify

Browse Source 
Originally committed as revision 14065 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-07-04 15:32:04 +00:00
parent 8a3227968c
commit 12ea267bca
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/ra288.c
View File

@ -38,7 +38,7 @@ typedef struct {
} Real288_internal; } Real288_internal;
/* Decode and produce output */ /* Decode and produce output */
static void decode(Real288_internal *glob, int amp_coef, int cb_coef) static void decode(Real288_internal *glob, float gain, int cb_coef)
{ {
unsigned int x, y; unsigned int x, y;
float f; float f;
@ -56,8 +56,6 @@ static void decode(Real288_internal *glob, int amp_coef, int cb_coef)
glob->sb[x] = sum; glob->sb[x] = sum;
} }
f = amptable[amp_coef];
/* convert log and do rms */ /* convert log and do rms */
for (sum=32, x=10; x--; sum -= glob->pr2[x] * glob->lhist[x]); for (sum=32, x=10; x--; sum -= glob->pr2[x] * glob->lhist[x]);
@ -66,7 +64,7 @@ static void decode(Real288_internal *glob, int amp_coef, int cb_coef)
else if (sum > 60) else if (sum > 60)
sum = 60; sum = 60;
sumsum = exp(sum * 0.1151292546497) * f; /* pow(10.0,sum/20)*f */ sumsum = exp(sum * 0.1151292546497) * gain; /* pow(10.0,sum/20)*f */
for (sum=0, x=5; x--;) { for (sum=0, x=5; x--;) {
buffer[x] = codetable[cb_coef][x] * sumsum; buffer[x] = codetable[cb_coef][x] * sumsum;
@ -223,10 +221,10 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data,
init_get_bits(&gb, buf, avctx->block_align * 8); init_get_bits(&gb, buf, avctx->block_align * 8);
for (x=0; x < 32; x++) { for (x=0; x < 32; x++) {
int amp_coef = get_bits(&gb, 3); float gain = amptable[get_bits(&gb, 3)];
int cb_coef = get_bits(&gb, 6 + (x&1)); int cb_coef = get_bits(&gb, 6 + (x&1));
glob->phasep = (glob->phase = x & 7) * 5; glob->phasep = (glob->phase = x & 7) * 5;
decode(glob, amp_coef, cb_coef); decode(glob, gain, cb_coef);
for (y=0; y<5; *(out++) = 8 * glob->output[glob->phasep+(y++)]); for (y=0; y<5; *(out++) = 8 * glob->output[glob->phasep+(y++)]);