New LSP books, more reliable fit and lower bit usage

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

6 files changed, 395 insertions, 817 deletions

diff --git a/include/vorbis/backends.h b/include/vorbis/backends.h
index cf1068d7..1a7caddb 100644
--- a/include/vorbis/backends.h
+++ b/include/vorbis/backends.h
@@ -13,7 +13,7 @@
 
  function: libvorbis backend and mapping structures; needed for 
            static mode headers
- last mod: $Id: backends.h,v 1.10 2000/06/14 08:19:22 xiphmont Exp $
+ last mod: $Id: backends.h,v 1.11 2000/07/12 09:36:17 xiphmont Exp $
 
  ********************************************************************/
 
@@ -54,12 +54,10 @@ typedef struct{
   vorbis_info_floor     *(*unpack)(vorbis_info *,oggpack_buffer *);
   vorbis_look_floor     *(*look)  (vorbis_dsp_state *,vorbis_info_mode *,
 				   vorbis_info_floor *);
-  vorbis_echstate_floor *(*state) (vorbis_info_floor *);
   void (*free_info) (vorbis_info_floor *);
   void (*free_look) (vorbis_look_floor *);
-  void (*free_state)(vorbis_echstate_floor *);
   int  (*forward)   (struct vorbis_block *,vorbis_look_floor *,
-		     double *,double *,vorbis_echstate_floor *);
+		     double *,double *);
   int  (*inverse)   (struct vorbis_block *,vorbis_look_floor *,
 		     double *);
 } vorbis_func_floor;
diff --git a/include/vorbis/book/lsp12_0.vqh b/include/vorbis/book/lsp12_0.vqh
index 431d4aed..f4e35bb5 100644
--- a/include/vorbis/book/lsp12_0.vqh
+++ b/include/vorbis/book/lsp12_0.vqh
@@ -11,7 +11,7 @@
  *                                                                  *
  ********************************************************************
 
- function: static codebook autogenerated by vq/somethingorother
+ function: static codebook autogenerated by vq/latticebuild
 
  ********************************************************************/
 
