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

[Monty]

xiphmont    03/09/01 18:59:54

  Modified:    lib      mapping0.c window.c
  Log:
  Halfrate decode feature addition caused a bug in _vorbis_apply_window
  for transition windoews that also bit encode.  Fixed.
  
  Monty

Revision  Changes    Path
1.59      +9 -9      vorbis/lib/mapping0.c

Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mapping0.c	18 Aug 2003 05:34:01 -0000	1.58
+++ mapping0.c	1 Sep 2003 22:59:54 -0000	1.59
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.58 2003/08/18 05:34:01 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.59 2003/09/01 22:59:54 xiphmont Exp $
 
  ********************************************************************/
 
@@ -157,7 +157,7 @@
 #include "psy.h"
 #include "scales.h"
 
-#if 0
+//#if 0
 static long seq=0;
 static ogg_int64_t total=0;
 static float FLOOR1_fromdB_LOOKUP[256]={
@@ -227,7 +227,7 @@
   0.82788260F, 0.88168307F, 0.9389798F, 1.F, 
 };
 
-#endif 
+//#endif 
 
 extern int *floor1_fit(vorbis_block *vb,vorbis_look_floor *look,
                        const float *logmdct,   /* in */
@@ -275,24 +275,24 @@
 
     scale_dB=todB(&scale);
 
-#if 0
+    //#if 0
     if(vi->channels==2)
       if(i==0)
         _analysis_output("pcmL",seq,pcm,n,0,0,total-n/2);
       else
         _analysis_output("pcmR",seq,pcm,n,0,0,total-n/2);
-#endif
+    //#endif
   
     /* window the PCM data */
     _vorbis_apply_window(pcm,b->window,ci->blocksizes,vb->lW,vb->W,vb->nW);
 
-#if 0
+    //#if 0
     if(vi->channels==2)
       if(i==0)
         _analysis_output("windowedL",seq,pcm,n,0,0,total-n/2);
       else
         _analysis_output("windowedR",seq,pcm,n,0,0,total-n/2);
-#endif
+    //#endif
 
     /* transform the PCM data */
     /* only MDCT right now.... */
@@ -641,10 +641,10 @@
     
   }
 
-#if 0
+  //#if 0
   seq++;
   total+=ci->blocksizes[vb->W]/4+ci->blocksizes[vb->nW]/4;
-#endif
+  //#endif
   return(0);
 }
 

<p><p>1.23      +5 -5      vorbis/lib/window.c

Index: window.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/window.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- window.c	18 Aug 2003 05:34:01 -0000	1.22
+++ window.c	1 Sep 2003 22:59:54 -0000	1.23
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: window functions
- last mod: $Id: window.c,v 1.22 2003/08/18 05:34:01 xiphmont Exp $
+ last mod: $Id: window.c,v 1.23 2003/09/01 22:59:54 xiphmont Exp $
 
  ********************************************************************/
 
@@ -2101,13 +2101,13 @@
 
 void _vorbis_apply_window(float *d,int *winno,long *blocksizes,
                           int lW,int W,int nW){
-  float *windowLW=vwin[winno[lW]];
-  float *windowNW=vwin[winno[nW]];
-
   lW=(W?lW:0);
   nW=(W?nW:0);
-
+  
   {
+    float *windowLW=vwin[winno[lW]];
+    float *windowNW=vwin[winno[nW]];
+
     long n=blocksizes[W];
     long ln=blocksizes[lW];
     long rn=blocksizes[nW];

<p><p>--- >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.