[FFmpeg-cvslog] r13926 - trunk/libavcodec/ra144.c

[vitor]

Author: vitor
Date: Mon Jun 23 22:35:02 2008
New Revision: 13926

Log:
Move factor multiplication out of irms()

Modified:
   trunk/libavcodec/ra144.c

Modified: trunk/libavcodec/ra144.c
==============================================================================
--- trunk/libavcodec/ra144.c	(original)
+++ trunk/libavcodec/ra144.c	Mon Jun 23 22:35:02 2008
@@ -111,7 +111,7 @@ static void copy_and_dup(const int16_t *
 }
 
 /** inverse root mean square */
-static int irms(const int16_t *data, int factor)
+static int irms(const int16_t *data)
 {
     unsigned int i, sum = 0;
 
@@ -121,7 +121,7 @@ static int irms(const int16_t *data, int
     if (sum == 0)
         return 0; /* OOPS - division by zero */
 
-    return (0x20000000 / (t_sqrt(sum) >> 8)) * factor;
+    return 0x20000000 / (t_sqrt(sum) >> 8);
 }
 
 static void add_wav(int n, int skip_first, int *m, const int16_t *s1,
@@ -217,7 +217,7 @@ static void do_output_subblock(RA144Cont
     if (cba_idx) {
         cba_idx += BLOCKSIZE/2 - 1;
         copy_and_dup(ractx->adapt_cb, buffer_a, cba_idx);
-        m[0] = irms(buffer_a, gval) >> 12;
+        m[0] = (irms(buffer_a) * gval) >> 12;
     } else {
         m[0] = 0;
     }