Incorrect thinking on my part; rolling change back to 1.77

svn path=/trunk/vorbis/; revision=4019

diff --git a/lib/mapping0.c b/lib/mapping0.c
index 938db89..2df1b74 100644 (file)
--- a/lib/mapping0.c
+++ b/lib/mapping0.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.54 2002/10/11 11:14:41 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.55 2002/10/17 04:56:23 xiphmont Exp $
 
  ********************************************************************/
 
@@ -157,7 +157,7 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb)
 #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 @@ static float FLOOR1_fromdB_LOOKUP[256]={
   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 */
@@ -346,7 +346,7 @@ static int mapping0_forward(vorbis_block *vb){
       for(j=0;j<n/2;j++)
        logmdct[j]=todB(mdct+j);
 
-#if 0
+      //#if 0
       if(vi->channels==2){
        if(i==0)
          _analysis_output("mdctL",seq,logmdct,n/2,1,0,0);
@@ -355,7 +355,7 @@ static int mapping0_forward(vorbis_block *vb){
       }else{
        _analysis_output("mdct",seq,logmdct,n/2,1,0,0);
       }
-#endif 
+      //#endif 
       
       /* first step; noise masking.  Not only does 'noise masking'
          give us curves from which we can decide how much resolution
@@ -641,10 +641,10 @@ static int mapping0_forward(vorbis_block *vb){
     
   }
 
-#if 0
+  //#if 0
   seq++;
   total+=ci->blocksizes[vb->W]/4+ci->blocksizes[vb->nW]/4;
-#endif
+  //#endif
   return(0);
 }
 

diff --git a/lib/psy.c b/lib/psy.c
index cdfcefa..719da03 100644 (file)
--- a/lib/psy.c
+++ b/lib/psy.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.78 2002/10/17 04:41:39 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.79 2002/10/17 04:56:23 xiphmont Exp $
 
  ********************************************************************/
 
@@ -630,10 +630,10 @@ static void bark_noise_hybridmp(int n,const long *b,
     lo = hi - fixed;
     
     tN = N[hi] + N[-lo];
-    tX = X[hi] + X[-lo];
+    tX = X[hi] - X[-lo];
     tXX = XX[hi] + XX[-lo];
     tY = Y[hi] + Y[-lo];
-    tXY = XY[hi] + XY[-lo];
+    tXY = XY[hi] - XY[-lo];
     
     
     A = tY * tXX - tX * tXY;
@@ -780,14 +780,14 @@ void _vp_noisemask(vorbis_look_psy *p,
     }
     
     if(seq&1)
-      _analysis_output("median2R",seq/2,work,n,1,0,0);
+      _analysis_output("medianR",seq/2,work,n,1,0,0);
     else
-      _analysis_output("median2L",seq/2,work,n,1,0,0);
+      _analysis_output("medianL",seq/2,work,n,1,0,0);
     
     if(seq&1)
-      _analysis_output("envelope2R",seq/2,work2,n,1,0,0);
+      _analysis_output("envelopeR",seq/2,work2,n,1,0,0);
     else
-      _analysis_output("envelope2L",seq/2,work2,n,1,0,0);
+      _analysis_output("enveloperL",seq/2,work2,n,1,0,0);
     seq++;
   }
 #endif