[xiph-commits] r13220 - trunk/ghost/libghost

[jm at svn.xiph.org]

Author: jm
Date: 2007-07-04 08:49:19 -0700 (Wed, 04 Jul 2007)
New Revision: 13220

Modified:
   trunk/ghost/libghost/vorbis_psy.c
Log:
Removing the mutilation I had to do to the masking curve to get it to work
with Speex.


Modified: trunk/ghost/libghost/vorbis_psy.c
===================================================================
--- trunk/ghost/libghost/vorbis_psy.c	2007-07-04 15:49:12 UTC (rev 13219)
+++ trunk/ghost/libghost/vorbis_psy.c	2007-07-04 15:49:19 UTC (rev 13220)
@@ -400,20 +400,8 @@
 
     /* derive a noise curve */
     _vp_noisemask(psy,work,curve);
-#define SIDEL 12
-    for (i=0;i<SIDEL;i++)
-    {
-       curve[i]=curve[SIDEL];
-    }
-#define SIDEH 12
-    for (i=0;i<SIDEH;i++)
-    {
-       curve[(psy->n>>1)-i-1]=curve[(psy->n>>1)-SIDEH];
-    }
     for(i=0;i<((psy->n)>>1);i++)
-       curve[i] = fromdB(1.2*curve[i]+.2*i);
-       //curve[i] = fromdB(0.8*curve[i]+.35*i);
-       //curve[i] = fromdB(0.9*curve[i])*pow(1.0*i+45,1.3);
+       curve[i] = fromdB(2.0*curve[i]);
 }
 
 /* Transform a masking curve (power spectrum) into a pole-zero filter */