incremental commit

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

2 files changed, 24 insertions, 23 deletions

diff --git a/include/vorbis/modes.h b/include/vorbis/modes.h
index 01fb501e..f1e5d093 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.4 2000/07/31 19:41:00 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.16.2.5 2000/08/01 02:00:10 xiphmont Exp $
 
  ********************************************************************/
 
@@ -84,13 +84,13 @@ static vorbis_info_psy _psy_set0={
    {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*700*/
    {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
    {-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*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
-   {-30.,-30.,-35.,-37.,-35.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
-   {-20.,-25.,-30.,-32.,-35.,-45.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
-   {-20.,-25.,-30.,-32.,-35.,-45.,-55.,-68.,-75.,-83., -90.}, /*11500*/
-   {-20.,-24.,-26.,-30.,-35.,-45.,-55.,-68.,-75.,-83., -90.}, /*16000*/
+   {-40.,-40.,-35.,-37.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
+   {-40.,-40.,-35.,-37.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/
+   {-35.,-35.,-35.,-37.,-35.,-47.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
+   {-30.,-30.,-35.,-37.,-35.,-47.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
+   {-20.,-25.,-30.,-32.,-35.,-47.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
+   {-20.,-25.,-30.,-32.,-35.,-47.,-60.,-68.,-75.,-83., -90.}, /*11500*/
+   {-20.,-24.,-26.,-30.,-35.,-47.,-60.,-68.,-75.,-83., -90.}, /*16000*/
   },
 
   1,/* peakattp */
@@ -124,15 +124,16 @@ static vorbis_info_psy _psy_set0={
    {-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*/
-   { -6., -6., -6., -6., -8., -8.,-10., -10., -10., -10., -10.}, /*1000*/
-   { -6., -6., -6., -6., -8., -8.,-10., -10., -10., -10., -10.}, /*1400*/
-   { -6., -6., -6., -6., -8., -8.,-10., -10., -10., -10., -10.}, /*2000*/
-   { -6., -6., -6., -6., -8., -8.,-10., -10., -10., -10., -10.}, /*2800*/
+   { -0., -0., -0., -0., -0., -0., -0.,  -0.,  -0.,  -0.,  -0.}, /*1000*/
+   { -0., -0., -0., -0., -0., -0., -0.,  -0.,  -0.,  -0.,  -0.}, /*1400*/
+   { -0., -0., -0., -0., -0., -0., -0.,  -0.,  -0.,  -0.,  -0.}, /*2000*/
+   { -0., -0., -0., -0., -0., -0., -0.,  -0.,  -0.,  -0.,  -0.}, /*2800*/
    { -0., -0., -0., -0., -0., -0., -0.,  -0.,  -0.,  -0.,  -0.}, /*4000*/
    { -0., -0., -0., -0., -0., -0., -0.,  -0.,  -0.,  -0.,  -0.}, /*5600*/
-   {  2.,  2.,  2.,  2.,  2., -0., -0.,  -0.,  -0.,  -0.,  -0.}, /*8000*/
-   {  2.,  2.,  2.,  2.,  2.,  2.,  2.,   2.,   2.,   2.,  -0.}, /*11500*/
-   {  2.,  2.,  2.,  2.,  2.,  2.,  2.,   2.,   2.,   2.,  -0.}, /*16000*/
+   { -0., -0., -0., -0., -0., -0., -0.,  -0.,  -0.,  -0.,  -0.}, /*8000*/
+   {  6.,  4.,  2.,  2.,  2.,  2.,  2.,  -0.,  -0.,  -0.,  -0.}, /*11500*/
+   {  6.,  6.,  6.,  4.,  2.,  2.,  2.,  -0.,  -0.,  -0.,  -0.}, /*16000*/
+
   },
 
   110.,
@@ -157,7 +158,7 @@ static vorbis_info_residue0 _residue_set0={0,128, 64,14,2,
 					   {99,99,99,99,99,99,99,
 					    99,99,99,99,99,99,99}};
 
-static vorbis_info_residue0 _residue_set1={0,1024, 64,28,3,
+static vorbis_info_residue0 _residue_set1={0,1024, 64,14,3,
 					   {0,1,1,1,1,1,1,1,1,1,1,1,1,1,
 					    0,1,1,1,1,1,1,1,1,1,1,1,1,1},
 					   {4,5,6,7,8,9,10,11,12,13,14,15,16,
@@ -176,7 +177,7 @@ static vorbis_info_residue0 _residue_set1={0,1024, 64,28,3,
 					   {6,6,6,6,6,6,6,6,6,6,6,6,6,6,
 					   6,6,6,6,6,6,6,6,6,6,6,6,6},/*6==64*/
 
-					   {2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+					   {
 					    99,99,99,99,99,99,99,
 					    99,99,99,99,99,99}};
 
diff --git a/lib/psy.c b/lib/psy.c
index 8a0af7f6..c360132d 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.5 2000/07/31 19:41:00 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.23.4.6 2000/08/01 02:00:10 xiphmont Exp $
 
  ********************************************************************/
 
@@ -256,15 +256,15 @@ void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate){
   /* interpolate curves between */
   for(i=1;i<P_BANDS;i+=2)
     for(j=4;j<P_LEVELS;j+=2){
-      memcpy(p->tonecurves[i][j],p->tonecurves[i-1][j],EHMER_MAX*sizeof(double));
-      /*interp_curve(p->tonecurves[i][j],
+      /*memcpy(p->tonecurves[i][j],p->tonecurves[i-1][j],EHMER_MAX*sizeof(double));*/
+      interp_curve(p->tonecurves[i][j],
 		   p->tonecurves[i-1][j],
-		   p->tonecurves[i+1][j],.5);*/
+		   p->tonecurves[i+1][j],.5);
     }
 
-  for(i=0;i<P_BANDS-1;i++)
+  /*for(i=0;i<P_BANDS-1;i++)
     for(j=4;j<P_LEVELS;j+=2)
-    min_curve(p->tonecurves[i][j],p->tonecurves[i+1][j]);
+    min_curve(p->tonecurves[i][j],p->tonecurves[i+1][j]);*/
 
   /* set up the final curves */
   for(i=0;i<P_BANDS;i++)