Incremental update. One more artifact to hunt (reediness in the treble with Mazer Rackham track 7)

Monty

svn path=/branches/monty_branch_20000724/vorbis/; revision=549

2 files changed, 19 insertions, 18 deletions

diff --git a/include/vorbis/modes.h b/include/vorbis/modes.h
index 2c028102..5c1262e5 100644
--- a/include/vorbis/modes.h
+++ b/include/vorbis/modes.h
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: modes.h,v 1.16.2.7 2000/08/08 02:25:07 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.16.2.8 2000/08/09 20:22:04 xiphmont Exp $
 
  ********************************************************************/
 
@@ -86,11 +86,11 @@ static vorbis_info_psy _psy_set0={
    {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
    {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
    {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/
-   {-35.,-35.,-35.,-37.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
+   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
    {-30.,-30.,-35.,-37.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
-   {-20.,-25.,-35.,-37.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
-   {-20.,-25.,-35.,-37.,-40.,-50.,-60.,-68.,-75.,-83., -90.}, /*11500*/
-   {-20.,-24.,-26.,-37.,-40.,-50.,-60.,-68.,-75.,-83., -90.}, /*16000*/
+   {-20.,-25.,-30.,-35.,-35.,-45.,-55.,-65.,-75.,-90.,-100.}, /*8000*/
+   {-20.,-25.,-30.,-33.,-35.,-45.,-55.,-65.,-75.,-83., -90.}, /*11500*/
+   {-20.,-24.,-26.,-32.,-35.,-45.,-55.,-65.,-75.,-83., -90.}, /*16000*/
   },
 
   1,/* peakattp */
@@ -114,7 +114,7 @@ static vorbis_info_psy _psy_set0={
    { -6., -6., -9., -9., -9., -9., -9., -9.,-10.,-11.,-12.}, /*16000*/
   },
 
-  1,/*noisemaskp */
+  0,/*noisemaskp */
   /*  0   10   20   30   40   50   60    70    80    90   100 */
   {{-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*63*/
    {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*88*/
@@ -123,22 +123,23 @@ static vorbis_info_psy _psy_set0={
    {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*250*/
    {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*350*/
    {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*500*/
-   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*700*/
-   { 10., 10.,  8.,  6.,  6.,  6.,  6.,   6.,   6.,   6.,   6.}, /*1000*/
-   { 10., 10.,  8.,  6.,  6.,  6.,  6.,   6.,   6.,   6.,   6.}, /*1400*/
-   { 10., 10.,  8.,  6.,  6.,  6.,  6.,   6.,   6.,   6.,   6.}, /*2000*/
-   { 10., 10.,  8.,  6.,  6.,  6.,  6.,   6.,   6.,   6.,   6.}, /*2800*/
-   { 10., 10.,  8.,  6.,  6.,  6.,  6.,   6.,   6.,   6.,   6.}, /*4000*/
-   { 10., 10., 10., 10., 10., 10., 10.,   8.,   8.,   8.,   8.}, /*5600*/
-   { 10., 10., 10., 10., 10., 10., 10.,  10.,   8.,   8.,   8.}, /*8000*/
-   { 10., 10., 10., 10., 10., 10., 10.,  10.,  10.,   9.,   9.}, /*11500*/
+   { 10., 10., 10.,  6.,  6.,  5.,  4.,   3.,   2.,   1.,   0.}, /*700*/
+
+   { 10., 10., 10., 10., 10.,  8.,  7.,   6.,   5.,   4.,   3.}, /*1000*/
+   { 10., 10., 10., 10., 10.,  8.,  7.,   6.,   5.,   4.,   3.}, /*1400*/
+   { 10., 10., 10., 10.,  8.,  8.,  7.,   6.,   5.,   4.,   3.}, /*2000*/
+   { 10., 10., 10., 10.,  8.,  8.,  7.,   6.,   5.,   4.,   3.}, /*2800*/
+   { 10., 10., 10., 10., 10., 10., 10.,  10.,  10.,  10.,  10.}, /*4000*/
+   { 10., 10., 10., 10., 10., 10., 10.,  10.,  10.,  10.,  10.}, /*5600*/
+   { 10., 10., 10., 10., 10., 10., 10.,  10.,  10.,  10.,  10.}, /*8000*/
+   { 10., 10., 10., 10., 10., 10., 10.,  10.,  10.,  10.,  10.}, /*11500*/
    { 10., 10., 10., 10., 10., 10., 10.,  10.,  10.,  10.,  10.}, /*16000*/
 
   },
 
   110.,
 
-  0., -.005,  /* attack/decay control */
+  0., -.005   /* attack/decay control */
 };
 
 
diff --git a/lib/psy.c b/lib/psy.c
index 64be8774..35710de9 100644
--- a/lib/psy.c
+++ b/lib/psy.c
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.23.4.8 2000/08/08 02:25:07 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.23.4.9 2000/08/09 20:22:04 xiphmont Exp $
 
  ********************************************************************/
 
@@ -261,7 +261,7 @@ void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate){
 		   p->tonecurves[i-1][j],
 		   p->tonecurves[i+1][j],.5);*/
       min_curve(p->tonecurves[i][j],p->tonecurves[i+1][j]);
-      min_curve(p->tonecurves[i][j],p->tonecurves[i-1][j]);
+      /*min_curve(p->tonecurves[i][j],p->tonecurves[i-1][j]);*/
     }
 
   /*for(i=0;i<P_BANDS-1;i++)