[xiph-commits] r17569 - trunk/vorbis/lib

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-10-26 10:09:47 -0700 (Tue, 26 Oct 2010)
New Revision: 17569

Modified:
   trunk/vorbis/lib/psy.c
Log:
Back out the old HF AoTuV weighting which was first enabled in 
Everywhere.  There are a few samples where I really don't like the 
effect it causes.



Modified: trunk/vorbis/lib/psy.c
===================================================================
--- trunk/vorbis/lib/psy.c	2010-10-26 11:20:48 UTC (rev 17568)
+++ trunk/vorbis/lib/psy.c	2010-10-26 17:09:47 UTC (rev 17569)
@@ -1160,14 +1160,22 @@
                     However, this is a temporary patch.
                     by Aoyumi @ 2004/04/18
                 */
-                float derate = (1.0 - de*((float)(j-limit+i) / (float)(n-limit)));
+                /*float derate = (1.0 - de*((float)(j-limit+i) / (float)(n-limit)));
+                /* elliptical 
+                if(reM[j]+reA[j]<0){
+                  reM[j] = - (qeM[j] = (fabs(reM[j])+fabs(reA[j]))*derate*derate);
+                }else{
+                  reM[j] =   (qeM[j] = (fabs(reM[j])+fabs(reA[j]))*derate*derate);
+                  }*/
 
                 /* elliptical */
                 if(reM[j]+reA[j]<0){
-                  reM[j] = - (qeM[j] = (fabs(reM[j])+fabs(reA[j]))*derate*derate);
+                  reM[j] = - (qeM[j] = fabs(reM[j])+fabs(reA[j]));
                 }else{
-                  reM[j] =   (qeM[j] = (fabs(reM[j])+fabs(reA[j]))*derate*derate);
+                  reM[j] =   (qeM[j] = fabs(reM[j])+fabs(reA[j]));
                 }
+
+
               }
               reA[j]=qeA[j]=0.f;
               fA[j]=1;