Mercurial > libavcodec.hg

changeset 6837:1acb9df14634 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify add_wav()
author vitor
date Wed, 21 May 2008 16:43:05 +0000
parents e271c9b997b1
children 7d4031cba765
files ra144.c
diffstat 1 files changed, 6 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/ra144.c	Wed May 21 16:41:58 2008 +0000
+++ b/ra144.c	Wed May 21 16:43:05 2008 +0000
@@ -129,30 +129,21 @@
 static void add_wav(int n, int f, int m1, int m2, int m3, const short *s1,
                     const short *s2, const short *s3, short *dest)
 {
-    int a, b, c, i;
+    int a = 0;
+    int b, c, i;
     const short *ptr, *ptr2;
 
     ptr  = wavtable1 + n * 9;
     ptr2 = wavtable2 + n * 9;
 
-    if (f != 0)
-        a = ((*ptr) * m1) >> ((*ptr2) + 1);
-    else
-        a = 0;
+    if (f)
+        a = (ptr[0] * m1) >> (ptr2[0] + 1);
 
-    ptr++;
-    ptr2++;
-    b = ((*ptr) * m2) >> ((*ptr2) + 1);
-    ptr++;
-    ptr2++;
-    c = ((*ptr) * m3) >> ((*ptr2) + 1);
+    b = (ptr[1] * m2) >> (ptr2[1] + 1);
+    c = (ptr[2] * m3) >> (ptr2[2] + 1);
 
-    if (f != 0)
         for (i=0; i < BLOCKSIZE; i++)
             dest[i] = ((*(s1++)) * a + (*(s2++)) * b + (*(s3++)) * c) >> 12;
-    else
-        for (i=0; i < BLOCKSIZE; i++)
-            dest[i] = ((*(s2++)) * b + (*(s3++)) * c) >> 12;
 }