Commit 136ce50f authored by vitor's avatar vitor

Revert r14218. FFMAX is a macro, so

   sum = FFMAX(1, scalar_product(...));
might calculate the scalar product twice, what is 
slower.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14230 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 87783268
...@@ -69,7 +69,9 @@ static void decode(Real288_internal *glob, float gain, int cb_coef) ...@@ -69,7 +69,9 @@ static void decode(Real288_internal *glob, float gain, int cb_coef)
for (x=0; x < 5; x++) for (x=0; x < 5; x++)
buffer[x] = codetable[cb_coef][x] * sumsum; buffer[x] = codetable[cb_coef][x] * sumsum;
sum = FFMAX(1, scalar_product_float(buffer, buffer, 5) / 5); sum = scalar_product_float(buffer, buffer, 5) / 5;
sum = FFMAX(sum, 1);
/* shift and store */ /* shift and store */
memmove(glob->lhist, glob->lhist - 1, 10 * sizeof(*glob->lhist)); memmove(glob->lhist, glob->lhist - 1, 10 * sizeof(*glob->lhist));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment