From: Monty <xiphmont@xiph.org>
Date: Thu, 17 Oct 2002 04:41:39 +0000 (+0000)
Subject: Fix a divide by zero in noise_hybridmp due to faulty spectrum wrapping
X-Git-Tag: v1.3.3~647
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae7094e49682e3094a590f9b896d416f2129f0b3;p=platform%2Fupstream%2Flibvorbis.git

Fix a divide by zero in noise_hybridmp due to faulty spectrum wrapping
around Bark 0.

svn path=/trunk/vorbis/; revision=4018
---

diff --git a/lib/psy.c b/lib/psy.c
index 48a8600..cdfcefa 100644
--- a/lib/psy.c
+++ b/lib/psy.c
@@ -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 @@ 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("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