@@ -20,407 +20,166 @@
 #include "vorbis/codebook.h"
 
 static long _vq_quantlist_lsp12_0[] = {
-	74,
-	72,
-	73,
-	79,
-	73,
-	73,
-	71,
-	78,
-	79,
-	77,
-	80,
-	72,
-	80,
-	72,
-	81,
-	73,
-	66,
-	71,
-	73,
-	67,
-	80,
-	74,
-	83,
-	83,
-	81,
-	82,
-	71,
-	75,
-	79,
-	65,
-	65,
-	80,
-	73,
-	65,
-	69,
-	74,
-	52,
-	46,
-	45,
-	82,
-	84,
-	78,
-	22,
-	50,
-	254,
-	48,
-	46,
-	23,
-	91,
-	78,
-	72,
-	73,
-	73,
-	63,
-	75,
-	67,
-	86,
-	80,
-	68,
-	68,
-	67,
-	86,
-	79,
-	66,
-	70,
-	82,
-	88,
-	70,
-	76,
-	82,
-	76,
-	65,
-	82,
-	71,
-	89,
-	9,
-	101,
-	155,
-	65,
-	79,
-	64,
-	31,
-	42,
-	47,
-	92,
-	125,
-	75,
-	94,
-	95,
-	98,
-	66,
-	71,
-	63,
-	65,
-	60,
-	75,
-	67,
-	81,
-	90,
-	75,
-	71,
-	92,
-	49,
-	57,
-	56,
-	82,
-	65,
-	79,
-	19,
-	220,
-	109,
-	68,
-	72,
-	88,
-	62,
-	84,
-	84,
-	63,
-	79,
-	81,
-	67,
-	47,
-	53,
-	18,
-	116,
-	195,
-	91,
-	76,
-	86,
-	71,
-	94,
-	78,
-	65,
-	63,
-	84,
-	93,
-	83,
-	82,
-	54,
-	73,
-	71,
-	50,
-	65,
-	68,
-	21,
-	164,
-	149,
-	69,
-	87,
-	65,
-	102,
-	95,
-	73,
-	69,
-	93,
-	89,
-	48,
-	205,
-	164,
-	98,
-	82,
-	66,
-	50,
-	59,
-	174,
-	108,
-	83,
-	64,
-	75,
-	57,
-	80,
-	72,
-	61,
-	91,
-	99,
-	204,
-	74,
-	58,
-	70,
-	187,
-	62,
-	67,
-	59,
-	125,
-	93,
-	59,
-	75,
-	93,
-	59,
-	92,
-	76,
-	60,
-	96,
-	86,
-	86,
-	110,
-	88,
-	38,
-	81,
-	86,
-	94,
-	64,
-	87,
-	90,
-	56,
-	81,
-	75,
-	230,
-	67,
-	60,
-	58,
-	71,
-	88,
-	3,
-	141,
-	89,
-	71,
-	56,
-	54,
-	77,
-	56,
-	68,
-	66,
-	96,
-	68,
-	73,
-	72,
-	105,
-	58,
-	92,
-	99,
-	81,
-	112,
-	61,
-	98,
-	54,
-	59,
-	81,
-	72,
-	101,
-	75,
-	58,
-	58,
-	95,
-	126,
-	32,
-	113,
-	59,
-	57,
-	57,
-	148,
-	61,
-	71,
-	46,
-	74,
-	57,
-	149,
-	131,
-	83,
-	56,
-	82,
-	128,
-	98,
-	106,
-	81,
-	100,
-	64,
-	88,
-	56,
-	57,
-	59,
-	42,
-	123,
-	81,
-	113,
-	78,
-	38,
+	0,
 	3,
-	199,
-	69,
-	111,
-	87,
-	61,
-	133,
-	111,
-	112,
-	58,
-	72,
-	96,
-	132,
-	87,
-	90,
-	63,
-	68,
-	98,
-	90,
-	135,
-	156,
-	90,
-	35,
-	93,
-	41,
-	63,
-	140,
-	251,
-	72,
-	60,
-	77,
-	92,
-	69,
-	64,
-	107,
-	33,
-	99,
-	123,
-	123,
-	65,
-	69,
-	49,
-	100,
-	64,
-	80,
-	78,
-	118,
-	87,
-	54,
-	69,
-	25,
-	234,
-	38,
-	10,
-	194,
+	6,
+	7,
+	8,
 	9,
-	79,
-	91,
-	123,
-	56,
-	61,
-	98,
-	148,
-	69,
-	0,
-	101,
-	68,
-	39,
-	148,
-	37,
-	59,
-	133,
-	37,
-	58,
-	99,
-	145,
+	10,
+	11,
+	13,
+	15,
 	19,
-	53,
-	78,
-	101,
-	80,
-	70,
-	55,
-	150,
-	114,
-	60,
-	69,
-	52,
-	103,
-	34,
-	139,
-	77,
-	76,
-	83,
-	49,
-	37,
-	170,
-	17,
-	76,
-	52,
-	143,
-	60,
-	91,
-	64,
-	47,
-	101,
-	50,
+	25,
+	40,
 };
 
 static long _vq_lengthlist_lsp12_0[] = {
-	 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,
-	10,10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-	11,11,11,11,11,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
+	 8,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0,
+	 0, 0,16, 0, 0, 0, 0, 0,17, 0,17, 0, 0,17, 0, 0,
+	17, 0, 0,17, 0, 0, 0, 0,17,17, 0, 0, 0,17, 0, 0,
+	 0, 0, 0, 0, 0,17,17, 0, 0, 0, 0, 0,17, 0, 0, 0,
+	 0, 0,17, 0, 0, 0, 0, 0,17, 0, 0, 0, 0, 0,15, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17, 0,16, 0, 0, 0,
+	 0, 0,17, 0,17, 0, 0, 0, 0,16, 0, 0,17, 0, 0, 0,
+	 0, 0,17, 0,17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	17, 0, 0, 0, 0, 0, 0,17, 0, 0,16,16,16,15, 0, 0,
+	 0, 0, 0, 0, 0, 0,17,17,15,17,16,16,16,14,15,17,
+	16, 0, 0, 0, 0, 0, 0, 0,15,17,15,17,17, 0, 0, 0,
+	 0, 0, 0,17,17, 0,17,12,17,16,16, 0,16, 0,15, 0,
+	 0, 0, 0, 8, 0, 0,14,14,15,16,14,14,17, 0, 0,17,
+	 0,16, 0,17,16,17, 0, 0,16,17, 0, 0, 0, 0,17,17,
+	 0,15,17, 0,17, 0,17,17,17, 0, 0, 0,17,17,17, 0,
+	 0,16,17,17,17, 0, 0,17,15, 0,17,15,15, 0,17,15,
+	 0,17, 0, 0, 0, 0,17, 0,17,16,16,15,17,16,16, 0,
+	 0,17, 0, 0, 0,17,16,15,17,17,16,16,17, 0, 0,16,
+	16, 0,16,16, 0, 0,15, 0,16, 0, 0, 0, 0, 0, 0, 0,
+	17,17,17, 0,16,17,17, 0, 0, 0,16,16, 0,17,17,17,
+	 0, 0, 0, 0, 0,16,17, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,14, 0, 0, 0, 0, 0, 0, 0, 0, 0,17, 0,13,
+	11,16, 0, 0, 0, 0,17,16,17,17,17, 0, 0,13,15,14,
+	14,14,13,14,14,17,15, 0, 0,16,14,15,12,12,12,13,
+	14,14,17, 0,17, 0,16,14,14,12,12,11,11,12,13,15,
+	 0,17, 0, 0,16,15,13,11,10, 9,11,13,14,15, 0, 0,
+	17,15,14,13,11,10,10,10,13,16,17, 0, 0, 0,17,16,
+	13,11,10,10,11,13,15,16, 0, 0,17, 0,15,13,13,12,
+	13,13,14,16, 0, 0, 0,17,16,16,17,15,15,16, 0,15,
+	16,15,17, 0, 0,17,16, 0, 0,17, 0,16, 0,16, 0,17,
+	 0, 0,15,14,17, 0, 0, 0, 0, 0, 0,17, 0, 0, 0,17,
+	17,17,16,16, 0,14, 8, 0, 0,17, 0,17,15, 0, 0, 0,
+	 0, 0,17,17, 0, 0, 0, 0, 0,17,17,17, 0, 0, 0,15,
+	17,16,17, 0,17,17,16,14,12,12,12,12,14,17,16,17,
+	 0, 0, 0,13,14,12,10,10,11,12,15,17, 0, 0, 0,17,
+	13,13,11, 9, 8, 8,10,13,15, 0, 0, 0, 0,13,12,10,
+	 8, 7, 7, 9,12,16, 0, 0, 0, 0,14,13,10, 8, 7, 8,
+	 9,12, 0, 0, 0, 0, 0,15,14,11, 9, 9, 9,10,13, 0,
+	17, 0, 0, 0, 0,14,11,12,12,12,13,16,16, 0, 0, 0,
+	 0,17,15,15,17,16,16,16, 0,17, 0, 0, 0, 0, 0, 0,
+	16, 0,17, 0, 0,17, 0, 0, 0, 0, 0,15, 0,17, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,17,17, 0,17,17, 0, 0, 0,
+	 0, 0, 0, 0, 0,17, 0, 0, 0, 0, 0, 0, 0,17, 0, 0,
+	 0,17, 0,15,14,16,16, 0,17, 0,16, 0,17, 0, 0,16,
+	14,12,11,11,11,12,15,17, 0, 0, 0, 0,15,13,11, 9,
+	 9,10,12,15, 0,17, 0, 0, 0,13,11, 8, 7, 6, 7, 9,
+	12,14, 0, 0, 0, 0,14, 9, 5, 5, 5, 6, 8,11,16, 0,
+	 0, 0, 0,17,10, 8, 7, 6, 7, 8,11,15, 0, 0, 0, 0,
+	 0,13,10, 8, 7, 8, 9,12,17,17, 0, 0, 0,17,13,12,
+	11,11,12,12,17,17, 0, 0, 0,17, 0,15,14,16,15,14,
+	17,17, 0, 0, 0, 0, 0, 0, 0, 0,17,15,17, 0, 0, 0,
+	 0, 0, 0, 0,17,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17, 0,
+	 0,17, 0, 0, 0, 0, 0, 0, 0, 0, 0,16,14,16, 0,17,
+	16,15, 0, 0, 0, 0, 0, 0,15,14,13,11,11,12,13,16,
+	16, 0, 0, 0, 0,16,13,11, 9, 8,10,11,15,15, 0, 0,
+	 0, 0, 0,11, 7, 5, 5, 7, 9,12,16, 0, 0, 0, 0,16,
+	10, 5, 4, 4, 5, 8,11,15, 0, 0, 0, 0,13,10, 6, 5,
+	 5, 6, 8,11, 0, 0, 0, 0, 0,15,12, 9, 7, 7, 8, 9,
+	14,17, 0, 0, 0, 0, 0,13,12,10,11,12,13, 0,17, 0,
+	 0, 0, 0, 0,14,15,14,15,15,16, 0, 0, 0, 0, 0, 0,
+	 0,14, 0, 0, 0, 0,17, 0, 0, 0, 0, 0,17,17,17, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,17, 0,17, 0,17, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,17,17,17,17,17,16,17,16, 0, 0,17, 0,
+	 0,16,14,13,12,12,13,13,16,17, 0, 0, 0, 0, 0,13,
+	11, 9, 9,10,11,14,17, 0, 0, 0, 0,17,13, 9, 7, 6,
+	 8,10,13, 0, 0, 0, 0,17,15,11, 8, 5, 5, 7, 9,12,
+	 0,16, 0, 0, 0,15,11, 7, 5, 6, 7, 9,12, 0, 0, 0,
+	 0, 0,15,11, 8, 7, 7, 8,10,14, 0, 0, 0, 0, 0,17,
+	13,11,10,11,12,14,17,16, 0, 0, 0, 0,17,14,14,15,
+	17, 0,15, 0,17, 0, 0, 0, 0,16,15,17,17, 0, 0,17,
+	 0, 0, 0, 0, 0,17,16,17, 0, 0,12, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17,16,
+	17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13, 0,
+	 0, 0,17, 0, 0, 0, 0, 0, 0, 0,15,13,13,12,13,13,
+	13, 0, 0,17, 0, 0, 0,16,14,13,11,11,11,13,17, 0,
+	17, 0, 0, 0,17,13,10, 9, 9,10,12,16, 0, 0, 0, 0,
+	17,14,12, 9, 8, 8, 9,11,14, 0, 0, 0, 0, 0, 0,10,
+	 9, 8, 8, 9,11,15, 0, 0, 0, 0, 0,17,10, 9, 8, 8,
+	 9,11,16, 0, 0, 0, 0, 0,15,11,11,11,13,15,15, 0,
+	14, 0, 0, 0, 0,15,13,15,14,17,15,16,17, 0, 0, 0,
+	 0, 0,16,16,15, 8,15,14, 0,17, 0, 0, 0, 0,17,15,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0,17, 0, 0, 0,
+	17, 0,17, 0, 0,17,17,16, 0,17,16, 0,16, 0,17, 0,
+	17, 0,17,16,14,12,12,14,17,15,17,17, 0, 0, 0, 0,
+	 0,15,14,13,13,14, 0,16, 0, 0, 0, 0, 0, 0,14,12,
+	12,13,14,14, 0,17, 0, 0, 0, 0,16,15,12,12,13,13,
+	15,17, 0, 0, 0, 0,17,16,13,12,12,13,14, 0, 0, 0,
+	 0, 0, 0,17,15,13,13,12,13,16,17, 0,17, 0, 0, 0,
+	 0,14,13,14,15,16, 0, 0,17,17, 0, 0, 0, 0,17,14,
+	15,14,14, 0,17, 0, 0, 0, 0, 0, 0,16,15,16, 0,15,
+	17, 0,15, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0,17,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0,17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17,
+	17, 0,17, 0, 0,17, 0,17, 0, 0, 0,17,17,16,17, 0,
+	17,16, 0, 0, 0, 0, 0, 0, 0,17, 0,15, 0,15, 0, 0,
+	 0,17,17, 0, 0, 0,15,15,17,16,17,16, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,15,17, 0,17,15, 0, 0, 0, 0, 0, 0,
+	16,15,15, 0, 0, 0,17, 0, 0, 0, 0, 0, 0,17,14,14,
+	16,16,17,16, 0, 0, 0, 0, 0, 0,15,14,14,17, 0,17,
+	 0, 0, 0, 0, 0, 0, 0,16,15,17, 0,17, 0, 0,17, 0,
+	 0, 0, 0, 0,16,17,17, 0, 0,17, 0, 0, 0, 0, 0, 0,
+	17,16,15, 0, 0, 0, 0, 0, 0,17, 0, 0, 0,17, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,15, 0, 0,17,16, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,16, 0, 0,17, 0, 0, 0, 0, 0, 0, 0, 0,16,
+	15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17,17, 0,17,
+	 0, 0,17, 0, 0, 0, 0, 0, 0,15,17, 0,17, 0, 0, 0,
+	 0,17, 0, 0, 0,16,17, 0, 0, 0, 0, 0,16,17, 0, 0,
+	 0, 0, 0,15,17, 0, 0, 0,17, 0, 0, 0, 0, 0, 0,17,
+	16,16, 0,17, 0,17, 0, 0, 0, 0, 0, 0, 0,17,17,16,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,17, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,17, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	17,17, 0, 0, 0, 0,17,17, 0, 0, 0, 0, 0, 0,17, 0,
+	 0, 0,17, 0, 0, 0, 0, 0, 0, 0,17, 0, 0, 0, 0,17,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,17, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,16,
+	17, 0, 0, 0, 0, 0,17, 0, 0, 0, 0,17, 0, 0, 0,17,
+	 0, 0, 0, 0, 0, 0, 0, 0,17,16, 0,17, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,17, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17,17, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0,
+         0, 0, 0, 0, 0,
 };
 
 static static_codebook _vq_book_lsp12_0 = {
-	3, 128,
+	3, 2197,
 	_vq_lengthlist_lsp12_0,
-	2, 1602090201, 1593036045, 8, 1,
+	1, 1605579571, 1597274849, 6, 1,
 	_vq_quantlist_lsp12_0,
 	NULL,
 	NULL,
diff --git a/include/vorbis/book/lsp30_0.vqh b/include/vorbis/book/lsp30_0.vqh
index 21f8033c..6bed1d43 100644
--- a/include/vorbis/book/lsp30_0.vqh
+++ b/include/vorbis/book/lsp30_0.vqh
@@ -11,7 +11,7 @@
  *                                                                  *
  ********************************************************************
 
- function: static codebook autogenerated by vq/somethingorother
+ function: static codebook autogenerated by vq/latticebuild
 
  ********************************************************************/
 
@@ -20,407 +20,242 @@
 #include "vorbis/codebook.h"
 
 static long _vq_quantlist_lsp30_0[] = {
-	54,
-	53,
-	52,
-	50,
-	55,
-	54,
-	53,
-	50,
-	55,
-	55,
-	56,
-	51,
-	53,
-	57,
-	56,
-	51,
-	49,
-	52,
-	53,
-	53,
-	46,
-	55,
-	60,
-	54,
-	48,
-	51,
-	60,
-	50,
-	56,
-	60,
-	58,
-	49,
-	57,
-	59,
-	55,
-	52,
-	63,
-	55,
-	53,
-	47,
-	58,
-	48,
-	54,
-	49,
-	61,
-	60,
-	47,
-	52,
-	45,
-	53,
-	54,
-	57,
-	47,
-	49,
-	51,
-	61,
-	48,
-	55,
-	55,
-	44,
-	52,
-	47,
-	47,
-	61,
-	52,
-	48,
-	47,
-	54,
-	63,
-	45,
-	60,
-	54,
-	55,
-	64,
-	59,
-	51,
-	46,
-	59,
-	58,
-	52,
-	61,
-	45,
-	50,
-	49,
-	41,
-	59,
-	60,
-	55,
-	44,
-	59,
-	50,
-	59,
-	64,
-	63,
-	57,
-	62,
-	49,
-	66,
-	53,
-	44,
-	80,
-	53,
-	46,
-	63,
-	56,
-	33,
-	51,
-	61,
-	54,
-	64,
-	45,
-	38,
-	55,
-	54,
-	50,
-	42,
-	59,
-	65,
-	60,
-	50,
-	55,
-	50,
-	63,
-	59,
-	43,
-	57,
-	47,
-	76,
-	45,
-	44,
-	50,
-	64,
-	55,
-	58,
-	64,
-	41,
-	46,
-	55,
-	58,
-	57,
-	42,
-	43,
-	72,
-	61,
-	50,
-	29,
-	44,
-	35,
-	49,
-	52,
-	57,
-	68,
-	54,
-	42,
-	31,
-	39,
-	43,
-	47,
-	61,
-	31,
-	44,
-	53,
-	33,
-	57,
-	66,
-	49,
-	70,
-	54,
-	53,
-	59,
-	43,
-	38,
-	78,
-	69,
-	46,
-	58,
-	43,
-	59,
-	62,
-	43,
-	50,
-	40,
-	51,
-	57,
-	66,
-	46,
-	64,
-	47,
-	66,
-	42,
-	65,
-	62,
-	47,
-	37,
-	48,
-	55,
-	40,
-	46,
-	47,
-	71,
-	65,
-	58,
-	39,
-	55,
-	66,
-	62,
-	58,
-	41,
-	87,
-	57,
-	53,
-	36,
-	34,
-	59,
-	52,
-	42,
-	66,
-	49,
-	48,
-	38,
-	57,
-	68,
-	42,
-	74,
-	50,
-	59,
-	42,
-	46,
-	49,
-	44,
-	39,
-	47,
-	56,
-	68,
-	36,
-	69,
-	75,
-	65,
-	45,
-	59,
-	54,
-	56,
-	37,
-	61,
-	43,
-	61,
-	47,
-	71,
-	43,
-	61,
-	45,
-	46,
-	64,
-	67,
-	65,
-	64,
-	46,
-	45,
-	44,
-	68,
-	47,
-	50,
-	50,
-	39,
-	37,
-	59,
-	58,
-	53,
-	53,
-	37,
-	66,
-	57,
-	42,
-	32,
-	67,
-	60,
-	39,
-	83,
-	69,
-	39,
-	65,
-	60,
-	38,
-	65,
-	69,
-	65,
-	46,
-	37,
-	32,
-	62,
-	73,
-	57,
-	69,
-	63,
-	35,
-	75,
-	79,
-	44,
-	62,
-	71,
-	39,
-	65,
-	52,
-	57,
-	57,
-	73,
-	62,
-	59,
-	73,
 	0,
 	5,
-	8,
-	16,
-	16,
-	58,
-	65,
-	41,
-	58,
-	38,
-	65,
-	47,
-	41,
-	57,
-	39,
-	64,
-	52,
-	38,
-	47,
-	64,
-	41,
-	58,
-	29,
-	49,
-	62,
-	46,
-	38,
-	59,
-	32,
-	56,
-	43,
-	55,
-	73,
-	37,
-	72,
-	51,
-	55,
-	51,
-	71,
-	71,
-	47,
-	36,
-	79,
-	61,
-	67,
-	73,
-	53,
-	46,
-	126,
-	99,
-	73,
-	95,
-	80,
-	64,
-	33,
-	177,
-	70,
-	0,
-	87,
-	116,
-	76,
-	59,
-	46,
-	36,
-	122,
-	63,
-	6,
-	26,
-	141,
+	10,
+	11,
+	12,
+	13,
+	14,
+	15,
+	17,
+	19,
 	21,
+	23,
+	27,
 	31,
-	71,
-	94,
-	1,
-	254,
+	35,
 };
 
 static long _vq_lengthlist_lsp30_0[] = {
-	 2, 3, 3, 3, 4, 4, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7,
-	 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,11,11,
-	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,13,13,13,13,13,13,13,13,13,14,
-	14,14,14,14,14,15,15,15,15,15,15,16,16,16,17,17,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	20,19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0,20,19, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,19,17,17, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,20, 0,18,15,16,17, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0,18,15,16,18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0,15,18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,19, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,18,17,15,15,17,17,16,17,17, 0,
+	 0, 0, 0, 0, 0, 0,17,14,14,16,17,16,17,18, 0, 0,
+	 0, 0, 0, 0, 0,17,14,14,15,16,16,16,19, 0, 0, 0,
+	 0, 0, 0, 0,18,15,15,17,19,17,18, 0, 0, 0, 0, 0,
+	 0,16, 0,19,17,17,18, 0,17,19, 0, 0, 0, 0, 0, 0,
+	 0, 0,18,16,17, 0,16,15,17,19, 0, 0, 0, 0, 0, 0,
+	 0, 0,16,18,16,14,15,17,18, 0, 0, 0, 0, 0, 0, 0,
+	 0,18,18,16,14,16,16,18, 0, 0, 0, 0, 0, 0,17,17,
+	17,17,19,17,17,17,17, 0, 0, 0, 0,19,19, 0,18,16,
+	18,17,18,17,19,17, 0, 0, 0,18, 0, 0,19,19, 0,15,
+	15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,18,19, 0,
+	19, 0,19, 0, 0, 0, 0, 0, 0, 0, 0, 0,19, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,19, 0, 0,16,16,17,16,16,16,18,
+	 0, 0, 0, 0, 0, 0, 0,19,17,16,18,18,18,18, 0, 0,
+	 0, 0, 0, 0, 0, 0,18,16,16,18,18,16,18, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,18,16,16,18,16,18, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,19,17,19,17,15,16, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,17,18, 0,17,14,15, 0, 0, 0, 0, 0, 0,
+	 0, 0,19,18,18,18,16,15,17,19, 0, 0, 0, 0, 0, 0,
+	 0,18,16,18,16,18,18,17,19, 0, 0, 0, 0, 0, 0,19,
+	19,18, 0,18,18,18,17,17, 0, 0, 0,19,19, 0,17,17,
+	17,18,15,17,17,18,18, 0, 0, 0, 0, 0, 0,18, 0,16,
+	15,16,18,17, 0,19, 0,19,17,18,18, 0, 0, 0,17, 0,
+	18,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,18,16,15,18,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,19, 0, 0,
+	 0, 0, 0, 0, 0, 0,18,17,17,15,14,14,15,16,16,17,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,14,15,18,19,18, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,16,16,17, 0,17,19, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0,18,15,17, 0,16,18, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,15,14,18,19,16,17, 0, 0, 0, 0,
+	 0, 0, 0, 0,19,17,15,18,18,16,17,19, 0, 0, 0, 0,
+	 0, 0, 0,19,17,18,16,16,16,17,17, 0, 0, 0, 0, 0,
+	 0, 0,19,17,16,16,16,16,15,17, 0, 0, 0, 0, 0, 0,
+	 0,19,17,19,17,17,16,15,18, 0, 0, 0, 0,19,17, 0,
+	19,17,16,15,15,15,16,18, 0, 0, 0, 0, 0,19,18,17,
+	15,14,15,16,16, 0, 0, 0,18,16,17,19, 0,18,17,16,
+	15,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,18, 0,15,14,
+	17, 0,19, 0,19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,19, 0,18,19,17,
+	19, 0, 0, 0, 0, 0, 0,19,16,14,15,15,15,17,18,18,
+	19, 0, 0, 0, 0, 0, 0, 0, 0,19,17,15,17,19, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,18,15,17,19,19,19, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,17,15,17, 0,18, 0, 0, 0,
+	 0, 0, 0, 0, 0,19,17,15,14,18,18,18,19, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,16,16,17,19,17,18, 0, 0, 0, 0,
+	 0, 0, 0, 0,18,17,16,16,15,16,15,18, 0, 0, 0, 0,
+	 0, 0, 0, 0,15,15,15,15,15,17,18, 0, 0, 0, 0,19,
+	 0, 0,18,17,16,14,14,16,16,18, 0, 0, 0,19, 0,19,
+	19,18,18,14,13,13,15,19,18, 0, 0, 0, 0,19, 0,16,
+	15,15,15,14,11,15, 0,19, 0,19,18, 0, 0,19,17,17,
+	14,14,12,13,19, 0, 0, 0, 0, 0, 0, 0,18,17,17,14,
+	14,17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0,18,18,16,15,15,14,14,15,15,
+	17,18, 0, 0, 0, 0, 0, 0,18,16,15,14,14,16,19,17,
+	17,19, 0, 0, 0, 0, 0, 0, 0, 0, 0,18,17,17,18,17,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,19, 0,17,17,19,19, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,18,16,18,18,18,19, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,18,16,17,18,19,19, 0, 0,
+	 0, 0, 0, 0, 0, 0,18,16,17,19,17,17,18, 0, 0, 0,
+	 0, 0, 0, 0, 0,19,16,14,15,14,15,17,18, 0, 0, 0,
+	 0, 0, 0, 0, 0,15,14,14,14,14,17,17, 0, 0, 0, 0,
+	 0, 0,19,19,17,14,12,12,15,17,18, 0, 0, 0, 0,18,
+	 0,18,17,15,14,12,12,13,18,19, 0, 0,17, 0,17,17,
+	18,16,15,14,12,12,14, 0, 0, 0,19, 0,18, 0,19, 0,
+	16,15,13,12,14,18, 0, 0, 0, 0, 0, 0,17,19,19,16,
+	13,13,16,19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,18,16,
+	16,17,18, 0, 0, 0, 0, 0,17,15,14,14,14,14,14,15,
+	15,15,17, 0, 0, 0, 0,15,16,16,17,17,14,13,16, 0,
+	 0,17, 0, 0, 0, 0,17,18,18,18, 0,18,16,18,18,17,
+	19,19, 0, 0, 0, 0, 0, 0, 0, 0,17,17,16,17,17,18,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,19,17,15,15,17,18, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,18,16,15,16,16, 0, 0,
+	 0, 0,18, 0, 0, 0,19,19,15,15,16,15,15,19, 0,16,
+	 0, 0, 0, 0, 0,19,17,14,12,13,12,12,17, 0, 0, 0,
+	 0, 0, 0,19,18,18,13,13,12,12,13,17,19, 0, 0, 0,
+	 0,18,19,19,16,13,11,11,10,12,16,19, 0, 0, 0, 0,
+	19,18,16,13,12,11,11,10,12,17, 0, 0,19,17,17,17,
+	18,17,15,13,12,10,11,14,17,19, 0,19,19,18,18,17,
+	17,15,15,11,12,14,18,17, 0, 0, 0,19,18,18,19,18,
+	14,13,13,16,18,19, 0,18, 0, 0, 0, 0, 0, 0,19, 0,
+	19,18,18,18,19, 0, 0, 0, 0,19,17,16,15,15,15,15,
+	16,16,14,17, 0, 0, 0,17,13,13,13,14,14,13,14,15,
+	16,16,17, 0, 0,16,19,16,17,16,14,16,17,16,17,17,
+	17,18, 0, 0,18, 0,18, 0,19,15,15,17,15,15,15,15,
+	17, 0, 0, 0,18,17,19,16,15,15,15,15,14,14,13,15,
+	 0, 0, 0,17,17, 0,19, 0,19,16,14,14,13,13,15,19,
+	 0, 0,18,17, 0, 0,18, 0,16,13,13,12,12,13,17,19,
+	 0, 0,18,18, 0,18,17,14,11,10,10,10,11,16,19, 0,
+	 0,17,18,19,19,14,14,10, 8, 8, 8,11,15,18, 0,19,
+	18,18,19,17,15,13,10, 8, 7, 8,11,13,17, 0,18, 0,
+	16,15,14,14,12,10, 8, 8, 9,11,13,14, 0,17,16,17,
+	16,15,15,14,11,10,10,10,13,14,14, 0, 0, 0,17,16,
+	17,17,15,12,11,12,15,15,14,16, 0, 0,17,19, 0, 0,
+	16,14,12,13,18,18,15,16,19, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,19,18, 0, 0, 0, 0, 0, 0,18,19, 0,16,
+	16,15,16,15,16,19, 0, 0, 0,17,18,15,14,15,17,18,
+	16,16,15,17,19, 0, 0, 0,14,19,15,13,14,14,15,18,
+	15,16,18, 0, 0, 0,18,12,19,14,14,15,14,15,14,15,
+	15,16,18, 0, 0,18,13,15,17,18,17,16,14,14,13,14,
+	15,19, 0, 0, 0,15,16,17, 0,18,15,14,14,12,13,14,
+	19, 0, 0, 0, 0,19,16,15,16,14,13,11,11,11,12,17,
+	 0, 0,15,14,16,17,16,14,12,10, 9, 8, 8,11,16,17,
+	 0,14,13,14,13,13,14,11, 8, 6, 5, 6,10,13,14, 0,
+	15,15,15,15,14,13,10, 7, 4, 4, 6,10,12,14, 0,17,
+	16,15,14,14,13,10, 8, 6, 6, 7,10,12,14, 0,17,15,
+	15,14,14,14,12,10,10,10,10,12,13,17, 0,19,16,17,
+	17,16,17,14,13,13,14,14,14,16,19, 0,18, 0, 0,18,
+	18,16,14,12,14,16,16,15,18, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	17,17, 0,17,17,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	18,18,17,15,17, 0, 0, 0, 0, 0, 0, 0, 0,17,15,14,
+	16,18,17,17,19, 0, 0, 0, 0,19,17,19,16,13,13,16,
+	15,16,14, 0, 0, 0, 0,19,16,16,15,16,14,14,15,14,
+	14,13,18, 0, 0, 0, 0,17,15,14,14,13,12,13,12,12,
+	13,19, 0, 0,18,17,18,15,13,13,12,11,11,10,10,12,
+	18,17, 0,14,12,14,13,13,12,11, 9, 8, 7, 8,11,15,
+	17, 0,12,12,13,12,12,11,10, 7, 5, 4, 6,10,14,16,
+	 0,13,13,14,12,12,11,10, 6, 4, 3, 5,10,13,16, 0,
+	13,13,13,12,12,11,10, 7, 6, 6, 7, 9,12,16, 0,15,
+	14,13,14,14,13,12,10,10,10,10,11,14,19, 0,16,16,
+	 0,18,16,15,14,13,13,14,13,14,17, 0, 0,19, 0,19,
+	17,17,15,12,12,14,16,15,15,17,16, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0,19, 0, 0,18,17, 0,19, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0,19,17,16,14,19, 0, 0,19, 0, 0, 0, 0,19,18,
+	16,17,18,16,16,18,19, 0, 0, 0, 0, 0,19,19,16,15,
+	15,16,15,14,19,19, 0, 0, 0, 0, 0, 0,17,15,14,14,
+	14,14,13,19,19, 0,19, 0, 0, 0,17,17,14,13,13,13,
+	13,13,18,19, 0,18,18,18,17,15,14,13,12,11,11,10,
+	12,17,19, 0,14,13,14,15,13,12,11, 9, 8, 8, 8,12,
+	16,19, 0,12,12,15,13,12,12,10, 8, 6, 6, 7,11,14,
+	17, 0,11,11,13,12,12,11,10, 7, 6, 6, 7,10,13,18,
+	19,10,12,13,13,12,11, 9, 7, 7, 7, 7, 9,12,15, 0,
+	13,12,14,14,14,13,11,10,10,10,10,11,14,17, 0,16,
+	13,17,15,14,13,12,12,13,13,12,13,16,19, 0, 0,19,
+	17,16,15,12,11,11,14,15,14,14,16,17, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0,17, 0,19, 0, 0, 0, 0, 0, 0,
+	19,18,18,17,16,16,15,17, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,18,17,17,18,16,18, 0, 0, 0, 0, 0,19,18,19,17,
+	16,17,18,16,15,19, 0, 0, 0, 0, 0, 0, 0, 0,17,15,
+	15,17,15,14, 0, 0, 0, 0, 0,19, 0,19,18,17,15,15,
+	15,15,14,18, 0, 0,17, 0,17,18,17,16,14,12,12,13,
+	13,14,16,18, 0,15,15,17,17,14,13,12,11,10,11,11,
+	13,15,19, 0,13,12,15,15,13,13,12,10, 9,10,11,12,
+	14,18, 0,13,11,15,14,13,13,11,10,10,10,10,12,14,
+	18, 0,13,11,14,13,12,13,12,11,10,11,11,12,14,18,
+	18,15,11,14,13,12,13,12,11,12,12,12,13,14,16, 0,
+	 0,12,14,15,14,13,12,12,13,13,12,14,16,19, 0, 0,
+	14,14,15,13,12,12,14,16,15,14,15,16,16, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,19, 0, 0,19, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0,19,19, 0, 0,18, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,18, 0, 0, 0,17,19, 0, 0, 0, 0, 0, 0,19, 0,18,
+	18, 0, 0,18,15, 0, 0, 0,18, 0, 0, 0,19,18,16,17,
+	 0,19,17,15, 0, 0, 0,19,19, 0,18,16,16,15,16,18,
+	16,15,15,18, 0, 0,17, 0,18,16,14,14,16,17,16,16,
+	15,15,17,19, 0,18,15,16,15,14,15,15,15,15,14,14,
+	14,16,19,19,16,14,15,14,15,15,14,13,14,14,13,14,
+	16, 0,19,17,13,15,13,13,15,14,14,14,14,13,13,17,
+	 0, 0,17,12,15,15,15,16,14,13,14,14,14,13,17, 0,
+	 0,18,12,13,15,15,15,14,14,14,13,14,13,17, 0, 0,
+	 0,13,13,13,13,15,16,18,18,17,18,18, 0,17, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,19, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,19, 0,18, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,19, 0, 0, 0, 0, 0,19,
+	 0,19, 0, 0,19, 0, 0, 0,19, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0,18,19, 0, 0, 0,18, 0, 0, 0, 0,19,18, 0, 0,
+	 0,19,18, 0, 0,18,18, 0, 0,19,19, 0,17,18,18,18,
+	17,16, 0, 0, 0, 0,17, 0, 0,18,19,18,18,18,17,16,
+	14,18, 0, 0,18,16,19, 0, 0, 0,16,15,17,15,14,13,
+	18, 0, 0, 0,13,17,17,19,19,18,17,19,16,15,13, 0,
+	 0,19,19,13,14,15,17,18,18, 0,18,18,17,17, 0, 0,
+	16,17,13,13,15,16,19,18, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
 static static_codebook _vq_book_lsp30_0 = {
-	3, 128,
+	3, 3375,
 	_vq_lengthlist_lsp30_0,
-	2, 1601492961, 1590858881, 8, 1,
+	1, 1602140242, 1592812110, 6, 1,
 	_vq_quantlist_lsp30_0,
 	NULL,
 	NULL,
diff --git a/include/vorbis/codec.h b/include/vorbis/codec.h
index 8de254f6..804a1ebe 100644
--- a/include/vorbis/codec.h
+++ b/include/vorbis/codec.h
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: libvorbis codec headers
- last mod: $Id: codec.h,v 1.20 2000/07/07 01:52:24 xiphmont Exp $
+ last mod: $Id: codec.h,v 1.21 2000/07/12 09:36:17 xiphmont Exp $
 
  ********************************************************************/
 
@@ -250,10 +250,6 @@ typedef struct vorbis_dsp_state{
   int      pcm_current;
   int      pcm_returned;
 
-  double  *multipliers;
-  int      envelope_storage;
-  int      envelope_current;
-
   int  eofflag;
 
   long lW;
@@ -270,7 +266,7 @@ typedef struct vorbis_dsp_state{
   int64_t res_bits;
 
   /* local lookup storage */
-  envelope_lookup         ve; /* envelope */    
+  void                   *ve; /* envelope lookup */    
   double                **window[2][2][2]; /* block, leadin, leadout, type */
   vorbis_look_transform **transform[2];    /* block, type */
   codebook               *fullbooks;
diff --git a/include/vorbis/internal.h b/include/vorbis/internal.h
index 02bf95b9..100df518 100644
--- a/include/vorbis/internal.h
+++ b/include/vorbis/internal.h
@@ -13,21 +13,13 @@
 
  function: libvorbis codec internal types.  These structures are 
            'visible', but generally uninteresting to the developer
- last mod: $Id: internal.h,v 1.6 2000/06/18 12:33:47 xiphmont Exp $
+ last mod: $Id: internal.h,v 1.7 2000/07/12 09:36:17 xiphmont Exp $
 
  ********************************************************************/
 
 #ifndef _vorbis_internal_h_
 #define _vorbis_internal_h_
 
-/* lookup structures for various simple transforms *****************/
-
-typedef struct {
-  double *window;
-  long winlen;
-  void *fft;
-} envelope_lookup;
-
 /* structures for various internal data abstractions ********************/
 
 typedef struct {
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