[xiph-cvs] cvs commit: vorbis/lib mdct.c

[Jack Moffitt]

jack        00/10/19 23:41:27

  Modified:    lib      Tag: branch_beta3 mdct.c
  Log:
  should have done this before
  
  jack.

Revision  Changes    Path
No                   revision

No                   revision

1.17.2.3  +45 -45    vorbis/lib/mdct.c

Index: mdct.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mdct.c,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -r1.17.2.2 -r1.17.2.3
--- mdct.c	2000/10/20 06:32:07	1.17.2.2
+++ mdct.c	2000/10/20 06:41:27	1.17.2.3
@@ -13,7 +13,7 @@
 
  function: normalized modified discrete cosine transform
            power of two length transform only [16 <= n ]
- last mod: $Id: mdct.c,v 1.17.2.2 2000/10/20 06:32:07 jack Exp $
+ last mod: $Id: mdct.c,v 1.17.2.3 2000/10/20 06:41:27 jack Exp $
 
  Algorithm adapted from _The use of multirate filter banks for coding
  of high quality digital audio_, by T. Sporer, K. Brandenburg and
@@ -137,59 +137,59 @@
         int w2=w1-(k0>>1);
         float AEv= A[0],wA;
         float AOv= A[1],wB;
-        int blah=i;
+        int unroll=i;
         wbase-=2;
 
         k0++;
-        blah--;
-        if(blah>0){
-          s=2<<blah;
+        unroll--;
+        if(unroll>0){
+          s=2<<unroll;
           s>>=1;
           do{
-	  wB     =w[w1]   -w[w2];
-	  x[w1]  =w[w1]   +w[w2];
-	  wA     =w[++w1] -w[++w2];
-	  x[w1]  =w[w1]   +w[w2];
-	  x[w2]  =wA*AEv  - wB*AOv;
-	  x[w2-1]=wB*AEv  + wA*AOv;
-	  w1-=k0;
-	  w2-=k0;
-	  wB     =w[w1]   -w[w2];
-	  x[w1]  =w[w1]   +w[w2];
-	  wA     =w[++w1] -w[++w2];
-	  x[w1]  =w[w1]   +w[w2];
-	  x[w2]  =wA*AEv  - wB*AOv;
-	  x[w2-1]=wB*AEv  + wA*AOv;
-	  w1-=k0;
-	  w2-=k0;
-	  wB     =w[w1]   -w[w2];
-	  x[w1]  =w[w1]   +w[w2];
-	  wA     =w[++w1] -w[++w2];
-	  x[w1]  =w[w1]   +w[w2];
-	  x[w2]  =wA*AEv  - wB*AOv;
-	  x[w2-1]=wB*AEv  + wA*AOv;
-	  w1-=k0;
-	  w2-=k0;
-	  wB     =w[w1]   -w[w2];
-	  x[w1]  =w[w1]   +w[w2];
-	  wA     =w[++w1] -w[++w2];
-	  x[w1]  =w[w1]   +w[w2];
-	  x[w2]  =wA*AEv  - wB*AOv;
-	  x[w2-1]=wB*AEv  + wA*AOv;
-	  w1-=k0;
-	  w2-=k0;
+            wB     =w[w1]   -w[w2];
+            x[w1]  =w[w1]   +w[w2];
+            wA     =w[++w1] -w[++w2];
+            x[w1]  =w[w1]   +w[w2];
+            x[w2]  =wA*AEv  - wB*AOv;
+            x[w2-1]=wB*AEv  + wA*AOv;
+            w1-=k0;
+            w2-=k0;
+            wB     =w[w1]   -w[w2];
+            x[w1]  =w[w1]   +w[w2];
+            wA     =w[++w1] -w[++w2];
+            x[w1]  =w[w1]   +w[w2];
+            x[w2]  =wA*AEv  - wB*AOv;
+            x[w2-1]=wB*AEv  + wA*AOv;
+            w1-=k0;
+            w2-=k0;
+            wB     =w[w1]   -w[w2];
+            x[w1]  =w[w1]   +w[w2];
+            wA     =w[++w1] -w[++w2];
+            x[w1]  =w[w1]   +w[w2];
+            x[w2]  =wA*AEv  - wB*AOv;
+            x[w2-1]=wB*AEv  + wA*AOv;
+            w1-=k0;
+            w2-=k0;
+            wB     =w[w1]   -w[w2];
+            x[w1]  =w[w1]   +w[w2];
+            wA     =w[++w1] -w[++w2];
+            x[w1]  =w[w1]   +w[w2];
+            x[w2]  =wA*AEv  - wB*AOv;
+            x[w2-1]=wB*AEv  + wA*AOv;
+            w1-=k0;
+            w2-=k0;
           }while(--s);
         }else{
           s=2<<i;
           do{
-          wB     =w[w1]   -w[w2];
-          x[w1]  =w[w1]   +w[w2];
-          wA     =w[++w1] -w[++w2];
-          x[w1]  =w[w1]   +w[w2];
-          x[w2]  =wA*AEv  - wB*AOv;
-          x[w2-1]=wB*AEv  + wA*AOv;
-          w1-=k0;
-          w2-=k0;
+            wB     =w[w1]   -w[w2];
+            x[w1]  =w[w1]   +w[w2];
+            wA     =w[++w1] -w[++w2];
+            x[w1]  =w[w1]   +w[w2];
+            x[w2]  =wA*AEv  - wB*AOv;
+            x[w2-1]=wB*AEv  + wA*AOv;
+            w1-=k0;
+            w2-=k0;
           }while(--s);
         }
         k0--;

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.