New LSP books, more reliable fit and lower bit usage

svn path=/trunk/vorbis/; revision=522

1 files changed, 13 insertions, 15 deletions

diff --git a/include/vorbis/modes.h b/include/vorbis/modes.h
index 9d41c8df..d1cc21f9 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.15 2000/06/19 10:05:57 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.16 2000/07/12 09:36:17 xiphmont Exp $
 
  ********************************************************************/
 
@@ -60,7 +60,7 @@
 /* A farily high quality setting mix */
 static vorbis_info_psy _psy_set0={
   1,/*athp*/
-  1,/*decayp*/
+  0,/*decayp*/
   1,/*smoothp*/
   0,8,0.,
 
@@ -76,12 +76,12 @@ static vorbis_info_psy _psy_set0={
   {-40.,-40.,-60.,-80.,-100.},  
 
   1,/* peakattp */
-  {-12.,-12.,-12.,-16.,-16.},
-  {-12.,-12.,-12.,-16.,-16.},
-  {-12.,-12.,-12.,-16.,-16.},
-  {-12.,-12.,-12.,-16.,-16.},
-  {-12.,-12.,-12.,-16.,-16.},
-  {-10.,-10.,-12.,-16.,-16.},
+  {-12.,-12.,-12.,-16.,-18.},
+  {-12.,-12.,-12.,-16.,-18.},
+  {-12.,-12.,-12.,-16.,-18.},
+  {-12.,-12.,-12.,-16.,-18.},
+  {-12.,-12.,-12.,-16.,-18.},
+  {-10.,-10.,-12.,-16.,-18.},
   {-6.,-8.,-10.,-12.,-12.},
 
   1,/*noisemaskp */
@@ -91,11 +91,11 @@ static vorbis_info_psy _psy_set0={
   {-65.,-65.,-65.,-85.,-85.},
   {-60.,-60.,-60.,-80.,-80.},
   {-60.,-60.,-60.,-80.,-80.},
-  {-52.,-55.,-60.,-80.,-80.},
+  {-60.,-60.,-60.,-80.,-80.},
 
   100.,
 
-  .9998, .9999  /* attack/decay control */
+  .9998, .9998  /* attack/decay control */
 };
 
 /* with GNUisms, this could be short and readable. Oh well */
@@ -113,7 +113,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,768, 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,
@@ -132,9 +132,7 @@ static vorbis_info_residue0 _residue_set1={0,768, 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,99,
 					    99,99,99,99,99,99}};
 
 static vorbis_info_mapping0 _mapping_set0={1, {0,0}, {0}, {0}, {0}, {0}};
@@ -197,7 +195,7 @@ vorbis_info info_A={
   /* psy */
   {&_psy_set0},
   /* thresh sample period, preecho clamp trigger threshhold, range */
-  64, 15, 2 
+  256, 24, 6
 };
 
 #define PREDEF_INFO_MAX 0