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

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-03-25 19:26:08 -0700 (Thu, 25 Mar 2010)
New Revision: 17052

Modified:
   trunk/vorbis/lib/floor1.c
Log:
Simple arithmetic error as part of fix to #1658 caused floor1 fitting to 
fall apart in overwhelmingly tonal regions.  



Modified: trunk/vorbis/lib/floor1.c
===================================================================
--- trunk/vorbis/lib/floor1.c	2010-03-26 01:54:25 UTC (rev 17051)
+++ trunk/vorbis/lib/floor1.c	2010-03-26 02:26:08 UTC (rev 17052)
@@ -511,7 +511,7 @@
     bn++;
   }
 
-  weight = bn*info->twofitweight/(an+1);
+  weight = (bn*an)*info->twofitweight/(an+1)+1.;
   xb += xa * weight;
   yb += ya * weight;
   x2b += x2a * weight;