[SCM] libav/experimental: Move constant multiplication out of the loop

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:30:29 UTC 2013


The following commit has been merged in the experimental branch:
commit b6c77581683c9ed0b5a72e2b598291162d12cf4b
Author: Vitor Sessak <vitor1001 at gmail.com>
Date:   Wed Sep 24 20:31:24 2008 +0000

    Move constant multiplication out of the loop
    
    Originally committed as revision 15404 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index 3993c34..11d5e4c 100644
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -96,12 +96,12 @@ static void decode(RA288Context *ractx, float gain, int cb_coef)
 
     /* block 48 of G.728 spec */
     /* exp(sum * 0.1151292546497) == pow(10.0,sum/20) */
-    sumsum = exp(sum * 0.1151292546497) * gain / 2048.;
+    sumsum = exp(sum * 0.1151292546497) * gain / (2048 * 4096);
 
     for (i=0; i < 5; i++)
         buffer[i] = codetable[cb_coef][i] * sumsum;
 
-    sum = scalar_product_float(buffer, buffer, 5) / 5;
+    sum = (4096 * 4096) * scalar_product_float(buffer, buffer, 5) / 5;
 
     sum = FFMAX(sum, 1);
 
@@ -118,7 +118,7 @@ static void decode(RA288Context *ractx, float gain, int cb_coef)
 
     /* output */
     for (i=0; i < 5; i++)
-        block[i] = av_clipf(block[i], -4095, 4095);
+        block[i] = av_clipf(block[i], -4095./4096., 4095./4096.);
 }
 
 /**
@@ -210,7 +210,7 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data,
         decode(ractx, gain, cb_coef);
 
         for (j=0; j < 5; j++)
-            *(out++) = (1/4096.) * ractx->sp_hist[70 + 36 + j];
+            *(out++) = ractx->sp_hist[70 + 36 + j];
 
         if ((i & 7) == 3)
             backward_filter(ractx);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list