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

[Monty]

xiphmont    02/10/17 00:41:39

  Modified:    lib      psy.c
  Log:
  Fix a divide by zero in noise_hybridmp due to faulty spectrum wrapping
  around Bark 0.

Revision  Changes    Path
1.78      +7 -7      vorbis/lib/psy.c

Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- psy.c	11 Oct 2002 07:44:28 -0000	1.77
+++ psy.c	17 Oct 2002 04:41:39 -0000	1.78
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.77 2002/10/11 07:44:28 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.78 2002/10/17 04:41:39 xiphmont Exp $
 
  ********************************************************************/
 
@@ -630,10 +630,10 @@
     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 @@
     }
     
     if(seq&1)
-      _analysis_output("medianR",seq/2,work,n,1,0,0);
+      _analysis_output("median2R",seq/2,work,n,1,0,0);
     else
-      _analysis_output("medianL",seq/2,work,n,1,0,0);
+      _analysis_output("median2L",seq/2,work,n,1,0,0);
     
     if(seq&1)
-      _analysis_output("envelopeR",seq/2,work2,n,1,0,0);
+      _analysis_output("envelope2R",seq/2,work2,n,1,0,0);
     else
-      _analysis_output("enveloperL",seq/2,work2,n,1,0,0);
+      _analysis_output("envelope2L",seq/2,work2,n,1,0,0);
     seq++;
   }
 #endif

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