Correct two bugs in floor1 that required retraining

svn path=/branches/branch_monty_20020507/vorbis/; revision=3434

16 files changed, 1565 insertions, 1426 deletions

diff --git a/examples/encoder_example.c b/examples/encoder_example.c
index 91450eb0..22241ea7 100644
--- a/examples/encoder_example.c
+++ b/examples/encoder_example.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.40.2.6 2002/06/27 07:05:45 xiphmont Exp $
+ last mod: $Id: encoder_example.c,v 1.40.2.7 2002/06/28 04:19:08 xiphmont Exp $
 
  ********************************************************************/
 
@@ -97,8 +97,8 @@ int main(){
   /* (quality mode .4: 44kHz stereo coupled, roughly 128kbps VBR) */
   vorbis_info_init(&vi);
 
-  vorbis_encode_init(&vi,2,44100,-1,64000,-1);
-  //vorbis_encode_init_vbr(&vi,2,44100,.4);
+  //vorbis_encode_init(&vi,2,44100,-1,118000,-1);
+  vorbis_encode_init_vbr(&vi,2,44100,.7);
 
   /* add a comment */
   vorbis_comment_init(&vc);
diff --git a/lib/analysis.c b/lib/analysis.c
index b9982d86..5caeba1a 100644
--- a/lib/analysis.c
+++ b/lib/analysis.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: single-block PCM analysis mode dispatch
- last mod: $Id: analysis.c,v 1.51.2.4 2002/06/20 03:55:27 xiphmont Exp $
+ last mod: $Id: analysis.c,v 1.51.2.5 2002/06/28 04:19:08 xiphmont Exp $
 
  ********************************************************************/
 
@@ -100,8 +100,9 @@ void _analysis_output_always(char *base,int i,float *v,int n,int bark,int dB,ogg
     /*  } */
 }
 
-void _analysis_output(char *base,int i,float *v,int n,int bark,int dB){
-  if(analysis_noisy)_analysis_output_always(base,i,v,n,bark,dB,0);
+void _analysis_output(char *base,int i,float *v,int n,int bark,int dB,
+		      ogg_int64_t off){
+  if(analysis_noisy)_analysis_output_always(base,i,v,n,bark,dB,off);
 }
 
 
diff --git a/lib/bitrate.c b/lib/bitrate.c
index 7d874c8d..b0c6c9c7 100644
--- a/lib/bitrate.c
+++ b/lib/bitrate.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: bitrate tracking and management
- last mod: $Id: bitrate.c,v 1.11.4.5 2002/06/26 08:03:15 xiphmont Exp $
+ last mod: $Id: bitrate.c,v 1.11.4.6 2002/06/28 04:19:08 xiphmont Exp $
 
  ********************************************************************/
 
@@ -293,7 +293,7 @@ int vorbis_bitrate_addblock(vorbis_block *vb){
 	/* apply the average floater to new blocks */
 	bin=rint(bm->avgfloat);
 
-	/*fprintf(stderr,"%d ",bin);*/
+	fprintf(stderr,"%d ",bin);
 
 	
 	while(bm->avg_centeracc>desired_center){
diff --git a/lib/books/coupled/res_books_44c.h b/lib/books/coupled/res_books_44c.h
index 80fd1149..2b000f12 100644
--- a/lib/books/coupled/res_books_44c.h
+++ b/lib/books/coupled/res_books_44c.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: res_books_44c.h,v 1.1.2.3 2002/06/27 07:05:48 xiphmont Exp $
+ last modified: $Id: res_books_44c.h,v 1.1.2.4 2002/06/28 04:19:13 xiphmont Exp $
 
  ********************************************************************/
 
@@ -90,7 +90,7 @@ static long _vq_lengthlist__44c0_s_p1_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 7, 0, 0, 0, 0,
-	 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
+	 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -135,7 +135,7 @@ static long _vq_lengthlist__44c0_s_p1_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 7, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
+	 0, 0, 5, 7, 8, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
 	 0, 0, 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -761,9 +761,9 @@ static long _vq_lengthlist__44c0_s_p6_0[] = {
 	12,12,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,10,11,
 	11,12,12,13,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
 	11,11,12,12,13,13, 0, 0, 0, 8, 8, 9, 9,10,10,10,
-	10,11,11,12,12,12,13, 0, 0, 0, 9, 9,10, 9,10,10,
-	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,11,11,12,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
+	10,11,11,12,12,12,13, 0, 0, 0, 9, 9, 9, 9,10,10,
+	10,11,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,10,
+	10,11,11,11,12,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
 	10,10,11,11,12,12,13,12,13,13, 0, 0, 0, 0, 0, 9,
 	 9,10,10,11,11,12,12,13,13,13,13, 0, 0, 0, 0, 0,
 	10,10,10,10,11,11,12,12,13,13,14,13, 0, 0, 0, 0,
@@ -1189,13 +1189,13 @@ static static_codebook _44c0_s_p9_2 = {
 };
 
 static long _huff_lengthlist__44c0_s_short[] = {
-	 6, 8,17,12,14,12,12,17,16,16, 4, 1,16, 4,13, 7,
-	10,13,16,16,16,16,16,16,16,16,16,16,16,16, 9, 4,
-	16, 6,14, 8,11,14,16,16,13, 5,16, 7,13,10,12,16,
-	14,15,11, 6,16, 8,12, 9,11,13,15,15,12, 8,16,10,
-	11, 9,10,12,13,14,16, 9,16, 9, 8, 9,11,12,13,16,
-	16, 6,16, 7, 5, 6, 7,10,14,16,13, 6,16, 7, 5, 5,
-	 7, 8,11,14,
+	 7, 9,16,12,14,13,14,15,16,16, 6, 1,16, 4,13, 7,
+	10,13,14,13,16,16,16,16,16,16,16,16,16,16, 9, 4,
+	16, 6,14, 8,11,14,16,13,13, 4,16, 8,13,10,12,16,
+	14,15,12, 6,16, 8,12, 9,11,13,15,14,11, 8,16,10,
+	11, 9,10,12,14,14,14, 9,16, 9, 8, 9,11,12,13,16,
+	16, 6,16, 7, 5, 6, 7,10,14,16,13, 6,16, 7, 4, 5,
+	 7, 9,11,14,
 };
 
 static static_codebook _huff_book__44c0_s_short = {
@@ -1237,417 +1237,417 @@ static long _vq_quantlist__44c0_sm_p1_0[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p1_0[] = {
-	 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
-	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 5, 8, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
-	 0, 0, 0, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 7, 8, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0,
-	 0, 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 7, 0, 0, 0, 0,
-	 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
-	 0, 0, 0, 9, 9,10, 0, 0, 0, 0, 0, 0, 9,10,10, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 9,10,10,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 7, 8, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,10,10, 0,
-	 0, 0, 0, 0, 0, 8, 9,10, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,10,10,
-	 0, 0, 0, 0, 0, 0, 9,10, 9, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,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,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,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,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,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,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,
+	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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,
+	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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,
+	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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,
+	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,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,12,12,12,12,12,12,
+	12,
 };
 
 static float _vq_quantthresh__44c0_sm_p1_0[] = {
@@ -1685,46 +1685,46 @@ static long _vq_quantlist__44c0_sm_p2_0[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p2_0[] = {
-	 1, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 6, 6, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 8,
-	 8, 0, 0, 0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
-	 0, 0, 5, 6, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0,
-	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 6, 8, 8, 0, 0, 0, 8, 8, 0, 0,
-	 0, 8, 8, 0, 0, 0,10, 9, 0, 0, 0, 0, 0, 0, 0, 6,
-	 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9,
-	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 6, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
-	 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0,
-	 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,10, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 8,10,10, 0, 0, 0,10,10, 0, 0, 0, 9,10, 0, 0, 0,
-	10,10, 0, 0, 0, 0, 0, 0, 0, 8,10,10, 0, 0, 0,10,
-	10, 0, 0, 0,10, 9, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9,
 };
 
 static float _vq_quantthresh__44c0_sm_p2_0[] = {
@@ -1762,46 +1762,46 @@ static long _vq_quantlist__44c0_sm_p3_0[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p3_0[] = {
-	 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 8, 8,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9,
 };
 
 static float _vq_quantthresh__44c0_sm_p3_0[] = {
@@ -1843,12 +1843,12 @@ static long _vq_quantlist__44c0_sm_p4_0[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p4_0[] = {
-	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
-	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
-	 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
-	 7, 8, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
-	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 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, 6, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 6,
 };
 
 static float _vq_quantthresh__44c0_sm_p4_0[] = {
@@ -1891,12 +1891,12 @@ static long _vq_quantlist__44c0_sm_p5_0[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p5_0[] = {
-	 1, 4, 3, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 8, 8,
-	10,10, 0, 5, 5, 7, 7, 8, 8,10,10, 0, 7, 7, 8, 8,
-	 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0,
-	 9, 8, 9, 9,11,11, 0, 0, 0, 8, 8, 9, 9,11,11, 0,
-	 0, 0,10,10, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
-	11,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 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, 6, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 6,
 };
 
 static float _vq_quantthresh__44c0_sm_p5_0[] = {
@@ -1947,25 +1947,25 @@ static long _vq_quantlist__44c0_sm_p6_0[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p6_0[] = {
-	 1, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,11,
-	11, 0, 6, 5, 7, 7, 8, 8, 9,10, 9, 9,10,10,11,11,
-	12,12, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,
-	11,12,12, 0, 7, 7, 8, 8, 8, 9,10,10,10,10,11,11,
-	12,12,12,12, 0, 0, 0, 8, 8, 9, 8,10,10,10,10,11,
-	11,12,12,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
-	11,11,12,12,13,13, 0, 0, 0, 8, 8, 9, 9,10,10,10,
-	10,11,11,12,12,13,13, 0, 0, 0, 9, 9, 9, 9,10,10,
-	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
-	10,10,11,11,12,12,12,12,13,13, 0, 0, 0, 0, 0, 9,
-	 9,10,10,11,11,12,12,12,12,13,13, 0, 0, 0, 0, 0,
-	10,10,10,10,11,11,12,12,13,13,13,13, 0, 0, 0, 0,
-	 0, 0, 0,10,10,11,11,12,12,13,13,13,13, 0, 0, 0,
-	 0, 0, 0, 0,11,11,12,11,12,12,13,13,14,14, 0, 0,
-	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,14,14, 0,
-	 0, 0, 0, 0, 0, 0,11,12,12,12,13,13,13,13,14,14,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,13,13,13,13,14,
-	14,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8,
 };
 
 static float _vq_quantthresh__44c0_sm_p6_0[] = {
@@ -2004,12 +2004,12 @@ static long _vq_quantlist__44c0_sm_p7_0[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p7_0[] = {
-	 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 6,10, 9, 9,10,
-	 9, 9, 5, 6, 6,10, 9, 9,10, 9, 9, 7,10,10,11,10,
-	10,11,10,10, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9,
-	10,10,10,11,10, 9, 7,10,10,11,11,11,11,11,11, 6,
-	 9, 9,11,10,10,11,10,10, 6, 9, 9,10, 9, 9,11,10,
-	10,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 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, 6, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 6,
 };
 
 static float _vq_quantthresh__44c0_sm_p7_0[] = {
@@ -2053,14 +2053,14 @@ static long _vq_quantlist__44c0_sm_p7_1[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p7_1[] = {
-	 2, 4, 4, 5, 5, 7, 6, 7, 7, 7, 7, 9, 6, 6, 7, 7,
-	 7, 7, 7, 7, 8, 8, 9, 6, 6, 7, 7, 7, 7, 7, 7, 7,
-	 7, 9, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7,
-	 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 8, 8, 8, 8, 8, 8,
-	 8, 8, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9,
-	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
-	 8, 8, 8,10,10, 9, 9, 9, 8, 8, 8, 8, 8, 8,10,10,
-	 9, 9, 9, 8, 8, 8, 8, 8, 8,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 6, 6, 6, 6, 6, 6, 6,
 };
 
 static float _vq_quantthresh__44c0_sm_p7_1[] = {
@@ -2108,17 +2108,17 @@ static long _vq_quantlist__44c0_sm_p8_0[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p8_0[] = {
-	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 7, 5, 5,
-	 7, 7, 8, 8, 8, 8,10,10,10,10, 7, 5, 5, 7, 7, 8,
-	 8, 8, 9,10,10,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,
-	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11, 0,12,12, 9, 9, 9, 9,10,10,11,11,12,12, 0,13,
-	13, 9, 9, 9, 9,10,10,11,11,12,12, 0, 0, 0, 9,10,
-	 9, 9,10,10,12,12,12,12, 0, 0, 0,10,10, 9, 9,11,
-	11,12,12,13,13, 0, 0, 0,13,13,10,10,11,11,12,12,
-	13,13, 0, 0, 0,14,14,10,10,11,11,13,12,13,13, 0,
-	 0, 0, 0, 0,12,11,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0,12,12,11,11,12,12,13,13,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7,
 };
 
 static float _vq_quantthresh__44c0_sm_p8_0[] = {
@@ -2158,8 +2158,8 @@ static long _vq_quantlist__44c0_sm_p8_1[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p8_1[] = {
-	 2, 4, 4, 5, 4, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6,
-	 5, 5, 5, 5, 6, 6, 6, 5, 5,
+	 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+	 5, 5, 4, 4, 4, 4, 4, 4, 4,
 };
 
 static float _vq_quantthresh__44c0_sm_p8_1[] = {
@@ -2197,46 +2197,46 @@ static long _vq_quantlist__44c0_sm_p9_0[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p9_0[] = {
-	 1, 3, 3,15,15, 5, 8, 8,15,15, 6, 8, 8,14,15,15,
-	15,15,15,15,15,15,15,15,15, 5,12,15,15,15,14,15,
-	15,15,15,14,15,15,15,15,15,15,15,15,14,14,14,14,
-	14,14, 5,11,12,14,14,13,13,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14, 5,13,14,
-	14,14,14,14,12,14,14,13,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14, 7,13,14,14,14,14,14,14,14,14,
-	13,12,14,14,14,14,14,14,14,14,14,14,14,14,14, 8,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14, 5,14,14,14,14,13,
-	14,14,14,14,13,14,11,14,14,14,14,14,14,14,14,14,
-	14,14,14, 8,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14, 7,13,14,14,
-	14,13,13,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,12,14,14,14,14,13,12,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,12,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9,
 };
 
 static float _vq_quantthresh__44c0_sm_p9_0[] = {
@@ -2282,17 +2282,17 @@ static long _vq_quantlist__44c0_sm_p9_1[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p9_1[] = {
-	 1, 4, 4, 6, 6, 6, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 9, 9,10,11,11,11, 7, 5, 5, 7, 7, 7,
-	 8, 9, 9,10,10,11,11,18, 8, 8, 8, 8, 9, 9,10,10,
-	11,11,12,11,19, 8, 8, 8, 8, 9, 9,10,10,11,11,11,
-	11,17,11,11, 8, 8, 9, 9,11,11,12,12,12,12,19,11,
-	11, 8, 8,10,10,11,11,11,11,12,12,17,18,18,10,10,
-	10,10,11,11,12,12,12,12,16,18,18,10,10,10,10,12,
-	12,13,12,12,12,17,18,17,14,13,11,11,12,12,12,13,
-	13,13,17,16,18,14,14,11,11,12,12,13,13,13,13,17,
-	18,18,16,16,12,12,11,11,12,12,13,13,18,17,18,16,
-	17,12,12,11,12,12,12,13,13,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7,
 };
 
 static float _vq_quantthresh__44c0_sm_p9_1[] = {
@@ -2340,17 +2340,17 @@ static long _vq_quantlist__44c0_sm_p9_2[] = {
 };
 
 static long _vq_lengthlist__44c0_sm_p9_2[] = {
-	 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 7, 7,
-	 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 6, 6, 7, 7, 7,
-	 7, 8, 8, 8, 8, 8, 8, 9, 7, 7, 7, 7, 8, 8, 8, 8,
-	 8, 8, 8, 8, 9, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8, 8,
-	 8, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
-	 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
-	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,
-	 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9,
-	 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7,
 };
 
 static float _vq_quantthresh__44c0_sm_p9_2[] = {
@@ -3144,8 +3144,8 @@ static long _vq_lengthlist__44c1_s_p6_0[] = {
 	12, 0, 0, 0, 7, 7, 9, 9,10,10, 9, 9,10,10,11,11,
 	12,12, 0, 0, 0, 7, 7, 9, 9,10,10, 9, 9,10,10,11,
 	11,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,10,11,11,
-	12,12,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,10,11,
-	11,12,12,13,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
+	11,12,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,10,11,
+	11,12,12,13,13, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
 	11,11,12,12,13,13, 0, 0, 0, 8, 8, 9, 9,10,10,10,
 	10,11,11,12,12,13,13, 0, 0, 0, 9, 9, 9, 9,10,10,
 	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,10,
@@ -3156,7 +3156,7 @@ static long _vq_lengthlist__44c1_s_p6_0[] = {
 	 0, 0, 0,10,10,11,11,12,12,13,13,14,14, 0, 0, 0,
 	 0, 0, 0, 0,11,11,11,11,12,12,13,13,14,14, 0, 0,
 	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,14,14, 0,
-	 0, 0, 0, 0, 0, 0,12,12,12,12,13,12,13,13,14,14,
+	 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,13,14,14,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,13,13,13,14,
 	14,
 };
@@ -3198,9 +3198,9 @@ static long _vq_quantlist__44c1_s_p7_0[] = {
 
 static long _vq_lengthlist__44c1_s_p7_0[] = {
 	 1, 4, 4, 6, 6, 6, 7, 6, 6, 5, 6, 6,10, 9, 8,10,
-	 8, 9, 5, 6, 6, 9, 8, 9,10, 9, 9, 7, 9, 9,10,10,
+	 8, 9, 5, 6, 6, 9, 8, 9,10, 9, 9, 7,10, 9,10,10,
 	10,11,10,10, 6, 9, 9,10,10,10,10, 9, 9, 6, 9, 9,
-	10,10,10,11, 9, 9, 7,10,10,11,11,11,11,11,11, 6,
+	10,10,10,11, 9, 9, 7,10,10,11,10,10,11,11,11, 6,
 	 9, 9,10, 9, 9,11,10,10, 6, 9, 9,10, 9, 9,11,10,
 	10,
 };
@@ -3246,13 +3246,13 @@ static long _vq_quantlist__44c1_s_p7_1[] = {
 };
 
 static long _vq_lengthlist__44c1_s_p7_1[] = {
-	 2, 3, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 9, 9, 6, 6,
-	 7, 7, 7, 7, 8, 8, 9, 9, 9, 6, 6, 7, 7, 7, 7, 7,
+	 2, 3, 4, 6, 6, 6, 7, 7, 7, 7, 7, 9, 9, 9, 6, 6,
+	 7, 7, 7, 7, 8, 8, 9, 9, 9, 6, 6, 7, 7, 7, 7, 8,
 	 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7,
 	 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7, 7, 8, 8, 8, 8,
-	 8, 8, 9, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
+	 8, 8,10, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8,10, 9,10,
 	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,10, 9, 9, 8, 8, 8,
-	 8, 8, 8,10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,10,10,
+	 8, 8, 8,10, 9,10, 9, 9, 8, 8, 8, 8, 8, 8,10,10,
 	 9, 9, 9, 8, 8, 8, 8, 8, 8,
 };
 
@@ -3390,39 +3390,39 @@ static long _vq_quantlist__44c1_s_p9_0[] = {
 };
 
 static long _vq_lengthlist__44c1_s_p9_0[] = {
-	 1, 4, 3,12,12, 6,10, 8,12,12, 6, 9, 8,12,12,12,
-	12,12,12,12,12,12,12,12,12, 5,12,11,12,12,12,12,
+	 1, 4, 3,13,13, 6, 9, 9,12,12, 6, 9, 8,12,12,12,
+	11,12,12,12,12,12,12,12,12, 5,12,11,12,12,12,12,
 	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
 	12,12, 5,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,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,12,12,
 	12,12,12,12,12,12,12,12,12,12,12,12,12, 6,12,12,
-	12,12,12,12,12,12,12,11,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12, 8,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,10,12,12,11,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12, 9,12,12,12,12,12,12,12,12,12,
 	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, 9,
+	12,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,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,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,12, 5,12,12,12,12,11,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12, 9,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12, 8,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,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,12,12,12, 5,12,12,12,12,10,
+	12,12,12,12,12,11,12,12,12,12,12,12,12,12,12,12,
+	12,12,12, 9,12,12,12,12,11,12,11,12,12,10,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12, 9,12,12,12,
+	12,12,11,12,12,12,12,12,12,12,12,12,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,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,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,11,12,12,12,12,12,11,12,12,12,10,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,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,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,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,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,12,12,12,
 	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
@@ -3477,14 +3477,14 @@ static long _vq_quantlist__44c1_s_p9_1[] = {
 static long _vq_lengthlist__44c1_s_p9_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 7, 9, 9,10,10,11,11, 7, 5, 5, 7, 7, 8,
-	 8, 9, 9,10,10,10,11,18, 8, 8, 8, 8, 9, 9,10,10,
-	11,11,11,12,18, 8, 8, 8, 8, 9, 9,10,10,11,11,12,
+	 8, 9, 9,10,10,10,11,17, 8, 8, 8, 8, 9, 9,10,10,
+	11,11,11,12,17, 8, 8, 8, 8, 9, 9,10,10,11,11,12,
 	11,16,11,11, 8, 8, 9, 9,11,11,11,11,12,12,17,11,
-	11, 8, 7,10, 9,11,11,11,11,11,12,17,17,17,10,10,
+	11, 8, 7,10, 9,11,11,11,11,12,12,17,17,17,10,10,
 	10,10,11,11,11,12,12,12,17,17,16,10,10,10,10,11,
-	12,12,12,12,12,16,17,16,14,13,10,11,12,11,12,12,
-	13,13,17,17,17,14,14,11,11,12,12,12,13,13,13,17,
-	15,17,15,17,12,12,11,12,12,12,13,13,17,16,17,15,
+	12,12,12,12,12,16,17,15,14,13,10,11,12,11,12,12,
+	12,13,17,17,16,13,14,11,11,12,12,12,13,13,13,16,
+	15,16,15,17,12,12,11,12,12,12,13,13,17,15,17,15,
 	16,12,12,11,12,12,12,13,13,
 };
 
@@ -3575,13 +3575,13 @@ static static_codebook _44c1_s_p9_2 = {
 };
 
 static long _huff_lengthlist__44c1_s_short[] = {
-	 4, 7,16,12,11,12,14,12,12,14, 4, 2,16, 4, 6, 6,
-	 8,11,13,16,16,16,16,16,16,16,16,16,16,16, 9, 4,
-	16, 4, 9, 6, 8,11,14,16,10, 5,16, 6, 5, 7, 9,11,
-	15,15,10, 5,16, 6, 7, 6, 8,11,14,16,11, 7,16, 8,
-	 9, 8, 9,11,14,15,12, 9,16, 9, 8, 9,10,11,13,13,
-	13, 7,16, 7, 5, 6, 7,10,12,14,14, 7,16, 7, 5, 5,
-	 6, 8,10,13,
+	 4, 7,17,13,11,12,13,17,14,16, 4, 2,16, 4, 6, 6,
+	 8,11,13,13,16,16,16,16,16,16,16,16,16,16,10, 4,
+	16, 4, 9, 6, 8,11,15,13,10, 5,16, 7, 5, 7, 9,12,
+	15,15,10, 5,16, 6, 7, 6, 8,11,14,15,10, 6,16, 7,
+	 9, 8, 8,11,13,14,12, 9,16, 9, 8, 8,10,10,14,12,
+	11, 7,16, 7, 5, 6, 7,10,12,14,13, 7,16, 7, 5, 5,
+	 7, 8,10,13,
 };
 
 static static_codebook _huff_book__44c1_s_short = {
@@ -3595,6 +3595,27 @@ static static_codebook _huff_book__44c1_s_short = {
 	0
 };
 
+static long _huff_lengthlist__44c1_sm_long[] = {
+	 3, 4,10, 9,10, 9,10,11,12,12, 4, 2,12, 5, 7, 7,
+	 8,10,13,13,10, 9, 7,12, 8, 9, 9,10,12,13, 9, 5,
+	13, 6, 9, 7,10,12,16,15, 9, 6, 8, 8, 5, 6, 7, 9,
+	11,12, 9, 6, 9, 7, 5, 5, 6, 8,11,12, 9, 8, 9, 9,
+	 6, 5, 5, 7,10,12,10,10,10,12, 8, 7, 6, 7, 9,11,
+	11,13,11,15,11,10, 8, 7, 8,10,11,15,13,16,14,14,
+	11, 8, 8,10,
+};
+
+static static_codebook _huff_book__44c1_sm_long = {
+	2, 100,
+	_huff_lengthlist__44c1_sm_long,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
 static long _vq_quantlist__44c1_sm_p1_0[] = {
 	1,
 	0,
@@ -4746,6 +4767,27 @@ static static_codebook _44c1_sm_p9_2 = {
 	0
 };
 
+static long _huff_lengthlist__44c1_sm_short[] = {
+	 3, 8,14,12,13,13,14,14,14,15, 4, 2,12, 5, 8, 7,
+	 9,12,14,15,14,10,11,10,10,10,11,13,16,14, 9, 4,
+	14, 5,10, 7, 8,11,15,16,11, 6, 9, 7, 6, 7, 8,11,
+	14,15,11, 6,10, 6, 7, 5, 6, 8,12,15,12, 7,10, 7,
+	 7, 6, 5, 7,10,14,13, 7,11, 8, 7, 7, 7, 7,10,13,
+	13, 6,11, 8, 6, 6, 6, 9,11,13,14, 8,12, 9, 6, 6,
+	 6, 8,10,12,
+};
+
+static static_codebook _huff_book__44c1_sm_short = {
+	2, 100,
+	_huff_lengthlist__44c1_sm_short,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
 static long _huff_lengthlist__44c2_s_long[] = {
 	 5, 5,11, 9,10,10,10,10,12,13, 5, 1, 9, 5, 7, 7,
 	 8,10,13,14,11, 9, 8,11, 7, 8, 9,11,14,15, 9, 5,
@@ -4784,7 +4826,7 @@ static long _vq_lengthlist__44c2_s_p1_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0, 0,
+	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
 	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4820,11 +4862,11 @@ static long _vq_lengthlist__44c2_s_p1_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 7, 7, 0, 0, 0, 0,
-	 0, 0, 7, 9, 8, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
+	 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
 	 0, 0, 0, 8, 9,10, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4866,7 +4908,7 @@ static long _vq_lengthlist__44c2_s_p1_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 4, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
-	 0, 0, 0, 0, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4875,7 +4917,7 @@ static long _vq_lengthlist__44c2_s_p1_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 8, 9, 0, 0, 0, 0, 0, 0, 8, 9, 9,
+	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9,
 	 0, 0, 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5223,9 +5265,9 @@ static long _vq_quantlist__44c2_s_p2_0[] = {
 
 static long _vq_lengthlist__44c2_s_p2_0[] = {
 	 1, 4, 4, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0,
-	 7, 7, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 8,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 9,
 	 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0,
-	 0, 0, 4, 6, 6, 0, 0, 0, 8, 9, 0, 0, 0, 8, 8, 0,
+	 0, 0, 4, 6, 6, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0,
 	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5299,13 +5341,13 @@ static long _vq_quantlist__44c2_s_p3_0[] = {
 };
 
 static long _vq_lengthlist__44c2_s_p3_0[] = {
-	 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 2, 4, 3, 6, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 4, 4, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 7, 7,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5380,9 +5422,9 @@ static long _vq_quantlist__44c2_s_p4_0[] = {
 };
 
 static long _vq_lengthlist__44c2_s_p4_0[] = {
-	 1, 3, 3, 6, 6, 0, 0, 0, 0, 0, 6, 6, 6, 6, 0, 0,
+	 1, 3, 3, 6, 7, 0, 0, 0, 0, 0, 6, 6, 6, 6, 0, 0,
 	 0, 0, 0, 6, 6, 6, 6, 0, 0, 0, 0, 0, 6, 6, 7, 7,
-	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 7, 6, 0, 0, 0, 0, 0, 0, 0,
 	 7, 8, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
 	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
@@ -5484,10 +5526,10 @@ static long _vq_quantlist__44c2_s_p6_0[] = {
 };
 
 static long _vq_lengthlist__44c2_s_p6_0[] = {
-	 1, 4, 3, 6, 6, 7, 8, 9, 9, 9, 9,10,10,11,11,12,
-	12, 0, 7, 7, 7, 7, 8, 8,10,10, 9, 9,10,10,11,11,
-	12,12, 0, 7, 7, 7, 7, 8, 8,10,10, 9, 9,10,10,11,
-	11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10, 9,10,11,11,
+	 1, 4, 3, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,12,
+	12, 0, 7, 7, 7, 7, 8, 8,10, 9, 9, 9,10,10,11,11,
+	12,12, 0, 7, 7, 7, 7, 8, 8, 9,10, 9, 9,10,10,11,
+	11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10, 9,10,10,10,
 	11,11,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,10,11,
 	11,12,12,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
 	11,11,12,12,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,
@@ -5495,12 +5537,12 @@ static long _vq_lengthlist__44c2_s_p6_0[] = {
 	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,10,
 	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
 	10,10,11,11,11,12,12,12,13,13, 0, 0, 0, 0, 0, 9,
-	 9,10,10,11,11,12,11,12,12,13,13, 0, 0, 0, 0, 0,
-	10,10,10,10,11,11,12,12,12,12,13,13, 0, 0, 0, 0,
+	 9,10, 9,11,11,12,11,12,12,13,13, 0, 0, 0, 0, 0,
+	10,10,10,10,11,11,12,12,12,13,13,13, 0, 0, 0, 0,
 	 0, 0, 0,10,10,11,11,12,12,13,12,13,13, 0, 0, 0,
 	 0, 0, 0, 0,11,11,11,11,12,12,13,13,13,14, 0, 0,
-	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,13,14, 0,
-	 0, 0, 0, 0, 0, 0,12,12,12,12,12,12,13,13,14,14,
+	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,13,13, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,12,12,12,13,13,14,13,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,14,
 	14,
 };
@@ -5593,9 +5635,9 @@ static long _vq_lengthlist__44c2_s_p7_1[] = {
 	 2, 4, 4, 6, 6, 7, 6, 7, 7, 7, 7, 9, 6, 6, 6, 6,
 	 7, 7, 7, 7, 8, 8, 9, 6, 6, 6, 6, 7, 7, 7, 7, 8,
 	 8, 9, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7,
-	 7, 7, 7, 8, 8, 8, 8,10,10, 9, 7, 7, 8, 8, 8, 8,
+	 7, 7, 7, 8, 8, 8, 8, 9,10, 9, 7, 7, 8, 8, 8, 8,
 	 8, 8, 9,10, 9, 7, 7, 8, 8, 8, 8, 8, 8,10, 9, 9,
-	 8, 8, 8, 8, 8, 8, 8, 8, 9,10,10, 9, 9, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 9, 9, 8, 8, 8,
 	 8, 8, 8,10,10,10, 9, 9, 8, 8, 8, 8, 8, 8,10,10,
 	10, 9, 9, 8, 8, 8, 8, 8, 8,
 };
@@ -5648,14 +5690,14 @@ static long _vq_lengthlist__44c2_s_p8_0[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 9, 9,10,10,11,11, 7, 5, 5, 7, 7, 8,
 	 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
-	10,10,11,11, 0, 8, 8, 8, 7, 9, 9, 9, 9,10,10,11,
+	10,10,11,11, 0, 8, 8, 8, 7, 9, 9, 9,10,10,10,11,
 	11, 0,12,12, 9, 9, 9, 9,10,10,11,11,12,12, 0,13,
 	13, 9, 8, 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10,
-	 9,10,11,11,12,12,12,12, 0, 0, 0,10,10,10,10,11,
+	 9,10,11,11,12,12,12,12, 0, 0, 0,10,10,10, 9,11,
 	11,12,12,12,13, 0, 0, 0,13,13,10,10,11,11,12,12,
-	13,13, 0, 0, 0,14,14,11,10,11,11,12,12,13,13, 0,
+	13,13, 0, 0, 0,14,14,11,10,11,11,13,12,13,13, 0,
 	 0, 0, 0, 0,12,12,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0,12,12,11,12,13,13,13,13,
+	 0,12,12,11,12,13,12,13,13,
 };
 
 static float _vq_quantthresh__44c2_s_p8_0[] = {
@@ -5738,10 +5780,10 @@ static long _vq_quantlist__44c2_s_p9_0[] = {
 };
 
 static long _vq_lengthlist__44c2_s_p9_0[] = {
-	 1, 3, 3,11,13,13,13,13,13, 5, 6, 6,13,12,13,13,
-	13,13, 3, 6, 5,13,13,13,13,13,13,13,13,12, 9,11,
-	13,13,13,13,13,13,11,11,13,13,13,13,13,13,13,13,
-	13,13,12,13,13,13,13,12,12,12,12,12,12,12,12,12,
+	 1, 3, 3,12,13,13,13,13,13, 5, 6, 6,13,13,13,13,
+	13,13, 3, 6, 5,13,13,13,13,13,13,13,12,12,12,12,
+	12,12,12,12,12,12,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,12,12,12,12,12,12,12,12,12,12,12,12,
 	12,
 };
@@ -5792,15 +5834,15 @@ static long _vq_quantlist__44c2_s_p9_1[] = {
 static long _vq_lengthlist__44c2_s_p9_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 9, 9,10,10,11,11, 7, 5, 5, 7, 7, 8,
-	 8, 9, 9,10,10,11,10,16, 8, 8, 8, 8, 9, 9,10,10,
-	10,10,11,11,16, 8, 8, 8, 8, 9, 9,10,10,10,11,11,
-	11,17,11,11, 8, 8, 9, 9,11,11,11,11,11,11,16,11,
-	12, 8, 8,10, 9,11,11,11,11,11,11,16,16,17,10,10,
-	10,10,11,11,12,12,12,12,16,16,17,10,10,10,10,11,
-	11,12,12,12,12,16,17,15,14,15,11,10,11,11,11,12,
-	11,11,17,15,15,13,14,11,11,11,11,12,11,12,12,16,
-	17,16,16,16,12,12,11,11,12,12,11,10,15,16,15,15,
-	15,12,12,11,11,12,11,12,10,
+	 8, 9, 9,10,10,11,10,17, 8, 8, 8, 8, 9, 9,10,10,
+	11,11,11,11,16, 8, 8, 8, 8, 9, 9,10,10,10,11,11,
+	11,17,11,11, 8, 8, 9, 9,11,11,11,12,11,11,16,11,
+	12, 8, 8,10, 9,10,11,11,11,11,11,16,16,16,10,10,
+	10,10,11,11,11,12,11,11,16,17,17,10,10,10,10,11,
+	11,12,12,12,11,16,17,15,14,14,11,11,11,11,12,12,
+	11,10,17,15,15,14,13,11,10,11,11,12,12,12,12,16,
+	17,16,16,17,12,12,11,11,12,12,12, 9,15,16,15,15,
+	16,12,12,11,11,12,11,13,13,
 };
 
 static float _vq_quantthresh__44c2_s_p9_1[] = {
@@ -5848,8 +5890,8 @@ static long _vq_quantlist__44c2_s_p9_2[] = {
 };
 
 static long _vq_lengthlist__44c2_s_p9_2[] = {
-	 3, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7,
-	 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 7, 7, 6, 6, 7,
+	 3, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 9, 7, 7,
+	 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 7, 7, 6, 6, 7,
 	 7, 7, 7, 8, 8, 8, 8, 9, 7, 7, 7, 7, 7, 7, 8, 8,
 	 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 8,
 	 8, 9, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
@@ -5890,13 +5932,13 @@ static static_codebook _44c2_s_p9_2 = {
 };
 
 static long _huff_lengthlist__44c2_s_short[] = {
-	 4, 7,13,11,10,11,12,13,12,13, 4, 2, 9, 4, 7, 6,
-	 8,11,13,17,12, 7, 8, 8, 7, 8,10,13,17,17, 9, 4,
-	12, 4, 9, 6, 8,11,15,17,13, 6, 7, 6, 5, 7, 9,13,
-	15,17,10, 6, 8, 6, 6, 6, 8,11,15,17,11, 7,10, 8,
-	 8, 8, 9,11,15,16,12, 9,12,10, 9,10,11,12,13,16,
-	13, 9, 9, 8, 6, 6, 8,11,14,15,14, 9, 8, 7, 4, 5,
-	 7, 9,12,16,
+	10, 9,12,11,11,11,12,12,13,17, 7, 1, 9, 4, 7, 7,
+	 9,12,15,17,12, 6, 8, 9, 7, 9,11,14,17,17,10, 4,
+	12, 5, 9, 8,10,12,15,17,12, 6, 7, 7, 5, 7, 9,13,
+	16,16,11, 6, 8, 7, 7, 7, 9,12,17,17,12, 7,10, 9,
+	 9, 9,10,12,16,17,13,10,12,10, 9,10,11,12,13,16,
+	13,10,10, 8, 6, 6, 8,11,14,15,16, 9, 9, 8, 5, 5,
+	 6, 9,12,16,
 };
 
 static static_codebook _huff_book__44c2_s_short = {
@@ -5910,6 +5952,48 @@ static static_codebook _huff_book__44c2_s_short = {
 	0
 };
 
+static long _huff_lengthlist__44c2_sm_long[] = {
+	 4, 4,11, 9,11,10,10,11,12,13, 4, 2,10, 5, 7, 7,
+	 8,10,12,14,10, 9, 8,10, 8, 9, 9,10,12,13, 9, 5,
+	13, 6, 9, 7,10,12,15,16,10, 6, 8, 8, 5, 5, 7, 9,
+	11,12, 9, 6, 9, 7, 5, 4, 6, 8,10,12, 9, 7, 9, 9,
+	 6, 5, 5, 7, 9,11,10, 9,10,11, 8, 7, 6, 7, 8,10,
+	11,12,11,14,10, 9, 8, 7, 7, 9,11,14,12,16,13,12,
+	11, 8, 7, 9,
+};
+
+static static_codebook _huff_book__44c2_sm_long = {
+	2, 100,
+	_huff_lengthlist__44c2_sm_long,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _huff_lengthlist__44c2_sm_short[] = {
+	 4, 7,14,11,12,12,13,13,13,14, 4, 2,10, 5, 8, 7,
+	 9,12,14,14,10, 8, 8, 9, 8, 9,10,12,15,16, 9, 4,
+	13, 6,10, 7, 9,12,17,17,11, 6, 8, 7, 6, 6, 7,10,
+	14,15,10, 6, 8, 6, 6, 5, 5, 8,12,15,11, 7,10, 8,
+	 7, 5, 5, 7,11,14,12, 7,11, 8, 8, 7, 7, 8,11,15,
+	13, 6,11, 7, 6, 6, 7, 9,12,14,15, 7,10, 8, 6, 5,
+	 6, 8,10,12,
+};
+
+static static_codebook _huff_book__44c2_sm_short = {
+	2, 100,
+	_huff_lengthlist__44c2_sm_short,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
 static long _huff_lengthlist__44c3_s_long[] = {
 	 4, 6,10,11,11,10,10,11,12,13, 5, 1,11, 5,11, 6,
 	 8,10,14,16,10,11, 8,12, 7, 8, 9,10,11,15,10, 5,
@@ -6466,10 +6550,10 @@ static long _vq_lengthlist__44c3_s_p3_0[] = {
 	 2, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 4, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8,
+	 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 9, 9,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 6, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -6592,12 +6676,12 @@ static long _vq_quantlist__44c3_s_p5_0[] = {
 };
 
 static long _vq_lengthlist__44c3_s_p5_0[] = {
-	 2, 3, 3, 5, 5, 7, 7, 8, 9, 0, 4, 5, 7, 7, 7, 7,
-	 9, 9, 0, 5, 4, 6, 7, 7, 7, 9, 9, 0, 6, 6, 7, 7,
-	 7, 7, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0,
+	 2, 3, 3, 5, 5, 7, 7, 9, 9, 0, 4, 4, 7, 7, 7, 7,
+	 9, 9, 0, 5, 4, 7, 7, 7, 7, 9, 9, 0, 6, 6, 7, 7,
+	 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
 	 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0,
-	 0, 0,10,10, 9, 9,10,10, 0, 0, 0, 0, 0, 9, 9,10,
-	10,
+	 0, 0,10,10, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
+	11,
 };
 
 static float _vq_quantthresh__44c3_s_p5_0[] = {
@@ -6648,25 +6732,25 @@ static long _vq_quantlist__44c3_s_p6_0[] = {
 };
 
 static long _vq_lengthlist__44c3_s_p6_0[] = {
-	 1, 4, 4, 6, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,12,
+	 1, 4, 4, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,12,
 	12, 0, 5, 5, 7, 7, 9, 9,10,10,10,10,11,11,11,11,
-	12,12, 0, 5, 5, 7, 7, 9, 9,10,10,10,10,11,11,11,
+	12,12, 0, 5, 5, 7, 7, 8, 8,10,10, 9,10,11,11,11,
 	11,12,12, 0, 6, 6, 8, 8, 9, 9,10,10,10,10,11,11,
-	12,12,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,11,
+	11,12,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,11,
 	11,12,12,13,13, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
-	11,11,12,12,13,13, 0, 0, 0, 8, 8, 9, 9,10,10,10,
+	11,11,12,12,13,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,
 	10,11,11,12,12,13,13, 0, 0, 0, 9, 9, 9, 9,11,11,
 	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,11,
-	10,10,10,12,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
-	10,10,11,11,12,12,12,12,13,13, 0, 0, 0, 0, 0, 9,
-	 9,10,10,11,11,12,12,12,12,13,13, 0, 0, 0, 0, 0,
-	10,10,10,10,11,11,12,12,13,13,13,13, 0, 0, 0, 0,
-	 0, 0, 0,10,10,11,11,12,12,13,13,13,13, 0, 0, 0,
-	 0, 0, 0, 0,11,11,12,12,12,12,13,13,14,13, 0, 0,
-	 0, 0, 0, 0, 0,11,11,11,12,12,12,13,13,13,14, 0,
-	 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,13,14,14,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,13,13,13,14,
-	14,
+	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
+	10,10,11,11,11,12,12,12,13,13, 0, 0, 0, 0, 0, 9,
+	 9,10, 9,11,11,12,11,12,12,13,13, 0, 0, 0, 0, 0,
+	10,10,10,10,11,11,12,12,13,12,13,13, 0, 0, 0, 0,
+	 0, 0, 0,10,10,11,11,12,12,13,12,13,13, 0, 0, 0,
+	 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,13, 0, 0,
+	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,13,14, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,12,12,13,13,13,14,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,14,
+	13,
 };
 
 static float _vq_quantthresh__44c3_s_p6_0[] = {
@@ -6809,15 +6893,15 @@ static long _vq_quantlist__44c3_s_p8_0[] = {
 };
 
 static long _vq_lengthlist__44c3_s_p8_0[] = {
-	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 9, 9,10,10,11,11, 7, 5, 5, 7, 7, 8,
+	 1, 4, 4, 6, 6, 7, 8, 8, 8, 9, 9,10,10, 6, 5, 5,
+	 7, 7, 8, 8, 9, 9,10,10,10,11, 7, 5, 5, 7, 7, 8,
 	 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
 	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11, 0,12,12, 9, 9, 9, 9,10,10,11,11,11,11, 0,13,
-	13, 9, 8, 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10,
+	11, 0,11,11, 9, 8, 9, 9,10,10,11,11,11,11, 0,12,
+	13, 9, 8, 9, 9,10,10,11,11,11,12, 0, 0, 0,10,10,
 	 9,10,11,11,11,11,12,12, 0, 0, 0,10,10, 9, 9,11,
-	11,11,12,12,12, 0, 0, 0,14,14,10,10,11,11,12,12,
-	13,13, 0, 0, 0,14,14,10,10,11,11,12,12,13,13, 0,
+	11,11,11,12,12, 0, 0, 0,13,13,10,10,11,11,12,12,
+	12,13, 0, 0, 0,14,14,10,10,11,11,12,12,13,12, 0,
 	 0, 0, 0, 0,12,12,11,11,12,12,13,13, 0, 0, 0, 0,
 	 0,12,12,11,12,12,12,13,13,
 };
@@ -6903,9 +6987,9 @@ static long _vq_quantlist__44c3_s_p9_0[] = {
 
 static long _vq_lengthlist__44c3_s_p9_0[] = {
 	 1, 3, 3,10,11,13,13,13,13, 4, 6, 6,13,13,13,13,
-	13,13, 4, 6, 4,13,11,13,13,13,13,13,11,11,10,13,
-	13,13,13,13,13,12,11,13,12,13,13,13,13,13,13,13,
-	13,13,12,13,13,13,13,13,13,12,12,12,12,12,12,12,
+	13,13, 4, 6, 4,13,11,13,13,13,13,13,11,12,13,13,
+	13,13,13,13,13,12,13,13,13,13,13,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,12,12,12,12,12,12,12,12,
 	12,
 };
@@ -6955,16 +7039,16 @@ static long _vq_quantlist__44c3_s_p9_1[] = {
 
 static long _vq_lengthlist__44c3_s_p9_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 9, 9, 9,10,11,11, 7, 5, 5, 7, 7, 8,
+	 7, 7, 8, 8, 9, 9, 9,10,10,11, 7, 5, 5, 7, 7, 8,
 	 8, 9, 9,10,10,11,10,16, 8, 8, 8, 8, 9, 9,10,10,
-	10,10,11,11,15, 8, 8, 8, 8, 9, 9,10,10,11,10,11,
-	11,16,11,11, 8, 8, 9, 9,10,11,11,11,11,11,15,12,
-	12, 8, 8, 9, 9,10,11,11,11,12,11,16,15,15,10,10,
-	10,10,11,11,11,11,12,11,15,15,16,10,11,10,10,11,
-	11,12,12,12,12,16,15,16,14,14,10,11,11,11,12,11,
-	12,12,16,14,15,13,14,11,11,11,11,12,12,12,12,16,
-	16,15,15,15,12,12,11,11,12,12,13,12,15,15,16,15,
-	15,12,12,11,11,12,12,13,12,
+	10,10,10,11,15, 8, 8, 8, 8, 9, 9,10,10,11,10,11,
+	11,16,11,11, 8, 8, 9, 9,10,11,11,11,11,10,15,12,
+	12, 8, 8, 9, 9,10,11,11,11,11,11,15,15,16,10,10,
+	10,10,11,11,12,11,12,11,15,15,17,11,11,10,10,11,
+	11,12,12,12,12,15,16,16,14,13,11,11,11,11,12,12,
+	12,12,15,15,15,14,13,11,11,11,11,12,12,12,12,17,
+	16,15,15,15,12,12,11,11,12,12,13,13,16,15,16,16,
+	15,12,12,11,11,12,12,13,13,
 };
 
 static float _vq_quantthresh__44c3_s_p9_1[] = {
@@ -7054,12 +7138,12 @@ static static_codebook _44c3_s_p9_2 = {
 };
 
 static long _huff_lengthlist__44c3_s_short[] = {
-	 4, 7,13,10,13,11,13,13,12,14, 4, 3,12, 5, 9, 6,
-	 8,11,14,15,11, 6, 9, 7, 6, 6, 8,12,16,17, 9, 4,
-	11, 5,10, 5, 8,12,15,17,12, 6, 7, 6, 5, 5, 8,12,
-	15,17,10, 5, 8, 5, 6, 4, 6,10,14,17,10, 6, 9, 7,
-	 8, 6, 7,10,14,17,13, 9,11,10, 9, 9,10,11,13,17,
-	13,11, 9, 9, 6, 6, 8,11,14,15,14,11, 9, 8, 5, 4,
+	10, 9,12,11,13,11,11,11,13,17, 8, 2,11, 4, 9, 5,
+	 8,11,15,17,10, 5, 9, 7, 6, 6, 8,12,15,17,11, 4,
+	11, 5, 9, 6, 9,13,17,17,12, 6, 7, 6, 5, 5, 7,12,
+	15,17,10, 5, 8, 5, 6, 5, 7,11,14,15,10, 6, 9, 8,
+	 7, 7, 8,11,14,16,12, 9,10,11, 9, 9,10,11,13,15,
+	13,11,10, 9, 6, 6, 7,10,13,15,14,11, 9, 8, 5, 4,
 	 6, 8,11,14,
 };
 
@@ -7074,6 +7158,48 @@ static static_codebook _huff_book__44c3_s_short = {
 	0
 };
 
+static long _huff_lengthlist__44c3_sm_long[] = {
+	 3, 5,11,10,10,10,10,11,12,13, 4, 2,10, 6, 7, 7,
+	 8,10,13,14,10, 9, 7,12, 7, 9,10,11,12,13,10, 6,
+	12, 7, 9, 8,10,13,15,16,10, 6, 7, 9, 4, 5, 7, 9,
+	11,12, 9, 6, 8, 7, 5, 5, 6, 8,10,12,10, 8, 9,10,
+	 6, 5, 5, 7, 9,11,10,10,10,12, 8, 7, 6, 6, 8,10,
+	11,12,11,14,10, 9, 8, 7, 7, 9,11,14,11,16,12,11,
+	10, 8, 7, 8,
+};
+
+static static_codebook _huff_book__44c3_sm_long = {
+	2, 100,
+	_huff_lengthlist__44c3_sm_long,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _huff_lengthlist__44c3_sm_short[] = {
+	 3, 7,13,11,12,11,12,14,14,15, 4, 3,10, 5, 7, 6,
+	 9,12,15,16,10, 9, 8,11, 8, 8,10,12,14,14, 9, 5,
+	13, 6, 9, 7, 9,13,17,17,11, 6, 7, 8, 5, 6, 7,10,
+	13,15,10, 5, 8, 6, 5, 4, 5, 8,12,15,11, 7, 9, 8,
+	 7, 5, 5, 7,11,14,12, 7,11, 9, 7, 7, 7, 8,11,14,
+	13, 7,12, 8, 6, 6, 7, 9,12,14,15, 8,11, 9, 6, 5,
+	 5, 7,10,12,
+};
+
+static static_codebook _huff_book__44c3_sm_short = {
+	2, 100,
+	_huff_lengthlist__44c3_sm_short,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
 static long _huff_lengthlist__44c4_s_long[] = {
 	 3, 5,10,11,12,11,10,11,12,13, 5, 2, 9, 6,10, 7,
 	 9,11,15,15, 9, 6, 5, 9, 5, 7, 8, 9,11,14,11, 6,
@@ -7102,8 +7228,8 @@ static long _vq_quantlist__44c4_s_p1_0[] = {
 };
 
 static long _vq_lengthlist__44c4_s_p1_0[] = {
-	 2, 4, 4, 0, 0, 0, 0, 0, 0, 4, 7, 6, 0, 0, 0, 0,
-	 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 0,
+	 0, 0, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -7627,13 +7753,13 @@ static long _vq_quantlist__44c4_s_p3_0[] = {
 };
 
 static long _vq_lengthlist__44c4_s_p3_0[] = {
-	 2, 3, 4, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 4, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8,
+	 0, 0, 4, 4, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 8, 8,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -7757,11 +7883,11 @@ static long _vq_quantlist__44c4_s_p5_0[] = {
 
 static long _vq_lengthlist__44c4_s_p5_0[] = {
 	 2, 3, 3, 6, 6, 7, 7, 9, 9, 0, 4, 4, 7, 7, 7, 7,
-	 9, 9, 0, 4, 4, 7, 7, 7, 7, 9,10, 0, 6, 6, 7, 7,
+	 9, 9, 0, 4, 4, 7, 7, 7, 7, 9, 9, 0, 6, 6, 7, 7,
 	 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
 	 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0,
-	 0, 0,10,10, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,10,
-	10,
+	 0, 0,10,10, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
+	11,
 };
 
 static float _vq_quantthresh__44c4_s_p5_0[] = {
@@ -7815,21 +7941,21 @@ static long _vq_lengthlist__44c4_s_p6_0[] = {
 	 2, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,11,
 	11, 0, 4, 4, 7, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,
 	12,12, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,
-	11,12,12, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9,10,10,10,
-	11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10, 9,10,
+	11,11,12, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9,10,10,10,
+	11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,10,10,
 	10,11,11,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,10,
 	11,11,11,11,12,12, 0, 0, 0, 7, 7, 9, 9, 9,10,10,
 	10,11,11,12,12,12,12, 0, 0, 0, 9, 8, 9, 9,10,10,
-	10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,11,11,12,11,12,12, 0, 0, 0, 0, 0, 9, 9,10,
 	10,10,10,11,11,12,11,13,12, 0, 0, 0, 0, 0, 9, 8,
-	 9, 9,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 8,
+	 9, 9,10,10,11,11,12,11,12,12, 0, 0, 0, 0, 0, 8,
 	 8, 9, 9,10,10,11,11,12,12,12,13, 0, 0, 0, 0, 0,
 	 9,10,10,10,10,11,11,11,12,12,13,13, 0, 0, 0, 0,
 	 0, 0, 0,10,10,10,10,11,11,12,12,12,13, 0, 0, 0,
 	 0, 0, 0, 0,11,11,11,11,11,12,12,12,13,13, 0, 0,
-	 0, 0, 0, 0, 0,11,10,11,11,11,11,12,12,13,13, 0,
-	 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,12,13,13,13,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,11,12,12,12,12,13,
+	 0, 0, 0, 0, 0,11,10,11,11,12,11,12,12,13,13, 0,
+	 0, 0, 0, 0, 0, 0,11,11,12,11,12,12,12,13,13,13,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,13,
 	13,
 };
 
@@ -7974,15 +8100,15 @@ static long _vq_quantlist__44c4_s_p8_0[] = {
 
 static long _vq_lengthlist__44c4_s_p8_0[] = {
 	 1, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 9, 9,10,10,11,11, 7, 5, 5, 7, 7, 8,
+	 7, 7, 8, 8, 9, 9,10,10,10,11, 7, 5, 5, 7, 7, 8,
 	 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
-	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,11,10,11,
+	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
 	11, 0,11,12, 8, 8, 9, 9,10,10,11,11,11,11, 0,13,
-	13, 9, 8, 9, 9,10,10,11,11,12,12, 0, 0, 0, 9,10,
-	 9, 9,10,11,11,11,11,12, 0, 0, 0,10,10, 9, 9,10,
+	12, 9, 8, 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10,
+	 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10, 9, 9,11,
 	10,11,11,12,12, 0, 0, 0,13,13,10,10,11,11,12,12,
-	13,12, 0, 0, 0,14,14,10,10,11,11,12,12,12,12, 0,
-	 0, 0, 0, 0,12,12,12,11,12,12,13,13, 0, 0, 0, 0,
+	13,12, 0, 0, 0,14,14,10,10,11,11,12,12,12,13, 0,
+	 0, 0, 0, 0,12,12,11,11,12,12,13,13, 0, 0, 0, 0,
 	 0,12,12,11,12,12,12,13,13,
 };
 
@@ -8023,7 +8149,7 @@ static long _vq_quantlist__44c4_s_p8_1[] = {
 };
 
 static long _vq_lengthlist__44c4_s_p8_1[] = {
-	 2, 4, 4, 5, 5, 6, 5, 4, 5, 5, 6, 5, 5, 5, 5, 6,
+	 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 5, 4, 5, 5, 6,
 	 5, 5, 5, 5, 6, 6, 6, 5, 5,
 };
 
@@ -8066,12 +8192,12 @@ static long _vq_quantlist__44c4_s_p9_0[] = {
 };
 
 static long _vq_lengthlist__44c4_s_p9_0[] = {
-	 1, 3, 3, 9, 9,14,14,13,13, 4, 5, 5,12,11,13,13,
-	13,13, 4, 6, 5,11,11,13,13,13,13,13,10,11,12,13,
+	 1, 3, 3, 9, 9,13,13,13,13, 4, 6, 6,12,11,13,13,
+	13,13, 4, 6, 4,11,11,13,13,13,13,13,11,11,13,13,
 	13,13,13,13,13,11,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,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,12,12,12,
+	12,
 };
 
 static float _vq_quantthresh__44c4_s_p9_0[] = {
@@ -8119,15 +8245,15 @@ static long _vq_quantlist__44c4_s_p9_1[] = {
 
 static long _vq_lengthlist__44c4_s_p9_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 9, 9,10,10,11,10, 7, 5, 5, 7, 7, 8,
-	 8, 9, 9,10,10,11,10,15, 8, 8, 8, 8, 9, 9,10,10,
-	10,10,11,11,15, 8, 8, 8, 8, 9, 9,10,10,11,10,11,
-	11,15,11,12, 8, 8, 9, 9,10,10,11,11,11,11,15,12,
-	12, 8, 9, 9, 9,10,10,11,11,11,11,15,16,15,10,10,
+	 7, 7, 8, 8, 9, 9,10,10,10,11, 6, 5, 5, 7, 7, 8,
+	 8, 9, 9,10,10,10,10,15, 8, 8, 8, 8, 9, 9,10,10,
+	10,11,11,11,15, 8, 8, 8, 8, 9, 9,10,10,10,11,11,
+	11,15,12,12, 9, 9, 9, 9,10,10,11,11,11,11,15,12,
+	12, 9, 9,10, 9,10,10,11,11,11,11,15,15,15,10,10,
 	10,10,11,11,11,11,11,11,15,16,15,11,11,10,10,11,
-	11,11,11,11,11,16,15,15,13,14,11,11,11,11,12,11,
-	12,12,16,15,15,14,14,11,11,11,11,11,11,12,12,15,
-	16,15,16,15,12,12,11,11,12,11,12,12,16,16,15,15,
+	11,11,11,12,11,16,15,14,14,14,11,11,11,11,12,11,
+	12,12,16,15,15,14,14,11,11,11,11,12,11,12,12,15,
+	16,16,15,15,12,12,11,11,12,12,12,12,16,15,15,15,
 	15,12,12,11,11,11,12,12,12,
 };
 
@@ -8177,11 +8303,11 @@ static long _vq_quantlist__44c4_s_p9_2[] = {
 
 static long _vq_lengthlist__44c4_s_p9_2[] = {
 	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 9, 6, 6,
-	 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 9, 6, 6, 6, 6, 7,
-	 7, 7, 7, 8, 7, 8, 7, 9, 7, 7, 7, 7, 7, 7, 8, 8,
+	 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 9, 6, 6, 6, 6, 7,
+	 7, 7, 7, 7, 7, 8, 7, 9, 7, 7, 7, 7, 7, 7, 8, 8,
 	 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 8,
 	 8, 9, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
-	 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
+	 9, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
 	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
 	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,
 	 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9,
@@ -8218,13 +8344,13 @@ static static_codebook _44c4_s_p9_2 = {
 };
 
 static long _huff_lengthlist__44c4_s_short[] = {
-	 3, 7,13,11,17,12,14,16,17,17, 4, 3, 9, 6, 8, 7,
-	10,12,15,17,11, 7, 6, 8, 5, 6, 9,12,14,14, 9, 5,
-	 9, 6, 9, 7,10,14,17,17,12, 7, 4, 7, 3, 5, 7,12,
-	17,13,10, 5, 6, 7, 5, 6, 8,12,15,15,10, 8, 8, 9,
-	 7, 8, 8,11,15,14,12,11,11,12,10,10,10,12,17,15,
-	12,11,10, 9, 6, 6, 8,11,15,16,13,11, 9, 8, 5, 5,
-	 6, 8,11,15,
+	 4, 8,13,12,17,11,12,16,17,17, 5, 2, 9, 5, 9, 7,
+	 9,13,16,17,10, 6, 5, 8, 5, 7, 9,12,14,15,10, 5,
+	 9, 7, 9, 8,12,16,17,17,12, 6, 4, 8, 3, 5, 8,12,
+	17,13,10, 7, 6, 8, 5, 6, 9,12,17,16,10, 9, 8,11,
+	 8, 9, 9,12,16,14,13,13,11,12,10,10,11,13,16,17,
+	12,11,10, 9, 6, 6, 8,12,15,17,17,11, 9, 8, 5, 5,
+	 6, 9,13,17,
 };
 
 static static_codebook _huff_book__44c4_s_short = {
@@ -8715,16 +8841,16 @@ static long _vq_quantlist__44c5_s_p2_0[] = {
 
 static long _vq_lengthlist__44c5_s_p2_0[] = {
 	 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
-	 7, 7, 0, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 7,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7,
 	 7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
-	 0, 0, 5, 6, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0,
+	 0, 0, 5, 6, 7, 0, 0, 0, 7, 8, 0, 0, 0, 7, 7, 0,
 	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 7, 7, 0, 0,
-	 0, 7, 7, 0, 0, 0, 9, 8, 0, 0, 0, 0, 0, 0, 0, 5,
+	 0, 7, 7, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5,
 	 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9,
 	 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -8732,15 +8858,15 @@ static long _vq_lengthlist__44c5_s_p2_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 5, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7,
-	 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0,
+	 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5, 7, 8, 0,
 	 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9, 9, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 7,10,10, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0,
-	10, 9, 0, 0, 0, 0, 0, 0, 0, 7,10,10, 0, 0, 0, 9,
+	 7, 9,10, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0,
+	 9, 9, 0, 0, 0, 0, 0, 0, 0, 7,10,10, 0, 0, 0, 9,
 	 9, 0, 0, 0, 9, 9, 0, 0, 0, 9,10, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -8791,13 +8917,13 @@ static long _vq_quantlist__44c5_s_p3_0[] = {
 };
 
 static long _vq_lengthlist__44c5_s_p3_0[] = {
-	 2, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 2, 3, 4, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 4, 4, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 7, 7,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -8875,7 +9001,7 @@ static long _vq_lengthlist__44c5_s_p4_0[] = {
 	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
 	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
 	 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
-	 7, 7, 0, 0, 0, 0, 0, 0, 0, 8, 7, 0, 0, 0, 0, 0,
+	 8, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
 	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
@@ -8977,23 +9103,23 @@ static long _vq_quantlist__44c5_s_p6_0[] = {
 
 static long _vq_lengthlist__44c5_s_p6_0[] = {
 	 2, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,11,
-	12, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,
+	11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,
 	12,12, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,
 	11,12,12, 0, 6, 6, 7, 7, 8, 8, 9,10,10,10,11,11,
-	11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9,10,10,10,11,
+	11,11,12,12, 0, 0, 0, 7, 7, 8, 8,10,10,10,10,11,
 	11,12,11,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,10,
 	11,11,12,12,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,
 	10,11,11,12,12,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,
 	10,10,11,11,12,12,13,12, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 8, 8,
+	10,10,10,11,11,12,12,13,12, 0, 0, 0, 0, 0, 8, 8,
 	 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 8,
 	 8, 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
-	10, 9,10,10,11,11,11,12,12,12,13,13, 0, 0, 0, 0,
+	 9, 9,10,10,11,11,11,12,12,12,13,13, 0, 0, 0, 0,
 	 0, 0, 0,10,10,11,10,11,11,12,12,13,13, 0, 0, 0,
 	 0, 0, 0, 0,11,11,11,11,12,12,12,12,13,13, 0, 0,
 	 0, 0, 0, 0, 0,11,11,11,11,12,12,12,12,13,13, 0,
-	 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,13,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,12,13,13,
+	 0, 0, 0, 0, 0, 0,11,12,12,12,12,12,13,13,13,13,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,
 	13,
 };
 
@@ -9142,10 +9268,10 @@ static long _vq_lengthlist__44c5_s_p8_0[] = {
 	 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
 	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
 	11, 0,12,12, 8, 9, 9, 9,10,10,11,11,12,11, 0,12,
-	13, 8, 8, 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10,
+	12, 8, 8, 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10,
 	 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10, 9, 9,10,
 	10,11,11,12,12, 0, 0, 0,13,13,10,10,11,11,12,12,
-	12,12, 0, 0, 0,14,14,10,10,11,11,12,12,12,12, 0,
+	12,12, 0, 0, 0,14,14,10,10,11,11,12,12,12,13, 0,
 	 0, 0, 0, 0,12,12,11,11,12,12,13,13, 0, 0, 0, 0,
 	 0,12,12,11,11,12,12,13,13,
 };
@@ -9233,9 +9359,9 @@ static long _vq_quantlist__44c5_s_p9_0[] = {
 
 static long _vq_lengthlist__44c5_s_p9_0[] = {
 	 1, 3, 3, 7, 8,11,12,15,13,15,15, 5, 5, 5, 9, 9,
-	15,14,15,15,15,15, 5, 5, 4,10,10,15,13,15,13,14,
-	14,14, 9,11,13,11,14,14,14,14,14,14,14,10, 9,11,
-	12,14,12,14,14,14,14,14,13,13,13,13,14,14,14,14,
+	15,14,15,15,15,15, 5, 5, 4,10, 9,15,13,15,14,15,
+	15,15,10,10,14,11,15,15,15,15,15,15,15,10, 9,11,
+	12,15,12,15,14,14,14,14,13,13,13,13,14,14,14,14,
 	14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
 	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
 	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
@@ -9289,15 +9415,15 @@ static long _vq_quantlist__44c5_s_p9_1[] = {
 static long _vq_lengthlist__44c5_s_p9_1[] = {
 	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 9, 9,10,10,10,10, 7, 5, 5, 7, 7, 8,
-	 8, 9, 9,10,10,10,10,14, 8, 8, 8, 8, 9, 9,10,10,
+	 8, 9, 9,10,10,10,10,14, 8, 8, 8, 8, 9, 9, 9,10,
 	10,10,11,11,14, 8, 8, 8, 8, 9, 9,10,10,10,10,11,
 	11,14,11,11, 9, 9, 9, 9,10,10,11,11,11,11,14,12,
 	11, 9, 9, 9, 9,10,10,11,11,11,11,14,14,14,10,10,
-	10,10,11,11,11,11,11,11,14,14,14,10,10,10,10,11,
+	10,10,11,11,11,11,11,11,14,14,14,11,11,10,10,11,
 	11,11,11,11,11,14,14,14,13,13,11,11,11,11,11,11,
 	11,11,14,14,14,13,13,11,11,11,11,11,11,11,12,14,
-	14,14,13,13,12,12,11,11,11,11,12,11,14,14,14,14,
-	14,12,12,11,11,11,11,12,12,
+	14,14,13,14,12,12,11,11,11,11,12,11,14,14,14,14,
+	13,12,12,11,11,11,11,12,12,
 };
 
 static float _vq_quantthresh__44c5_s_p9_1[] = {
@@ -9345,15 +9471,15 @@ static long _vq_quantlist__44c5_s_p9_2[] = {
 };
 
 static long _vq_lengthlist__44c5_s_p9_2[] = {
-	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 9, 6, 6,
-	 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 6, 6, 7, 6, 7,
+	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6,
+	 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 6, 6, 6, 6, 7,
 	 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7, 7, 7, 8,
-	 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 7, 8, 8, 8,
+	 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 8,
 	 8, 9, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
 	 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
 	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
 	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,
-	 8, 8, 9, 9, 9, 8, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9,
+	 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9,
 	 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
 	 9, 9, 9, 8, 8, 8, 8, 8, 8,
 };
@@ -9387,13 +9513,13 @@ static static_codebook _44c5_s_p9_2 = {
 };
 
 static long _huff_lengthlist__44c5_s_short[] = {
-	 3, 8,18,13, 9,10,11,14,18,17, 4, 3,11, 7, 5, 7,
-	 8,13,15,17,12, 8, 7,10, 6, 8,10,13,15,14,10, 6,
-	10, 7, 7, 8,11,16,17,17, 8, 4, 6, 7, 3, 5, 7,11,
-	17,15,10, 6, 7, 8, 4, 5, 7,11,16,16,10, 9, 9,11,
-	 6, 7, 8,11,15,13,12,12,13,13,10,11,10,13,15,14,
-	12,15,13,10, 8, 7, 8,11,16,17,13,13,12, 8, 6, 4,
-	 5, 8,11,17,
+	 3, 8,18,14, 9, 9,11,13,14,18, 4, 3,11, 7, 5, 6,
+	 8,13,15,17,14, 9, 8,10, 6, 8,10,12,14,17,11, 6,
+	11, 7, 7, 8,12,15,17,17, 8, 4, 6, 7, 3, 5, 7,12,
+	17,17,10, 6, 7, 8, 4, 5, 7,12,16,17,10, 9, 9,11,
+	 6, 7, 9,12,17,17,12,13,11,13,10,10,11,14,17,17,
+	13,15,14,11, 8, 7, 8,11,15,17,14,14,13, 9, 6, 4,
+	 5, 7,11,17,
 };
 
 static static_codebook _huff_book__44c5_s_short = {
@@ -9484,22 +9610,22 @@ static long _vq_lengthlist__44c6_s_p2_0[] = {
 	11,11, 6, 6, 7, 9, 9, 0, 7, 8, 9,10, 0, 7, 7, 9,
 	10, 0, 9, 9,11,11, 0, 0, 0,11,11, 9, 9, 9,10,10,
 	 0,11,10,12,12, 0,11,11,12,12, 0,13,13,14,14, 0,
-	 0, 0,14,14, 9, 9, 9,10,10, 0,10,11,11,12, 0,11,
+	 0, 0,14,14, 9, 9, 9,10,10, 0,10,11,12,12, 0,11,
 	11,12,12, 0,13,13,14,14, 0, 0, 0,14,14, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 5, 7, 7,11,11, 0, 7, 7,10,10,
 	 0, 7, 7,10,10, 0, 8, 8,11,11, 0, 0, 0,11,11, 5,
 	 7, 7,11,11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 8,
 	 8,11,11, 0, 0, 0,11,11, 9,10, 9,12,12, 0,10,10,
-	12,11, 0,10,10,12,12, 0,12,12,13,13, 0, 0, 0,13,
+	12,11, 0,10,10,12,12, 0,12,12,14,13, 0, 0, 0,13,
 	13, 9, 9,10,12,12, 0,10,10,11,12, 0,10,10,12,12,
 	 0,12,12,13,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 6, 8, 7,11,10, 0, 7, 7,10,10, 0, 7, 7,
-	10,10, 0, 8, 8,11,11, 0, 0, 0,11,11, 6, 7, 8,11,
+	10,10, 0, 8, 8,11,11, 0, 0, 0,11,11, 6, 7, 8,10,
 	11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 8, 8,11,11,
 	 0, 0, 0,11,11, 9,10, 9,12,12, 0,10,10,12,12, 0,
-	10,10,12,11, 0,12,12,13,13, 0, 0, 0,14,13, 9, 9,
+	10,10,12,12, 0,12,12,13,13, 0, 0, 0,13,13, 9, 9,
 	10,12,12, 0,10,10,12,12, 0,10,10,12,12, 0,12,12,
 	13,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9675,8 +9801,8 @@ static long _vq_lengthlist__44c6_s_p5_0[] = {
 	 1, 4, 4, 5, 7, 7, 5, 7, 7, 4, 7, 7,10,10,10,10,
 	11,10, 4, 7, 7,10,10,10,10,10,11, 5,10,10, 9,12,
 	12,10,12,12, 7,11,10,12,12,12,12,13,13, 7,10,10,
-	12,12,13,13,13,13, 5,11,11,10,13,12,10,12,12, 7,
-	11,10,12,12,12,12,12,12, 7,11,11,12,13,12,12,12,
+	12,12,12,13,13,13, 5,11,11,10,13,12,11,12,12, 7,
+	11,10,11,12,12,12,12,12, 7,11,11,12,12,12,12,12,
 	12,
 };
 
@@ -9724,10 +9850,10 @@ static long _vq_lengthlist__44c6_s_p5_1[] = {
 	 3, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,12, 4, 4, 6, 6,
 	 8, 8, 9, 9, 9, 9,12, 4, 4, 6, 6, 8, 8, 9, 9, 9,
 	 9,12, 5, 5, 6, 6, 8, 8, 9, 9,10,10,12,12,12, 6,
-	 6, 8, 8, 9, 9,10,10,11,11,11, 6, 7, 8, 8, 9, 9,
-	 9, 9,12,11,11, 6, 7, 8, 8, 8, 8, 9, 9,11,11,11,
+	 6, 8, 8, 9, 9,10,10,11,11,12, 7, 7, 8, 8, 9, 9,
+	 9, 9,12,11,11, 6, 6, 8, 8, 8, 8, 9, 9,11,11,11,
 	 7, 7, 8, 8, 8, 8, 9, 9,12,11,11,11,11, 8, 8, 8,
-	 8, 9, 9,12,12,12,11,11, 7, 8, 8, 8, 8, 8,12,11,
+	 8, 9, 9,12,11,12,11,11, 7, 8, 8, 8, 8, 8,12,11,
 	11,11,11, 7, 7, 8, 8, 8, 8,
 };
 
@@ -9875,15 +10001,15 @@ static long _vq_quantlist__44c6_s_p7_0[] = {
 static long _vq_lengthlist__44c6_s_p7_0[] = {
 	 1, 4, 4, 6, 7, 8, 8, 9, 9, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 8,
-	 8,10, 9,10,10,11,11,19, 7, 7, 7, 7, 9, 9,10,10,
-	11,11,11,12,19, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
-	12,19,11,11, 8, 9,10,10,10,10,11,11,12,12,19,12,
-	12, 8, 9,10,10,11,11,11,11,12,12,19,19,19,11,11,
-	10,10,11,11,12,12,12,12,19,19,19,11,11,10,10,11,
-	11,12,12,13,12,19,19,19,14,14,11,11,11,11,12,12,
-	13,13,19,19,19,15,15,11,11,12,11,12,12,13,13,19,
-	19,19,19,18,13,13,12,12,12,12,13,14,18,18,18,18,
-	18,13,13,12,12,12,12,14,13,
+	 8, 9, 9,10,10,11,11,20, 7, 7, 7, 7, 9, 9,10,10,
+	11,11,11,11,20, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
+	11,20,11,11, 8, 9,10,10,10,10,11,11,12,12,20,12,
+	12, 9, 9,10,10,11,11,11,11,12,12,20,20,20,11,11,
+	10,10,11,11,11,12,12,12,20,20,20,11,11,10,10,11,
+	11,12,11,12,12,20,20,20,14,14,11,11,12,11,12,12,
+	13,13,20,20,20,15,14,11,11,11,11,12,12,13,13,20,
+	20,20,20,19,13,13,12,12,12,13,13,13,19,19,19,19,
+	19,13,13,12,12,12,13,13,13,
 };
 
 static float _vq_quantthresh__44c6_s_p7_0[] = {
@@ -9930,11 +10056,11 @@ static long _vq_quantlist__44c6_s_p7_1[] = {
 
 static long _vq_lengthlist__44c6_s_p7_1[] = {
 	 3, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7, 8, 5, 5, 7, 7,
-	 7, 7, 7, 7, 8, 8, 8, 5, 5, 7, 7, 7, 7, 7, 7, 7,
-	 7, 8, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7,
-	 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 7, 7, 7, 7, 8, 8,
+	 7, 7, 7, 7, 7, 7, 8, 5, 5, 7, 7, 7, 7, 7, 7, 7,
+	 7, 8, 6, 6, 7, 7, 7, 7, 8, 8, 8, 7, 8, 8, 8, 7,
+	 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 8, 8,
 	 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8,
-	 7, 7, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 8, 7,
+	 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 7,
 	 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 8, 8, 8, 8,
 	 8, 8, 8, 7, 7, 7, 7, 8, 8,
 };
@@ -9988,18 +10114,18 @@ static long _vq_quantlist__44c6_s_p8_0[] = {
 static long _vq_lengthlist__44c6_s_p8_0[] = {
 	 1, 4, 4, 6, 7, 8, 8, 8, 8, 9, 9,10,10,10,11, 6,
 	 5, 5, 7, 7, 9, 9, 8, 9,10,10,11,10,12,11, 6, 5,
-	 5, 7, 7, 9, 9, 9, 8,10,10,10,10,11,11,18, 8, 8,
+	 5, 7, 7, 9, 9, 8, 8,10,10,10,11,11,11,18, 8, 8,
 	 8, 8, 9, 9, 9, 9,10,10,11,11,11,11,18, 8, 8, 8,
-	 8, 9, 9, 9, 9,10,10,11,11,12,12,18,13,12, 9, 9,
-	10,10,10,10,10,10,11,11,12,12,18,13,13, 9, 9,10,
-	10,10,10,10,11,11,11,13,12,18,18,18,10,10, 9, 9,
-	10,10,11,11,11,12,12,12,18,18,18,10,10, 9, 9,10,
-	11,11,11,12,12,12,12,18,18,18,13,13,10,10,11,11,
-	12,12,12,13,12,13,18,18,18,13,13,10,10,11,11,12,
-	12,12,12,13,13,18,18,18,18,18,12,12,11,11,13,12,
-	12,13,14,13,18,18,18,18,18,12,12,11,11,12,12,13,
-	13,13,14,18,18,18,18,18,16,14,12,12,12,12,13,13,
-	14,13,18,18,18,18,18,14,15,12,12,13,12,13,12,14,
+	 8, 9, 9, 9, 9,10,10,11,11,12,12,18,12,12, 9, 9,
+	10,10,10,10,10,11,11,11,12,12,18,13,13, 9, 9,10,
+	10,10,10,10,11,11,11,12,12,18,18,18,10,10, 9, 9,
+	10,10,11,11,12,12,12,13,18,18,18,10,10, 9, 9,11,
+	11,11,11,12,12,12,12,18,18,18,13,14,10,10,11,11,
+	12,12,12,12,13,13,18,18,18,14,14,10,10,11,11,12,
+	12,12,12,13,13,18,18,18,18,18,12,12,11,12,12,12,
+	13,13,13,13,18,18,18,18,18,12,12,11,11,12,12,13,
+	13,14,14,18,18,18,18,18,16,14,12,12,12,13,13,13,
+	14,14,18,17,17,17,17,14,16,12,11,12,12,13,13,14,
 	14,
 };
 
@@ -10056,7 +10182,7 @@ static long _vq_quantlist__44c6_s_p8_1[] = {
 };
 
 static long _vq_lengthlist__44c6_s_p8_1[] = {
-	 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 9,
+	 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9,
 	 9, 9, 9, 9, 9,10, 6, 7, 7, 7, 8, 8, 8, 8, 8, 8,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8,
 	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
@@ -10068,22 +10194,22 @@ static long _vq_lengthlist__44c6_s_p8_1[] = {
 	 9, 9, 9,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
-	10,10, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9,10, 9, 9,
+	10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9,
 	 9, 9,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9,10, 9, 9, 9, 9, 9, 9,10,10,10,10,
+	 9, 9, 9, 9, 9,10, 9, 9, 9, 9, 9,10,10,10,10,11,
 	10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,10, 9,
+	 9,10,10,10,10,10,11,10, 9, 9, 9, 9, 9, 9,10, 9,
 	 9,10, 9, 9, 9, 9,10,10,10,10,10,10,10, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,
-	11,10, 9, 9, 9, 9,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,11,10,10,10,10, 9,10, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10, 9,
-	10,10, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,10,
-	10,10,11,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	10,11,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,10,
+	10,10,10, 9, 9, 9,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,11,10,10,10,10,10,10,10,10,10, 9,
+	10,10, 9, 9, 9, 9, 9,10,10, 9,10,10,10,10,10,10,
+	10,10,11, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,
+	 9, 9,10, 9,10,10,10,10,10,10,10,10,10,10,10, 9,
+	 9, 9, 9, 9, 9, 9, 9,10, 9,
 };
 
 static float _vq_quantthresh__44c6_s_p8_1[] = {
@@ -10314,13 +10440,13 @@ static static_codebook _44c6_s_p9_2 = {
 };
 
 static long _huff_lengthlist__44c6_s_short[] = {
-	 4, 9,11,11,13,13,16,17,16,17, 4, 4, 4, 6, 8, 9,
-	13,16,17,17, 7, 4, 3, 4, 7, 8,12,14,17,17,10, 6,
-	 4, 4, 5, 6,10,15,15,16,11, 8, 6, 5, 6, 7,10,14,
-	16,16,12, 9, 7, 6, 6, 7,10,14,15,15,13,13,10, 8,
-	 9, 9,10,13,17,14,14,12, 8, 5, 6, 6, 8,12,17,14,
-	15,16, 8, 6, 6, 7, 9,12,17,17,17,17,11, 8, 8, 8,
-	10,12,17,17,
+	 3, 9,11,11,13,14,16,17,17,17, 4, 4, 5, 6, 8, 9,
+	13,15,18,18, 7, 4, 3, 4, 7, 8,11,13,18,18,11, 6,
+	 4, 4, 6, 7,11,13,18,18,11, 8, 6, 5, 6, 7,11,14,
+	18,18,12, 9, 7, 6, 7, 7,10,15,17,17,13,13, 9, 8,
+	 9, 9,11,14,17,17,14,13, 8, 5, 6, 6, 8,11,17,17,
+	17,16, 9, 6, 6, 7, 8,12,17,17,17,17,11, 8, 8, 8,
+	 9,13,17,17,
 };
 
 static static_codebook _huff_book__44c6_s_short = {
@@ -10409,9 +10535,9 @@ static long _vq_lengthlist__44c7_s_p2_0[] = {
 	 7, 7,10,10, 0, 0, 0,10,10, 5, 7, 6, 9, 9, 0, 7,
 	 7,10, 9, 0, 7, 7,10, 9, 0, 9, 9,11,11, 0, 0, 0,
 	11,11, 5, 6, 7, 9, 9, 0, 7, 7, 9,10, 0, 7, 7, 9,
-	 9, 0, 9, 9,11,11, 0, 0, 0,11,11, 8, 9, 9,10,10,
+	 9, 0, 9, 9,11,11, 0, 0, 0,11,11, 9, 9, 9,10,10,
 	 0,11,10,12,11, 0,10,11,11,12, 0,13,13,14,14, 0,
-	 0, 0,14,14, 9, 9, 9,10,10, 0,10,11,11,12, 0,11,
+	 0, 0,14,14, 8, 9, 9,10,10, 0,10,11,11,12, 0,10,
 	10,12,12, 0,13,13,13,14, 0, 0, 0,14,14, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 6, 7, 7,10,11, 0, 7, 7,10,10,
@@ -10419,7 +10545,7 @@ static long _vq_lengthlist__44c7_s_p2_0[] = {
 	 7, 7,11,10, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 8,
 	 8,10,11, 0, 0, 0,11,11, 9,10, 9,12,12, 0,10,10,
 	12,11, 0,10,10,12,12, 0,12,12,13,13, 0, 0, 0,13,
-	13, 9, 9, 9,11,12, 0,10,10,11,12, 0,10,10,11,12,
+	13, 9, 9, 9,11,12, 0,10,10,11,12, 0,10,10,12,12,
 	 0,11,12,13,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 6, 7, 7,11,10, 0, 7, 7,10,10, 0, 7, 7,
@@ -10430,13 +10556,13 @@ static long _vq_lengthlist__44c7_s_p2_0[] = {
 	10,11,12, 0,10,10,11,12, 0,10,10,11,12, 0,12,12,
 	13,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 7, 9, 9,13,13, 0, 8, 8,12,11, 0, 8, 8,11,12, 0,
-	 9, 9,12,11, 0, 0, 0,12,12, 7, 9, 9,13,13, 0, 8,
+	 7, 9, 9,13,13, 0, 8, 8,12,12, 0, 8, 8,11,12, 0,
+	 9, 9,12,12, 0, 0, 0,12,12, 7, 9, 9,13,13, 0, 8,
 	 8,11,12, 0, 8, 8,12,12, 0, 9, 9,12,12, 0, 0, 0,
-	12,12,10,11,11,14,14, 0,11,10,13,13, 0,11,11,13,
-	13, 0,12,12,13,13, 0, 0, 0,13,14,10,11,11,14,14,
+	12,12,10,11,11,14,14, 0,11,10,13,12, 0,11,11,13,
+	13, 0,12,12,13,13, 0, 0, 0,13,14,10,11,11,14,13,
 	 0,10,11,13,13, 0,11,11,13,13, 0,12,12,13,13, 0,
-	 0, 0,13,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -10542,14 +10668,14 @@ static long _vq_quantlist__44c7_s_p4_0[] = {
 };
 
 static long _vq_lengthlist__44c7_s_p4_0[] = {
-	 3, 4, 4, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,11,11,
+	 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,11,11,
 	11, 0, 4, 4, 6, 6, 7, 7, 9, 9, 9, 9,10,10,11,11,
 	12,12, 0, 4, 4, 6, 6, 7, 7, 9, 9, 9, 9,10,10,11,
 	11,12,12, 0, 5, 5, 6, 6, 7, 7, 9, 9, 9, 9,11,11,
-	12,12,13,12, 0, 0, 0, 6, 6, 8, 8, 9, 9, 9, 9,11,
+	12,12,13,12, 0, 0, 0, 6, 6, 7, 7, 9, 9, 9, 9,11,
 	11,12,12,13,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,10,
 	11,11,12,12,13,13, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,
-	10,11,11,12,12,13,13, 0, 0, 0, 7, 6, 7, 7, 9, 9,
+	10,11,11,12,12,13,13, 0, 0, 0, 6, 6, 7, 7, 9, 9,
 	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 7, 7, 9,
 	 9,10,10,12,11,12,12,13,13, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -10599,11 +10725,11 @@ static long _vq_quantlist__44c7_s_p5_0[] = {
 };
 
 static long _vq_lengthlist__44c7_s_p5_0[] = {
-	 1, 4, 4, 4, 7, 7, 5, 7, 7, 5, 8, 7,10,10,10,10,
-	11,10, 5, 7, 7,10,10,10,10,10,11, 4,10,10, 9,12,
+	 1, 4, 5, 4, 7, 7, 5, 7, 7, 5, 8, 7,10,10,10,10,
+	11,10, 4, 7, 7,10,10,10,10,10,11, 4,10,10, 9,12,
 	12, 9,12,12, 7,11,10,12,12,12,12,13,13, 7,10,10,
 	12,12,12,12,13,13, 5,10,10, 9,12,12,10,12,12, 7,
-	11,10,12,13,13,12,12,12, 7,10,10,12,13,13,12,12,
+	11,10,11,13,13,12,12,12, 7,10,11,12,12,12,12,12,
 	12,
 };
 
@@ -10650,11 +10776,11 @@ static long _vq_quantlist__44c7_s_p5_1[] = {
 static long _vq_lengthlist__44c7_s_p5_1[] = {
 	 3, 5, 4, 6, 6, 8, 8, 9, 9, 9, 9,12, 4, 4, 6, 6,
 	 8, 8, 9, 9,10,10,12, 4, 4, 6, 6, 8, 8, 9, 9,10,
-	10,13, 5, 5, 6, 6, 7, 7, 9, 9,10,10,13,12,12, 6,
+	10,12, 5, 5, 6, 6, 7, 7, 9, 9,10,10,12,12,12, 6,
 	 6, 7, 7, 9, 9,10,10,12,12,12, 6, 6, 8, 8, 9, 9,
 	 9, 9,12,12,12, 6, 6, 8, 8, 8, 8, 9, 9,12,12,12,
 	 7, 7, 8, 8, 8, 8, 9, 9,12,12,12,11,11, 8, 8, 8,
-	 8, 9, 9,12,12,12,11,12, 7, 7, 8, 8, 8, 8,12,12,
+	 8, 9, 9,12,12,12,12,12, 7, 7, 8, 8, 8, 8,12,12,
 	12,12,12, 7, 7, 7, 8, 8, 8,
 };
 
@@ -10703,11 +10829,11 @@ static long _vq_quantlist__44c7_s_p6_0[] = {
 };
 
 static long _vq_lengthlist__44c7_s_p6_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 5, 5,
+	 1, 4, 4, 7, 7, 8, 8, 8, 8,10,10,10,10, 5, 5, 5,
 	 7, 7, 9, 9, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 9,
-	 9, 9, 9,11,11,12,11, 0, 6, 6, 7, 7, 9, 9,10,10,
-	11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
-	12, 0,11,11, 8, 8,10, 9,10,11,11,11,12,12, 0,12,
+	 9, 9, 9,10,10,11,11, 0, 7, 6, 7, 7, 9, 9,10,10,
+	11,11,11,12, 0, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
+	12, 0,11,11, 8, 8, 9, 9,10,10,11,11,12,12, 0,12,
 	12, 8, 8, 9, 9,11,11,12,12,13,13, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -10800,17 +10926,17 @@ static long _vq_quantlist__44c7_s_p7_0[] = {
 };
 
 static long _vq_lengthlist__44c7_s_p7_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 9, 8, 9, 9,10,10, 6, 5, 5,
+	 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 6, 5, 5,
 	 7, 7, 8, 8, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 8,
-	 8, 9, 9,10,10,11,11,20, 7, 7, 7, 7, 9, 9,10,10,
+	 9, 9, 9,10,10,11,11,20, 7, 7, 7, 7, 9, 9,10,10,
 	11,11,11,12,20, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
-	11,20,11,11, 8, 9,10,10,10,10,11,11,12,12,20,12,
-	12, 8, 8, 9, 9,11,11,11,11,12,12,20,20,20,10,10,
-	10,10,11,11,12,11,12,12,20,20,20,11,11,10,10,11,
-	11,12,12,12,12,20,20,20,14,14,11,11,12,11,12,12,
+	12,20,11,11, 8, 8,10,10,10,10,11,11,12,12,20,12,
+	12, 8, 8, 9,10,11,11,11,11,12,12,20,20,20,10,11,
+	10,10,11,11,11,12,12,12,20,20,20,11,11,10,10,11,
+	11,12,12,13,12,20,20,20,14,14,11,11,12,11,12,12,
 	13,13,20,20,20,14,15,11,11,12,12,12,12,13,13,20,
-	20,20,20,19,12,13,12,12,12,13,13,13,19,19,19,19,
-	19,13,13,12,12,13,12,14,14,
+	20,20,20,19,13,13,12,12,12,12,13,13,19,19,19,19,
+	19,13,13,12,12,13,13,14,14,
 };
 
 static float _vq_quantthresh__44c7_s_p7_0[] = {
@@ -10857,12 +10983,12 @@ static long _vq_quantlist__44c7_s_p7_1[] = {
 
 static long _vq_lengthlist__44c7_s_p7_1[] = {
 	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 5, 5, 7, 7,
-	 7, 7, 7, 7, 8, 8, 8, 5, 5, 7, 7, 7, 7, 7, 7, 8,
+	 7, 7, 7, 7, 8, 8, 8, 5, 5, 7, 7, 7, 7, 7, 7, 7,
 	 7, 8, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7,
-	 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 7, 7, 7, 7, 8, 8,
-	 8, 8, 9, 8, 8, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9,
-	 7, 7, 8, 7, 8, 7, 8, 8, 8, 8, 8, 8, 8, 7, 8, 7,
-	 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 8, 8, 8, 8,
+	 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 8, 8,
+	 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8,
+	 7, 7, 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 8, 8, 8, 8,
 	 8, 8, 8, 7, 7, 7, 7, 8, 8,
 };
 
@@ -10913,20 +11039,20 @@ static long _vq_quantlist__44c7_s_p8_0[] = {
 };
 
 static long _vq_lengthlist__44c7_s_p8_0[] = {
-	 1, 4, 4, 6, 7, 8, 8, 8, 8, 9, 9,10,10,11,11, 6,
-	 5, 5, 7, 7, 9, 9, 8, 9, 9,10,11,11,11,11, 6, 5,
-	 5, 7, 7, 9, 9, 9, 8,10,10,11,10,12,11,18, 8, 8,
+	 1, 4, 4, 6, 7, 8, 8, 8, 8, 9, 9,10,10,10,11, 6,
+	 5, 5, 7, 7, 9, 9, 8, 8,10,10,11,10,12,11, 6, 5,
+	 5, 7, 7, 9, 9, 9, 9,10,10,11,10,12,11,18, 8, 8,
 	 8, 8, 9, 9, 9, 9,10,10,11,11,12,12,18, 8, 8, 8,
-	 8, 9, 9, 9, 9,10,10,11,11,12,12,18,12,12, 9, 9,
-	10,10,10,10,10,10,11,11,11,12,18,13,13, 9, 9,10,
-	10,10,10,11,11,11,11,12,12,18,18,18,10,10, 9, 9,
+	 8, 9, 9, 9, 9,10,10,11,11,12,12,18,13,12, 9, 9,
+	10,10,10, 9,11,10,11,12,12,12,18,13,13, 9, 9,10,
+	10,10,10,11,11,11,11,12,12,18,18,18, 9,10, 9, 9,
 	10,10,11,11,12,12,12,13,18,18,18,10, 9, 9, 9,10,
 	11,11,11,12,12,12,12,18,18,18,13,13,10,10,11,11,
 	12,12,12,12,13,13,18,18,18,13,14,10,10,11,11,12,
-	12,12,12,13,13,18,18,18,18,18,12,11,11,11,12,12,
-	13,13,13,13,18,18,18,18,18,11,11,11,11,12,12,13,
-	13,14,14,18,18,18,18,18,16,14,12,12,13,13,13,13,
-	14,14,18,18,18,18,18,14,15,12,12,12,12,13,13,14,
+	12,12,12,13,13,18,18,18,18,18,12,12,11,11,12,12,
+	13,13,13,13,18,18,18,18,18,12,11,11,11,12,12,13,
+	13,14,14,18,18,18,18,18,15,14,12,12,13,13,13,13,
+	14,13,18,18,18,18,18,15,16,12,12,13,12,13,13,15,
 	14,
 };
 
@@ -10983,12 +11109,12 @@ static long _vq_quantlist__44c7_s_p8_1[] = {
 };
 
 static long _vq_lengthlist__44c7_s_p8_1[] = {
-	 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9,
-	 9, 9, 9, 9, 9,10, 6, 7, 7, 7, 8, 8, 8, 8, 8, 9,
+	 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 9, 9, 9, 9, 9,10, 6, 7, 7, 7, 8, 8, 8, 8, 8, 8,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8,
 	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 8, 8, 9, 9, 9,
+	 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 8, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
 	10, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
@@ -11004,10 +11130,10 @@ static long _vq_lengthlist__44c7_s_p8_1[] = {
 	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10, 9, 9, 9,
 	 9,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,
 	10,10, 9, 9, 9, 9,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,10,10,10,10,10, 9,10, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10, 9, 9,
 	10, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,
-	10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
+	10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
 	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,
 	 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9,
@@ -11241,12 +11367,12 @@ static static_codebook _44c7_s_p9_2 = {
 };
 
 static long _huff_lengthlist__44c7_s_short[] = {
-	 4,10,13,13,14,14,17,17,18,16, 4, 5, 6, 7, 8, 9,
-	12,16,18,17, 6, 5, 4, 4, 6, 8,11,13,17,17, 9, 6,
-	 4, 3, 5, 6,10,14,16,17,11, 8, 6, 4, 5, 6, 9,13,
-	15,16,12,10, 7, 5, 5, 5, 8,12,16,15,14,12,10, 9,
-	 8, 8, 9,12,16,14,14,14,12, 6, 6, 6, 7,11,17,14,
-	15,14,13, 7, 6, 6, 7,10,17,17,17,17,16, 9, 8, 8,
+	 4,10,12,12,14,14,18,16,18,16, 4, 5, 6, 7, 8, 9,
+	12,15,18,18, 7, 5, 4, 4, 6, 7,10,12,17,17, 9, 6,
+	 4, 3, 5, 6, 9,13,17,17,11, 8, 6, 4, 5, 6, 9,13,
+	17,17,11, 9, 7, 5, 5, 5, 8,13,17,17,13,12,10, 8,
+	 8, 8,10,13,17,17,15,13,11, 6, 6, 6, 7,11,17,17,
+	16,15,14, 7, 6, 6, 7,10,17,17,17,17,16, 9, 8, 8,
 	 9,11,17,17,
 };
 
@@ -11332,45 +11458,45 @@ static long _vq_quantlist__44c8_s_p2_0[] = {
 };
 
 static long _vq_lengthlist__44c8_s_p2_0[] = {
-	 4, 5, 5, 8, 8, 0, 6, 6, 8, 8, 0, 6, 6, 8, 8, 0,
-	 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 6, 6, 9, 8, 0, 7,
+	 3, 5, 5, 8, 8, 0, 6, 6, 9, 9, 0, 6, 6, 9, 9, 0,
+	 7, 7, 9,10, 0, 0, 0,10,10, 6, 7, 6, 9, 8, 0, 7,
 	 7, 9, 9, 0, 7, 7, 9, 9, 0, 9, 9,11,10, 0, 0, 0,
-	11,10, 5, 6, 6, 8, 9, 0, 7, 7, 9, 9, 0, 7, 7, 9,
-	 9, 0, 9, 9,10,11, 0, 0, 0,10,11, 8, 9, 8,10,10,
-	 0,10,10,11,11, 0,10,10,11,11, 0,12,12,14,13, 0,
-	 0, 0,13,13, 8, 8, 9,10,10, 0,10,10,11,12, 0,10,
-	10,11,11, 0,12,12,13,13, 0, 0, 0,13,13, 0, 0, 0,
+	11,10, 5, 6, 7, 8, 9, 0, 7, 7, 9, 9, 0, 7, 7, 9,
+	 9, 0, 9, 9,11,11, 0, 0, 0,11,11, 8, 9, 8,10,10,
+	 0,11,10,12,11, 0,10,10,12,11, 0,12,12,14,13, 0,
+	 0, 0,13,13, 8, 8, 9,10,10, 0,10,11,11,12, 0,10,
+	10,11,11, 0,12,12,13,14, 0, 0, 0,13,13, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 6, 7, 7,10,10, 0, 7, 7,10, 9,
-	 0, 7, 7, 9,10, 0, 8, 8,10,10, 0, 0, 0,10,10, 6,
-	 7, 7,10,10, 0, 7, 7, 9,10, 0, 7, 7,10,10, 0, 8,
-	 8,10,10, 0, 0, 0,10,10, 8, 9, 9,11,11, 0,10, 9,
-	11,11, 0, 9,10,11,11, 0,11,11,12,12, 0, 0, 0,12,
-	12, 9, 9, 9,11,11, 0, 9,10,11,11, 0,10, 9,11,11,
-	 0,11,11,12,13, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 6, 7, 7,10,10, 0, 7, 7,10, 9, 0, 7, 7,
+	 0, 7, 7,10,10, 0, 8, 8,10,10, 0, 0, 0,10,10, 6,
+	 7, 7,10,10, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 8,
+	 8,10,11, 0, 0, 0,10,10, 9, 9, 9,11,11, 0,10, 9,
+	11,11, 0,10,10,11,11, 0,11,11,13,12, 0, 0, 0,13,
+	12, 9, 9, 9,11,11, 0, 9,10,11,11, 0,10,10,11,11,
+	 0,11,11,12,13, 0, 0, 0,13,12, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 6, 7, 7,11,10, 0, 7, 7,10,10, 0, 7, 7,
 	10, 9, 0, 8, 8,10,10, 0, 0, 0,10,10, 6, 7, 7,10,
-	10, 0, 7, 7, 9,10, 0, 7, 7, 9,10, 0, 8, 8,10,10,
-	 0, 0, 0,10,10, 9, 9, 9,12,11, 0,10,10,11,11, 0,
-	10, 9,11,11, 0,11,11,13,12, 0, 0, 0,13,12, 9, 9,
-	 9,11,12, 0,10,10,11,12, 0, 9,10,11,12, 0,11,11,
+	10, 0, 7, 7,10,10, 0, 7, 7, 9,10, 0, 8, 8,11,10,
+	 0, 0, 0,10,10, 9,10, 9,12,11, 0,10,10,12,11, 0,
+	10,10,12,11, 0,11,11,13,12, 0, 0, 0,13,12, 9, 9,
+	10,11,12, 0,10,10,11,12, 0, 9,10,11,12, 0,11,11,
 	12,13, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 7, 9, 9,12,12, 0, 8, 8,11,11, 0, 8, 8,11,11, 0,
-	 9, 9,11,11, 0, 0, 0,11,11, 7, 9, 9,12,12, 0, 8,
-	 8,11,11, 0, 8, 8,11,11, 0, 9, 9,11,11, 0, 0, 0,
-	11,11,10,11,11,13,13, 0,10,10,13,12, 0,10,10,12,
+	 9, 9,12,11, 0, 0, 0,11,11, 7, 9, 9,12,12, 0, 8,
+	 8,11,11, 0, 8, 8,11,11, 0, 9, 9,11,12, 0, 0, 0,
+	12,11,10,11,11,13,13, 0,10,10,13,12, 0,10,10,13,
 	12, 0,12,11,13,12, 0, 0, 0,13,13,10,10,11,13,13,
-	 0,10,10,12,13, 0,10,10,12,12, 0,11,11,12,13, 0,
+	 0,10,10,12,13, 0,10,10,13,13, 0,11,12,12,13, 0,
 	 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
-	11,10,14,13, 0,10,10,13,12, 0,10,10,13,12, 0,11,
-	11,13,13, 0, 0, 0,13,12, 9,10,11,13,13, 0,10,10,
-	12,13, 0,10,10,12,13, 0,11,11,13,13, 0, 0, 0,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
+	11,11,14,13, 0,10,10,13,12, 0,10,10,13,12, 0,11,
+	11,13,13, 0, 0, 0,13,12,10,11,11,13,14, 0,10,10,
+	13,13, 0,10,11,12,13, 0,11,11,13,13, 0, 0, 0,12,
 	13,
 };
 
@@ -11470,13 +11596,13 @@ static long _vq_quantlist__44c8_s_p4_0[] = {
 
 static long _vq_lengthlist__44c8_s_p4_0[] = {
 	 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,
-	11, 0, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,11,11,
-	12,12, 0, 4, 5, 6, 6, 7, 7, 8, 8, 8, 8,10,10,11,
+	11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,11,11,
+	12,12, 0, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10,10,11,
 	11,12,12, 0, 5, 5, 6, 6, 7, 7, 9, 9, 9, 9,10,10,
 	11,11,12,12, 0, 0, 0, 6, 6, 7, 7, 9, 9, 9, 9,10,
-	10,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,
-	11,11,12,12,13,13, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9,
-	 9,11,11,12,12,13,13, 0, 0, 0, 7, 7, 7, 7, 9, 9,
+	10,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9,10,
+	11,11,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9,
+	 9,11,11,12,12,12,12, 0, 0, 0, 7, 7, 7, 7, 9, 9,
 	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 7, 7, 9,
 	 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -11526,11 +11652,11 @@ static long _vq_quantlist__44c8_s_p5_0[] = {
 };
 
 static long _vq_lengthlist__44c8_s_p5_0[] = {
-	 1, 4, 5, 4, 7, 7, 5, 7, 7, 5, 7, 7, 9,10,10,10,
-	10,10, 5, 7, 7, 9,10,10,10,10,10, 4, 9, 9, 8,11,
-	11, 9,11,11, 6,10,10,11,12,12,12,12,13, 6,10,10,
-	11,12,12,11,12,12, 5,10,10, 9,12,11,10,11,11, 7,
-	10,10,11,12,12,12,12,12, 7,10,10,11,12,13,11,12,
+	 1, 4, 4, 4, 7, 7, 5, 7, 7, 5, 8, 7,10,10,10,10,
+	11,10, 5, 7, 8,10,10,11,10,10,10, 4,10,10, 8,11,
+	11, 9,11,11, 7,11,10,11,12,12,12,13,12, 7,10,11,
+	11,12,12,12,13,13, 5,10,10, 9,12,12,10,12,12, 7,
+	11,10,11,13,12,12,13,12, 7,10,10,11,12,13,11,12,
 	12,
 };
 
@@ -11633,8 +11759,8 @@ static long _vq_lengthlist__44c8_s_p6_0[] = {
 	 1, 4, 4, 7, 7, 8, 9, 9, 9,10,10,11,11, 5, 5, 4,
 	 8, 8, 9, 9,10,10,11,11,12,12, 6, 5, 5, 8, 8, 9,
 	 9,10,10,11,11,12,12, 0, 6, 6, 7, 7, 9, 9,10,10,
-	11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10,12,11,12,
-	12, 0,11,11, 9, 8,10,10,11,11,12,12,13,13, 0,11,
+	11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
+	12, 0,11,11, 9, 8,10,10,11,11,12,12,13,13, 0,12,
 	12, 9, 8,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -11681,7 +11807,7 @@ static long _vq_quantlist__44c8_s_p6_1[] = {
 
 static long _vq_lengthlist__44c8_s_p6_1[] = {
 	 3, 4, 4, 5, 5, 6, 4, 4, 5, 5, 6, 4, 4, 5, 5, 6,
-	 5, 5, 5, 4, 6, 6, 6, 5, 5,
+	 5, 5, 4, 5, 6, 6, 6, 5, 5,
 };
 
 static float _vq_quantthresh__44c8_s_p6_1[] = {
@@ -11727,16 +11853,16 @@ static long _vq_quantlist__44c8_s_p7_0[] = {
 };
 
 static long _vq_lengthlist__44c8_s_p7_0[] = {
-	 1, 4, 4, 7, 6, 8, 8, 9, 8, 9, 9,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 9,
-	 8, 9, 9,10,10,11,11,20, 7, 7, 7, 8, 9, 9,10,10,
+	 1, 4, 4, 6, 6, 8, 8, 9, 8, 9, 9,10,10, 6, 5, 5,
+	 7, 7, 8, 8, 9, 9,10,10,11,11, 7, 5, 5, 7, 7, 9,
+	 9, 9, 9,10,10,11,11,20, 7, 7, 7, 8, 9, 9,10,10,
 	11,11,11,12,20, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
-	12,20,11,11, 8, 9,10,10,10,10,11,11,12,12,20,12,
-	12, 9, 8,10, 9,11,11,11,11,12,12,20,20,20,10,10,
-	10,10,11,11,12,12,12,12,20,20,20,10,10,10,10,11,
-	11,12,12,12,12,20,20,20,14,14,11,11,11,11,12,12,
+	11,20,11,11, 8, 9,10,10,10,10,11,11,12,12,20,12,
+	12, 8, 8,10, 9,11,10,11,11,12,12,20,20,20,10,10,
+	10,10,11,11,12,12,12,12,20,20,20,11,10,10,10,11,
+	11,12,12,13,12,20,20,20,14,14,11,11,11,12,12,12,
 	13,13,20,20,20,15,14,11,11,12,11,12,12,13,13,20,
-	20,20,20,19,12,13,12,12,12,13,13,13,19,19,19,19,
+	20,20,20,19,12,13,12,12,12,12,13,13,19,19,19,19,
 	19,13,12,12,12,13,13,14,14,
 };
 
@@ -11783,14 +11909,14 @@ static long _vq_quantlist__44c8_s_p7_1[] = {
 };
 
 static long _vq_lengthlist__44c8_s_p7_1[] = {
-	 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 5, 5, 7, 7,
-	 7, 7, 7, 7, 8, 8, 8, 5, 5, 7, 7, 7, 7, 7, 7, 7,
+	 4, 5, 5, 6, 7, 7, 7, 7, 7, 7, 7, 8, 5, 5, 7, 7,
+	 7, 7, 7, 7, 8, 8, 8, 5, 5, 6, 6, 7, 7, 7, 7, 7,
 	 7, 8, 6, 6, 7, 7, 7, 7, 7, 8, 8, 7, 8, 8, 8, 7,
-	 7, 7, 7, 7, 8, 8, 7, 8, 8, 8, 7, 7, 7, 7, 8, 8,
+	 7, 7, 7, 8, 8, 8, 7, 8, 8, 8, 7, 7, 7, 7, 8, 8,
 	 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 8, 7, 8, 8, 8,
 	 7, 7, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 7, 7, 7,
 	 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 7, 8, 7, 8, 8,
-	 8, 8, 8, 7, 7, 7, 7, 7, 7,
+	 8, 8, 8, 7, 7, 7, 7, 7, 8,
 };
 
 static float _vq_quantthresh__44c8_s_p7_1[] = {
@@ -11840,20 +11966,20 @@ static long _vq_quantlist__44c8_s_p8_0[] = {
 };
 
 static long _vq_lengthlist__44c8_s_p8_0[] = {
-	 1, 4, 4, 7, 6, 8, 8, 8, 8, 9, 9,10,10,11,11, 6,
-	 5, 5, 7, 7, 9, 9, 8, 9,10,10,11,11,11,11, 6, 5,
-	 5, 7, 7, 9, 9, 9, 8,10,10,11,11,12,12,19, 8, 8,
-	 8, 8, 9, 9, 9, 9,10,10,11,11,12,12,19, 8, 8, 8,
-	 8, 9, 9, 9, 9,10,10,11,11,12,12,19,12,12, 9, 9,
-	 9,10,10, 9,10,10,11,11,12,12,19,12,12, 9, 9, 9,
-	10,10,10,11,11,11,11,12,12,19,19,19,10,10, 9, 9,
-	10,10,11,11,12,12,12,12,19,18,18,10,10, 9, 9,10,
-	11,11,11,12,12,12,12,18,18,18,13,14,10,10,11,11,
-	12,11,12,12,13,12,18,18,18,14,14,10,10,11,11,12,
-	12,12,12,13,13,18,18,18,18,18,11,12,12,11,12,12,
+	 1, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,10,10,11,11, 6,
+	 5, 5, 7, 7, 9, 9, 9, 9,10,10,11,11,11,11, 6, 5,
+	 5, 7, 7, 9, 9, 9, 9,10,10,11,11,11,11,18, 8, 8,
+	 8, 8, 9, 9, 9, 9,10,10,11,11,12,12,18, 8, 8, 8,
+	 8, 9, 9, 9, 9,10,10,11,11,12,12,18,12,12, 9, 9,
+	10,10,10,10,11,10,11,11,12,12,18,12,12, 9, 9,10,
+	10,10,10,11,11,11,11,12,12,18,18,18,10,10, 9, 9,
+	10,10,11,11,12,12,12,13,18,18,18,10,10, 9, 9,10,
+	11,11,11,12,12,13,12,18,18,18,13,13,10,10,11,11,
+	12,12,12,12,13,13,18,18,18,14,14,10,10,11,11,12,
+	12,12,12,13,13,18,18,18,18,18,12,12,12,11,12,12,
 	13,13,13,13,18,18,18,18,18,12,11,12,11,12,12,13,
-	13,13,13,18,18,18,18,18,15,15,12,12,13,13,13,13,
-	14,13,18,18,18,18,18,15,15,12,12,12,12,13,13,14,
+	13,14,13,18,18,18,18,18,15,15,12,12,13,13,13,13,
+	14,13,18,18,18,18,18,15,16,12,12,13,12,13,13,14,
 	14,
 };
 
@@ -11911,14 +12037,14 @@ static long _vq_quantlist__44c8_s_p8_1[] = {
 
 static long _vq_lengthlist__44c8_s_p8_1[] = {
 	 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 9, 9,10, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 7, 6, 8, 8, 8,
+	 8, 8, 8, 9, 8,10, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 7, 6, 8, 7, 8,
 	 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
+	 8, 8, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 9, 8,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
-	10, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	10, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
@@ -12178,13 +12304,13 @@ static static_codebook _44c8_s_p9_2 = {
 };
 
 static long _huff_lengthlist__44c8_s_short[] = {
-	 4,11,14,14,14,15,16,18,18,16, 5, 6, 8, 8, 9, 9,
-	11,16,18,18, 6, 5, 5, 5, 7, 7, 9,13,18,18, 8, 6,
-	 5, 3, 4, 6, 9,13,18,18,10, 8, 6, 4, 4, 5, 8,12,
-	16,18,11,10, 7, 5, 5, 4, 6,10,14,15,13,12,10, 8,
-	 7, 6, 7,10,17,14,14,15,12, 8, 6, 5, 6, 9,16,14,
-	16,14,14, 9, 6, 6, 7, 9,18,17,15,16,17,11, 8, 8,
-	 8,10,17,17,
+	 4,11,14,14,15,15,18,17,18,18, 5, 5, 8, 8, 9, 9,
+	11,16,18,16, 6, 5, 5, 5, 7, 7, 9,13,17,18, 9, 7,
+	 5, 3, 4, 6, 9,13,17,18,11, 8, 6, 4, 4, 5, 8,12,
+	18,18,11,10, 7, 5, 5, 4, 6,11,16,18,13,13,10, 8,
+	 7, 6, 8,11,18,18,15,15,12, 8, 6, 5, 6, 8,18,18,
+	17,15,15, 9, 6, 6, 7, 9,18,18,15,18,17,11, 9, 8,
+	 8,10,18,18,
 };
 
 static static_codebook _huff_book__44c8_s_short = {
@@ -12275,7 +12401,7 @@ static long _vq_lengthlist__44c9_s_p2_0[] = {
 	10,10, 5, 6, 7, 8, 9, 0, 7, 8, 9, 9, 0, 7, 7, 9,
 	 9, 0, 9, 9,10,10, 0, 0, 0,10,10, 8, 9, 9,10,10,
 	 0,11,10,12,11, 0,10,10,11,11, 0,12,12,13,13, 0,
-	 0, 0,13,13, 8, 9, 9,10,10, 0,10,11,11,12, 0,10,
+	 0, 0,13,13, 8, 9, 9,10,10, 0,10,11,11,12, 0,11,
 	10,11,11, 0,12,12,13,13, 0, 0, 0,13,13, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 6, 7, 7,10,10, 0, 7, 7,10,10,
@@ -12288,26 +12414,26 @@ static long _vq_lengthlist__44c9_s_p2_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 6, 8, 7,11,10, 0, 7, 7,10,10, 0, 7, 7,
 	10, 9, 0, 8, 8,10,10, 0, 0, 0,10,10, 6, 7, 8,10,
-	11, 0, 7, 7,10,10, 0, 7, 7, 9,10, 0, 8, 8,11,10,
+	11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 8, 8,11,10,
 	 0, 0, 0,10,10, 9, 9, 9,12,11, 0,10,10,12,11, 0,
 	10,10,11,11, 0,11,11,13,12, 0, 0, 0,12,12, 9, 9,
 	 9,11,12, 0,10,10,11,12, 0,10,10,11,11, 0,11,11,
 	12,13, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 7, 9, 9,12,12, 0, 9, 8,11,11, 0, 8, 9,11,11, 0,
-	 9, 9,12,11, 0, 0, 0,11,11, 7, 9, 9,12,12, 0, 8,
-	 8,11,11, 0, 9, 8,11,11, 0, 9, 9,11,12, 0, 0, 0,
-	11,11, 9,11,11,13,13, 0,10,10,13,12, 0,11,11,12,
-	12, 0,11,11,12,12, 0, 0, 0,13,13, 9,11,11,13,13,
+	 9, 9,11,11, 0, 0, 0,11,11, 7, 9, 9,12,12, 0, 8,
+	 8,11,11, 0, 9, 8,11,11, 0, 9, 9,11,11, 0, 0, 0,
+	11,11, 9,11,11,13,13, 0,10,10,12,12, 0,11,11,12,
+	12, 0,11,11,12,12, 0, 0, 0,13,13, 9,10,11,13,13,
 	 0,10,10,12,12, 0,11,11,12,12, 0,11,11,12,12, 0,
 	 0, 0,13,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
-	11,10,13,13, 0,10,11,13,12, 0,10,10,12,12, 0,11,
-	11,12,13, 0, 0, 0,12,12, 9,10,11,13,13, 0,10,10,
-	12,13, 0,10,10,12,13, 0,11,11,13,13, 0, 0, 0,12,
+	11,10,13,13, 0,10,10,13,12, 0,10,10,13,12, 0,11,
+	11,13,13, 0, 0, 0,12,12, 9,10,11,13,13, 0,10,10,
+	12,13, 0,10,10,12,12, 0,11,11,13,13, 0, 0, 0,12,
 	12,
 };
 
@@ -12350,7 +12476,7 @@ static long _vq_quantlist__44c9_s_p3_0[] = {
 };
 
 static long _vq_lengthlist__44c9_s_p3_0[] = {
-	 3, 4, 4, 5, 5, 6, 6, 8, 8, 0, 4, 4, 5, 5, 6, 7,
+	 3, 4, 4, 5, 5, 6, 6, 8, 8, 0, 4, 4, 5, 5, 7, 6,
 	 8, 8, 0, 4, 4, 5, 5, 7, 7, 8, 8, 0, 5, 5, 6, 6,
 	 7, 7, 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0,
 	 7, 7, 8, 8, 9, 9, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0,
@@ -12464,9 +12590,9 @@ static long _vq_quantlist__44c9_s_p5_0[] = {
 
 static long _vq_lengthlist__44c9_s_p5_0[] = {
 	 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 7, 6, 9,10,10,10,
-	10,10, 4, 6, 7, 9,10,10,10,10,10, 5, 9, 9, 9,11,
+	10,10, 4, 6, 7, 9,10,10, 9,10,10, 5, 9, 9, 9,11,
 	11, 9,11,11, 7,10,10,11,12,12,11,12,12, 7,10,10,
-	11,12,12,11,12,12, 6,10, 9, 9,11,11,10,11,11, 7,
+	11,12,12,11,12,12, 6,10,10, 9,11,11,10,11,11, 7,
 	10,10,11,12,12,11,12,12, 7,10,10,11,12,12,11,12,
 	12,
 };
@@ -12514,11 +12640,11 @@ static long _vq_quantlist__44c9_s_p5_1[] = {
 static long _vq_lengthlist__44c9_s_p5_1[] = {
 	 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7,11, 5, 5, 6, 6,
 	 7, 7, 7, 7, 8, 8,11, 5, 5, 6, 6, 7, 7, 7, 7, 8,
-	 8,11, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11,11,11, 6,
-	 6, 7, 7, 8, 8, 8, 8,11,11,11, 6, 6, 7, 7, 8, 8,
+	 8,11, 6, 5, 6, 6, 7, 7, 8, 8, 8, 8,11,11,11, 6,
+	 6, 7, 7, 8, 8, 8, 8,11,11,11, 6, 6, 7, 7, 7, 7,
 	 8, 8,11,11,11, 6, 6, 7, 7, 7, 7, 8, 8,11,11,11,
-	 7, 7, 7, 7, 7, 7, 8, 7,11,11,11,10,10, 7, 7, 7,
-	 7, 7, 8,11,11,11,11,11, 7, 7, 7, 7, 7, 7,11,11,
+	 7, 7, 7, 7, 7, 7, 7, 7,11,11,11,10,10, 7, 7, 7,
+	 7, 7, 7,11,11,11,11,11, 7, 7, 7, 7, 7, 7,11,11,
 	11,11,11, 7, 7, 7, 7, 7, 7,
 };
 
@@ -12567,12 +12693,12 @@ static long _vq_quantlist__44c9_s_p6_0[] = {
 };
 
 static long _vq_lengthlist__44c9_s_p6_0[] = {
-	 2, 3, 4, 7, 7, 9, 9, 9, 9,11,11,12,12, 5, 4, 4,
-	 7, 7, 9, 9,10,10,11,11,12,12, 5, 4, 4, 7, 7, 9,
+	 2, 4, 3, 7, 7, 9, 9, 9, 9,11,11,12,12, 5, 4, 4,
+	 7, 7, 9, 9,10,10,12,11,13,13, 5, 4, 4, 7, 7, 9,
 	 9,10,10,12,11,12,13, 0, 5, 5, 6, 6, 9, 9,10,10,
 	12,12,13,13, 0, 6, 6, 7, 7, 9, 9,10,11,12,12,13,
 	13, 0,10,10, 8, 8,10,10,11,11,12,12,13,13, 0,10,
-	11, 8, 8,10,10,11,11,12,12,14,14, 0, 0, 0, 0, 0,
+	10, 8, 8,10,10,11,11,12,12,14,14, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -12618,7 +12744,7 @@ static long _vq_quantlist__44c9_s_p6_1[] = {
 
 static long _vq_lengthlist__44c9_s_p6_1[] = {
 	 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5,
-	 5, 5, 5, 4, 5, 5, 5, 4, 4,
+	 5, 5, 4, 5, 5, 5, 5, 4, 4,
 };
 
 static float _vq_quantthresh__44c9_s_p6_1[] = {
@@ -12668,8 +12794,8 @@ static long _vq_lengthlist__44c9_s_p7_0[] = {
 	 7, 7, 9, 9,10,10,11,11,11,12, 6, 5, 5, 7, 7, 9,
 	 9,10,10,11,11,12,12,20, 7, 6, 7, 7, 9, 9,10,10,
 	11,11,12,12,20, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
-	12,20,11,11, 8, 8,10,10,11,11,11,12,12,12,20,12,
-	12, 8, 8,10,10,11,11,12,12,13,13,20,20,20,10,11,
+	12,20,11,11, 8, 9,10,10,11,11,11,12,12,12,20,12,
+	12, 8, 8, 9, 9,11,11,12,12,13,13,20,20,20,10,11,
 	10,10,11,11,12,12,13,13,20,20,20,11,11,10,10,11,
 	11,12,12,13,13,20,20,20,14,14,11,11,12,12,13,12,
 	13,13,20,20,20,15,14,11,11,12,11,12,12,13,13,20,
@@ -12777,20 +12903,20 @@ static long _vq_quantlist__44c9_s_p8_0[] = {
 };
 
 static long _vq_lengthlist__44c9_s_p8_0[] = {
-	 1, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,10,10,11,10, 7,
+	 1, 4, 4, 6, 6, 8, 7, 8, 8, 9, 9,10,10,11,10, 7,
 	 5, 5, 7, 7, 8, 8, 9, 9,10,10,10,10,11,11, 7, 5,
 	 5, 7, 7, 8, 8, 9, 9,10,10,11,10,11,11,20, 8, 8,
 	 8, 8, 9, 9, 9, 9,10,10,11,11,11,12,20, 8, 8, 8,
 	 8, 9, 9, 9, 9,10,10,11,11,12,12,20,12,12, 9, 9,
-	 9, 9,10,10,10,10,11,11,12,12,20,12,12, 9, 9, 9,
+	 9,10,10,10,10,10,11,11,12,12,20,12,12, 9, 9,10,
 	 9,10,10,11,11,11,11,12,12,20,20,20,10,10, 9,10,
-	10,10,11,11,12,11,12,12,20,20,20,10,10, 9, 9,10,
-	10,11,11,12,12,12,12,20,20,20,13,14,10,10,11,11,
-	11,12,12,12,12,12,20,20,20,14,14,10,10,11,11,12,
-	12,12,12,13,12,20,20,20,20,20,12,12,11,11,12,12,
-	13,13,13,13,20,20,20,20,20,12,12,11,11,12,12,13,
-	13,13,13,20,20,20,20,20,15,17,12,12,12,12,13,12,
-	14,13,20,19,19,19,19,15,16,12,12,12,12,13,13,14,
+	10,10,11,11,11,12,12,12,20,19,19,10,10, 9,10,11,
+	10,11,11,12,12,12,12,19,19,19,13,14,10,10,11,11,
+	11,12,12,12,13,13,19,19,19,14,14,10,10,11,11,12,
+	12,12,12,13,13,19,19,19,19,19,12,12,11,11,12,12,
+	13,13,13,13,19,19,19,19,19,12,12,11,11,12,12,13,
+	13,13,13,19,19,19,19,19,15,15,12,12,12,12,13,13,
+	14,14,19,19,19,19,19,15,15,12,12,12,12,13,13,14,
 	14,
 };
 
@@ -12847,17 +12973,17 @@ static long _vq_quantlist__44c9_s_p8_1[] = {
 };
 
 static long _vq_lengthlist__44c9_s_p8_1[] = {
-	 5, 6, 6, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8,10, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 8, 7, 8,
+	 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8,10, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 6, 8, 7, 8,
 	 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 8, 9, 9, 9,10,
 	 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,10, 8, 8, 8, 8, 9, 8, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 8,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
 	10, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9,
+	 9, 9, 9,10,10,10, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 8, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
 	10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
@@ -13115,13 +13241,13 @@ static static_codebook _44c9_s_p9_2 = {
 };
 
 static long _huff_lengthlist__44c9_s_short[] = {
-	 5,12,15,16,17,16,17,17,18,18, 5, 7,10,12,12,12,
-	13,16,18,17, 6, 6, 8, 9, 9, 8, 9,12,18,18, 8, 6,
-	 6, 6, 6, 6, 8,11,17,18, 9, 7, 7, 5, 4, 4, 7,10,
-	16,18,10, 8, 7, 6, 4, 3, 4, 7,15,15,12,12,10, 8,
-	 6, 4, 4, 6,16,15,14,14,12,11, 9, 6, 6, 7,14,14,
-	18,15,14,14, 8, 5, 5, 6,14,18,15,16,17,17, 9, 6,
-	 6, 7,14,18,
+	 5,12,15,15,16,17,18,17,18,18, 5, 6,10,12,12,11,
+	13,16,17,16, 6, 6, 7, 9, 9, 9, 9,12,16,18, 8, 6,
+	 6, 6, 6, 6, 8,11,15,18, 9, 8, 7, 5, 4, 4, 7,10,
+	16,18,10, 9, 8, 6, 4, 3, 4, 7,15,18,12,12,10, 8,
+	 6, 4, 4, 6,16,18,14,14,13,11, 9, 6, 6, 7,17,18,
+	18,15,14,15, 8, 5, 5, 6,15,18,15,17,18,18, 9, 6,
+	 6, 7,13,18,
 };
 
 static static_codebook _huff_book__44c9_s_short = {
diff --git a/lib/books/floor/floor_books.h b/lib/books/floor/floor_books.h
index 3f179372..0e1bd6e6 100644
--- a/lib/books/floor/floor_books.h
+++ b/lib/books/floor/floor_books.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: floor_books.h,v 1.1.2.2 2002/06/27 07:05:54 xiphmont Exp $
+ last modified: $Id: floor_books.h,v 1.1.2.3 2002/06/28 04:19:21 xiphmont Exp $
 
  ********************************************************************/
 
@@ -305,13 +305,13 @@ static static_codebook _huff_book_line_1024x27_class4 = {
 };
 
 static long _huff_lengthlist_line_128x11_0sub0[] = {
-	 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 5, 5, 6, 5,
-	 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 7, 8, 7, 8,
-	 7, 8, 7, 8, 7, 8, 8, 9, 8, 9, 8, 9, 8,10, 8,10,
-	 9,10, 9,11, 9,11,10,11,10,11,11,12,10,12,11,13,
-	11,13,12,15,12,14,13,14,14,13,13,16,15,16,15,16,
-	15,16,15,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	 6, 6, 6, 6, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5,
+	 6, 5, 6, 5, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8,
+	 9, 8, 9, 8, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,
+	10,11,10,11,12,12,12,13,12,14,14,15,15,16,14,16,
+	14,16,16,16,15,16,16,16,15,16,16,16,16,16,16,16,
 	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,
 };
 
@@ -327,8 +327,8 @@ static static_codebook _huff_book_line_128x11_0sub0 = {
 };
 
 static long _huff_lengthlist_line_128x11_1sub0[] = {
-	 1, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 7, 6, 7, 6, 8, 6, 8, 7, 8, 7, 9, 7, 9, 7,
+	 2, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+	 5, 6, 5, 6, 5, 6, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6,
 };
 
 static static_codebook _huff_book_line_128x11_1sub0 = {
@@ -345,12 +345,12 @@ static static_codebook _huff_book_line_128x11_1sub0 = {
 static long _huff_lengthlist_line_128x11_1sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 5, 3, 6, 3, 6, 4, 6, 4, 7, 4, 7, 4, 7, 4, 7, 4,
-	 8, 5, 8, 5, 8, 5, 8, 5, 8, 5, 9, 6, 9, 6, 9, 6,
-	10, 7,11, 8, 8, 8,10, 9,10, 9,12,10,11,12,11,13,
-	13,13,12,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	 5, 3, 5, 3, 6, 4, 6, 4, 6, 4, 7, 4, 7, 4, 8, 4,
+	 8, 5, 8, 5, 9, 5, 9, 5,10, 5,11, 6,11, 6,11, 7,
+	11, 7,10, 8,10, 9,11, 9,10,10,10,11,11,11,11,12,
+	10,13,11,13,10,13,10,13,11,13,10,13,11,13,10,13,
+	11,13,10,13,11,13,12,13,13,13,13,13,13,13,13,13,
 	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
 };
 
 static static_codebook _huff_book_line_128x11_1sub1 = {
@@ -365,8 +365,8 @@ static static_codebook _huff_book_line_128x11_1sub1 = {
 };
 
 static long _huff_lengthlist_line_128x11_2sub1[] = {
-	 0, 4, 5, 4, 5, 3, 6, 3, 6, 3, 6, 3, 7, 3, 8, 4,
-	 8, 4,
+	 0, 4, 5, 4, 5, 4, 5, 3, 5, 3, 4, 4, 4, 4, 4, 4,
+	 5, 5,
 };
 
 static static_codebook _huff_book_line_128x11_2sub1 = {
@@ -382,9 +382,9 @@ static static_codebook _huff_book_line_128x11_2sub1 = {
 
 static long _huff_lengthlist_line_128x11_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 2, 6, 2, 6, 3, 7, 4, 7, 5, 7, 5, 7, 5,
-	 9, 6, 6,10, 6,10, 6,10, 6,10, 6,10, 7,10, 8, 9,
-	 7, 9,
+	 0, 0, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6,
+	 6, 6, 6, 7, 6, 7, 7, 8, 8, 9, 9, 9, 8,10, 9,10,
+	10,10,
 };
 
 static static_codebook _huff_book_line_128x11_2sub2 = {
@@ -402,9 +402,9 @@ static long _huff_lengthlist_line_128x11_2sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 6, 7, 4, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 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, 6, 6, 6, 6, 6, 6,
 	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 };
@@ -421,7 +421,7 @@ static static_codebook _huff_book_line_128x11_2sub3 = {
 };
 
 static long _huff_lengthlist_line_128x11_3sub1[] = {
-	 0, 4, 4, 4, 4, 4, 4, 4, 4, 3, 5, 4, 5, 4, 5, 4,
+	 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 4,
 	 5, 4,
 };
 
@@ -438,9 +438,9 @@ static static_codebook _huff_book_line_128x11_3sub1 = {
 
 static long _huff_lengthlist_line_128x11_3sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 3, 6, 3, 6, 3, 7, 4, 8, 4, 8, 4, 9, 4,
-	 9, 4,10, 4,10, 5,11, 5,11, 5,12, 5,11, 6,13, 6,
-	13, 7,
+	 0, 0, 5, 3, 5, 4, 6, 4, 7, 4, 7, 3, 7, 4, 8, 4,
+	 8, 4, 9, 4, 9, 4,10, 5,10, 5,10, 5,11, 6,12, 6,
+	12, 7,
 };
 
 static static_codebook _huff_book_line_128x11_3sub2 = {
@@ -458,11 +458,11 @@ static long _huff_lengthlist_line_128x11_3sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 6, 2, 7, 3, 7, 3, 7, 4, 7, 4, 8, 5, 7, 5,
-	 7, 6, 8, 7, 7, 7, 6, 9, 6, 9, 6, 8, 7, 9, 6, 9,
-	 6, 9, 7, 9, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8,
+	 0, 0, 8, 2, 7, 2, 8, 3, 8, 4, 8, 5, 9, 7, 9, 9,
+	 9, 8, 8, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
 static static_codebook _huff_book_line_128x11_3sub3 = {
@@ -477,7 +477,7 @@ static static_codebook _huff_book_line_128x11_3sub3 = {
 };
 
 static long _huff_lengthlist_line_128x11_class1[] = {
-	 1, 5, 3, 7, 2, 7, 4, 6,
+	 1, 6, 4, 7, 2, 5, 3, 7,
 };
 
 static static_codebook _huff_book_line_128x11_class1 = {
@@ -492,10 +492,10 @@ static static_codebook _huff_book_line_128x11_class1 = {
 };
 
 static long _huff_lengthlist_line_128x11_class2[] = {
-	 1,13,13,13, 4,11,11,13, 7,10, 7,13,13,13,10,13,
-	 2,13,13,13, 6,13,13,13, 7,12, 7,13,13,13,11,13,
-	 3,13,13,12, 9,12,12,12,12,12,10,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	 1, 9, 8,14, 4,12,11,14, 7,14,11,14,14,14,14,14,
+	 2, 8, 7,14, 4,13,10,14, 7,14,13,14,14,14,14,14,
+	 4,11, 9,14, 6,12, 9,14, 9,12, 9,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,13,
 };
 
 static static_codebook _huff_book_line_128x11_class2 = {
@@ -510,10 +510,10 @@ static static_codebook _huff_book_line_128x11_class2 = {
 };
 
 static long _huff_lengthlist_line_128x11_class3[] = {
-	 7, 8,12,16, 6, 7,10,16,10,10,13,16,16,16,16,16,
-	 3, 5, 8,16, 3, 4, 7,16, 6, 6, 8,16,16,16,13,15,
-	 4, 6, 8,15, 2, 3, 5,15, 5, 5, 7,15,13,11,14,15,
-	12,13,13,15, 8, 9,12,15, 9, 9,11,15,15,15,15,15,
+	 7, 7,11,15, 7, 7,10,15,11, 9,11,15,15,15,15,15,
+	 4, 4, 7,15, 4, 4, 6,15, 8, 6, 8,14,15,15,15,15,
+	 4, 4, 6,15, 3, 2, 5,13, 6, 4, 5,15,14,12,11,14,
+	12,11,13,15, 9, 8,10,15,11,10,12,15,14,14,14,14,
 };
 
 static static_codebook _huff_book_line_128x11_class3 = {
@@ -528,14 +528,14 @@ static static_codebook _huff_book_line_128x11_class3 = {
 };
 
 static long _huff_lengthlist_line_128x17_0sub0[] = {
-	 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5,
-	 6, 5, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7,
-	 7, 7, 8, 7, 8, 7, 8, 7, 8, 8, 8, 7, 9, 8, 9, 8,
-	 9, 8,10, 8,10, 8,10, 8,10, 9,11, 9,11, 9,11, 9,
-	12,10,12,10,12,11,13,12,13,12,14,13,14,14,16,14,
-	18,16,19,16,18,17,19,17,19,18,19,19,19,19,19,19,
-	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,18,
+	 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 6, 6, 7, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 8, 7, 8, 7, 8, 7, 8, 8, 8, 8, 8, 8, 9, 8, 9, 8,
+	 9, 8, 9, 8,10, 9,10, 9,10, 9,10, 9,10, 9,11, 9,
+	11, 9,11, 9,12, 9,12,10,12,11,13,11,14,12,15,13,
+	15,15,16,16,18,18,18,18,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
 };
 
 static static_codebook _huff_book_line_128x17_0sub0 = {
@@ -550,8 +550,8 @@ static static_codebook _huff_book_line_128x17_0sub0 = {
 };
 
 static long _huff_lengthlist_line_128x17_1sub0[] = {
-	 2, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-	 5, 6, 6, 6, 6, 6, 7, 6, 7, 6, 8, 7, 9, 7, 9, 7,
+	 2, 5, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5,
+	 6, 5, 6, 6, 6, 6, 7, 6, 7, 6, 8, 7, 8, 7, 8, 8,
 };
 
 static static_codebook _huff_book_line_128x17_1sub0 = {
@@ -568,11 +568,11 @@ static static_codebook _huff_book_line_128x17_1sub0 = {
 static long _huff_lengthlist_line_128x17_1sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 4, 2, 5, 3, 5, 3, 6, 4, 7, 4, 7, 4, 8, 5, 8, 5,
-	 9, 6,11, 6,11, 6,11, 7,12, 8,14, 8,12, 9,13, 9,
-	13,11,13,12,11,14,11,14,10,14,11,15,12,13,11,14,
-	11,15,10,14,10,14,10,14,10,12, 9,12,10,14,11,15,
-	11,13,11,15,12,15,14,15,14,14,15,15,15,15,15,15,
+	 4, 2, 4, 3, 5, 3, 6, 4, 6, 4, 6, 5, 7, 5, 8, 5,
+	 8, 6, 9, 7, 9, 7, 9, 8,10, 8,10, 9,10,10,11,11,
+	11,11,11,13,11,15,11,15,11,15,11,15,11,15,11,15,
+	10,15,10,15,10,15,11,14,11,15,11,15,13,15,13,15,
+	13,15,14,15,14,15,15,15,15,15,15,15,15,15,15,15,
 	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
 };
 
@@ -588,8 +588,8 @@ static static_codebook _huff_book_line_128x17_1sub1 = {
 };
 
 static long _huff_lengthlist_line_128x17_2sub1[] = {
-	 0, 4, 5, 4, 5, 3, 5, 3, 6, 3, 7, 3, 8, 3, 9, 4,
-	 9, 4,
+	 0, 5, 6, 4, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 8, 3,
+	 8, 4,
 };
 
 static static_codebook _huff_book_line_128x17_2sub1 = {
@@ -605,9 +605,9 @@ static static_codebook _huff_book_line_128x17_2sub1 = {
 
 static long _huff_lengthlist_line_128x17_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 8, 1, 8, 2, 8, 4, 9, 4,10, 5,11, 5,10, 6,
-	11, 7, 9, 7,11, 9,12, 8, 9,12, 9,12,11,12,12,12,
-	12,12,
+	 0, 0, 7, 1, 7, 2, 8, 3, 8, 5, 9, 6, 9, 6,10, 7,
+	11, 7,11, 7,11, 9,11, 9,11,11,11,11,11,11,11,11,
+	11,11,
 };
 
 static static_codebook _huff_book_line_128x17_2sub2 = {
@@ -644,7 +644,7 @@ static static_codebook _huff_book_line_128x17_2sub3 = {
 };
 
 static long _huff_lengthlist_line_128x17_3sub1[] = {
-	 0, 4, 4, 4, 4, 4, 5, 4, 5, 3, 5, 3, 5, 4, 5, 4,
+	 0, 4, 5, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 5, 4,
 	 5, 4,
 };
 
@@ -661,9 +661,9 @@ static static_codebook _huff_book_line_128x17_3sub1 = {
 
 static long _huff_lengthlist_line_128x17_3sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 3, 5, 3, 5, 4, 6, 4, 6, 4, 7, 4, 8, 4,
-	 8, 4, 9, 4, 9, 5,10, 5,10, 5,10, 5,11, 6,12, 6,
-	12, 7,
+	 0, 0, 5, 3, 5, 3, 6, 3, 6, 3, 7, 4, 7, 4, 8, 4,
+	 9, 4, 9, 5,10, 5,10, 6,11, 6,11, 6,11, 7,12, 7,
+	12, 8,
 };
 
 static static_codebook _huff_book_line_128x17_3sub2 = {
@@ -681,11 +681,11 @@ static long _huff_lengthlist_line_128x17_3sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 8, 1,10, 2, 9, 3,11, 4,12, 6,12, 6,12, 8,
-	12, 9,12,10,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,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,11,11,11,11,11,
+	 0, 0, 6, 1, 6, 3, 6, 3, 6, 4, 7, 5, 7, 6, 8, 8,
+	 7,10, 7,11, 8,11, 9,11, 9,11,10,11,10,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,10,10,
 };
 
 static static_codebook _huff_book_line_128x17_3sub3 = {
@@ -700,7 +700,7 @@ static static_codebook _huff_book_line_128x17_3sub3 = {
 };
 
 static long _huff_lengthlist_line_128x17_class1[] = {
-	 1, 4, 3, 7, 2, 6, 5, 7,
+	 1, 3, 4, 7, 2, 6, 5, 7,
 };
 
 static static_codebook _huff_book_line_128x17_class1 = {
@@ -715,10 +715,10 @@ static static_codebook _huff_book_line_128x17_class1 = {
 };
 
 static long _huff_lengthlist_line_128x17_class2[] = {
-	 1,15,15,15, 2,12,14,15, 5,12,10,15,15,15,15,15,
-	 3,15,15,15, 4,15,15,15, 6,15,13,15,15,15,15,15,
-	 7,15,15,15, 8,15,15,15,12,15,15,15,15,15,15,15,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	 1, 4, 6,15, 3, 9,10,15, 7,11,12,15,15,15,15,15,
+	 2, 8,11,15, 7,11,13,15, 8,15,15,15,15,15,15,15,
+	 6,11,15,15,10,13,14,15,13,15,15,15,15,15,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
 };
 
 static static_codebook _huff_book_line_128x17_class2 = {
@@ -733,10 +733,10 @@ static static_codebook _huff_book_line_128x17_class2 = {
 };
 
 static long _huff_lengthlist_line_128x17_class3[] = {
-	 1, 6,10,20, 5, 8,11,20,11,10,12,20,20,17,20,20,
-	 3, 6, 9,19, 4, 6, 8,19, 9, 7,10,19,19,15,16,19,
-	 4, 6, 8,19, 4, 5, 6,19, 8, 7, 8,19,19,14,15,19,
-	13,13,14,19,10,10,11,19,13,11,13,19,19,19,19,19,
+	 2, 6,10,19, 4, 8,11,19, 9,10,12,19,19,19,19,19,
+	 2, 5, 7,17, 4, 6, 8,16, 8, 7, 9,18,17,14,17,19,
+	 3, 5, 7,19, 4, 5, 7,16, 8, 8, 9,16,16,12,15,19,
+	13,15,14,19,10,11,11,19,14,12,12,19,19,19,19,18,
 };
 
 static static_codebook _huff_book_line_128x17_class3 = {
@@ -781,8 +781,8 @@ static static_codebook _huff_book_line_128x4_0sub1 = {
 };
 
 static long _huff_lengthlist_line_128x4_0sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 3, 4, 3,
-	 4, 4, 4, 4, 5, 4, 5, 5, 5,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 4, 4, 4, 4,
+	 4, 4, 4, 4, 4, 4, 5, 3, 5,
 };
 
 static static_codebook _huff_book_line_128x4_0sub2 = {
@@ -798,9 +798,9 @@ static static_codebook _huff_book_line_128x4_0sub2 = {
 
 static long _huff_lengthlist_line_128x4_0sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 3, 5, 4,
-	 5, 4, 6, 5, 6, 6, 7, 6, 8, 8, 8,10, 9,15, 9,15,
-	 9, 9, 9,12,15,15,14,14,14,14,14,14,14,14,14,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 5, 2, 5, 3, 6, 3,
+	 6, 4, 7, 5, 7, 6, 7, 7, 8, 8, 8,10,10,15,10,15,
+	12,15,14,15,15,15,15,15,15,15,14,14,14,14,14,14,
 };
 
 static static_codebook _huff_book_line_128x4_0sub3 = {
@@ -815,22 +815,22 @@ static static_codebook _huff_book_line_128x4_0sub3 = {
 };
 
 static long _huff_lengthlist_line_128x4_class0[] = {
-	 8, 8, 8,12, 7, 7, 8,12, 6, 6, 6, 9,10, 9, 9,11,
-	 9, 9, 9,13, 8, 8, 8,12, 7, 6, 7,10,10,11,10,13,
-	10,10,10,12, 9, 9,10,12, 9, 8, 8,13,15,12,12,15,
-	16,15,14,16,14,16,15,16,15,16,14,16,16,16,16,16,
-	 8, 7, 7,10, 7, 7, 7,10, 6, 5, 6, 9,10, 9, 9,12,
-	 8, 8, 8,11, 8, 7, 7,10, 6, 6, 6,10,10, 9, 9,12,
-	 9, 9, 9,12, 9, 9, 9,11, 9, 8, 9,10,13,14,12,13,
-	16,14,14,16,15,14,14,15,16,16,14,15,16,16,16,16,
-	 8, 7, 6, 7, 6, 6, 5, 6, 5, 5, 5, 5,10, 9, 8,11,
-	 8, 7, 6, 7, 7, 6, 5, 6, 6, 6, 5, 6,10, 9, 8,10,
-	 9, 8, 7, 8, 9, 8, 6, 7, 8, 7, 5, 7,10,10, 9,10,
-	13,12,11,14,12,12,11,14,12,11,10,11,16,16,13,14,
-	11,10,10,11,10, 9, 9,11, 9, 9, 8, 8,10,10,10,15,
-	11,11,10,12,10, 9, 9,11, 9, 8, 7,10,10,10,10,14,
-	11,10,10,13,10, 9, 8,13, 9, 8, 7,12,11,10,11,16,
-	14,13,11,16,13,13,11,16,14,16,11,14,16,16,15,15,
+	 9, 9, 9,14, 8, 8, 9,12, 7, 7, 7, 9,11,11, 9,12,
+	10, 9,10,16, 9, 9, 9,14, 8, 7, 7,10,12,12,10,14,
+	11,10,11,16,10,10,11,16,10, 9, 9,12,15,15,13,15,
+	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	 8, 8, 8,14, 7, 7, 8,13, 6, 6, 6,10,10, 9, 9,12,
+	 9, 8, 9,13, 8, 8, 8,12, 7, 7, 7,11,10,11,10,12,
+	10,10,10,12,10, 9,10,13, 9, 9, 9,16,14,12,13,15,
+	16,14,14,16,15,16,15,14,16,16,16,16,16,16,16,16,
+	 7, 7, 6, 7, 6, 6, 5, 7, 5, 5, 5, 6, 9, 9, 8,11,
+	 8, 7, 6, 7, 7, 6, 6, 7, 5, 6, 5, 6, 9, 9, 9,10,
+	 9, 8, 7, 8, 9, 8, 7, 8, 8, 7, 6, 7,11,11, 9,10,
+	12,13,12,14,12,12,11,14,14,12,10,12,16,16,13,14,
+	 9, 8, 7, 8, 8, 7, 6, 7, 7, 6, 6, 6, 9, 9, 8,11,
+	 9, 9, 7, 7, 8, 8, 7, 7, 7, 7, 6, 6, 9, 9, 8,12,
+	10, 9, 8, 9, 9, 8, 7, 8, 8, 7, 6, 8,10, 9, 9,11,
+	12,11,11,14,12,11,11,13,11,12,10,12,16,15,13,14,
 };
 
 static static_codebook _huff_book_line_128x4_class0 = {
@@ -845,7 +845,7 @@ static static_codebook _huff_book_line_128x4_class0 = {
 };
 
 static long _huff_lengthlist_line_128x7_0sub1[] = {
-	 0, 4, 3, 4, 2, 4, 2, 4, 3,
+	 0, 3, 3, 3, 3, 4, 3, 4, 2,
 };
 
 static static_codebook _huff_book_line_128x7_0sub1 = {
@@ -860,8 +860,8 @@ static static_codebook _huff_book_line_128x7_0sub1 = {
 };
 
 static long _huff_lengthlist_line_128x7_0sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 4, 4, 4, 4, 4,
-	 4, 4, 4, 4, 4, 5, 5, 5, 5,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 3, 4, 3, 4,
+	 4, 4, 4, 5, 5, 5, 5, 5, 5,
 };
 
 static static_codebook _huff_book_line_128x7_0sub2 = {
@@ -877,9 +877,9 @@ static static_codebook _huff_book_line_128x7_0sub2 = {
 
 static long _huff_lengthlist_line_128x7_0sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 4, 4, 5,
-	 4, 5, 4, 5, 5, 5, 5, 6, 6, 7, 7,10, 7, 9, 9,14,
-	10,12,11,14,12,14,14,14,14,14,14,14,14,13,13,13,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 4, 4, 5, 4,
+	 5, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 5, 5, 5,
+	 6, 7, 8,10,12,12,12,12,12,12,12,12,12,12,12,12,
 };
 
 static static_codebook _huff_book_line_128x7_0sub3 = {
@@ -894,7 +894,7 @@ static static_codebook _huff_book_line_128x7_0sub3 = {
 };
 
 static long _huff_lengthlist_line_128x7_1sub1[] = {
-	 0, 2, 3, 3, 3, 3, 4, 3, 4,
+	 0, 3, 3, 3, 3, 2, 4, 3, 4,
 };
 
 static static_codebook _huff_book_line_128x7_1sub1 = {
@@ -909,8 +909,8 @@ static static_codebook _huff_book_line_128x7_1sub1 = {
 };
 
 static long _huff_lengthlist_line_128x7_1sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 5, 3,
-	 5, 3, 6, 4, 7, 4, 8, 5, 8,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 3, 6, 3, 7, 3,
+	 8, 3, 9, 3,10, 3,11, 4,11,
 };
 
 static static_codebook _huff_book_line_128x7_1sub2 = {
@@ -926,9 +926,9 @@ static static_codebook _huff_book_line_128x7_1sub2 = {
 
 static long _huff_lengthlist_line_128x7_1sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 5, 3, 5, 3, 6, 3,
-	 6, 3, 7, 4, 8, 5, 9, 6, 9, 7, 9, 9,10,10, 9, 7,
-	 8, 9,13,13,13,13,13,13,13,13,13,13,13,13,12,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,10, 2, 8, 3,11, 4,
+	11, 5,11, 7,11, 8,11,11,11,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
 };
 
 static static_codebook _huff_book_line_128x7_1sub3 = {
@@ -943,10 +943,10 @@ static static_codebook _huff_book_line_128x7_1sub3 = {
 };
 
 static long _huff_lengthlist_line_128x7_class0[] = {
-	 9, 7, 6, 9,11, 8, 7,10,14,11, 9,10,16,16,16,16,
-	 7, 4, 4, 6, 7, 4, 3, 6,11, 8, 7, 8,16,16,16,16,
-	 9, 6, 5, 7, 6, 3, 2, 5,10, 7, 6, 7,16,16,15,15,
-	15,11, 8, 9, 9, 6, 5, 7,13,11, 9, 8,16,16,16,16,
+	11, 9, 8,13,11, 8, 7,11,11, 8, 7, 9,16,16,15,16,
+	 8, 6, 6,10, 7, 5, 5, 7, 8, 5, 4, 7,16,16,14,14,
+	 8, 5, 6, 8, 6, 3, 3, 6, 7, 4, 4, 6,14,11,12,14,
+	10, 7, 8,10, 7, 4, 5, 6, 8, 5, 4, 5,16,12,10,11,
 };
 
 static static_codebook _huff_book_line_128x7_class0 = {
@@ -961,22 +961,22 @@ static static_codebook _huff_book_line_128x7_class0 = {
 };
 
 static long _huff_lengthlist_line_128x7_class1[] = {
-	 6,17,17,17,11,17,16,16,15,16,16,16,16,16,16,16,
-	 5,16,16,16, 9,16,16,16,14,16,15,16,16,16,16,16,
-	 8,16,16,16, 9,16,16,16,13,16,16,16,16,16,16,16,
-	15,16,16,16,15,16,16,16,16,16,16,16,16,16,16,16,
-	 3,16,16,16, 8,16,16,16,11,13,12,16,16,16,15,16,
-	 2,16,16,16, 7,16,16,16, 9,14,12,16,16,16,14,16,
-	 5,16,16,16, 7,16,16,16,11,16,13,16,16,16,16,16,
-	13,16,16,16,12,16,16,16,16,16,15,16,16,16,16,16,
-	 4,16,16,16, 8,16,16,16,10,13,12,16,16,16,15,16,
-	 2,16,16,16, 5,16,16,16, 8,13,10,16,16,16,13,16,
-	 4,16,16,16, 6,16,16,16, 8,14,11,16,16,16,11,16,
-	11,16,16,16,10,16,16,16,14,16,13,16,16,16,13,16,
-	 8,16,16,16,11,16,16,16,12,16,15,16,16,16,13,16,
-	 5,16,16,16, 9,16,16,16, 9,16,14,16,16,16, 9,16,
-	 6,16,16,16, 7,16,16,16, 9,16,11,16,16,16, 8,16,
-	12,16,16,16,11,16,16,16,14,16,13,16,16,16,13,16,
+	 8,16,15,16, 9,15,16,16,11,16,16,16,16,16,16,16,
+	 7,15,14,16, 7,14,16,16,10,14,16,16,16,16,16,16,
+	 9,16,16,16, 9,13,14,16,11,15,15,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	 6,14,12,16, 7,14,13,16, 9,14,15,16,16,16,16,16,
+	 4,12,11,16, 5,11,11,16, 7,12,13,16,16,16,16,16,
+	 6,14,13,16, 6,12,12,16, 8,13,14,16,16,16,16,16,
+	15,16,16,16,13,16,15,16,15,16,16,16,16,16,16,16,
+	 5,11, 9,16, 5,12,11,16, 7,11,13,16,16,16,16,16,
+	 2,10, 8,16, 3, 9, 8,16, 5, 8,11,16,15,16,16,16,
+	 4,10, 9,16, 3, 9, 8,16, 6,10,11,16,16,15,16,16,
+	11,16,16,16,10,16,12,16,12,16,16,16,16,16,16,16,
+	 8,16,15,16, 9,15,14,16,11,16,16,16,16,16,16,16,
+	 5,14,12,16, 6,13,12,16, 8,11,14,16,16,16,16,16,
+	 6,14,16,16, 6,14,14,16, 9,14,13,16,16,16,16,16,
+	11,16,16,16,11,16,14,16,13,16,16,16,16,16,16,16,
 };
 
 static static_codebook _huff_book_line_128x7_class1 = {
diff --git a/lib/floor1.c b/lib/floor1.c
index 7a18f447..0c44eb22 100644
--- a/lib/floor1.c
+++ b/lib/floor1.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: floor backend 1 implementation
- last mod: $Id: floor1.c,v 1.20.4.5 2002/06/26 08:03:15 xiphmont Exp $
+ last mod: $Id: floor1.c,v 1.20.4.6 2002/06/28 04:19:09 xiphmont Exp $
 
  ********************************************************************/
 
@@ -76,10 +76,10 @@ static void floor1_free_info(vorbis_info_floor *i){
 static void floor1_free_look(vorbis_look_floor *i){
   vorbis_look_floor1 *look=(vorbis_look_floor1 *)i;
   if(look){
-    /*fprintf(stderr,"floor 1 bit usage %f:%f (%f total)\n",
+    fprintf(stderr,"floor 1 bit usage %f:%f (%f total)\n",
 	    (float)look->phrasebits/look->frames,
 	    (float)look->postbits/look->frames,
-	    (float)(look->postbits+look->phrasebits)/look->frames);*/
+	    (float)(look->postbits+look->phrasebits)/look->frames);
 
     memset(look,0,sizeof(*look));
     _ogg_free(look);
@@ -474,8 +474,7 @@ static int accumulate_fit(const float *flr,const float *mdct,
   return(na);
 }
 
-/* returns < 0 on too few points to fit, >=0 (meansq error) on success */
-static int fit_line(lsfit_acc *a,int fits,int *y0,int *y1){
+static void fit_line(lsfit_acc *a,int fits,int *y0,int *y1){
   long x=0,y=0,x2=0,y2=0,xy=0,n=0,an=0,i;
   long x0=a[0].x0;
   long x1=a[fits-1].x1;
@@ -528,7 +527,6 @@ static int fit_line(lsfit_acc *a,int fits,int *y0,int *y1){
     if(*y0<0)*y0=0;
     if(*y1<0)*y1=0;
 
-    return(0);
   }
 }
 
@@ -620,7 +618,9 @@ int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look,
   int hineighbor[VIF_POSIT+2]; 
   int *output=NULL;
   int memo[VIF_POSIT+2];
-  
+
+  for(i=0;i<posts;i++)fit_valueA[i]=-200; /* mark all unused */
+  for(i=0;i<posts;i++)fit_valueB[i]=-200; /* mark all unused */
   for(i=0;i<posts;i++)loneighbor[i]=0; /* 0 for the implicit 0 post */
   for(i=0;i<posts;i++)hineighbor[i]=1; /* 1 for the implicit post at n */
   for(i=0;i<posts;i++)memo[i]=-1;      /* no neighbor yet */
@@ -640,116 +640,78 @@ int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look,
     /* start by fitting the implicit base case.... */
     int y0=-200;
     int y1=-200;
-    int mse=fit_line(fits,posts-1,&y0,&y1);
-    if(mse<0){
-      /* Only a single nonzero point */
-      y0=-200;
-      y1=0;
-      fit_line(fits,posts-1,&y0,&y1);
-    }
+    fit_line(fits,posts-1,&y0,&y1);
 
     fit_valueA[0]=y0;
     fit_valueB[0]=y0;
     fit_valueB[1]=y1;
     fit_valueA[1]=y1;
 
-    if(mse>=0){
-      /* Non degenerate case */
-      /* start progressive splitting.  This is a greedy, non-optimal
-	 algorithm, but simple and close enough to the best
-	 answer. */
-      for(i=2;i<posts;i++){
-	int sortpos=look->reverse_index[i];
-	int ln=loneighbor[sortpos];
-	int hn=hineighbor[sortpos];
-
-	/* eliminate repeat searches of a particular range with a memo */
-	if(memo[ln]!=hn){
-	  /* haven't performed this error search yet */
-	  int lsortpos=look->reverse_index[ln];
-	  int hsortpos=look->reverse_index[hn];
-	  memo[ln]=hn;
-
-	  {
-	    /* A note: we want to bound/minimize *local*, not global, error */
-	    int lx=info->postlist[ln];
-	    int hx=info->postlist[hn];	  
-	    int ly=post_Y(fit_valueA,fit_valueB,ln);
-	    int hy=post_Y(fit_valueA,fit_valueB,hn);
+    /* Non degenerate case */
+    /* start progressive splitting.  This is a greedy, non-optimal
+       algorithm, but simple and close enough to the best
+       answer. */
+    for(i=2;i<posts;i++){
+      int sortpos=look->reverse_index[i];
+      int ln=loneighbor[sortpos];
+      int hn=hineighbor[sortpos];
+      
+      /* eliminate repeat searches of a particular range with a memo */
+      if(memo[ln]!=hn){
+	/* haven't performed this error search yet */
+	int lsortpos=look->reverse_index[ln];
+	int hsortpos=look->reverse_index[hn];
+	memo[ln]=hn;
+		
+	{
+	  /* A note: we want to bound/minimize *local*, not global, error */
+	  int lx=info->postlist[ln];
+	  int hx=info->postlist[hn];	  
+	  int ly=post_Y(fit_valueA,fit_valueB,ln);
+	  int hy=post_Y(fit_valueA,fit_valueB,hn);
+	  
+	  if(inspect_error(lx,hx,ly,hy,logmask,logmdct,info)){
+	    /* outside error bounds/begin search area.  Split it. */
+	    int ly0=-200;
+	    int ly1=-200;
+	    int hy0=-200;
+	    int hy1=-200;
+	    fit_line(fits+lsortpos,sortpos-lsortpos,&ly0,&ly1);
+	    fit_line(fits+sortpos,hsortpos-sortpos,&hy0,&hy1);
 	    
-	    if(inspect_error(lx,hx,ly,hy,logmask,logmdct,info)){
-	      /* outside error bounds/begin search area.  Split it. */
-	      int ly0=-200;
-	      int ly1=-200;
-	      int hy0=-200;
-	      int hy1=-200;
-	      int lmse=fit_line(fits+lsortpos,sortpos-lsortpos,&ly0,&ly1);
-	      int hmse=fit_line(fits+sortpos,hsortpos-sortpos,&hy0,&hy1);
-	      
-	      /* the boundary/sparsity cases are the hard part.  They
-                 don't happen often given that we use the full mask
-                 curve (weighted) now, but when they do happen they
-                 can go boom. Pay them detailed attention */
-	      /* cases for a segment:
-		 >=0) normal fit (>=2 unique points)
-		 -1) one point on x0;
-		 one point on x1; <-- disallowed by fit_line
-		 -2) one point in between x0 and x1
-		 -3) no points */
-
-	      switch(lmse){ 
-	      case -2:  
-		/* no points in the low segment */
-		break;
-	      case -1:
-		ly0=fits[lsortpos].edgey0;
-		break;
-		/*default:
-		  break;*/
-	      }
-
-	      switch(hmse){ 
-	      case -2:  
-		/* no points in the hi segment */
-		break;
-	      case -1:
-		hy0=fits[sortpos].edgey0;
-		break;
-	      }
+	    /* store new edge values */
+	    fit_valueB[ln]=ly0;
+	    if(ln==0)fit_valueA[ln]=ly0;
+	    fit_valueA[i]=ly1;
+	    fit_valueB[i]=hy0;
+	    fit_valueA[hn]=hy1;
+	    if(hn==1)fit_valueB[hn]=hy1;
+	    
+	    if(ly1>=0 || hy0>=0){
+	      /* store new neighbor values */
+	      for(j=sortpos-1;j>=0;j--)
+		if(hineighbor[j]==hn)
+		  hineighbor[j]=i;
+		else
+		  break;
+	      for(j=sortpos+1;j<posts;j++)
+		if(loneighbor[j]==ln)
+		  loneighbor[j]=i;
+		else
+		  break;
 	      
-	      /* store new edge values */
-	      fit_valueB[ln]=ly0;
-	      if(ln==0 && ly0>=0)fit_valueA[ln]=ly0;
-	      fit_valueA[i]=ly1;
-	      fit_valueB[i]=hy0;
-	      fit_valueA[hn]=hy1;
-	      if(hn==1 && hy1>=0)fit_valueB[hn]=hy1;
-
-	      if(ly1>=0 || hy0>=0){
-		/* store new neighbor values */
-		for(j=sortpos-1;j>=0;j--)
-		  if(hineighbor[j]==hn)
-		    hineighbor[j]=i;
-		  else
-		    break;
-		for(j=sortpos+1;j<posts;j++)
-		  if(loneighbor[j]==ln)
-		    loneighbor[j]=i;
-		  else
-		    break;
-		
-	      }
-	    }else{
-	      fit_valueA[i]=-200;
-	      fit_valueB[i]=-200;
 	    }
+	  }else{
+	    
+	    fit_valueA[i]=-200;
+	    fit_valueB[i]=-200;
 	  }
 	}
       }
     }
-    
+  
     output=_vorbis_block_alloc(vb,sizeof(*output)*posts);
-
+    
     output[0]=post_Y(fit_valueA,fit_valueB,0);
     output[1]=post_Y(fit_valueA,fit_valueB,1);
     
@@ -766,7 +728,7 @@ int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look,
       
       int predicted=render_point(x0,x1,y0,y1,info->postlist[i]);
       int vx=post_Y(fit_valueA,fit_valueB,i);
-	
+      
       if(vx>=0 && predicted!=vx){ 
 	output[i]=vx;
       }else{
diff --git a/lib/mapping0.c b/lib/mapping0.c
index 9e1cd63d..24e8d362 100644
--- a/lib/mapping0.c
+++ b/lib/mapping0.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.49.2.8 2002/06/26 08:03:15 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.49.2.9 2002/06/28 04:19:09 xiphmont Exp $
 
  ********************************************************************/
 
@@ -37,8 +37,6 @@
    blocksize is set by the mode, and low backend lookups may require
    parameters from other areas of the mode/mapping */
 
-extern int analysis_noisy;
-
 static void mapping0_free_info(vorbis_info_mapping *i){
   vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)i;
   if(info){
@@ -159,10 +157,10 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb)
 #include "psy.h"
 #include "scales.h"
 
-/* no time mapping implementation for now */
+#if 0
 static long seq=0;
 static ogg_int64_t total=0;
-extern void _analysis_output_always(char *base,int i,float *v,int n,int bark,int dB,ogg_int64_t off);
+#endif 
 
 extern int *floor1_fit(vorbis_block *vb,vorbis_look_floor *look,
 		       const float *logmdct,   /* in */
@@ -199,7 +197,6 @@ static int mapping0_forward(vorbis_block *vb){
 
   vb->mode=modenumber;
 
-
   for(i=0;i<vi->channels;i++){
     float scale=4.f/n;
     float scale_dB;
@@ -214,9 +211,9 @@ static int mapping0_forward(vorbis_block *vb){
 #if 0
     if(vi->channels==2)
       if(i==0)
-	_analysis_output_always("pcmL",seq,pcm,n,0,0,total-n/2);
+	_analysis_output("pcmL",seq,pcm,n,0,0,total-n/2);
       else
-	_analysis_output_always("pcmR",seq,pcm,n,0,0,total-n/2);
+	_analysis_output("pcmR",seq,pcm,n,0,0,total-n/2);
 #endif
   
     /* window the PCM data */
@@ -225,9 +222,9 @@ static int mapping0_forward(vorbis_block *vb){
 #if 0
     if(vi->channels==2)
       if(i==0)
-	_analysis_output_always("windowedL",seq,pcm,n,0,0,total-n/2);
+	_analysis_output("windowedL",seq,pcm,n,0,0,total-n/2);
       else
-	_analysis_output_always("windowedR",seq,pcm,n,0,0,total-n/2);
+	_analysis_output("windowedR",seq,pcm,n,0,0,total-n/2);
 #endif
 
     /* transform the PCM data */
@@ -250,9 +247,9 @@ static int mapping0_forward(vorbis_block *vb){
 #if 0
     if(vi->channels==2)
       if(i==0)
-	_analysis_output_always("fftL",seq,logfft,n/2,1,0,0);
+	_analysis_output("fftL",seq,logfft,n/2,1,0,0);
       else
-	_analysis_output_always("fftR",seq,logfft,n/2,1,0,0);
+	_analysis_output("fftR",seq,logfft,n/2,1,0,0);
 #endif
 
   }
@@ -285,11 +282,11 @@ static int mapping0_forward(vorbis_block *vb){
 #if 0
       if(vi->channels==2){
 	if(i==0)
-	  _analysis_output_always("mdctL",seq,logmdct,n/2,1,0,0);
+	  _analysis_output("mdctL",seq,logmdct,n/2,1,0,0);
 	else
-	  _analysis_output_always("mdctR",seq,logmdct,n/2,1,0,0);
+	  _analysis_output("mdctR",seq,logmdct,n/2,1,0,0);
       }else{
-	_analysis_output_always("mdct",seq,logmdct,n/2,1,0,0);
+	_analysis_output("mdct",seq,logmdct,n/2,1,0,0);
       }
 #endif 
       
@@ -306,9 +303,9 @@ static int mapping0_forward(vorbis_block *vb){
 #if 0
       if(vi->channels==2){
 	if(i==0)
-	  _analysis_output_always("noiseL",seq,noise,n/2,1,0,0);
+	  _analysis_output("noiseL",seq,noise,n/2,1,0,0);
 	else
-	  _analysis_output_always("noiseR",seq,noise,n/2,1,0,0);
+	  _analysis_output("noiseR",seq,noise,n/2,1,0,0);
       }
 #endif
 
@@ -325,9 +322,9 @@ static int mapping0_forward(vorbis_block *vb){
 #if 0
       if(vi->channels==2){
 	if(i==0)
-	  _analysis_output_always("toneL",seq,tone,n/2,1,0,0);
+	  _analysis_output("toneL",seq,tone,n/2,1,0,0);
 	else
-	  _analysis_output_always("toneR",seq,tone,n/2,1,0,0);
+	  _analysis_output("toneR",seq,tone,n/2,1,0,0);
       }
 #endif
 
@@ -345,9 +342,9 @@ static int mapping0_forward(vorbis_block *vb){
 #if 0
       if(vi->channels==2){
 	if(i==0)
-	  _analysis_output_always("mask1L",seq,logmask,n/2,1,0,0);
+	  _analysis_output("mask1L",seq,logmask,n/2,1,0,0);
 	else
-	  _analysis_output_always("mask1R",seq,logmask,n/2,1,0,0);
+	  _analysis_output("mask1R",seq,logmask,n/2,1,0,0);
       }
 #endif
 
@@ -375,9 +372,9 @@ static int mapping0_forward(vorbis_block *vb){
 #if 0
 	if(vi->channels==2){
 	  if(i==0)
-	    _analysis_output_always("mask2L",seq,logmask,n/2,1,0,0);
+	    _analysis_output("mask2L",seq,logmask,n/2,1,0,0);
 	  else
-	    _analysis_output_always("mask2R",seq,logmask,n/2,1,0,0);
+	    _analysis_output("mask2R",seq,logmask,n/2,1,0,0);
 	}
 #endif
 	
@@ -396,9 +393,9 @@ static int mapping0_forward(vorbis_block *vb){
 #if 0
 	if(vi->channels==2)
 	  if(i==0)
-	    _analysis_output_always("mask0L",seq,logmask,n/2,1,0,0);
+	    _analysis_output("mask0L",seq,logmask,n/2,1,0,0);
 	  else
-	    _analysis_output_always("mask0R",seq,logmask,n/2,1,0,0);
+	    _analysis_output("mask0R",seq,logmask,n/2,1,0,0);
 #endif
 
 	floor_posts[i][0]=
@@ -494,11 +491,6 @@ static int mapping0_forward(vorbis_block *vb){
 				 ilogmask);
 #if 0
 	{
-
-
-
-
-
 	  static float FLOOR1_fromdB_LOOKUP[256]={
 	    1.0649863e-07F, 1.1341951e-07F, 1.2079015e-07F, 1.2863978e-07F, 
 	    1.3699951e-07F, 1.4590251e-07F, 1.5538408e-07F, 1.6548181e-07F, 
@@ -571,7 +563,7 @@ static int mapping0_forward(vorbis_block *vb){
 	  float work[n/2];
 	  for(j=0;j<n/2;j++)
 	    work[j]=FLOOR1_fromdB_LOOKUP[ilogmask[j]];
-	  _analysis_output_always(buf,seq,work,n/2,1,1,0);
+	  _analysis_output(buf,seq,work,n/2,1,1,0);
 	}
 #endif
 	_vp_remove_floor(psy_look,
@@ -585,7 +577,7 @@ static int mapping0_forward(vorbis_block *vb){
 	{
 	  char buf[80];
 	  sprintf(buf,"resI%d",k,i);
-	  _analysis_output_always(buf,seq,res,n/2,1,1,0);
+	  _analysis_output(buf,seq,res,n/2,1,1,0);
 	}
 #endif
       }
@@ -640,10 +632,12 @@ static int mapping0_forward(vorbis_block *vb){
       
     }
     
-    seq++;
-  } 
+  }
 
+#if 0
+  seq++;
   total+=ci->blocksizes[vb->W]/4+ci->blocksizes[vb->nW]/4;
+#endif
   return(0);
 }
 
diff --git a/lib/misc.h b/lib/misc.h
new file mode 100644
index 00000000..9517765a
--- /dev/null
+++ b/lib/misc.h
@@ -0,0 +1,52 @@
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+ *                                                                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
+ ********************************************************************
+
+ function: miscellaneous prototypes
+ last mod: $Id: misc.h,v 1.11.4.1 2002/06/28 04:19:09 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_RANDOM_H_
+#define _V_RANDOM_H_
+#include "vorbis/codec.h"
+
+extern int analysis_noisy;
+
+extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
+extern void _vorbis_block_ripcord(vorbis_block *vb);
+extern void _analysis_output(char *base,int i,float *v,int n,int bark,int dB,
+			     ogg_int64_t off);
+
+#ifdef DEBUG_MALLOC
+
+#define _VDBG_GRAPHFILE "malloc.m"
+extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line); 
+extern void _VDBG_free(void *ptr,char *file,long line); 
+
+#ifndef MISC_C 
+#undef _ogg_malloc
+#undef _ogg_calloc
+#undef _ogg_realloc
+#undef _ogg_free
+
+#define _ogg_malloc(x) _VDBG_malloc(NULL,(x),__FILE__,__LINE__)
+#define _ogg_calloc(x,y) _VDBG_malloc(NULL,(x)*(y),__FILE__,__LINE__)
+#define _ogg_realloc(x,y) _VDBG_malloc((x),(y),__FILE__,__LINE__)
+#define _ogg_free(x) _VDBG_free((x),__FILE__,__LINE__)
+#endif
+#endif
+
+#endif
+
+
+
+
diff --git a/lib/modes/floor_44.h b/lib/modes/floor_44.h
index 81ad48d3..bf3609b1 100644
--- a/lib/modes/floor_44.h
+++ b/lib/modes/floor_44.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: key floor settings for 44.1/48kHz
- last mod: $Id: floor_44.h,v 1.2.8.5 2002/06/27 07:05:55 xiphmont Exp $
+ last mod: $Id: floor_44.h,v 1.2.8.6 2002/06/28 04:19:22 xiphmont Exp $
 
  ********************************************************************/
 
@@ -103,7 +103,7 @@ static vorbis_info_floor1 _floor_44[9]={
   {
     1,{0},{4},{2},{0},
     {{1,2,3,4}},
-    4,{0,128, 33,8,16,58},
+    4,{0,128, 33,8,16,70},
 
     60,30,500,   0.,18.,  -1
   },
@@ -111,7 +111,7 @@ static vorbis_info_floor1 _floor_44[9]={
   {
     1,{0},{4},{2},{0},
     {{1,2,3,4}},
-    4,{0,256, 66,16,32,116},
+    4,{0,256, 66,16,32,140},
 
     60,30,500,   0.,18.,  -1
   },
@@ -119,7 +119,7 @@ static vorbis_info_floor1 _floor_44[9]={
   {
     2,{0,1},{3,4},{2,2},{0,1},
     {{-1,2,3,4},{-1,5,6,7}},
-    4,{0,128, 8,2,28, 1,4,14,58},
+    4,{0,128, 14,4,58, 2,8,28,90},
     
     60,30,500,   0.,18.,  -1
   },
@@ -127,7 +127,7 @@ static vorbis_info_floor1 _floor_44[9]={
   {
     2,{0,1},{3,4},{2,2},{0,1},
     {{-1,2,3,4},{-1,5,6,7}},
-    4,{0,256, 16,4,56, 2,8,28,116},
+    4,{0,256, 28,8,116, 4,16,56,180},
     
     60,30,500,   0.,18.,  -1
   },
@@ -137,7 +137,7 @@ static vorbis_info_floor1 _floor_44[9]={
     4,{0,1,2,3},{2,3,3,3},{0,1,2,2},{-1,0,1,2},
     {{3},{4,5},{-1,6,7,8},{-1,9,10,11}},
     
-    2,{0,128,  6,23,  2,12,46,  1,4,8,  16,33,70},
+    2,{0,128,  8,33,  4,16,70,  2,6,12,  23,46,90},
     
      60,30,500,   0,18.,  -1
   },
@@ -146,8 +146,8 @@ static vorbis_info_floor1 _floor_44[9]={
   {
     6,{0,1,1,2,3,3},{2,3,3,3},{0,1,2,2},{-1,0,1,2},
     {{3},{4,5},{-1,6,7,8},{-1,9,10,11}},
-    2,{0,128,  10,39,  2,6,14,  19,28,70,  1,4,8,  12,16,23,  33,46,93},
-    
+    2,{0,128,  12,46,  4,8,16,  23,33,70,  2,6,10,  14,19,28,  39,58,90},
+
     60,30,500,    0,18.,  -1 
   },
   
@@ -155,8 +155,8 @@ static vorbis_info_floor1 _floor_44[9]={
   {
     6,{0,1,1,2,3,3},{2,3,3,3},{0,1,2,2},{-1,0,1,2},
     {{3},{4,5},{-1,6,7,8},{-1,9,10,11}},
-    2,{0,1024,  79,312,  14,46,111,  158,220,556,  
-       6,33,65,  93,130,186,  260,372,750},
+    2,{0,1024,  93,372,  33,65,130,  186,260,556,  
+       14,46,79,  111,158,220,  312,464,720},
     
     60,30,500,    0,18.,  -1 /* lowpass! */
   },
diff --git a/lib/modes/psych_44.h b/lib/modes/psych_44.h
index 02845212..e48ddadd 100644
--- a/lib/modes/psych_44.h
+++ b/lib/modes/psych_44.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: psych_44.h,v 1.15.2.10 2002/06/27 07:05:55 xiphmont Exp $
+ last mod: $Id: psych_44.h,v 1.15.2.11 2002/06/28 04:19:22 xiphmont Exp $
 
  ********************************************************************/
 
@@ -24,31 +24,31 @@ static vorbis_info_psy_global _psy_global_44[5]={
    {20.f,14.f,12.f,12.f,12.f,12.f,12.f}, 
    {-60.f,-30.f,-40.f,-40.f,-40.f,-40.f,-40.f}, 2,-75.f,
    -6.f,
-   {99.},{{99.},{99.}},{0},{0}
+   {99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
   },
   {8,   /* lines per eighth octave */
    {14.f,10.f,10.f,10.f,10.f,10.f,10.f}, 
    {-40.f,-30.f,-25.f,-25.f,-25.f,-25.f,-25.f}, 2,-80.f,
    -6.f,
-   {99.},{{99.},{99.}},{0},{0}
+   {99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
   },
   {8,   /* lines per eighth octave */
    {12.f,10.f,10.f,10.f,10.f,10.f,10.f}, 
    {-20.f,-20.f,-15.f,-15.f,-15.f,-15.f,-15.f}, 0,-80.f,
    -6.f,
-   {99.},{{99.},{99.}},{0},{0}
+   {99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
   },
   {8,   /* lines per eighth octave */
    {10.f,8.f,8.f,8.f,8.f,8.f,8.f}, 
    {-20.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-80.f,
    -6.f,
-   {99.},{{99.},{99.}},{0},{0}
+   {99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
   },
   {8,   /* lines per eighth octave */
    {10.f,6.f,6.f,6.f,6.f,6.f,6.f}, 
    {-15.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-85.f,
    -6.f,
-   {99.},{{99.},{99.}},{0},{0}
+   {99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
   },
 };
 
@@ -143,17 +143,18 @@ static noise3 _psy_noisebias_trans[11]={
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2,  0,  0,  0,  2,  4, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4, -2}}},
   /* 1 */
-  {{{-15,-15,-15,-15,-15,-12,-10, -8,  0,  2,  2,  2,  4,  4,  5,  6, 10},
+  {{{-15,-15,-15,-15,-15,-12,-10, -8,  0,  2,  4,  4,  5,  5,  5,  8, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2,  0,  2, 6},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6,-4}}},
   /* 2 */
   {{{-15,-15,-15,-15,-15,-12,-10, -8,  0,  2,  2,  2,  4,  4,  5,  6, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2,  0,  2, 6},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8,-6}}},
   /* 3 */
-  {{{-15,-15,-15,-15,-15,-12,-10, -8,  0,  2,  2,  2,  4,  4,  5,  6, 10},
+  {{{-15,-15,-15,-15,-15,-12,-10, -8,  0,  2,  2,  2,  4,  4,  4,  5, 8},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -1,  1, 4},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8,-4}}},
+
   /* 4 */
   {{{-15,-15,-15,-15,-15,-12,-10, -8,  0,  2,  2,  2,  4,  4,  5,  6, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -1,  1, 4},
@@ -192,20 +193,19 @@ static noise3 _psy_noisebias_long[11]={
   {{{-10,-10,-10,-10,-10,-10, -8, -8,  0,  2,  4,  4,  5,  5,  5,  8,  10},
     {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2,  0,  0,  0,  0,  2,  4,  10},
     {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}},
-
   /* 1 */
-  {{{-10,-10,-10,-10,-10,-10,-10, -8,  0,  2,  2,  2,  4,  4,  5,  6, 10},
+  {{{-10,-10,-10,-10,-10,-10, -8, -8,  0,  2,  4,  4,  5,  5,  5,  8,  10},
     {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2,  0,  2, 6},
-    {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
-
+    {-20,-20,-20,-20,-20,-20,-20,-14, -8, -8, -8, -8, -8, -6, -6, -6,-4}}},
   /* 2 */
   {{{-10,-10,-10,-10,-10,-10,-10, -8,  0,  2,  2,  2,  4,  4,  5,  6, 10},
     {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2,  0,  2, 6},
-    {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
+    {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8,-6}}},
   /* 3 */
-  {{{-10,-10,-10,-10,-10,-10,-10, -8,  0,  2,  2,  2,  4,  4,  5,  6, 10},
+  {{{-10,-10,-10,-10,-10,-10,-10, -8,  0,  2,  2,  2,  4,  4,  4,  5, 8},
     {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -1,  1, 4},
-    {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
+    {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8,-6}}},
+
   /* 4 */
   {{{-10,-10,-10,-10,-10,-10,-10, -8,  0,  2,  2,  2,  4,  4,  5,  6, 10},
     {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -1,  1, 4},
@@ -245,17 +245,18 @@ static noise3 _psy_noisebias_impulse[11]={
     {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -2,  2,  2,  4,  4,  5,  8},
     {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},
   /* 1 */
-  {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  2,  2,  2,  2,  3,  4, 8},
+  {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  4,  4,  5,  5,  5,  5, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4,  0,  0,  0,  0,  0, 4},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8,-10,-10, -8, -8, -8, -6,-4}}},
   /* 2 */
   {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  2,  2,  2,  2,  3,  4, 8},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4,  0,  0,  0,  0,  0, 4},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-6}}},
   /* 3 */
   {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  2,  2,  2,  2,  3,  4, 8},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4, -1, -1, -1, -1,  0, 3},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-6}}},
+
   /* 4 */
   {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  2,  2,  2,  2,  3,  4, 8},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4, -1, -1, -1, -1,  0, 3},
@@ -295,20 +296,20 @@ static noise3 _psy_noisebias_padding[11]={
   {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  4,  4,  5,  5,  5,  8, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2,  2,  3,  6,  6,  8, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -4, -4, -4, -4, -2,  0,  2}}},
-
   /* 1 */
-  {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  2,  2,  4,  4,  5,  6, 10},
+  {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  4,  4,  5,  5,  5,  8, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4,  0,  0,  0,  2,  2,  4, 8},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
-
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -6, -4, -2, 0}}},
   /* 2 */
   {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  2,  2,  4,  4,  5,  6, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4,  0,  0,  0,  2,  2,  4, 8},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4,-2}}},
   /* 3 */
-  {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  2,  2,  4,  4,  5,  6, 10},
+  {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  2,  2,  3,  3,  4,  6, 9},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -1, -1, -1, -1,  0,  2, 6},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8,-4}}},
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4,-2}}},
+
+
   /* 4 */
   {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  2,  2,  2,  4,  4,  5,  6, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -1, -1, -1, -1,  0,  2, 6},
@@ -400,22 +401,23 @@ static adj_stereo _psy_stereo_modes_44[11]={
   {{  4,  4,  4,  4,  4,  4,  4,  3,  2,  2,  1,  0,  0,  0,  0},
    {  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  5,  4,  3},
    {  4,  4,  4,  4,  4,  4,  4,  4,  4,  5,  6,  7,  8,  8,  8},
-   {  8, 10, 12, 14, 15, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
+   {  7,  8, 10, 12, 14, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14         1  */
-  {{  3,  3,  3,  3,  3,  3,  3,  3,  2,  1,  0,  0,  0,  0,  0},
+  {{  4,  4,  4,  4,  4,  4,  3,  3,  2,  1,  0,  0,  0,  0,  0},
    {  8,  8,  8,  8,  6,  6,  6,  5,  5,  5,  5,  5,  5,  4,  3},
-   {  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  6,  8, 10, 10, 10},
-   { 10, 12, 14, 15, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
+   {  4,  4,  4,  4,  4,  5,  6,  6,  6,  6,  6,  8,  8,  8,  8},
+   {  8, 10, 12, 14, 15, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14         2  */
-  {{  3,  3,  3,  3,  3,  3,  2,  2,  2,  1,  0,  0,  0,  0,  0},
-   {  8,  8,  8,  7,  5,  5,  5,  5,  3,  3,  3,  3,  2,  1,  1},
-   {  4,  4,  4,  4,  5,  6,  6,  6,  6,  6,  8, 10, 10, 10, 10},
-   { 12, 14, 15, 16, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
+  {{  4,  4,  4,  3,  3,  3,  2,  2,  2,  1,  0,  0,  0,  0,  0},
+   {  8,  8,  8,  7,  5,  5,  5,  5,  5,  5,  5,  4,  3,  2,  1},
+   {  4,  4,  4,  4,  5,  6,  6,  6,  6,  6,  6,  8,  8,  8,  8},
+   { 10, 12, 14, 16, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14         3  */
   {{  3,  3,  3,  3,  3,  3,  2,  1,  1,  0,  0,  0,  0,  0,  0},
-   {  8,  8,  7,  6,  5,  4,  4,  4,  3,  3,  3,  2,  1,  0,  0},
-   {  4,  4,  4,  4,  5,  6,  6,  6,  8,  8, 10, 10, 10, 10, 10},
-   { 12, 14, 15, 16, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
+   {  7,  6,  5,  4,  4,  4,  4,  4,  4,  4,  4,  4,  3,  2,  1},
+   {  6,  6,  6,  6,  6,  6,  6,  6,  8,  8, 10, 10, 10, 10, 10},
+   { 12, 14, 16, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
+
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14         4  */
   {{  3,  3,  3,  2,  2,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0},
    {  8,  8,  7,  6,  5,  4,  4,  4,  3,  3,  3,  2,  1,  0,  0},
@@ -458,10 +460,10 @@ static adj_stereo _psy_stereo_modes_44[11]={
 /* tone master attenuation by base quality mode and bitrate tweak */
 
 static att3 _psy_tone_masteratt_44[11]={
-  {{ 40,  20,   6}, -6, 1.25}, /* 0 */
-  {{ 30,  14,   0}, -4, 1.25}, /* 1 */
-  {{ 25,  10,  -8},  0,    0}, /* 2 */
-  {{ 25,  10, -12},  0,    0}, /* 3 */
+  {{ 42,  20,   4}, -6, 1.25}, /* 0 */
+  {{ 38,  14,   0}, -4, 1.25}, /* 1 */
+  {{ 30,  10,  -4},  0,    0}, /* 2 */
+  {{ 25,  10,  -4},  0,    0}, /* 3 */
   {{ 20,  10, -20},  0,    0}, /* 4 */
   {{ 20,   6, -20},  0,    0}, /* 5 */
   {{ 20,   3, -20},  0,    0}, /* 6 */
diff --git a/lib/modes/residue_44.h b/lib/modes/residue_44.h
index 78968f8f..1358bb7b 100644
--- a/lib/modes/residue_44.h
+++ b/lib/modes/residue_44.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: toplevel residue templates for 32/44.1/48kHz
- last mod: $Id: residue_44.h,v 1.11.6.10 2002/06/27 07:05:56 xiphmont Exp $
+ last mod: $Id: residue_44.h,v 1.11.6.11 2002/06/28 04:19:22 xiphmont Exp $
 
  ********************************************************************/
 
@@ -175,29 +175,29 @@ static vorbis_residue_template _res_44s_0[]={
 };
 static vorbis_residue_template _res_44s_1[]={
   {2,0,  &_residue_44_mid,
-   &_huff_book__44c1_s_short,&_huff_book__44c1_s_short,
-   &_resbook_44s_1,&_resbook_44s_1},
+   &_huff_book__44c1_s_short,&_huff_book__44c1_sm_short,
+   &_resbook_44s_1,&_resbook_44sm_1},
 
   {2,0,  &_residue_44_mid,
-   &_huff_book__44c1_s_long,&_huff_book__44c1_s_long,
-   &_resbook_44s_1,&_resbook_44s_1}
+   &_huff_book__44c1_s_long,&_huff_book__44c1_sm_long,
+   &_resbook_44s_1,&_resbook_44sm_1}
 };
 static vorbis_residue_template _res_44s_2[]={
   {2,0,  &_residue_44_mid,
-   &_huff_book__44c2_s_short,&_huff_book__44c2_s_short,
+   &_huff_book__44c2_s_short,&_huff_book__44c2_sm_short,
    &_resbook_44s_2,&_resbook_44s_2},
 
   {2,0,  &_residue_44_mid,
-   &_huff_book__44c2_s_long,&_huff_book__44c2_s_long,
+   &_huff_book__44c2_s_long,&_huff_book__44c2_sm_long,
    &_resbook_44s_2,&_resbook_44s_2}
 };
 static vorbis_residue_template _res_44s_3[]={
   {2,0,  &_residue_44_mid,
-   &_huff_book__44c2_s_short,&_huff_book__44c2_s_short,
+   &_huff_book__44c3_s_short,&_huff_book__44c3_sm_short,
    &_resbook_44s_3,&_resbook_44s_3},
 
   {2,0,  &_residue_44_mid,
-   &_huff_book__44c2_s_long,&_huff_book__44c2_s_long,
+   &_huff_book__44c3_s_long,&_huff_book__44c3_sm_long,
    &_resbook_44s_3,&_resbook_44s_3}
 };
 static vorbis_residue_template _res_44s_4[]={
@@ -211,11 +211,11 @@ static vorbis_residue_template _res_44s_4[]={
 };
 static vorbis_residue_template _res_44s_5[]={
   {2,0,  &_residue_44_mid,
-   &_huff_book__44c4_s_short,&_huff_book__44c4_s_short,
+   &_huff_book__44c5_s_short,&_huff_book__44c5_s_short,
    &_resbook_44s_5,&_resbook_44s_5},
 
   {2,0,  &_residue_44_mid,
-   &_huff_book__44c4_s_long,&_huff_book__44c4_s_long,
+   &_huff_book__44c5_s_long,&_huff_book__44c5_s_long,
    &_resbook_44s_5,&_resbook_44s_5}
 };
 static vorbis_residue_template _res_44s_6[]={
@@ -229,29 +229,29 @@ static vorbis_residue_template _res_44s_6[]={
 };
 static vorbis_residue_template _res_44s_7[]={
   {2,0,  &_residue_44_high,
-   &_huff_book__44c6_s_short,&_huff_book__44c6_s_short,
+   &_huff_book__44c7_s_short,&_huff_book__44c7_s_short,
    &_resbook_44s_7,&_resbook_44s_7},
 
   {2,0,  &_residue_44_high,
-   &_huff_book__44c6_s_long,&_huff_book__44c6_s_long,
+   &_huff_book__44c7_s_long,&_huff_book__44c7_s_long,
    &_resbook_44s_7,&_resbook_44s_7}
 };
 static vorbis_residue_template _res_44s_8[]={
   {2,0,  &_residue_44_high,
-   &_huff_book__44c6_s_short,&_huff_book__44c6_s_short,
+   &_huff_book__44c8_s_short,&_huff_book__44c8_s_short,
    &_resbook_44s_8,&_resbook_44s_8},
 
   {2,0,  &_residue_44_high,
-   &_huff_book__44c6_s_long,&_huff_book__44c6_s_long,
+   &_huff_book__44c8_s_long,&_huff_book__44c8_s_long,
    &_resbook_44s_8,&_resbook_44s_8}
 };
 static vorbis_residue_template _res_44s_9[]={
   {2,0,  &_residue_44_high,
-   &_huff_book__44c6_s_short,&_huff_book__44c6_s_short,
+   &_huff_book__44c9_s_short,&_huff_book__44c9_s_short,
    &_resbook_44s_9,&_resbook_44s_9},
 
   {2,0,  &_residue_44_high,
-   &_huff_book__44c6_s_long,&_huff_book__44c6_s_long,
+   &_huff_book__44c9_s_long,&_huff_book__44c9_s_long,
    &_resbook_44s_9,&_resbook_44s_9}
 };
 
diff --git a/lib/psy.c b/lib/psy.c
index d4a53004..57d65032 100644
--- a/lib/psy.c
+++ b/lib/psy.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.67.2.10 2002/06/27 07:05:46 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.67.2.11 2002/06/28 04:19:09 xiphmont Exp $
 
  ********************************************************************/
 
@@ -711,9 +711,11 @@ void _vp_remove_floor(vorbis_look_psy *p,
  
   if(sliding_lowpass>n)sliding_lowpass=n;
   
-  for(i=0;i<sliding_lowpass;i++)
+  for(i=0;i<sliding_lowpass;i++){
     residue[i]=
       mdct[i]*FLOOR1_fromdB_INV_LOOKUP[codedflr[i]];
+  }
+
   for(;i<n;i++)
     residue[i]=0.;
 }
diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
index fecffd9e..d2a33b00 100644
--- a/lib/vorbisenc.c
+++ b/lib/vorbisenc.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.39.2.9 2002/06/26 08:03:15 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.39.2.10 2002/06/28 04:19:10 xiphmont Exp $
 
  ********************************************************************/
 
@@ -424,7 +424,7 @@ static void vorbis_encode_residue_setup(vorbis_info *vi,
 				       vorbis_residue_template *res){
 
   codec_setup_info *ci=vi->codec_setup;
-  int i,n,k;
+  int i,n;
   
   vorbis_info_residue0 *r=ci->residue_param[number]=
     _ogg_malloc(sizeof(*r));
diff --git a/vq/44c1.vqs b/vq/44c1.vqs
index 947ce6c9..b0ffc0fa 100644
--- a/vq/44c1.vqs
+++ b/vq/44c1.vqs
@@ -1,7 +1,7 @@
 cp 44c1_s/resaux_0.vqd _44c1_s_short.vqd
 cp 44c1_s/resaux_1.vqd _44c1_s_long.vqd
-#cp 44c1_sm/resaux_0.vqd _44c1_sm_short.vqd
-#cp 44c1_sm/resaux_1.vqd _44c1_sm_long.vqd
+cp 44c1_sm/resaux_0.vqd _44c1_sm_short.vqd
+cp 44c1_sm/resaux_1.vqd _44c1_sm_long.vqd
 
 GO
 
@@ -41,10 +41,10 @@ haux _44c1_s_long.vqd 0,64,2
 
 
 >_44c1s_sm noninterleaved
-#haux _44c1_sm_short.vqd 0,16,2
+haux _44c1_sm_short.vqd 0,16,2
 
 >_44c1_sm noninterleaved
-#haux _44c1_sm_long.vqd 0,64,2
+haux _44c1_sm_long.vqd 0,64,2
 	
 #iter 0
 
diff --git a/vq/44c2.vqs b/vq/44c2.vqs
index 702b53db..5f6fcb0a 100644
--- a/vq/44c2.vqs
+++ b/vq/44c2.vqs
@@ -1,7 +1,7 @@
 cp 44c2_s/resaux_0.vqd _44c2_s_short.vqd
 cp 44c2_s/resaux_1.vqd _44c2_s_long.vqd
-#cp 44c2_sm/resaux_0.vqd _44c2_sm_short.vqd
-#cp 44c2_sm/resaux_1.vqd _44c2_sm_long.vqd
+cp 44c2_sm/resaux_0.vqd _44c2_sm_short.vqd
+cp 44c2_sm/resaux_1.vqd _44c2_sm_long.vqd
 
 GO
 
@@ -41,8 +41,8 @@ haux _44c2_s_long.vqd 0,64,2
 
 
 >_44c2s_sm noninterleaved
-#haux _44c2_sm_short.vqd 0,16,2
+haux _44c2_sm_short.vqd 0,16,2
 
 >_44c2_sm noninterleaved
-#haux _44c2_sm_long.vqd 0,64,2
+haux _44c2_sm_long.vqd 0,64,2
 	
\ No newline at end of file
diff --git a/vq/44c3.vqs b/vq/44c3.vqs
index 685c90e9..2f5953d1 100644
--- a/vq/44c3.vqs
+++ b/vq/44c3.vqs
@@ -1,7 +1,7 @@
 cp 44c3_s/resaux_0.vqd _44c3_s_short.vqd
 cp 44c3_s/resaux_1.vqd _44c3_s_long.vqd
-#cp 44c3_sm/resaux_0.vqd _44c3_sm_short.vqd
-#cp 44c3_sm/resaux_1.vqd _44c3_sm_long.vqd
+cp 44c3_sm/resaux_0.vqd _44c3_sm_short.vqd
+cp 44c3_sm/resaux_1.vqd _44c3_sm_long.vqd
 
 GO
 
@@ -41,8 +41,8 @@ haux _44c3_s_long.vqd 0,64,2
 
 
 >_44c3s_sm noninterleaved
-#haux _44c3_sm_short.vqd 0,16,2
+haux _44c3_sm_short.vqd 0,16,2
 
 >_44c3_sm noninterleaved
-#haux _44c3_sm_long.vqd 0,64,2
+haux _44c3_sm_long.vqd 0,64,2
 	
\ No newline at end of file