[xiph-cvs] cvs commit: vorbis/lib/modes mode_B.h mode_C.h mode_D.h mode_E.h

Monty xiphmont at xiph.org
Sun Feb 18 01:53:16 PST 2001



xiphmont    01/02/18 01:53:13

  Modified:    lib      Makefile.am envelope.c envelope.h iir.c scales.h
               lib/books res0_160_1024_1.vqh res0_160_1024_2.vqh
                        res0_160_1024_3.vqh res0_160_1024_4.vqh
                        res0_160_1024_5.vqh res0_160_1024_6.vqh
                        res0_160_1024_7.vqh res0_160_1024_8.vqh
                        res0_160_1024_9.vqh res0_160_1024aux.vqh
                        res0_160_128_1.vqh res0_160_128_2.vqh
                        res0_160_128_3.vqh res0_160_128_4.vqh
                        res0_160_128_5.vqh res0_160_128aux.vqh
                        res0_192_1024_1.vqh res0_192_1024_2.vqh
                        res0_192_1024_3.vqh res0_192_1024_4.vqh
                        res0_192_1024_5.vqh res0_192_1024_6.vqh
                        res0_192_1024_7.vqh res0_192_1024_8.vqh
                        res0_192_1024_9.vqh res0_192_1024aux.vqh
                        res0_192_128_1.vqh res0_192_128_2.vqh
                        res0_192_128_3.vqh res0_192_128_4.vqh
                        res0_192_128_5.vqh res0_192_128aux.vqh
                        res0_256_1024_1.vqh res0_256_1024_2.vqh
                        res0_256_1024_3.vqh res0_256_1024_4.vqh
                        res0_256_1024_5.vqh res0_256_1024_6.vqh
                        res0_256_1024_7.vqh res0_256_1024aux.vqh
                        res0_256_128_1.vqh res0_256_128_2.vqh
                        res0_256_128_3.vqh res0_256_128_4.vqh
                        res0_256_128_5.vqh res0_256_128aux.vqh
               lib/modes mode_B.h mode_C.h mode_D.h mode_E.h
  Log:
  bugfix/speed improvement to envelope.c
  Tuning for modes B->E for beta 4.
  
  Pending bugfixes/release version update, beta 4 is frozen.
  Monty

Revision  Changes    Path
1.10      +1 -1      vorbis/lib/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am	2000/11/17 23:09:10	1.9
+++ Makefile.am	2001/02/18 09:53:01	1.10
@@ -11,7 +11,7 @@
 libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c lpc.c\
                         analysis.c synthesis.c psy.c info.c time0.c floor0.c\
                         res0.c mapping0.c registry.c codebook.c sharedbook.c\
-			iir.c lookup.c bitbuffer.c\
+			lookup.c bitbuffer.c\
                         envelope.h lpc.h lsp.h codebook.h misc.h psy.h\
                         masking.h iir.h os.h mdct.h smallft.h\
                         registry.h scales.h window.h lookup.h lookup_data.h\

1.34      +13 -20    vorbis/lib/envelope.c

Index: envelope.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/envelope.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- envelope.c	2001/02/17 10:13:47	1.33
+++ envelope.c	2001/02/18 09:53:01	1.34
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: PCM data envelope analysis and manipulation
- last mod: $Id: envelope.c,v 1.33 2001/02/17 10:13:47 xiphmont Exp $
+ last mod: $Id: envelope.c,v 1.34 2001/02/18 09:53:01 xiphmont Exp $
 
  Preecho calculation.
 
@@ -29,6 +29,7 @@
 #include "scales.h"
 #include "envelope.h"
 #include "misc.h"
+#include "iir.c" /* Yes, ugly, but needed for inlining */
 
 /* Digital filter designed by mkfilter/mkshape/gencode A.J. Fisher */
 
@@ -173,12 +174,11 @@
     IIR_state *iir2=ve->iir+i*4+2;
     IIR_state *iir3=ve->iir+i*4+3;
     int flag=1;
-    
     for(j=ve->current;j<v->pcm_current;j++){
       filtered0[j]=IIR_filter(iir0,pcm[j]);
-      filtered1[j]=IIR_filter(iir1,pcm[j]);
-      filtered2[j]=IIR_filter(iir2,pcm[j]);
-      filtered3[j]=IIR_filter(iir3,pcm[j]);
+      filtered1[j]=IIR_filter_Band(iir1,pcm[j]);
+      filtered2[j]=IIR_filter_Band(iir2,pcm[j]);
+      filtered3[j]=IIR_filter_Band(iir3,pcm[j]);
       if(pcm[j])flag=0;
     }
     if(flag && ve->current+64<v->pcm_current){
@@ -202,31 +202,24 @@
   if(j<ve->lastmark)j=ve->lastmark;
   
   while(j+ve->winlength<=v->pcm_current){
+    if(j>=searchpoint)return(1);
+
+    ve->lastmark=j;
     for(i=0;i<ve->ch;i++){
       for(k=0;k<4;k++){
         float *filtered=ve->filtered[i*4+k]+j;
         float m=_ve_deltai(ve,filtered-ve->winlength,filtered);
       
-	if(m>ci->preecho_thresh[k]){
-	  /*granulepos++;*/
-	  ve->lastmark=j;
-	  return(0);
-	}
-	if(m<ci->postecho_thresh[k]){
-	  /*granulepos++;*/
-	  ve->lastmark=j;
-	  return(0);
-	}
-	/*granulepos++;*/
+	if(m>ci->preecho_thresh[k])return(0);
+	if(m<ci->postecho_thresh[k])return(0);
+
       }
     }
 
     j+=min(ci->blocksizes[0],ve->winlength)/2;
-
-    if(j>=searchpoint){
-      return(1);
-    }
+   
   }
+  if(j>=searchpoint)return(1);
  
   return(-1);
 }

1.15      +1 -3      vorbis/lib/envelope.h

Index: envelope.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/envelope.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- envelope.h	2001/02/17 10:13:47	1.14
+++ envelope.h	2001/02/18 09:53:01	1.15
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: PCM data envelope analysis and manipulation
- last mod: $Id: envelope.h,v 1.14 2001/02/17 10:13:47 xiphmont Exp $
+ last mod: $Id: envelope.h,v 1.15 2001/02/18 09:53:01 xiphmont Exp $
 
  ********************************************************************/
 
@@ -20,8 +20,6 @@
 
 #include "iir.h"
 #include "smallft.h"
-
-#define EORDER 16
 
 typedef struct {
   int ch;

1.9       +8 -12     vorbis/lib/iir.c

Index: iir.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/iir.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- iir.c	2001/02/15 19:05:45	1.8
+++ iir.c	2001/02/18 09:53:01	1.9
@@ -10,8 +10,8 @@
  *                                                                  *
  ********************************************************************
 
-  function: Direct Form I, II IIR filters, plus some specializations
-  last mod: $Id: iir.c,v 1.8 2001/02/15 19:05:45 xiphmont Exp $
+  function: Direct Form II IIR filters, plus some specializations
+  last mod: $Id: iir.c,v 1.9 2001/02/18 09:53:01 xiphmont Exp $
 
  ********************************************************************/
 
@@ -27,7 +27,7 @@
 void IIR_init(IIR_state *s,int stages,float gain, float *A, float *B){
   memset(s,0,sizeof(IIR_state));
   s->stages=stages;
-  s->gain=gain;
+  s->gain=1.f/gain;
   s->coeff_A=_ogg_malloc(stages*sizeof(float));
   s->coeff_B=_ogg_malloc((stages+1)*sizeof(float));
   s->z_A=_ogg_calloc(stages*2,sizeof(float));
@@ -51,11 +51,10 @@
 
 float IIR_filter(IIR_state *s,float in){
   int stages=s->stages,i;
-  float newA;
+  float newA= in*s->gain;
   float newB=0;
   float *zA=s->z_A+s->ring;
 
-  newA=in/=s->gain;
   for(i=0;i<stages;i++){
     newA+= s->coeff_A[i] * zA[i];
     newB+= s->coeff_B[i] * zA[i];
@@ -64,7 +63,6 @@
 
   zA[0]=zA[stages]=newA;
   if(++s->ring>=stages)s->ring=0;
-
   return(newB);
 }
 
@@ -72,14 +70,13 @@
    a typical bandpass to save multiplies */
 float IIR_filter_Band(IIR_state *s,float in){
   int stages=s->stages,i;
-  float newA;
+  int stages2=stages>>1;
+  float newA= in*s->gain;
   float newB=0;
   float *zA=s->z_A+s->ring;
 
-  newA=in/=s->gain;
-
   newA+= s->coeff_A[0] * zA[0];
-  for(i=1;i<(stages>>1);i++){
+  for(i=1;i<stages2;i++){
     newA+= s->coeff_A[i] * zA[i];
     newB+= s->coeff_B[i] * (zA[i]-zA[stages-i]);
   }
@@ -87,11 +84,10 @@
   for(;i<stages;i++)
     newA+= s->coeff_A[i] * zA[i];
 
-  newB+= newA-zA[0];
+  newB+=newA-zA[0];
 
   zA[0]=zA[stages]=newA;
   if(++s->ring>=stages)s->ring=0;
-
   return(newB);
 }
 

1.13      +2 -1      vorbis/lib/scales.h

Index: scales.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/scales.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scales.h	2001/02/02 03:51:57	1.12
+++ scales.h	2001/02/18 09:53:01	1.13
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: linear scale -> dB, Bark and Mel scales
- last mod: $Id: scales.h,v 1.12 2001/02/02 03:51:57 xiphmont Exp $
+ last mod: $Id: scales.h,v 1.13 2001/02/18 09:53:01 xiphmont Exp $
 
  ********************************************************************/
 
@@ -19,6 +19,7 @@
 #define _V_SCALES_H_
 
 #include <math.h>
+#include <os.h>
 
 /* 20log10(x) */
 #define DYNAMIC_RANGE_dB 200.f

1.5       +8 -7      vorbis/lib/books/res0_160_1024_1.vqh

Index: res0_160_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_1024_1.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_1024_1.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,12 +25,12 @@
 };
 
 static long _vq_lengthlist_res0_160_1024_1[] = {
-	 1, 4, 4, 4, 8, 8, 4, 8, 8, 5, 8, 8, 9,12,12, 8,
-	12,12, 4, 8, 8, 8,12,12, 8,12,12, 5, 8, 8, 9,12,
-	12, 8,12,12, 9,12,12,12,16,16,13,16,16, 8,12,12,
-	12,16,16,12,16,16, 5, 8, 8, 9,12,12, 8,12,12, 8,
-	12,12,12,16,16,12,16,16, 8,12,12,13,16,16,12,16,
-	16,
+	 1, 4, 4, 4, 7, 7, 4, 7, 7, 5, 8, 8, 8,11,11, 8,
+	11,11, 5, 8, 8, 8,11,11, 8,11,11, 5, 8, 8, 8,11,
+	11, 8,11,11, 8,12,11,11,15,15,11,15,15, 8,11,11,
+	11,15,15,11,15,15, 5, 8, 8, 8,11,11, 8,11,11, 8,
+	11,11,12,15,15,11,15,15, 8,11,11,11,15,15,11,15,
+	15,
 };
 
 static float _vq_quantthresh_res0_160_1024_1[] = {

1.4       +7 -6      vorbis/lib/books/res0_160_1024_2.vqh

Index: res0_160_1024_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_2.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_160_1024_2.vqh	2001/02/02 03:52:07	1.3
+++ res0_160_1024_2.vqh	2001/02/18 09:53:02	1.4
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
 };
 
 static long _vq_lengthlist_res0_160_1024_2[] = {
-	 3, 4, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 8, 8, 6,
-	 8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 5, 6, 6, 6, 8,
-	 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
-	 8, 9, 9, 8, 9, 9, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
-	 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8, 8, 9, 9, 8, 9,
+	 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 7, 8, 6,
+	 8, 7, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 6, 8,
+	 8, 6, 8, 7, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
+	 8, 9, 9, 8, 9, 9, 5, 6, 6, 6, 8, 7, 6, 8, 8, 6,
+	 8, 8, 8, 9, 9, 8, 9, 9, 6, 7, 8, 8, 9, 9, 7, 9,
          9,
 };
 

1.5       +34 -33    vorbis/lib/books/res0_160_1024_3.vqh

Index: res0_160_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_1024_3.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_1024_3.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -27,45 +28,45 @@
 
 static long _vq_lengthlist_res0_160_1024_3[] = {
          3, 5, 5, 7, 7, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 7,
-	 9, 9,13,13, 7, 9, 9,13,12, 5, 7, 6, 9, 9, 7, 8,
+	 9, 9,13,12, 7, 9, 9,13,12, 5, 7, 7, 9, 9, 7, 8,
          8,11,11, 7, 8, 8,11,11, 9,11,11,14,15, 9,11,11,
-	14,15, 5, 6, 6, 9, 9, 7, 8, 8,11,11, 6, 8, 8,11,
-	11, 9,11,11,15,15, 9,11,11,15,14, 7, 9, 9,12,12,
+	14,14, 5, 6, 6, 9, 9, 7, 8, 8,11,11, 6, 8, 8,11,
+	11, 9,11,11,15,14, 9,11,11,14,14, 7, 9, 9,13,12,
          9,11,11,15,15, 9,11,11,15,15,13,15,15,18,18,13,
-	15,15,18,17, 7, 9, 9,12,12, 9,11,11,15,15, 9,11,
-	11,15,15,13,15,15,18,20,13,15,15,19,18, 5, 7, 7,
+	15,15,19,18, 7, 9, 9,12,13, 9,11,11,14,14, 9,11,
+	11,15,15,13,15,15,18,18,13,15,15,18,18, 5, 7, 7,
          9, 9, 7, 8, 8,11,11, 7, 8, 8,11,11, 9,11,11,15,
         15, 9,11,11,15,15, 7, 8, 8,11,11, 8,10,10,13,13,
-	 8,10,10,13,13,11,13,13,17,17,11,13,13,17,16, 7,
+	 8,10,10,13,13,11,13,13,16,17,11,13,13,17,16, 6,
          8, 8,11,11, 8,10,10,13,13, 8,10,10,13,13,11,13,
-	13,17,17,11,13,13,17,17, 9,11,11,15,15,11,13,14,
-	17,17,11,13,13,17,16,15,16,18,18,20,15,17,17,20,
-	20, 9,11,11,15,15,11,13,13,17,17,11,13,13,17,17,
-	15,17,16,20,20,15,17,18,21,19, 5, 7, 6, 9, 9, 7,
+	13,17,16,11,13,13,17,17, 9,11,11,15,15,11,13,13,
+	17,17,11,13,13,17,17,15,17,16,20,20,15,17,17,21,
+	22, 9,11,11,15,15,11,13,13,16,16,11,13,13,17,17,
+	15,17,16,19,18,15,17,17,19,20, 5, 7, 6, 9, 9, 7,
          8, 8,11,11, 7, 8, 8,11,11, 9,11,11,15,15, 9,11,
         11,15,15, 7, 8, 8,11,11, 8,10,10,13,13, 8,10,10,
-	13,13,11,13,13,17,17,11,13,13,17,17, 6, 8, 8,11,
-	11, 8,10,10,13,13, 8,10,10,13,13,11,13,13,17,17,
-	11,13,13,17,17, 9,11,11,15,15,11,13,13,17,17,11,
-	13,13,17,17,15,17,17,21,20,15,17,17,19,21, 9,11,
-	11,15,15,11,13,13,17,17,11,13,13,17,17,15,17,16,
-	19,19,15,17,17,20,19, 7, 9, 9,13,13, 9,11,11,15,
-	15, 9,11,11,15,15,12,15,15,19,18,13,15,15,18,18,
-	 9,11,11,15,15,11,13,13,17,17,11,13,13,17,17,15,
-	17,17,19,20,15,18,17,20,20, 9,11,11,15,15,11,13,
-	13,18,17,11,13,13,17,17,15,17,17,21,20,15,18,17,
-	22,20,13,15,15,19,19,15,17,17,20,21,15,17,17,22,
-	21,19,20,20,21,21,18,20,20,22,22,13,15,15,18,18,
-	15,17,17,21,19,15,17,17,19,19,18,20,19,22,22,18,
-	20,19,22,22, 7, 9, 9,12,13, 9,11,11,15,15, 9,11,
-	11,15,15,12,15,15,18,19,13,15,15,18,19, 9,11,11,
-	15,15,11,13,13,17,17,11,13,13,17,18,15,17,17,20,
-	19,15,17,18,19,20, 9,11,11,15,15,11,13,13,17,17,
-	11,13,13,17,17,15,18,17,20,20,15,18,17,22,20,13,
-	15,15,19,19,15,17,17,20,21,14,17,17,20,20,18,20,
-	19,22,22,18,19,20,22,22,13,15,15,18,18,15,17,17,
-	21,20,15,17,17,22,21,19,20,22,22,22,18,21,19,20,
-	22,
+	13,13,11,13,13,17,16,11,13,13,16,17, 6, 8, 8,11,
+	11, 8,10,10,13,13, 8,10,10,13,13,11,13,13,16,17,
+	11,13,13,16,16, 9,11,11,15,15,11,13,13,17,17,11,
+	13,13,17,17,15,17,17,19,20,15,16,17,20,20, 9,11,
+	11,15,15,11,13,13,16,16,11,13,13,17,17,15,17,17,
+	20,19,15,17,16,19,19, 7, 9, 9,13,13, 9,11,11,15,
+	15, 9,11,11,15,15,13,15,15,18,19,13,15,15,19,18,
+	 9,11,11,15,15,11,13,13,16,16,11,13,13,16,16,15,
+	16,16,20,20,15,17,17,20,20, 9,11,11,15,15,11,13,
+	13,17,17,11,13,13,17,17,15,16,16,22,20,15,17,17,
+	20,20,13,15,15,18,18,14,17,17,20,20,15,17,16,21,
+	19,18,19,21,21,20,18,21,20,21,21,13,15,15,19,19,
+	15,17,16,19,19,15,17,17,20,20,18,21,19,20,21,19,
+	21,20,21,21, 7, 9, 9,13,13, 9,11,11,15,15, 9,11,
+	11,15,15,13,15,15,18,19,13,15,15,18,19, 9,11,11,
+	15,15,11,13,13,17,17,11,13,13,16,17,15,17,17,20,
+	19,15,17,17,19,20, 9,11,11,15,15,11,13,13,17,17,
+	11,13,13,17,16,15,16,16,20,20,15,17,17,21,20,13,
+	15,15,18,18,15,17,17,20,20,15,16,16,21,20,18,20,
+	19,21,21,18,19,21,20,21,13,15,15,18,18,15,16,16,
+	19,20,15,17,16,21,21,18,21,20,21,21,18,19,19,20,
+	20,
 };
 
 static float _vq_quantthresh_res0_160_1024_3[] = {

1.5       +33 -32    vorbis/lib/books/res0_160_1024_4.vqh

Index: res0_160_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_4.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_1024_4.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_1024_4.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,46 +27,46 @@
 };
 
 static long _vq_lengthlist_res0_160_1024_4[] = {
-	 5, 6, 6, 8, 8, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8,
+	 5, 6, 6, 8, 8, 6, 7, 7, 9, 9, 6, 7, 6, 9, 9, 8,
          9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 7,
-	 7,10,10, 7, 7, 7, 9, 9, 9, 9,10,12,12, 9, 9,10,
-	12,12, 6, 7, 7, 9, 9, 7, 7, 7, 9, 9, 7, 7, 7, 9,
-	 9, 9,10, 9,12,12, 9, 9, 9,12,12, 8, 9, 9,11,11,
+	 7, 9,10, 7, 7, 7, 9,10, 9,10,10,12,12, 9,10,10,
+	12,12, 6, 7, 7, 9, 9, 7, 7, 7,10, 9, 6, 7, 7,10,
+	 9, 9,10,10,12,12, 9,10, 9,12,12, 8, 9, 9,11,11,
          9,10,10,12,12, 9,10,10,12,12,11,12,12,14,14,11,
         12,12,14,14, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,12,14,14,11,12,12,14,14, 6, 7, 7,
+	10,12,12,11,12,12,14,14,11,12,12,15,14, 6, 7, 7,
          9, 9, 7, 7, 7,10,10, 7, 7, 7,10,10, 9,10,10,12,
-	12, 9,10, 9,12,12, 7, 7, 7,10,10, 7, 8, 8,10,10,
-	 7, 8, 8,10,10,10,10,10,13,13,10,10,10,13,13, 7,
-	 7, 7,10,10, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,
+	12, 9,10,10,12,12, 7, 7, 7,10,10, 7, 8, 8,10,10,
+	 7, 8, 8,10,10,10,10,11,13,13,10,11,10,13,13, 7,
+	 7, 7,10,10, 7, 8, 8,11,10, 7, 8, 8,10,10,10,10,
         10,13,13,10,10,10,13,13, 9,10,10,12,12,10,10,10,
-	13,13,10,11,10,13,13,12,13,13,15,15,12,13,13,15,
-	15, 9,10,10,12,12,10,10,10,13,13,10,10,10,13,13,
-	12,13,12,15,15,12,13,13,15,15, 6, 7, 7, 9, 9, 7,
+	13,13,10,11,10,13,13,12,13,13,15,16,12,13,13,15,
+	16, 9,10,10,12,12,10,10,10,13,13,10,10,11,13,13,
+	12,13,13,16,15,12,13,13,15,16, 6, 7, 7, 9, 9, 7,
          7, 7,10,10, 7, 7, 7,10,10, 9,10,10,12,12, 9,10,
         10,12,12, 7, 7, 7,10,10, 7, 8, 8,10,10, 7, 8, 8,
-	10,10,10,10,10,13,13,10,10,10,13,13, 7, 7, 7,10,
+	10,10,10,11,10,13,13,10,10,10,13,13, 7, 7, 7,10,
         10, 7, 8, 8,10,10, 7, 8, 8,10,10,10,10,10,13,13,
-	10,10,10,13,12, 9,10,10,12,12,10,10,10,13,13, 9,
-	10,10,13,13,12,13,13,15,15,12,13,13,15,15, 9,10,
-	10,12,12,10,10,10,13,13, 9,10,10,13,13,12,13,13,
-	15,15,12,13,12,16,15, 8, 9, 9,11,11, 9,10,10,12,
-	12, 9,10,10,12,12,11,12,12,15,15,11,12,12,15,14,
-	 9,10,10,12,12,10,10,10,13,13,10,11,10,13,13,12,
-	13,13,15,16,12,13,13,15,15, 9,10,10,12,12,10,10,
-	10,13,13,10,10,10,13,13,12,13,13,16,15,12,13,13,
-	15,15,11,12,12,15,14,12,13,13,15,15,12,13,13,16,
-	15,14,15,15,17,18,15,16,15,17,18,11,12,12,15,15,
-	12,13,13,16,15,12,13,13,15,15,14,16,15,17,17,15,
-	16,16,17,18, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
+	10,10,10,13,13, 9,10,10,12,12,10,11,11,13,13,10,
+	10,10,13,13,12,13,13,16,15,12,13,13,15,15, 9,10,
+	10,12,12,10,10,11,13,13, 9,10,10,13,13,12,13,13,
+	15,15,12,13,13,16,15, 8, 9, 9,11,11, 9,10,10,12,
+	12, 9,10,10,12,12,11,12,12,15,15,11,12,12,15,15,
+	 9,10,10,12,12,10,10,11,13,13,10,11,11,13,13,12,
+	13,13,15,16,12,13,13,16,15, 9,10,10,12,12,10,11,
+	10,13,13,10,11,11,13,13,12,13,13,16,15,12,13,13,
+	16,16,11,12,12,15,15,12,13,13,15,15,12,13,13,16,
+	15,14,15,16,17,17,15,16,15,18,18,11,12,12,15,15,
+	12,13,13,16,15,12,13,13,16,16,14,16,15,18,17,15,
+	15,15,18,18, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
         10,12,12,11,12,12,15,15,11,12,12,15,15, 9,10,10,
-	12,12,10,10,10,13,13,10,10,10,13,13,12,13,13,15,
-	16,12,13,13,15,15, 9,10,10,12,12,10,10,11,13,13,
-	10,10,10,13,13,12,13,13,15,15,12,13,13,16,15,11,
-	12,12,15,14,12,13,13,15,15,12,13,13,15,15,15,15,
-	15,17,17,14,15,15,17,17,11,12,12,14,14,12,13,13,
-	15,15,12,13,12,15,15,14,15,15,17,18,14,15,15,17,
-	17,
+	12,12,10,11,10,13,13,10,10,11,13,13,12,13,13,15,
+	16,12,13,13,16,16, 9,10,10,12,12,10,10,11,13,13,
+	10,10,10,13,13,12,13,13,16,16,12,13,13,15,16,11,
+	12,12,15,15,12,13,13,16,16,12,13,13,15,15,15,15,
+	15,18,18,15,15,15,17,17,11,12,12,14,15,12,13,13,
+	16,16,12,13,13,15,15,15,15,15,18,18,14,15,15,18,
+	16,
 };
 
 static float _vq_quantthresh_res0_160_1024_4[] = {

1.5       +13 -12    vorbis/lib/books/res0_160_1024_5.vqh

Index: res0_160_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_5.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_1024_5.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_1024_5.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist_res0_160_1024_5[] = {
-	 1, 4, 4, 6, 6, 7, 7, 8, 8,10,10,11,10, 4, 6, 6,
-	 8, 8, 9, 9,11,11,12,12,14,14, 4, 6, 5, 8, 8, 9,
-	 9,11,11,12,12,13,14, 6, 8, 8,11,11,11,11,13,13,
-	15,15,16,16, 6, 8, 8,11,11,11,11,13,13,15,14,16,
-	16, 7, 9, 9,12,11,14,13,15,15,16,16,17,17, 7, 9,
-	 9,12,12,13,14,15,15,16,16,17,17, 9,11,11,14,14,
-	15,15,16,16,17,17,18,18, 9,11,11,13,14,15,15,16,
-	16,17,18,18,18,10,13,13,15,15,17,17,17,17,19,18,
-	20,19,10,13,13,15,15,16,16,17,18,20,19,18,19,11,
-	14,14,16,16,17,17,18,19,20,19,20,19,11,14,14,16,
-	16,18,17,19,18,18,19,20,20,
+	 2, 3, 3, 6, 6, 7, 7, 8, 8,10, 9,11,11, 4, 5, 5,
+	 8, 8, 8, 8,11,11,12,12,14,13, 3, 5, 5, 8, 8, 8,
+	 8,11,11,12,12,13,13, 6, 8, 8,10,10,11,11,13,13,
+	15,15,16,16, 6, 8, 8,10,10,11,11,13,13,15,15,16,
+	16, 7, 9, 9,11,11,13,13,15,15,16,16,17,17, 7, 9,
+	 9,11,11,13,13,15,15,16,17,17,17, 8,11,11,13,13,
+	15,15,16,16,18,18,19,19, 8,11,11,13,13,15,15,16,
+	16,18,18,19,19,10,13,12,15,15,16,16,18,17,19,18,
+	20,21,10,12,12,15,15,16,17,17,17,18,19,19,19,11,
+	14,14,16,16,18,18,19,19,20,19,21,20,11,14,14,16,
+	16,17,17,19,18,20,19,21,21,
 };
 
 static float _vq_quantthresh_res0_160_1024_5[] = {

1.5       +10 -9     vorbis/lib/books/res0_160_1024_6.vqh

Index: res0_160_1024_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_6.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_1024_6.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_1024_6.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist_res0_160_1024_6[] = {
-	 3, 4, 4, 5, 5, 7, 7, 8, 8, 9, 9,10,10, 4, 4, 4,
+	 3, 4, 4, 5, 5, 6, 7, 8, 8, 9, 9,10,10, 4, 5, 4,
          6, 6, 7, 7, 9, 9,10,10,11,11, 4, 5, 4, 6, 6, 7,
-	 7, 9, 9,10,10,11,11, 6, 6, 6, 8, 8, 9, 9,10,10,
-	12,12,13,13, 5, 6, 6, 8, 8, 9, 9,10,10,12,12,13,
+	 7, 9, 9,10,10,11,11, 5, 6, 6, 8, 8, 9, 9,10,10,
+	12,12,13,13, 5, 6, 6, 8, 8, 9, 9,10,10,12,11,13,
         13, 7, 8, 8, 9, 9,11,11,12,12,13,13,14,14, 7, 8,
-	 8, 9, 9,11,11,12,12,13,13,14,14, 9, 9, 9,11,11,
+	 8, 9, 9,10,11,12,12,13,13,14,14, 8, 9, 9,11,11,
         12,12,13,13,14,14,15,15, 8, 9, 9,11,11,12,12,13,
-	13,14,14,16,15,10,11,11,12,12,13,13,14,14,15,15,
-	16,16,10,11,11,12,12,13,13,14,14,15,15,16,15,11,
-	12,12,13,13,14,14,15,15,16,16,17,17,11,12,12,13,
-	13,14,14,16,16,16,16,17,17,
+	13,14,14,15,15, 9,10,10,12,12,13,13,14,14,15,15,
+	16,16, 9,10,10,12,12,13,13,14,14,15,15,16,16,10,
+	12,12,13,13,14,15,15,15,16,16,17,17,10,12,11,13,
+	13,14,14,15,15,16,16,17,17,
 };
 
 static float _vq_quantthresh_res0_160_1024_6[] = {

1.5       +52 -51    vorbis/lib/books/res0_160_1024_7.vqh

Index: res0_160_1024_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_7.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_1024_7.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_1024_7.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -52,57 +53,57 @@
 static long _vq_lengthlist_res0_160_1024_7[] = {
          2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
          8, 9, 9, 9, 9,10,10,10,10,10,10,10,10, 4, 6, 6,
-	 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,11,11,
-	11,11,11,11,12,12,12,12,12,12, 4, 6, 6, 7, 7, 8,
-	 8, 9, 9, 9, 9,10,10,10,10,10,10,11,11,11,11,11,
-	11,12,12,12,12,12,12, 6, 7, 7, 8, 8, 9, 9,10,10,
-	11,11,11,11,11,11,11,12,12,12,12,12,13,13,13,13,
-	13,13,14,14, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,11,
-	11,11,11,12,12,12,12,12,12,13,13,13,13,13,13,14,
-	14, 7, 8, 8, 9, 9,10,10,11,11,12,12,12,12,12,12,
-	13,12,13,13,13,13,14,14,14,14,14,14,15,15, 7, 8,
-	 8, 9, 9,10,10,11,11,11,11,12,12,12,12,13,13,13,
-	13,13,14,14,14,14,14,15,14,15,15, 8, 9, 9,10,10,
-	11,11,12,12,12,12,13,13,13,13,14,13,14,14,14,14,
-	15,14,15,15,15,15,16,15, 8, 9, 9,10,10,11,11,12,
+	 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,11,10,
+	11,11,11,11,12,11,12,12,12,12, 4, 6, 6, 7, 7, 8,
+	 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,11,11,
+	11,11,11,12,12,12,12, 6, 7, 7, 9, 9, 9, 9,10,10,
+	11,11,11,11,11,11,12,12,12,12,12,12,13,13,13,13,
+	13,13,14,14, 6, 7, 7, 9, 9, 9, 9,10,10,11,11,11,
+	11,11,11,11,12,12,12,12,12,13,13,13,13,13,13,14,
+	13, 7, 8, 8, 9,10,10,10,11,11,12,12,12,12,12,12,
+	13,13,13,13,13,13,14,14,14,14,14,14,14,14, 7, 8,
+	 8,10, 9,10,10,11,11,12,12,12,12,12,12,13,13,13,
+	13,13,13,14,14,14,14,14,14,14,15, 8, 9, 9,10,10,
+	11,11,12,12,12,12,13,13,13,13,13,13,14,14,14,14,
+	15,14,15,15,15,15,15,15, 8, 9, 9,10,10,11,11,12,
         12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,15,
-	15,15,15,15,15, 9,10,10,11,11,12,12,12,13,13,13,
-	14,14,14,14,14,14,14,14,15,15,15,15,16,15,16,16,
-	16,15, 9,10,10,11,11,12,12,12,12,13,13,14,14,14,
-	14,14,14,15,15,15,15,15,15,15,15,16,15,16,16, 9,
-	10,10,12,11,12,12,13,13,14,14,14,14,14,14,15,15,
-	15,15,15,15,15,16,16,16,17,16,17,17, 9,10,10,12,
-	11,12,12,13,13,14,14,14,14,14,14,14,15,15,15,15,
-	15,16,16,16,16,16,16,17,16, 9,10,10,11,11,12,12,
-	13,13,14,14,14,14,15,15,15,15,15,15,16,16,16,16,
-	16,16,16,17,17,17, 9,10,10,11,11,12,12,13,13,14,
-	14,14,15,15,15,15,16,16,15,16,15,16,17,16,17,17,
-	16,16,17, 9,11,11,12,12,13,13,14,14,14,14,15,15,
-	15,15,16,15,16,16,16,17,17,16,17,17,16,16,18,18,
-	 9,11,11,12,12,13,13,14,14,14,14,15,15,15,16,15,
-	15,16,16,16,16,17,16,17,16,17,17,17,19,10,11,11,
-	12,13,13,13,14,14,15,15,15,15,16,15,16,16,16,16,
-	17,16,17,17,18,17,18,18,17,17,10,11,11,12,13,13,
-	13,14,14,15,15,15,15,15,16,16,16,16,16,16,17,16,
-	17,17,17,19,17,18,18,10,12,12,13,13,14,14,15,14,
-	15,15,15,16,16,16,16,16,17,17,17,17,17,18,18,17,
-	18,19,17,17,10,12,11,13,13,14,14,14,15,16,15,15,
-	15,15,16,16,16,17,17,17,18,17,18,17,17,18,18,18,
-	18,10,12,12,13,13,14,14,15,15,16,16,17,16,16,17,
-	17,17,17,17,17,18,17,17,18,18,19,17,19,18,10,12,
-	12,13,13,14,14,15,15,15,15,16,16,16,16,16,17,18,
-	17,17,17,18,18,18,18,18,17,18,18,11,12,12,14,14,
-	15,15,15,15,16,16,16,16,17,17,17,16,17,18,17,18,
-	17,17,18,18,17,19,19,18,11,13,12,14,14,15,15,15,
-	15,16,16,17,16,17,16,17,17,18,17,17,17,17,18,18,
-	17,18,18,19,18,11,13,13,14,14,15,15,15,15,15,16,
-	17,16,16,17,17,17,17,17,18,17,18,18,19,19,18,18,
-	18,20,11,13,13,14,14,15,15,15,16,17,16,17,17,16,
-	17,18,17,17,18,18,18,18,18,18,18,18,18,18,18,11,
-	13,13,14,14,16,15,17,16,16,17,17,17,17,18,17,18,
-	18,18,19,18,19,19,18,18,19,19,18,18,11,13,13,14,
-	14,15,16,16,16,16,16,17,16,17,17,17,17,18,17,19,
-	17,19,19,18,18,18,19,20,17,
+	15,15,15,15,15, 8,10,10,11,11,12,12,12,12,13,13,
+	13,13,13,14,14,14,14,14,15,15,15,15,15,15,15,15,
+	16,16, 8,10,10,11,11,12,12,12,12,13,13,14,13,14,
+	14,14,14,14,14,15,14,15,15,15,15,15,15,16,15, 9,
+	10,10,12,12,12,12,13,13,14,14,14,14,14,14,14,15,
+	15,15,15,15,16,16,15,16,16,16,16,16, 9,10,10,12,
+	12,12,12,13,13,14,14,14,14,14,14,15,15,15,15,15,
+	16,16,15,16,15,16,16,17,16, 8,10,10,12,11,12,12,
+	13,13,14,14,14,14,15,15,15,15,16,15,16,16,16,16,
+	16,16,16,16,16,17, 9,10,10,12,11,13,12,13,13,14,
+	14,14,14,15,15,15,15,15,16,15,16,16,16,16,16,17,
+	16,17,17, 9,11,11,12,12,13,13,14,14,14,14,15,15,
+	15,15,15,15,15,16,16,16,17,16,17,16,17,16,17,17,
+	 9,11,11,12,12,13,13,14,13,14,14,15,15,15,15,15,
+	16,16,15,16,16,17,17,16,17,17,17,17,17, 9,11,11,
+	13,12,13,13,14,14,15,15,15,15,16,16,16,16,16,16,
+	17,16,16,17,17,16,17,17,17,18, 9,11,11,12,13,14,
+	13,14,14,15,14,15,15,15,15,16,16,16,16,17,17,16,
+	17,16,17,18,17,18,17,10,11,12,13,13,14,14,15,15,
+	15,15,15,16,16,16,17,16,17,17,17,17,17,17,18,18,
+	17,18,18,18,10,12,11,13,13,14,14,15,14,15,15,16,
+	16,16,16,16,16,16,16,17,16,17,17,17,17,17,17,18,
+	18,10,12,12,13,13,14,14,15,15,15,16,16,16,16,16,
+	17,17,16,17,17,17,17,17,17,17,18,18,18,18,10,12,
+	12,13,13,14,14,15,15,16,15,16,16,16,16,17,17,17,
+	17,17,17,17,17,17,17,17,18,18,18,11,12,12,14,14,
+	15,15,15,15,16,16,16,16,17,17,17,17,17,17,17,17,
+	19,17,17,18,19,18,17,19,11,12,12,14,14,15,14,16,
+	15,16,15,16,16,16,17,17,16,18,17,17,17,18,17,18,
+	18,18,18,18,18,11,13,13,14,14,15,15,16,15,16,16,
+	16,16,17,17,17,17,17,17,17,18,17,17,18,17,19,18,
+	18,18,11,13,13,14,14,15,15,15,16,16,16,17,17,17,
+	17,17,17,17,17,18,18,18,17,18,18,18,17,19,19,11,
+	13,13,14,14,15,15,16,16,17,16,17,16,18,17,17,17,
+	17,17,17,17,19,18,19,18,18,18,18,19,11,13,13,15,
+	15,15,15,16,16,16,17,17,17,17,17,18,17,17,18,17,
+	18,18,17,18,19,18,18,18,18,
 };
 
 static float _vq_quantthresh_res0_160_1024_7[] = {

1.5       +7 -235    vorbis/lib/books/res0_160_1024_8.vqh

Index: res0_160_1024_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_8.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_1024_8.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_1024_8.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -82,239 +83,10 @@
 };
 
 static long _vq_lengthlist_res0_160_1024_8[] = {
-	 3, 4, 4, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8,
-	 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10, 9, 9, 9,
-	 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,11,
-	11,11,11,11,11,11,11,11,11,12,11,12,12, 5, 6, 6,
-	 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,10,10,10,
-	10,10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-	11,11,11,11,11,12,12,12,12,12,12,12,12,12,12,12,
-	12,13,13,13,13,13,13,13,13,13, 5, 6, 6, 7, 7, 8,
-	 8, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,
-	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-	11,12,11,12,12,12,12,12,12,12,12,12,12,13,12,13,
-	13,13,13,13,13,13,13, 6, 7, 7, 8, 8, 9, 9,10,10,
-	10,10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,13,13,
-	13,13,13,13,13,13,13,13,13,13,14,13,14,14,14,14,
-	14,14,14,14, 6, 7, 7, 8, 8, 9, 9,10,10,10,10,10,
-	10,11,11,11,11,11,11,12,11,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,13,
-	13,13,13,14,13,13,13,13,13,14,14,14,14,14,14,14,
-	14, 7, 8, 8, 9, 9,10,10,10,11,11,11,11,11,11,11,
-	12,12,12,12,12,12,12,12,13,13,13,13,13,13,12,13,
-	13,13,13,13,13,13,14,13,14,13,14,14,14,14,14,14,
-	14,14,14,14,14,14,15,15,15,15,15,14,15,15, 7, 8,
-	 8, 9, 9,10,10,10,10,11,11,11,11,11,11,12,12,12,
-	12,12,12,12,12,13,12,13,13,13,13,13,12,13,13,13,
-	13,13,13,13,13,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,15,14,15,15,15,15, 8, 9, 9,10,10,
-	11,11,11,11,12,12,12,12,12,12,12,12,13,13,13,13,
-	13,13,13,13,13,13,14,14,13,13,14,13,14,14,14,14,
-	14,14,14,14,15,14,14,14,15,15,15,15,15,14,15,15,
-	15,15,15,15,15,15,16,15, 8, 9, 9,10,10,11,11,11,
-	11,11,12,12,12,12,12,12,12,13,13,13,13,13,13,13,
-	13,13,13,14,13,13,13,13,13,14,13,14,14,14,14,14,
-	14,14,14,14,14,15,14,15,14,15,15,15,15,15,15,15,
-	15,15,15,16,15, 9,10,10,11,11,11,11,12,12,12,12,
-	12,12,13,13,13,13,13,13,14,13,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,15,15,15,15,
-	15,15,15,15,15,15,15,15,15,16,16,15,15,15,15,15,
-	16,16, 9,10,10,11,11,11,11,12,12,12,12,12,12,13,
-	13,13,13,13,13,13,13,14,14,14,14,14,13,14,14,14,
-	14,14,14,14,14,14,14,15,14,15,14,15,14,15,15,15,
-	14,15,15,15,15,15,15,16,15,16,15,16,16,16,15, 9,
-	10,10,11,11,12,12,12,12,13,13,13,13,13,13,13,14,
-	14,14,14,14,14,14,15,14,14,14,15,14,14,15,15,14,
-	15,14,15,14,15,14,15,15,15,15,15,15,15,15,16,15,
-	16,15,16,15,16,16,16,16,16,16,16,16, 9,10,10,11,
-	11,12,12,12,12,13,12,13,13,13,13,14,13,14,14,14,
-	14,14,14,14,14,15,14,15,14,14,14,14,14,15,15,15,
-	14,15,15,15,15,15,15,15,15,16,15,15,15,16,16,16,
-	16,16,16,16,16,16,16,16,16, 9,10,10,12,12,12,12,
-	13,13,13,13,13,14,14,13,14,14,14,14,14,14,15,14,
-	15,14,15,15,15,15,14,14,15,15,15,15,15,15,15,15,
-	15,15,15,15,16,16,16,15,16,16,16,16,16,16,16,16,
-	16,17,16,16,16,17, 9,11,10,11,12,12,12,13,13,13,
-	13,13,13,14,14,14,14,14,14,14,14,14,14,15,14,15,
-	15,15,15,14,15,15,15,16,15,15,15,15,15,15,15,16,
-	15,16,16,16,15,16,16,16,16,16,16,16,16,17,16,16,
-	16,17,16,10,11,11,12,12,13,13,13,13,13,14,14,14,
-	14,14,14,14,15,15,15,14,14,15,15,15,15,15,15,15,
-	15,15,15,15,15,15,15,16,15,16,16,15,16,16,16,16,
-	16,16,17,16,16,17,16,16,16,16,17,16,17,19,18,18,
-	10,11,11,12,12,13,13,13,13,14,13,14,14,14,14,14,
-	14,15,14,15,15,15,15,15,15,15,15,15,15,15,15,15,
-	15,15,15,15,15,16,15,16,16,16,16,16,16,17,16,16,
-	16,17,16,17,17,17,17,17,16,17,17,17,17,10,11,11,
-	12,12,13,13,13,13,14,14,14,14,14,14,14,15,15,15,
-	15,15,15,15,15,15,16,15,15,15,16,15,16,15,16,16,
-	16,15,16,16,15,16,16,16,16,16,16,17,17,17,16,16,
-	17,17,17,16,17,17,17,18,18,19,10,11,11,12,12,13,
-	13,13,13,14,14,14,14,14,14,15,15,15,15,15,15,15,
-	15,15,15,16,15,15,15,15,15,16,15,16,16,15,16,16,
-	15,16,16,16,15,16,16,16,16,17,17,17,16,17,17,16,
-	17,17,17,17,18,17,17,10,12,11,13,12,13,13,14,14,
-	14,14,14,14,14,14,15,15,15,15,15,15,15,15,16,16,
-	16,16,16,15,16,16,16,16,16,15,16,15,16,16,17,16,
-	17,16,17,16,17,17,17,17,18,16,17,17,17,17,17,17,
-	17,17,18,18,10,12,11,12,12,13,13,14,14,14,14,14,
-	14,15,14,15,14,15,15,16,15,16,15,15,15,16,15,16,
-	16,15,15,16,16,16,16,15,16,16,15,16,16,16,16,16,
-	16,17,16,17,16,16,16,16,17,18,17,18,16,17,18,17,
-	17,10,12,12,13,13,13,14,14,14,14,14,15,15,15,15,
-	15,15,15,15,15,15,16,16,16,16,16,16,16,16,15,16,
-	16,15,17,16,17,17,17,16,17,16,17,16,16,17,16,17,
-	17,18,16,17,18,17,18,17,18,17,18,17,18,17,11,12,
-	12,13,13,13,14,14,14,14,14,15,15,15,15,15,15,15,
-	15,15,15,15,16,15,15,16,15,16,16,16,16,16,16,16,
-	16,16,16,17,16,17,16,16,17,17,16,17,17,17,17,17,
-	16,17,17,17,17,18,18,17,17,18,18,11,12,12,13,13,
-	14,14,14,14,15,15,15,14,15,15,15,15,15,15,16,15,
-	17,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,17,16,17,17,17,17,19,17,17,17,17,18,
-	19,17,17,17,18,17,18,18,11,12,12,13,13,13,13,14,
-	14,15,14,15,15,15,15,15,15,16,15,16,16,16,16,17,
-	16,16,15,16,15,16,16,16,16,17,17,17,16,17,17,18,
-	16,16,17,17,17,17,16,16,17,17,20,17,17,17,18,17,
-	17,17,19,18,17,11,12,12,13,13,14,14,14,14,15,15,
-	15,15,15,15,15,15,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,17,16,16,17,16,17,17,16,16,19,17,
-	17,17,18,17,17,17,17,18,18,18,17,18,17,18,18,18,
-	18,18,11,12,12,13,13,14,14,14,15,15,15,15,15,15,
-	15,16,15,16,16,16,15,16,16,17,16,17,16,17,17,16,
-	16,16,16,17,17,16,16,17,17,17,17,17,16,17,16,17,
-	17,17,18,17,17,18,18,19,17,19,17,18,17,17,19,11,
-	13,13,13,13,14,14,15,15,15,15,15,15,16,15,16,16,
-	16,15,16,15,16,16,17,16,17,16,17,16,16,16,17,16,
-	16,17,16,17,18,16,18,17,17,17,17,17,17,18,19,18,
-	17,17,17,17,19,19,17,18,19,18,19,18,11,13,13,13,
-	13,14,14,15,15,15,15,16,16,16,15,16,15,16,16,17,
-	16,16,16,16,16,17,16,17,16,16,16,17,17,17,16,17,
-	17,16,17,17,17,17,17,18,17,17,17,17,17,19,17,18,
-	17,17,18,18,18,17,19,18,18,10,12,12,13,13,14,14,
-	14,14,15,15,15,15,15,15,16,16,16,15,16,16,16,16,
-	16,16,17,16,17,17,17,16,17,16,16,16,17,16,17,17,
-	17,17,17,17,17,17,19,18,18,18,17,17,18,18,19,19,
-	19,18,19,17,19,19,10,12,12,13,13,14,14,14,14,15,
-	14,15,15,16,15,16,16,15,16,16,16,16,16,16,16,17,
-	16,16,16,16,16,17,17,17,17,17,17,17,17,17,18,18,
-	17,18,18,17,17,17,17,17,18,17,18,19,19,18,17,19,
-	18,18,18,11,12,12,13,13,14,14,14,14,15,15,15,15,
-	16,16,16,16,16,16,16,16,17,17,16,16,17,17,16,16,
-	17,16,17,17,17,17,17,17,17,18,17,17,18,17,17,17,
-	18,17,18,18,18,18,19,17,19,19,18,17,19,18,18,18,
-	11,12,12,13,13,14,14,14,15,15,15,15,15,15,15,16,
-	16,16,16,15,16,16,16,17,16,17,16,16,17,16,16,16,
-	16,17,17,17,17,17,17,17,16,18,18,17,17,17,18,18,
-	18,18,20,18,19,18,18,18,18,19,17,19,18,11,12,12,
-	13,14,14,14,14,14,15,15,15,16,15,16,16,16,16,15,
-	16,16,16,16,17,16,17,16,17,16,18,17,17,16,17,17,
-	17,17,18,17,17,19,17,18,18,18,18,17,18,17,18,17,
-	19,18,18,18,18,18,19,18,18,19,11,12,12,13,13,14,
-	14,15,15,15,15,15,16,16,16,16,16,16,16,17,16,17,
-	16,16,17,17,17,17,17,17,17,17,17,18,17,19,18,17,
-	18,17,18,17,17,18,17,20,17,18,17,19,18,19,17,20,
-	19,18,18,17,18,20,18,11,12,13,14,14,15,15,15,15,
-	15,15,16,15,16,16,16,16,16,16,16,16,17,16,16,17,
-	18,16,16,17,17,17,17,16,18,17,19,17,18,17,18,17,
-	19,18,18,17,19,17,17,17,19,18,18,19,19,19,17,18,
-	19,18,18,20,11,13,13,13,14,14,14,15,15,16,16,16,
-	16,17,16,16,16,16,16,16,16,17,17,16,16,16,17,17,
-	16,17,17,17,17,17,17,17,18,17,18,17,17,17,18,19,
-	18,17,18,19,18,19,19,18,18,18,18,18,18,19,19,19,
-	18,11,13,13,14,14,15,15,15,15,15,16,16,16,16,16,
-	16,16,17,16,16,16,17,16,17,16,18,17,17,17,17,17,
-	17,17,17,18,17,18,18,17,17,19,18,18,17,18,19,18,
-	18,17,18,17,19,18,19,19,18,18,19,19,19,19,11,12,
-	13,14,14,14,15,15,15,15,15,16,16,16,16,17,16,16,
-	16,16,16,17,18,17,17,17,17,17,17,17,17,18,17,19,
-	17,18,17,18,17,18,17,17,18,17,18,18,18,19,18,17,
-	19,17,17,19,18,18,19,19,19,19,18,11,13,13,14,14,
-	15,15,15,16,15,16,17,17,17,16,17,16,16,16,16,17,
-	17,17,17,16,17,17,16,17,19,17,19,17,20,19,18,18,
-	20,17,18,19,18,18,18,18,18,19,19,18,19,17,19,18,
-	18,19,20,19,19,19,19,19,12,13,13,14,14,15,15,15,
-	16,16,16,16,16,16,16,16,16,16,17,17,16,17,17,17,
-	17,17,16,18,18,17,17,17,17,18,17,18,18,17,19,19,
-	17,18,18,19,18,18,19,18,18,19,19,18,18,19,18,19,
-	19,19,19,19,19,12,13,13,15,14,15,15,15,16,16,16,
-	17,17,17,16,16,17,17,16,17,17,17,17,17,17,17,17,
-	17,17,19,18,17,18,18,18,18,18,18,18,18,18,19,17,
-	19,18,19,20,19,18,20,18,18,19,19,18,19,18,18,18,
-	18,19,12,13,13,15,15,16,16,15,16,16,16,17,17,16,
-	16,16,17,17,16,17,17,17,17,17,17,19,18,17,18,18,
-	17,18,18,19,18,17,18,19,19,19,17,19,18,18,18,18,
-	18,19,18,18,18,18,19,19,19,19,19,19,18,18,19,12,
-	14,14,15,15,15,16,16,15,16,16,17,18,17,17,17,17,
-	17,17,19,16,17,17,19,17,19,17,18,17,19,18,17,18,
-	18,17,17,18,17,19,18,19,19,18,17,19,19,19,18,19,
-	19,19,19,18,18,18,20,18,19,19,20,19,12,13,14,15,
-	15,15,15,16,16,16,16,17,16,17,16,17,17,17,16,17,
-	17,17,17,18,17,17,17,18,18,17,18,18,18,18,19,17,
-	19,20,17,17,17,18,18,18,20,19,18,18,19,19,19,19,
-	19,19,19,18,19,20,20,18,19,12,14,14,15,15,15,16,
-	16,16,16,16,17,16,17,16,18,17,17,17,16,18,19,17,
-	18,18,18,17,18,17,18,18,18,17,17,17,18,18,18,19,
-	18,18,19,19,18,19,18,20,20,19,18,19,19,19,19,19,
-	19,18,19,19,19,19,12,14,14,15,15,16,16,16,16,16,
-	17,16,17,17,17,17,17,18,18,18,17,18,17,18,17,16,
-	17,17,17,18,19,19,19,17,17,18,19,19,18,19,18,19,
-	18,18,20,18,19,18,18,19,18,19,19,19,20,19,19,20,
-	20,19,19,13,14,14,15,15,16,16,16,16,17,16,16,17,
-	17,17,17,17,17,18,19,17,18,18,18,17,18,18,19,18,
-	19,18,20,18,17,18,18,19,18,19,18,19,19,19,18,18,
-	19,18,19,18,19,18,19,19,18,19,19,18,19,19,19,19,
-	12,14,14,15,15,16,16,16,17,17,17,17,17,17,17,17,
-	17,18,17,18,18,18,17,18,17,18,17,18,18,18,18,17,
-	18,19,19,20,19,18,20,18,18,19,19,18,18,19,19,19,
-	18,19,19,19,19,20,19,18,20,19,19,19,19,13,14,14,
-	15,15,16,16,16,16,17,16,17,17,17,16,17,17,17,17,
-	17,17,18,17,19,17,19,18,18,18,19,18,19,18,18,18,
-	18,18,19,19,20,19,18,18,19,19,19,19,19,19,19,18,
-	18,18,19,19,20,19,18,19,20,18,13,14,15,15,15,16,
-	16,16,17,17,17,17,17,18,17,17,17,17,18,17,17,18,
-	18,18,17,17,18,18,20,19,19,19,18,18,18,18,19,19,
-	19,19,18,19,18,19,19,19,20,20,19,19,19,19,18,18,
-	19,18,19,18,19,19,19,13,14,14,16,15,16,16,16,17,
-	17,17,18,17,18,17,18,17,18,17,18,17,18,18,17,19,
-	17,19,19,19,18,18,19,20,18,18,19,18,19,19,20,19,
-	19,18,19,19,19,19,18,19,19,18,20,18,19,19,20,19,
-	19,18,19,20,13,14,15,15,16,17,16,17,17,16,17,17,
-	17,18,16,18,18,18,19,17,18,17,18,18,18,19,18,18,
-	18,18,19,19,18,19,18,20,19,19,20,19,19,19,18,19,
-	18,20,19,19,18,19,19,19,20,20,20,20,20,20,19,20,
-	20,14,15,15,16,15,16,17,17,17,16,17,17,17,17,17,
-	17,18,18,18,18,17,18,18,18,19,18,18,18,19,18,19,
-	19,20,20,20,18,18,19,19,18,19,19,18,20,19,19,19,
-	18,19,20,19,18,19,19,20,20,18,19,19,19,19,14,15,
-	14,16,16,17,17,17,17,18,18,18,18,17,17,17,18,18,
-	18,18,18,18,18,19,18,18,18,19,18,18,18,18,19,19,
-	19,19,19,18,19,19,19,20,19,18,19,19,19,19,19,20,
-	19,18,19,20,19,19,19,19,20,20,19,14,15,15,16,17,
-	17,17,18,17,18,17,18,18,19,17,17,18,18,18,18,19,
-	19,18,18,20,19,18,19,18,20,19,18,19,18,19,18,18,
-	20,19,20,19,20,19,18,18,19,19,19,20,19,19,19,20,
-	19,20,19,20,20,19,19,20,14,15,15,16,16,17,17,16,
-	17,17,17,17,18,17,18,18,18,19,18,18,18,19,19,19,
-	20,18,19,19,19,19,18,19,18,18,18,18,19,19,18,19,
-	18,18,20,20,18,18,19,19,19,19,19,20,19,20,19,19,
-	19,20,19,20,19,14,15,15,17,16,17,17,18,17,17,17,
-	17,19,18,18,17,19,17,19,18,19,19,18,19,17,20,19,
-	20,19,18,18,18,19,20,17,19,18,19,18,19,18,19,20,
-	19,19,19,20,20,19,19,19,19,19,19,19,19,19,20,19,
-	19,20,14,15,15,17,17,17,16,17,17,17,17,18,18,18,
-	19,17,19,17,18,19,18,17,17,18,19,19,18,19,19,19,
-	18,19,18,18,18,19,19,20,19,20,19,19,19,20,20,19,
-	20,19,20,19,20,20,19,19,20,19,20,20,20,19,20,14,
-	15,16,16,16,17,17,17,19,20,18,18,17,18,18,18,17,
-	19,18,18,18,19,18,19,19,18,19,20,19,18,20,18,19,
-	19,19,19,18,20,19,19,20,20,19,19,19,19,19,20,20,
-	20,20,19,20,19,18,20,19,19,19,19,19,14,16,15,16,
-	16,17,17,17,18,17,17,17,19,18,19,19,17,19,19,20,
-	20,20,18,18,19,19,19,19,17,19,19,20,19,19,19,20,
-	19,19,19,19,19,20,18,19,19,20,19,19,18,20,20,20,
-	19,19,19,20,20,20,19,19,19,
+	 2, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7,
+	 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 8,
+	 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,11,11,11,11,
 };
 
 static float _vq_quantthresh_res0_160_1024_8[] = {
@@ -347,7 +119,7 @@
 };
 
 static static_codebook _vq_book_res0_160_1024_8 = {
-	2, 3721,
+	1, 61,
         _vq_lengthlist_res0_160_1024_8,
         1, -526516224, 1611661312, 6, 0,
         _vq_quantlist_res0_160_1024_8,

1.5       +362 -519  vorbis/lib/books/res0_160_1024_9.vqh

Index: res0_160_1024_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_9.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_1024_9.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_1024_9.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -18,766 +19,608 @@
 #include "codebook.h"
 
 static long _vq_quantlist_res0_160_1024_9[] = {
-	280,
-	279,
-	281,
-	278,
-	282,
-	277,
-	283,
-	276,
-	284,
-	275,
-	285,
-	274,
-	286,
-	273,
-	287,
-	272,
-	288,
-	271,
-	289,
-	270,
-	290,
-	269,
-	291,
-	268,
-	292,
-	267,
-	293,
-	266,
-	294,
-	265,
-	295,
-	264,
-	296,
-	263,
-	297,
-	262,
-	298,
-	261,
-	299,
-	260,
-	300,
-	259,
-	301,
-	258,
-	302,
-	257,
-	303,
-	256,
-	304,
-	255,
-	305,
-	254,
-	306,
-	253,
-	307,
-	252,
-	308,
-	251,
-	309,
-	250,
-	310,
-	249,
-	311,
-	248,
-	312,
-	247,
-	313,
-	246,
-	314,
-	245,
-	315,
-	244,
-	316,
-	243,
-	317,
-	242,
-	318,
-	241,
-	319,
-	240,
-	320,
-	239,
-	321,
-	238,
-	322,
-	237,
-	323,
-	236,
-	324,
-	235,
-	325,
-	234,
-	326,
-	233,
-	327,
-	232,
-	328,
-	231,
-	329,
-	230,
-	330,
-	229,
-	331,
-	228,
-	332,
-	227,
-	333,
-	226,
-	334,
-	225,
-	335,
-	224,
-	336,
-	223,
-	337,
-	222,
-	338,
-	221,
-	339,
         220,
-	340,
         219,
-	341,
+	221,
         218,
-	342,
+	222,
         217,
-	343,
+	223,
         216,
-	344,
+	224,
         215,
-	345,
+	225,
         214,
-	346,
+	226,
         213,
-	347,
+	227,
         212,
-	348,
+	228,
         211,
-	349,
+	229,
         210,
-	350,
+	230,
         209,
-	351,
+	231,
         208,
-	352,
+	232,
         207,
-	353,
+	233,
         206,
-	354,
+	234,
         205,
-	355,
+	235,
         204,
-	356,
+	236,
         203,
-	357,
+	237,
         202,
-	358,
+	238,
         201,
-	359,
+	239,
         200,
-	360,
+	240,
         199,
-	361,
+	241,
         198,
-	362,
+	242,
         197,
-	363,
+	243,
         196,
-	364,
+	244,
         195,
-	365,
+	245,
         194,
-	366,
+	246,
         193,
-	367,
+	247,
         192,
-	368,
+	248,
         191,
-	369,
+	249,
         190,
-	370,
+	250,
         189,
-	371,
+	251,
         188,
-	372,
+	252,
         187,
-	373,
+	253,
         186,
-	374,
+	254,
         185,
-	375,
+	255,
         184,
-	376,
+	256,
         183,
-	377,
+	257,
         182,
-	378,
+	258,
         181,
-	379,
+	259,
         180,
-	380,
+	260,
         179,
-	381,
+	261,
         178,
-	382,
+	262,
         177,
-	383,
+	263,
         176,
-	384,
+	264,
         175,
-	385,
+	265,
         174,
-	386,
+	266,
         173,
-	387,
+	267,
         172,
-	388,
+	268,
         171,
-	389,
+	269,
         170,
-	390,
+	270,
         169,
-	391,
+	271,
         168,
-	392,
+	272,
         167,
-	393,
+	273,
         166,
-	394,
+	274,
         165,
-	395,
+	275,
         164,
-	396,
+	276,
         163,
-	397,
+	277,
         162,
-	398,
+	278,
         161,
-	399,
+	279,
         160,
-	400,
+	280,
         159,
-	401,
+	281,
         158,
-	402,
+	282,
         157,
-	403,
+	283,
         156,
-	404,
+	284,
         155,
-	405,
+	285,
         154,
-	406,
+	286,
         153,
-	407,
+	287,
         152,
-	408,
+	288,
         151,
-	409,
+	289,
         150,
-	410,
+	290,
         149,
-	411,
+	291,
         148,
-	412,
+	292,
         147,
-	413,
+	293,
         146,
-	414,
+	294,
         145,
-	415,
+	295,
         144,
-	416,
+	296,
         143,
-	417,
+	297,
         142,
-	418,
+	298,
         141,
-	419,
+	299,
         140,
-	420,
+	300,
         139,
-	421,
+	301,
         138,
-	422,
+	302,
         137,
-	423,
+	303,
         136,
-	424,
+	304,
         135,
-	425,
+	305,
         134,
-	426,
+	306,
         133,
-	427,
+	307,
         132,
-	428,
+	308,
         131,
-	429,
+	309,
         130,
-	430,
+	310,
         129,
-	431,
+	311,
         128,
-	432,
+	312,
         127,
-	433,
+	313,
         126,
-	434,
+	314,
         125,
-	435,
+	315,
         124,
-	436,
+	316,
         123,
-	437,
+	317,
         122,
-	438,
+	318,
         121,
-	439,
+	319,
         120,
-	440,
+	320,
         119,
-	441,
+	321,
         118,
-	442,
+	322,
         117,
-	443,
+	323,
         116,
-	444,
+	324,
         115,
-	445,
+	325,
         114,
-	446,
+	326,
         113,
-	447,
+	327,
         112,
-	448,
+	328,
         111,
-	449,
+	329,
         110,
-	450,
+	330,
         109,
-	451,
+	331,
         108,
-	452,
+	332,
         107,
-	453,
+	333,
         106,
-	454,
+	334,
         105,
-	455,
+	335,
         104,
-	456,
+	336,
         103,
-	457,
+	337,
         102,
-	458,
+	338,
         101,
-	459,
+	339,
         100,
-	460,
+	340,
         99,
-	461,
+	341,
         98,
-	462,
+	342,
         97,
-	463,
+	343,
         96,
-	464,
+	344,
         95,
-	465,
+	345,
         94,
-	466,
+	346,
         93,
-	467,
+	347,
         92,
-	468,
+	348,
         91,
-	469,
+	349,
         90,
-	470,
+	350,
         89,
-	471,
+	351,
         88,
-	472,
+	352,
         87,
-	473,
+	353,
         86,
-	474,
+	354,
         85,
-	475,
+	355,
         84,
-	476,
+	356,
         83,
-	477,
+	357,
         82,
-	478,
+	358,
         81,
-	479,
+	359,
         80,
-	480,
+	360,
         79,
-	481,
+	361,
         78,
-	482,
+	362,
         77,
-	483,
+	363,
         76,
-	484,
+	364,
         75,
-	485,
+	365,
         74,
-	486,
+	366,
         73,
-	487,
+	367,
         72,
-	488,
+	368,
         71,
-	489,
+	369,
         70,
-	490,
+	370,
         69,
-	491,
+	371,
         68,
-	492,
+	372,
         67,
-	493,
+	373,
         66,
-	494,
+	374,
         65,
-	495,
+	375,
         64,
-	496,
+	376,
         63,
-	497,
+	377,
         62,
-	498,
+	378,
         61,
-	499,
+	379,
         60,
-	500,
+	380,
         59,
-	501,
+	381,
         58,
-	502,
+	382,
         57,
-	503,
+	383,
         56,
-	504,
+	384,
         55,
-	505,
+	385,
         54,
-	506,
+	386,
         53,
-	507,
+	387,
         52,
-	508,
+	388,
         51,
-	509,
+	389,
         50,
-	510,
+	390,
         49,
-	511,
+	391,
         48,
-	512,
+	392,
         47,
-	513,
+	393,
         46,
-	514,
+	394,
         45,
-	515,
+	395,
         44,
-	516,
+	396,
         43,
-	517,
+	397,
         42,
-	518,
+	398,
         41,
-	519,
+	399,
         40,
-	520,
+	400,
         39,
-	521,
+	401,
         38,
-	522,
+	402,
         37,
-	523,
+	403,
         36,
-	524,
+	404,
         35,
-	525,
+	405,
         34,
-	526,
+	406,
         33,
-	527,
+	407,
         32,
-	528,
+	408,
         31,
-	529,
+	409,
         30,
-	530,
+	410,
         29,
-	531,
+	411,
         28,
-	532,
+	412,
         27,
-	533,
+	413,
         26,
-	534,
+	414,
         25,
-	535,
+	415,
         24,
-	536,
+	416,
         23,
-	537,
+	417,
         22,
-	538,
+	418,
         21,
-	539,
+	419,
         20,
-	540,
+	420,
         19,
-	541,
+	421,
         18,
-	542,
+	422,
         17,
-	543,
+	423,
         16,
-	544,
+	424,
         15,
-	545,
+	425,
         14,
-	546,
+	426,
         13,
-	547,
+	427,
         12,
-	548,
+	428,
         11,
-	549,
+	429,
         10,
-	550,
+	430,
         9,
-	551,
+	431,
         8,
-	552,
+	432,
         7,
-	553,
+	433,
         6,
-	554,
+	434,
         5,
-	555,
+	435,
         4,
-	556,
+	436,
         3,
-	557,
+	437,
         2,
-	558,
+	438,
         1,
-	559,
+	439,
         0,
-	560,
+	440,
 };
 
 static long _vq_lengthlist_res0_160_1024_9[] = {
-	 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6,
+	 6, 6, 6, 6, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7,
          7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,11,11,
-	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-	11,11,11,11,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,13,12,13,13,
+	 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,12,12,11,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13,
         13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,14,13,14,13,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,15,14,15,14,14,15,
-	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
-	16,15,15,16,15,15,15,16,16,16,16,15,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,17,16,16,16,
-	16,16,16,16,17,16,16,16,16,17,16,17,17,16,17,17,
-	17,17,17,17,16,16,16,17,17,17,17,17,17,17,16,17,
-	18,17,18,17,17,18,17,17,17,17,17,17,17,18,18,17,
-	18,17,17,19,18,17,17,17,18,17,18,18,18,19,18,18,
-	19,18,18,18,18,18,18,18,18,18,17,18,18,19,19,18,
-	19,18,18,18,19,19,19,18,18,20,18,19,18,20,18,20,
-	19,19,18,18,20,18,19,20,20,19,19,18,19,19,19,19,
-	20,19,20,18,19,20,19,21,19,19,20,21,20,20,20,19,
-	19,19,20,20,19,20,20,21,21,20,20,21,21,21,20,19,
-	20,21,21,21,21,21,19,20,19,20,20,21,21,21,21,21,
-	21,19,20,21,21,20,21,21,21,21,21,21,19,21,20,21,
-	21,21,21,21,20,20,21,21,21,21,21,21,21,21,21,21,
-	21,21,21,21,21,21,21,20,21,21,21,21,21,20,21,21,
-	21,21,21,20,21,21,21,20,21,21,21,21,21,21,21,21,
-	20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
+	13,13,13,13,13,13,13,14,14,14,14,13,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,15,14,15,14,14,14,14,
+	14,14,14,15,15,15,15,14,15,15,15,15,15,15,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,17,15,16,15,
+	16,15,16,16,16,16,15,16,16,16,16,16,16,16,16,16,
+	16,16,17,16,17,17,16,16,17,17,17,16,16,17,16,17,
+	17,17,17,17,17,17,17,17,17,17,17,18,17,17,17,18,
+	17,18,19,17,18,17,20,18,18,18,18,18,18,18,17,18,
+	19,18,19,18,19,17,18,19,19,18,18,18,18,18,19,18,
+	19,19,18,19,18,20,19,19,19,20,19,18,18,18,19,20,
+	19,20,20,19,21,21,20,21,19,21,20,21,20,19,20,19,
+	19,20,19,20,20,19,21,21,19,21,19,21,20,20,20,19,
+	19,20,21,21,20,21,20,20,20,21,21,21,21,21,21,21,
+	21,21,20,21,21,20,21,21,21,21,21,21,21,20,19,21,
+	21,20,21,20,21,21,20,21,21,20,21,21,21,21,21,21,
+	21,21,21,21,20,21,21,21,21,21,21,21,21,21,21,21,
         21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-	21,21,21,21,21,20,21,21,21,21,21,21,21,21,21,21,
-	21,21,21,21,21,21,21,21,21,21,21,21,20,21,21,21,
-	21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-	21,
+	21,21,21,21,20,21,21,21,21,21,21,21,21,21,21,20,
+	21,21,21,21,21,21,21,21,20,
 };
 
 static float _vq_quantthresh_res0_160_1024_9[] = {
-	-279.5, -278.5, -277.5, -276.5, -275.5, -274.5, -273.5, -272.5, 
-	-271.5, -270.5, -269.5, -268.5, -267.5, -266.5, -265.5, -264.5, 
-	-263.5, -262.5, -261.5, -260.5, -259.5, -258.5, -257.5, -256.5, 
-	-255.5, -254.5, -253.5, -252.5, -251.5, -250.5, -249.5, -248.5, 
-	-247.5, -246.5, -245.5, -244.5, -243.5, -242.5, -241.5, -240.5, 
-	-239.5, -238.5, -237.5, -236.5, -235.5, -234.5, -233.5, -232.5, 
-	-231.5, -230.5, -229.5, -228.5, -227.5, -226.5, -225.5, -224.5, 
-	-223.5, -222.5, -221.5, -220.5, -219.5, -218.5, -217.5, -216.5, 
-	-215.5, -214.5, -213.5, -212.5, -211.5, -210.5, -209.5, -208.5, 
-	-207.5, -206.5, -205.5, -204.5, -203.5, -202.5, -201.5, -200.5, 
-	-199.5, -198.5, -197.5, -196.5, -195.5, -194.5, -193.5, -192.5, 
-	-191.5, -190.5, -189.5, -188.5, -187.5, -186.5, -185.5, -184.5, 
-	-183.5, -182.5, -181.5, -180.5, -179.5, -178.5, -177.5, -176.5, 
-	-175.5, -174.5, -173.5, -172.5, -171.5, -170.5, -169.5, -168.5, 
-	-167.5, -166.5, -165.5, -164.5, -163.5, -162.5, -161.5, -160.5, 
-	-159.5, -158.5, -157.5, -156.5, -155.5, -154.5, -153.5, -152.5, 
-	-151.5, -150.5, -149.5, -148.5, -147.5, -146.5, -145.5, -144.5, 
-	-143.5, -142.5, -141.5, -140.5, -139.5, -138.5, -137.5, -136.5, 
-	-135.5, -134.5, -133.5, -132.5, -131.5, -130.5, -129.5, -128.5, 
-	-127.5, -126.5, -125.5, -124.5, -123.5, -122.5, -121.5, -120.5, 
-	-119.5, -118.5, -117.5, -116.5, -115.5, -114.5, -113.5, -112.5, 
-	-111.5, -110.5, -109.5, -108.5, -107.5, -106.5, -105.5, -104.5, 
-	-103.5, -102.5, -101.5, -100.5, -99.5, -98.5, -97.5, -96.5, 
-	-95.5, -94.5, -93.5, -92.5, -91.5, -90.5, -89.5, -88.5, 
-	-87.5, -86.5, -85.5, -84.5, -83.5, -82.5, -81.5, -80.5, 
-	-79.5, -78.5, -77.5, -76.5, -75.5, -74.5, -73.5, -72.5, 
-	-71.5, -70.5, -69.5, -68.5, -67.5, -66.5, -65.5, -64.5, 
-	-63.5, -62.5, -61.5, -60.5, -59.5, -58.5, -57.5, -56.5, 
-	-55.5, -54.5, -53.5, -52.5, -51.5, -50.5, -49.5, -48.5, 
-	-47.5, -46.5, -45.5, -44.5, -43.5, -42.5, -41.5, -40.5, 
-	-39.5, -38.5, -37.5, -36.5, -35.5, -34.5, -33.5, -32.5, 
-	-31.5, -30.5, -29.5, -28.5, -27.5, -26.5, -25.5, -24.5, 
-	-23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, 
-	-15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, 
-	-7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 
-	0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 
-	8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 
-	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
-	24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 
-	32.5, 33.5, 34.5, 35.5, 36.5, 37.5, 38.5, 39.5, 
-	40.5, 41.5, 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 
-	48.5, 49.5, 50.5, 51.5, 52.5, 53.5, 54.5, 55.5, 
-	56.5, 57.5, 58.5, 59.5, 60.5, 61.5, 62.5, 63.5, 
-	64.5, 65.5, 66.5, 67.5, 68.5, 69.5, 70.5, 71.5, 
-	72.5, 73.5, 74.5, 75.5, 76.5, 77.5, 78.5, 79.5, 
-	80.5, 81.5, 82.5, 83.5, 84.5, 85.5, 86.5, 87.5, 
-	88.5, 89.5, 90.5, 91.5, 92.5, 93.5, 94.5, 95.5, 
-	96.5, 97.5, 98.5, 99.5, 100.5, 101.5, 102.5, 103.5, 
-	104.5, 105.5, 106.5, 107.5, 108.5, 109.5, 110.5, 111.5, 
-	112.5, 113.5, 114.5, 115.5, 116.5, 117.5, 118.5, 119.5, 
-	120.5, 121.5, 122.5, 123.5, 124.5, 125.5, 126.5, 127.5, 
-	128.5, 129.5, 130.5, 131.5, 132.5, 133.5, 134.5, 135.5, 
-	136.5, 137.5, 138.5, 139.5, 140.5, 141.5, 142.5, 143.5, 
-	144.5, 145.5, 146.5, 147.5, 148.5, 149.5, 150.5, 151.5, 
-	152.5, 153.5, 154.5, 155.5, 156.5, 157.5, 158.5, 159.5, 
-	160.5, 161.5, 162.5, 163.5, 164.5, 165.5, 166.5, 167.5, 
-	168.5, 169.5, 170.5, 171.5, 172.5, 173.5, 174.5, 175.5, 
-	176.5, 177.5, 178.5, 179.5, 180.5, 181.5, 182.5, 183.5, 
-	184.5, 185.5, 186.5, 187.5, 188.5, 189.5, 190.5, 191.5, 
-	192.5, 193.5, 194.5, 195.5, 196.5, 197.5, 198.5, 199.5, 
-	200.5, 201.5, 202.5, 203.5, 204.5, 205.5, 206.5, 207.5, 
-	208.5, 209.5, 210.5, 211.5, 212.5, 213.5, 214.5, 215.5, 
-	216.5, 217.5, 218.5, 219.5, 220.5, 221.5, 222.5, 223.5, 
-	224.5, 225.5, 226.5, 227.5, 228.5, 229.5, 230.5, 231.5, 
-	232.5, 233.5, 234.5, 235.5, 236.5, 237.5, 238.5, 239.5, 
-	240.5, 241.5, 242.5, 243.5, 244.5, 245.5, 246.5, 247.5, 
-	248.5, 249.5, 250.5, 251.5, 252.5, 253.5, 254.5, 255.5, 
-	256.5, 257.5, 258.5, 259.5, 260.5, 261.5, 262.5, 263.5, 
-	264.5, 265.5, 266.5, 267.5, 268.5, 269.5, 270.5, 271.5, 
-	272.5, 273.5, 274.5, 275.5, 276.5, 277.5, 278.5, 279.5, 
+	-219.5, -218.5, -217.5, -216.5, -215.5, -214.5, -213.5, -212.5, 
+	-211.5, -210.5, -209.5, -208.5, -207.5, -206.5, -205.5, -204.5, 
+	-203.5, -202.5, -201.5, -200.5, -199.5, -198.5, -197.5, -196.5, 
+	-195.5, -194.5, -193.5, -192.5, -191.5, -190.5, -189.5, -188.5, 
+	-187.5, -186.5, -185.5, -184.5, -183.5, -182.5, -181.5, -180.5, 
+	-179.5, -178.5, -177.5, -176.5, -175.5, -174.5, -173.5, -172.5, 
+	-171.5, -170.5, -169.5, -168.5, -167.5, -166.5, -165.5, -164.5, 
+	-163.5, -162.5, -161.5, -160.5, -159.5, -158.5, -157.5, -156.5, 
+	-155.5, -154.5, -153.5, -152.5, -151.5, -150.5, -149.5, -148.5, 
+	-147.5, -146.5, -145.5, -144.5, -143.5, -142.5, -141.5, -140.5, 
+	-139.5, -138.5, -137.5, -136.5, -135.5, -134.5, -133.5, -132.5, 
+	-131.5, -130.5, -129.5, -128.5, -127.5, -126.5, -125.5, -124.5, 
+	-123.5, -122.5, -121.5, -120.5, -119.5, -118.5, -117.5, -116.5, 
+	-115.5, -114.5, -113.5, -112.5, -111.5, -110.5, -109.5, -108.5, 
+	-107.5, -106.5, -105.5, -104.5, -103.5, -102.5, -101.5, -100.5, 
+	-99.5, -98.5, -97.5, -96.5, -95.5, -94.5, -93.5, -92.5, 
+	-91.5, -90.5, -89.5, -88.5, -87.5, -86.5, -85.5, -84.5, 
+	-83.5, -82.5, -81.5, -80.5, -79.5, -78.5, -77.5, -76.5, 
+	-75.5, -74.5, -73.5, -72.5, -71.5, -70.5, -69.5, -68.5, 
+	-67.5, -66.5, -65.5, -64.5, -63.5, -62.5, -61.5, -60.5, 
+	-59.5, -58.5, -57.5, -56.5, -55.5, -54.5, -53.5, -52.5, 
+	-51.5, -50.5, -49.5, -48.5, -47.5, -46.5, -45.5, -44.5, 
+	-43.5, -42.5, -41.5, -40.5, -39.5, -38.5, -37.5, -36.5, 
+	-35.5, -34.5, -33.5, -32.5, -31.5, -30.5, -29.5, -28.5, 
+	-27.5, -26.5, -25.5, -24.5, -23.5, -22.5, -21.5, -20.5, 
+	-19.5, -18.5, -17.5, -16.5, -15.5, -14.5, -13.5, -12.5, 
+	-11.5, -10.5, -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, 
+	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
+	4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 
+	12.5, 13.5, 14.5, 15.5, 16.5, 17.5, 18.5, 19.5, 
+	20.5, 21.5, 22.5, 23.5, 24.5, 25.5, 26.5, 27.5, 
+	28.5, 29.5, 30.5, 31.5, 32.5, 33.5, 34.5, 35.5, 
+	36.5, 37.5, 38.5, 39.5, 40.5, 41.5, 42.5, 43.5, 
+	44.5, 45.5, 46.5, 47.5, 48.5, 49.5, 50.5, 51.5, 
+	52.5, 53.5, 54.5, 55.5, 56.5, 57.5, 58.5, 59.5, 
+	60.5, 61.5, 62.5, 63.5, 64.5, 65.5, 66.5, 67.5, 
+	68.5, 69.5, 70.5, 71.5, 72.5, 73.5, 74.5, 75.5, 
+	76.5, 77.5, 78.5, 79.5, 80.5, 81.5, 82.5, 83.5, 
+	84.5, 85.5, 86.5, 87.5, 88.5, 89.5, 90.5, 91.5, 
+	92.5, 93.5, 94.5, 95.5, 96.5, 97.5, 98.5, 99.5, 
+	100.5, 101.5, 102.5, 103.5, 104.5, 105.5, 106.5, 107.5, 
+	108.5, 109.5, 110.5, 111.5, 112.5, 113.5, 114.5, 115.5, 
+	116.5, 117.5, 118.5, 119.5, 120.5, 121.5, 122.5, 123.5, 
+	124.5, 125.5, 126.5, 127.5, 128.5, 129.5, 130.5, 131.5, 
+	132.5, 133.5, 134.5, 135.5, 136.5, 137.5, 138.5, 139.5, 
+	140.5, 141.5, 142.5, 143.5, 144.5, 145.5, 146.5, 147.5, 
+	148.5, 149.5, 150.5, 151.5, 152.5, 153.5, 154.5, 155.5, 
+	156.5, 157.5, 158.5, 159.5, 160.5, 161.5, 162.5, 163.5, 
+	164.5, 165.5, 166.5, 167.5, 168.5, 169.5, 170.5, 171.5, 
+	172.5, 173.5, 174.5, 175.5, 176.5, 177.5, 178.5, 179.5, 
+	180.5, 181.5, 182.5, 183.5, 184.5, 185.5, 186.5, 187.5, 
+	188.5, 189.5, 190.5, 191.5, 192.5, 193.5, 194.5, 195.5, 
+	196.5, 197.5, 198.5, 199.5, 200.5, 201.5, 202.5, 203.5, 
+	204.5, 205.5, 206.5, 207.5, 208.5, 209.5, 210.5, 211.5, 
+	212.5, 213.5, 214.5, 215.5, 216.5, 217.5, 218.5, 219.5, 
 };
 
 static long _vq_quantmap_res0_160_1024_9[] = {
-	  559,  557,  555,  553,  551,  549,  547,  545,
-	  543,  541,  539,  537,  535,  533,  531,  529,
-	  527,  525,  523,  521,  519,  517,  515,  513,
-	  511,  509,  507,  505,  503,  501,  499,  497,
-	  495,  493,  491,  489,  487,  485,  483,  481,
-	  479,  477,  475,  473,  471,  469,  467,  465,
-	  463,  461,  459,  457,  455,  453,  451,  449,
-	  447,  445,  443,  441,  439,  437,  435,  433,
-	  431,  429,  427,  425,  423,  421,  419,  417,
-	  415,  413,  411,  409,  407,  405,  403,  401,
-	  399,  397,  395,  393,  391,  389,  387,  385,
-	  383,  381,  379,  377,  375,  373,  371,  369,
-	  367,  365,  363,  361,  359,  357,  355,  353,
-	  351,  349,  347,  345,  343,  341,  339,  337,
-	  335,  333,  331,  329,  327,  325,  323,  321,
-	  319,  317,  315,  313,  311,  309,  307,  305,
-	  303,  301,  299,  297,  295,  293,  291,  289,
-	  287,  285,  283,  281,  279,  277,  275,  273,
-	  271,  269,  267,  265,  263,  261,  259,  257,
-	  255,  253,  251,  249,  247,  245,  243,  241,
-	  239,  237,  235,  233,  231,  229,  227,  225,
-	  223,  221,  219,  217,  215,  213,  211,  209,
-	  207,  205,  203,  201,  199,  197,  195,  193,
-	  191,  189,  187,  185,  183,  181,  179,  177,
-	  175,  173,  171,  169,  167,  165,  163,  161,
-	  159,  157,  155,  153,  151,  149,  147,  145,
-	  143,  141,  139,  137,  135,  133,  131,  129,
-	  127,  125,  123,  121,  119,  117,  115,  113,
-	  111,  109,  107,  105,  103,  101,   99,   97,
-	   95,   93,   91,   89,   87,   85,   83,   81,
-	   79,   77,   75,   73,   71,   69,   67,   65,
-	   63,   61,   59,   57,   55,   53,   51,   49,
-	   47,   45,   43,   41,   39,   37,   35,   33,
-	   31,   29,   27,   25,   23,   21,   19,   17,
-	   15,   13,   11,    9,    7,    5,    3,    1,
-	    0,    2,    4,    6,    8,   10,   12,   14,
-	   16,   18,   20,   22,   24,   26,   28,   30,
-	   32,   34,   36,   38,   40,   42,   44,   46,
-	   48,   50,   52,   54,   56,   58,   60,   62,
-	   64,   66,   68,   70,   72,   74,   76,   78,
-	   80,   82,   84,   86,   88,   90,   92,   94,
-	   96,   98,  100,  102,  104,  106,  108,  110,
-	  112,  114,  116,  118,  120,  122,  124,  126,
-	  128,  130,  132,  134,  136,  138,  140,  142,
-	  144,  146,  148,  150,  152,  154,  156,  158,
-	  160,  162,  164,  166,  168,  170,  172,  174,
-	  176,  178,  180,  182,  184,  186,  188,  190,
-	  192,  194,  196,  198,  200,  202,  204,  206,
-	  208,  210,  212,  214,  216,  218,  220,  222,
-	  224,  226,  228,  230,  232,  234,  236,  238,
-	  240,  242,  244,  246,  248,  250,  252,  254,
-	  256,  258,  260,  262,  264,  266,  268,  270,
-	  272,  274,  276,  278,  280,  282,  284,  286,
-	  288,  290,  292,  294,  296,  298,  300,  302,
-	  304,  306,  308,  310,  312,  314,  316,  318,
-	  320,  322,  324,  326,  328,  330,  332,  334,
-	  336,  338,  340,  342,  344,  346,  348,  350,
-	  352,  354,  356,  358,  360,  362,  364,  366,
-	  368,  370,  372,  374,  376,  378,  380,  382,
-	  384,  386,  388,  390,  392,  394,  396,  398,
-	  400,  402,  404,  406,  408,  410,  412,  414,
-	  416,  418,  420,  422,  424,  426,  428,  430,
-	  432,  434,  436,  438,  440,  442,  444,  446,
-	  448,  450,  452,  454,  456,  458,  460,  462,
-	  464,  466,  468,  470,  472,  474,  476,  478,
-	  480,  482,  484,  486,  488,  490,  492,  494,
-	  496,  498,  500,  502,  504,  506,  508,  510,
-	  512,  514,  516,  518,  520,  522,  524,  526,
-	  528,  530,  532,  534,  536,  538,  540,  542,
-	  544,  546,  548,  550,  552,  554,  556,  558,
-	  560,
+	  439,  437,  435,  433,  431,  429,  427,  425,
+	  423,  421,  419,  417,  415,  413,  411,  409,
+	  407,  405,  403,  401,  399,  397,  395,  393,
+	  391,  389,  387,  385,  383,  381,  379,  377,
+	  375,  373,  371,  369,  367,  365,  363,  361,
+	  359,  357,  355,  353,  351,  349,  347,  345,
+	  343,  341,  339,  337,  335,  333,  331,  329,
+	  327,  325,  323,  321,  319,  317,  315,  313,
+	  311,  309,  307,  305,  303,  301,  299,  297,
+	  295,  293,  291,  289,  287,  285,  283,  281,
+	  279,  277,  275,  273,  271,  269,  267,  265,
+	  263,  261,  259,  257,  255,  253,  251,  249,
+	  247,  245,  243,  241,  239,  237,  235,  233,
+	  231,  229,  227,  225,  223,  221,  219,  217,
+	  215,  213,  211,  209,  207,  205,  203,  201,
+	  199,  197,  195,  193,  191,  189,  187,  185,
+	  183,  181,  179,  177,  175,  173,  171,  169,
+	  167,  165,  163,  161,  159,  157,  155,  153,
+	  151,  149,  147,  145,  143,  141,  139,  137,
+	  135,  133,  131,  129,  127,  125,  123,  121,
+	  119,  117,  115,  113,  111,  109,  107,  105,
+	  103,  101,   99,   97,   95,   93,   91,   89,
+	   87,   85,   83,   81,   79,   77,   75,   73,
+	   71,   69,   67,   65,   63,   61,   59,   57,
+	   55,   53,   51,   49,   47,   45,   43,   41,
+	   39,   37,   35,   33,   31,   29,   27,   25,
+	   23,   21,   19,   17,   15,   13,   11,    9,
+	    7,    5,    3,    1,    0,    2,    4,    6,
+	    8,   10,   12,   14,   16,   18,   20,   22,
+	   24,   26,   28,   30,   32,   34,   36,   38,
+	   40,   42,   44,   46,   48,   50,   52,   54,
+	   56,   58,   60,   62,   64,   66,   68,   70,
+	   72,   74,   76,   78,   80,   82,   84,   86,
+	   88,   90,   92,   94,   96,   98,  100,  102,
+	  104,  106,  108,  110,  112,  114,  116,  118,
+	  120,  122,  124,  126,  128,  130,  132,  134,
+	  136,  138,  140,  142,  144,  146,  148,  150,
+	  152,  154,  156,  158,  160,  162,  164,  166,
+	  168,  170,  172,  174,  176,  178,  180,  182,
+	  184,  186,  188,  190,  192,  194,  196,  198,
+	  200,  202,  204,  206,  208,  210,  212,  214,
+	  216,  218,  220,  222,  224,  226,  228,  230,
+	  232,  234,  236,  238,  240,  242,  244,  246,
+	  248,  250,  252,  254,  256,  258,  260,  262,
+	  264,  266,  268,  270,  272,  274,  276,  278,
+	  280,  282,  284,  286,  288,  290,  292,  294,
+	  296,  298,  300,  302,  304,  306,  308,  310,
+	  312,  314,  316,  318,  320,  322,  324,  326,
+	  328,  330,  332,  334,  336,  338,  340,  342,
+	  344,  346,  348,  350,  352,  354,  356,  358,
+	  360,  362,  364,  366,  368,  370,  372,  374,
+	  376,  378,  380,  382,  384,  386,  388,  390,
+	  392,  394,  396,  398,  400,  402,  404,  406,
+	  408,  410,  412,  414,  416,  418,  420,  422,
+	  424,  426,  428,  430,  432,  434,  436,  438,
+	  440,
 };
 
 static encode_aux_threshmatch _vq_auxt_res0_160_1024_9 = {
         _vq_quantthresh_res0_160_1024_9,
         _vq_quantmap_res0_160_1024_9,
-	561,
-	561
+	441,
+	441
 };
 
 static static_codebook _vq_book_res0_160_1024_9 = {
-	1, 561,
+	1, 441,
         _vq_lengthlist_res0_160_1024_9,
-	1, -518946816, 1611661312, 10, 0,
+	1, -520388608, 1611661312, 9, 0,
         _vq_quantlist_res0_160_1024_9,
         NULL,
         &_vq_auxt_res0_160_1024_9,

1.5       +13 -12    vorbis/lib/books/res0_160_1024aux.vqh

Index: res0_160_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024aux.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_1024aux.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_1024aux.vqh	2001/02/18 09:53:02	1.5
@@ -1,12 +1,13 @@
 /********************************************************************
  *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
  * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
+ * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
@@ -19,13 +20,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res0_160_1024aux[] = {
-	 2, 7,12,11,13,10,13,12,15,18, 5, 4, 7, 7, 9, 7,
-	 9,11,12,15,10, 6, 5, 6, 6, 8, 8,12,14,17, 9, 6,
-	 5, 5, 5, 5, 7, 9,12,16,13, 8, 6, 5, 5, 6, 7,12,
-	14,18, 9, 7, 7, 5, 6, 5, 7, 8,11,16,13, 9, 8, 7,
-	 6, 7, 6, 9,11,16,10, 9,10, 8, 9, 7, 7, 7, 9,13,
-	10,10,12,10,11, 8, 7, 7, 7,11,12,12,13,11,12,10,
-	 7, 6, 6,10,
+	 3, 7,12,11,15,10,14,11,14,19, 5, 4, 7, 7, 8, 8,
+	 9,10,12,19,10, 6, 5, 5, 6, 7, 8,12,14,18, 9, 6,
+	 5, 4, 5, 6, 6, 9,12,17,13, 8, 5, 5, 5, 6, 7,11,
+	14,18, 9, 7, 7, 5, 6, 5, 6, 7,11,18,13, 8, 7, 6,
+	 6, 6, 6, 8,10,17,10, 9,10, 8, 9, 6, 6, 6, 8,14,
+	10,10,12,10,11, 8, 7, 6, 7,12,13,12,13,11,13,10,
+	 7, 6, 6,12,
 };
 
 static static_codebook _huff_book_res0_160_1024aux = {

1.5       +7 -6      vorbis/lib/books/res0_160_128_1.vqh

Index: res0_160_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_128_1.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_128_1.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
 };
 
 static long _vq_lengthlist_res0_160_128_1[] = {
-	 3, 4, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 8, 8, 6,
-	 8, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8,
-	 8, 6, 8, 8, 6, 8, 8, 8, 9,10, 8,10, 9, 6, 8, 8,
-	 8,10, 8, 8, 9,10, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
-	 8, 8, 8,10, 9, 8, 8,10, 6, 8, 8, 8, 9,10, 8,10,
+	 3, 4, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 7, 8, 6,
+	 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 7, 8,
+	 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
+	 8, 9, 9, 8, 9, 9, 5, 6, 6, 6, 8, 8, 7, 8, 8, 6,
+	 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8, 8, 9, 9, 8, 9,
          9,
 };
 

1.5       +7 -153    vorbis/lib/books/res0_160_128_2.vqh

Index: res0_160_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_128_2.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_128_2.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -28,157 +29,10 @@
 };
 
 static long _vq_lengthlist_res0_160_128_2[] = {
-	 3, 5, 5, 7, 7,10,10, 5, 7, 7, 9, 8,12,11, 5, 7,
-	 7, 8, 9,12,12, 7, 9, 9,13,13,15,16, 7, 9, 9,12,
-	12,15,16,10,11,12,15,14,16,16,10,12,12,15,15,17,
-	17, 5, 7, 7, 9, 9,12,12, 7, 8, 8,10,10,13,13, 7,
-	 8, 8,10,10,13,14, 9,10,10,14,14,16,16, 9,10,10,
-	14,14,15,17,12,13,14,17,17,17,17,12,13,13,15,17,
-	17,16, 5, 7, 7, 8, 9,12,11, 7, 8, 8,10,10,13,13,
-	 7, 8, 8,10,10,14,12, 9,11,10,14,13,16,17, 9,11,
-	10,15,13,15,17,12,14,13,17,17,17,15,12,13,13,17,
-	17,17,17, 7, 9, 9,13,13,15,14, 9,10,10,14,14,16,
-	15, 9,10,10,14,14,16,17,12,14,16,16,15,17,17,13,
-	14,14,15,17,17,17,14,15,16,17,17,17,17,14,16,16,
-	16,17,17,17, 7, 9, 9,13,13,14,15, 9,10,10,13,14,
-	16,15, 9,10,10,15,14,17,15,13,14,13,17,16,16,17,
-	13,14,14,17,15,17,17,15,17,17,17,15,17,17,16,17,
-	16,16,17,17,17,10,13,13,15,14,17,16,12,14,13,17,
-	15,17,16,12,14,14,16,17,17,17,15,15,16,16,17,17,
-	17,14,16,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	16,16,17,17,16,17,10,12,13,15,15,17,17,12,15,13,
-	17,17,17,17,13,15,14,16,16,17,16,15,16,14,17,16,
-	17,17,14,14,16,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,16,17,17, 5, 7, 7, 9, 9,12,12, 7, 8,
-	 8,11,10,14,15, 7, 8, 8,10,11,13,13, 9,10,11,15,
-	16,16,17, 9,10,11,14,17,17,17,12,14,15,15,15,17,
-	17,12,14,14,15,17,17,17, 7, 9, 8,10,10,14,13, 8,
-	10,10,11,12,17,15, 8,10,10,12,11,14,15,10,12,12,
-	14,15,17,17,11,12,12,16,15,17,16,13,15,15,17,17,
-	17,17,14,16,17,17,17,17,17, 7, 8, 9,11,10,13,13,
-	 8,10,10,12,12,15,14, 8,10,10,12,12,14,14,11,12,
-	11,17,14,17,17,11,12,13,14,16,17,16,14,16,15,17,
-	17,16,17,15,15,15,17,15,17,17, 9,11,11,14,15,17,
-	17,10,12,12,16,17,15,15,11,13,12,17,15,17,17,14,
-	15,16,16,17,17,16,15,15,15,17,16,17,17,16,16,17,
-	17,17,17,17,17,17,17,17,17,17,17, 9,11,11,14,14,
-	16,17,10,13,12,17,14,16,15,11,13,12,15,15,15,17,
-	14,15,16,17,15,17,17,14,16,14,17,17,17,16,15,17,
-	16,17,16,17,17,17,17,16,17,17,16,17,13,14,14,17,
-	17,17,16,14,13,15,16,16,17,17,13,16,15,17,17,17,
-	17,16,17,17,15,17,17,17,17,17,17,17,17,17,17,17,
-	17,16,16,17,17,17,17,17,17,17,17,17,17,12,13,15,
-	17,17,17,17,13,14,15,16,16,17,17,15,16,15,17,17,
-	17,17,17,17,15,17,17,17,17,15,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17, 5, 7,
-	 7, 9, 9,12,12, 7, 9, 8,10,10,13,14, 7, 8, 8,10,
-	10,13,13, 9,10,10,15,14,16,15, 9,11,10,14,15,16,
-	17,12,13,14,15,16,17,17,12,15,14,15,16,17,17, 7,
-	 8, 8,10,10,15,14, 8,10,10,12,11,14,14, 8,10,10,
-	11,12,14,15,11,12,11,16,15,17,17,11,11,13,14,15,
-	17,17,14,17,16,16,17,17,17,14,16,14,16,17,17,17,
-	 7, 8, 8,10,10,14,13, 8,10,10,11,12,14,14, 8,10,
-	10,12,12,14,14,10,11,12,14,14,16,17,10,12,12,17,
-	14,17,17,15,15,16,17,17,16,17,14,15,15,17,17,17,
-	17, 9,11,10,14,14,17,17,10,12,12,17,14,17,17,10,
-	12,12,14,17,15,17,15,14,15,17,17,17,17,14,16,15,
-	17,17,17,17,16,16,17,17,17,16,17,17,17,17,17,17,
-	16,17, 9,11,11,15,13,15,16,11,12,12,14,17,16,17,
-	11,12,12,16,17,17,17,15,16,16,16,15,16,17,14,15,
-	15,17,15,17,17,17,15,17,16,16,17,16,17,17,17,17,
-	17,17,17,13,15,14,15,17,17,17,15,15,15,17,17,17,
-	17,14,15,17,17,17,16,17,17,17,17,17,17,17,17,17,
-	16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,13,14,17,16,17,17,17,14,16,15,17,17,
-	17,16,15,16,14,17,17,17,17,16,17,17,17,15,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17, 7, 9, 9,13,13,15,17, 9,11,11,14,
-	14,15,16, 9,11,11,15,14,16,17,14,15,14,17,17,16,
-	17,13,17,15,17,17,17,17,17,16,16,16,17,17,17,16,
-	17,15,17,17,17,17, 9,11,11,14,14,17,17,11,12,13,
-	15,17,17,16,11,13,12,17,15,16,17,16,16,17,17,17,
-	17,17,16,15,15,17,16,17,17,16,17,17,17,17,17,17,
-	17,17,17,15,17,17,17, 9,11,11,15,16,17,16,11,12,
-	12,16,16,16,17,11,12,13,17,16,16,17,14,17,17,17,
-	17,17,17,17,16,16,16,17,17,17,17,17,15,17,17,17,
-	17,17,17,16,17,17,17,17,13,16,14,16,14,17,16,15,
-	15,15,17,15,17,17,16,15,16,17,17,17,17,16,15,16,
-	16,17,17,17,17,17,17,17,17,17,17,17,17,17,16,17,
-	17,17,17,17,17,17,17,17,17,13,17,15,17,16,17,17,
-	14,15,15,17,17,17,17,17,16,16,17,16,17,17,15,16,
-	17,17,15,16,17,16,17,17,17,17,16,17,17,17,17,17,
-	16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,16,17,17,17,17,16,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,15,16,17,17,17,17,17,17,
-	17,17,17,17,17,17,16,17,17,17,17,17,17,16,17,17,
-	17,17,16,17,16,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17, 7, 9, 9,13,
-	14,15,15, 9,11,11,14,15,17,16, 9,11,11,15,15,17,
-	17,13,16,15,16,17,17,17,13,15,15,17,16,17,17,17,
-	17,17,17,17,17,17,17,17,16,17,17,17,17, 9,11,11,
-	14,15,17,16,11,12,12,17,15,17,17,10,13,13,16,15,
-	16,17,15,17,15,16,16,16,17,16,15,16,15,17,17,17,
-	17,17,17,17,17,17,16,17,17,16,17,17,17,17, 9,11,
-	11,14,15,15,17,11,12,12,14,16,17,17,11,12,12,17,
-	15,16,17,14,15,17,17,17,17,16,15,17,16,17,16,17,
-	17,16,17,17,17,17,17,17,16,17,16,17,17,16,17,14,
-	15,15,17,17,17,17,15,16,17,17,16,17,17,14,17,17,
-	17,17,17,17,16,17,17,17,17,17,17,17,17,17,15,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	15,14,14,17,15,16,17,15,17,16,17,17,17,17,15,17,
-	15,17,17,17,17,15,17,17,16,17,17,17,17,17,17,17,
-	16,17,17,16,17,17,17,17,17,17,17,17,17,17,15,17,
-	17,15,16,17,17,17,17,17,17,17,16,17,17,17,17,17,
-	17,16,17,17,17,17,17,16,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,16,17,16,17,17,17,17,17,17,17,17,17,17,17,
-	15,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,11,13,13,15,16,17,17,13,15,14,17,17,17,
-	17,13,14,14,17,17,17,17,17,17,17,17,17,17,17,15,
-	17,17,17,16,17,16,17,17,17,16,17,17,17,17,17,17,
-	17,17,17,17,12,14,17,15,17,17,17,17,15,15,16,17,
-	17,16,13,17,16,17,17,17,17,16,15,17,17,17,17,17,
-	16,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,12,15,15,17,17,17,17,14,17,15,17,
-	17,17,17,14,16,17,17,17,16,17,16,16,16,17,17,17,
-	17,16,17,17,17,17,17,17,17,16,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,16,17,17,17,17,
-	16,16,17,17,17,16,17,17,17,17,17,17,15,17,17,17,
-	17,17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,16,16,16,17,17,17,17,17,16,
-	16,17,17,17,17,17,17,17,16,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,16,17,17,17,17,17,17,
-	16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,11,13,13,17,17,17,
-	15,13,16,13,16,15,17,17,13,15,16,17,17,17,17,17,
-	17,17,17,17,17,17,16,16,17,17,17,17,17,17,17,16,
-	17,17,17,17,17,17,17,17,17,17,17,12,14,14,17,16,
-	17,16,16,16,17,17,15,17,17,16,17,15,16,17,17,17,
-	17,17,17,16,17,17,17,17,17,17,16,17,17,17,17,17,
-	17,17,17,17,17,17,16,15,17,17,17,17,12,15,14,17,
-	17,17,17,14,16,14,17,17,16,17,15,16,15,15,16,17,
-	17,17,17,17,17,17,17,17,16,17,16,17,17,17,17,17,
-	16,17,16,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,15,17,17,17,
-	17,17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,17,
-	16,17,17,17,17,17,14,17,17,17,17,17,16,16,17,17,
-	17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,
-	17,17,17,17,16,17,17,17,17,17,17,17,16,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,16,17,17,17,17,17,17,17,17,17,17,16,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	16,
+	 2, 3, 3, 5, 5, 8, 8, 4, 5, 5, 7, 7,10, 9, 3, 5,
+	 5, 7, 7, 9, 9, 6, 7, 7,10,10,13,13, 6, 7, 7,10,
+	10,13,13, 8,10,10,14,13,16,17, 8,10,10,13,13,15,
+	17,
 };
 
 static float _vq_quantthresh_res0_160_128_2[] = {
@@ -197,7 +51,7 @@
 };
 
 static static_codebook _vq_book_res0_160_128_2 = {
-	4, 2401,
+	2, 49,
         _vq_lengthlist_res0_160_128_2,
         1, -533200896, 1611661312, 3, 0,
         _vq_quantlist_res0_160_128_2,

1.5       +63 -62    vorbis/lib/books/res0_160_128_3.vqh

Index: res0_160_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128_3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_128_3.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_128_3.vqh	2001/02/18 09:53:02	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -52,67 +53,67 @@
 };
 
 static long _vq_lengthlist_res0_160_128_3[] = {
-	 3, 4, 4, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9,
-	 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5,
-	 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 9, 9, 5, 5,
-	 5, 6, 6, 7, 7, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7, 7, 7,
-	 8, 8, 9, 9, 9,10,10,10,10,10,10,10,11,11,11,11,
-	11,11,11,11,11,11,11,12,11,11,11,11, 7, 7, 7, 8,
-	 8, 9, 9, 9, 9,10,10,10,10,10,11,11,11,11,11,11,
-	11,11,11,11,11,10,11,11,11,11,11, 8, 8, 9,10,10,
-	11,10,11,11,12,11,12,12,12,12,12,12,13,12,12,13,
-	12,13,12,12,13,13,12,13,12,13, 8, 9, 9,10,10,10,
-	11,11,11,12,12,12,12,12,12,12,12,13,12,12,12,13,
-	13,12,13,12,12,12,13,12,12, 9, 9, 9,11,11,11,11,
-	12,13,12,13,13,13,14,13,13,14,13,13,13,14,15,14,
-	15,14,13,14,13,13,13,14, 9, 9, 9,11,11,11,11,12,
-	12,12,12,13,12,12,13,14,14,14,14,13,14,17,14,14,
-	14,13,13,13,17,14,14,10,11,10,12,12,12,13,13,13,
-	13,13,14,13,13,15,13,15,14,14,15,15,14,14,16,15,
-	15,15,14,14,16,16, 9,10,10,12,12,12,13,12,13,13,
-	15,13,13,13,13,13,14,14,15,15,14,16,15,16,15,14,
-	15,15,15,14,15,11,11,11,13,13,13,13,15,14,13,14,
-	13,15,13,15,15,14,15,14,15,14,15,16,15,15,15,15,
-	16,16,16,15,10,12,11,13,12,13,14,14,13,15,15,15,
-	13,15,13,15,15,14,15,15,15,15,14,14,16,16,15,15,
-	15,16,15,11,12,13,13,13,13,14,13,13,14,14,14,14,
-	13,16,16,15,16,15,15,16,15,15,16,15,16,15,15,16,
-	15,15,11,12,12,13,13,13,13,15,15,16,14,16,16,15,
-	14,15,15,16,14,15,15,15,16,16,16,15,16,15,16,16,
-	16,12,12,13,14,13,16,16,15,16,15,15,15,15,15,15,
-	14,14,14,14,15,15,16,15,16,15,16,16,16,16,16,16,
-	11,13,13,14,14,14,15,15,14,16,15,16,15,16,16,16,
-	14,16,14,16,15,15,16,16,16,15,15,15,14,15,16,13,
-	13,14,15,15,15,16,15,16,16,15,16,15,16,15,16,16,
-	16,16,15,15,15,15,16,15,15,16,16,16,15,16,13,14,
-	13,15,15,16,14,15,16,16,15,15,16,16,16,16,15,16,
-	16,16,16,16,15,16,16,15,16,16,16,16,16,13,14,13,
-	15,16,15,15,15,15,16,15,16,16,16,15,15,16,16,16,
-	15,16,16,16,15,16,16,16,15,16,16,16,13,12,15,15,
-	15,16,15,16,15,16,16,15,16,16,16,16,16,16,15,16,
-	15,16,16,16,16,16,16,16,15,16,16,13,15,14,15,15,
-	15,16,16,16,16,16,16,16,16,16,15,16,15,15,16,16,
-	16,16,16,16,16,16,16,16,16,16,13,15,14,15,15,15,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,16,
-	16,16,16,16,16,16,16,15,15,14,15,15,15,15,16,16,
-	16,15,16,16,16,16,16,16,15,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,14,15,15,16,15,16,15,16,
-	16,16,15,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,15,16,16,16,16,14,14,16,15,16,15,16,16,16,
-	16,16,16,16,16,16,16,16,15,16,16,16,16,16,16,16,
-	16,16,16,16,16,15,15,15,15,16,16,15,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,
-	16,16,16,16,16,14,15,15,16,16,15,16,16,16,16,16,
-	16,16,16,16,16,16,16,15,16,16,16,16,16,16,16,16,
-	16,16,16,16,15,16,16,15,16,15,16,16,16,16,16,16,
-	16,15,16,15,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,15,14,16,15,16,16,16,16,16,16,15,16,16,15,
-	16,16,16,16,15,16,16,16,16,16,15,16,16,16,16,16,
-	16,16,15,15,16,16,16,16,15,16,16,15,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,
-	16,
+	 3, 4, 4, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,
+	 9, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4,
+	 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 9, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4, 5,
+	 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 9, 8, 9, 8, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 7, 7, 7,
+	 9, 9,10,10,10,10,10,11,10,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11, 7, 7, 7, 9,
+	 9,10, 9,10,10,10,10,10,10,10,11,11,11,11,11,11,
+	12,11,11,11,11,11,11,11,11,11,11, 8, 9, 9,10,10,
+	11,11,11,11,12,12,12,12,12,13,12,12,12,13,13,13,
+	12,12,12,13,12,13,12,13,12,13, 8, 9, 9,11,10,11,
+	11,12,12,12,12,12,12,12,12,12,13,12,13,12,13,12,
+	12,12,12,12,12,13,13,13,12, 8,10,10,12,11,12,12,
+	13,14,13,14,14,14,14,14,13,14,14,14,13,15,13,14,
+	13,13,13,14,14,13,14,14, 8,10,10,11,11,12,13,13,
+	13,13,13,13,14,13,14,13,14,13,15,14,13,14,14,13,
+	14,14,14,13,14,14,13,10,11,11,12,13,13,14,13,14,
+	14,14,14,13,14,16,14,15,14,15,14,15,14,15,14,15,
+	15,15,14,14,15,15,10,11,11,13,12,13,13,13,14,14,
+	14,14,14,14,15,14,15,14,15,15,15,15,15,14,14,15,
+	14,15,15,17,14,11,12,12,14,13,13,14,14,15,14,14,
+	15,15,15,15,15,15,16,16,15,16,16,15,15,15,15,15,
+	15,14,15,15,11,12,12,13,13,14,15,15,15,15,15,15,
+	16,15,15,15,15,15,16,15,15,15,15,15,16,16,15,17,
+	15,17,16,11,13,13,15,15,15,14,14,16,15,16,15,16,
+	15,16,14,17,15,16,15,17,15,15,16,16,16,16,15,16,
+	17,17,11,12,12,14,14,14,15,16,15,16,15,16,16,15,
+	16,16,17,15,16,15,17,16,15,16,15,17,16,16,15,16,
+	16,12,13,13,15,15,14,16,16,15,16,15,16,16,16,16,
+	16,16,16,16,17,16,15,17,16,16,16,16,17,16,17,17,
+	12,14,13,15,15,15,14,17,16,16,16,15,16,17,16,16,
+	17,16,15,15,16,16,16,16,16,16,16,17,16,16,16,13,
+	14,14,16,15,17,16,16,17,15,16,15,17,16,17,17,17,
+	16,16,16,16,16,16,16,16,17,16,17,16,17,17,13,15,
+	14,15,15,17,16,17,17,17,16,16,16,16,17,16,16,17,
+	16,15,17,16,17,17,16,16,16,16,16,17,17,13,15,14,
+	16,16,17,16,17,16,16,16,15,17,17,17,16,16,16,17,
+	17,17,16,16,16,17,16,15,17,16,17,16,13,14,13,16,
+	16,16,16,17,16,16,16,16,16,16,16,17,17,17,17,16,
+	17,17,17,16,17,17,16,16,16,17,16,14,14,15,16,15,
+	16,16,17,17,16,17,17,16,16,17,17,17,17,16,16,17,
+	16,17,17,17,16,17,17,17,17,17,13,14,14,17,16,16,
+	17,16,16,16,17,17,17,15,16,16,17,16,17,16,16,16,
+	17,16,16,17,17,17,15,16,16,14,15,15,17,16,16,17,
+	17,17,17,17,16,16,16,17,17,17,17,17,17,17,17,17,
+	17,17,17,17,17,17,17,17,14,15,14,17,16,16,17,17,
+	17,16,17,17,17,17,17,17,17,17,17,17,17,16,17,17,
+	17,16,17,17,17,16,16,15,16,15,16,16,17,17,16,16,
+	17,17,17,17,17,17,17,17,15,17,17,16,17,17,16,17,
+	17,17,17,17,17,17,15,15,16,16,17,16,16,17,16,17,
+	17,17,17,17,17,17,17,17,17,17,17,16,15,17,17,17,
+	17,17,16,17,17,15,16,15,16,17,16,17,17,17,17,17,
+	17,17,17,16,17,16,17,17,17,17,17,17,17,17,17,17,
+	17,17,17,17,15,16,16,15,16,17,16,16,17,17,17,17,
+	16,17,16,16,17,16,17,17,17,16,16,17,16,16,16,17,
+	16,17,17,15,17,16,16,17,16,16,17,17,17,17,17,17,
+	16,17,17,17,17,17,17,17,17,17,17,17,17,16,17,16,
+	17,16,15,16,16,17,16,17,16,17,17,17,17,17,16,16,
+	17,16,17,16,16,17,17,16,16,17,17,17,16,17,17,17,
+	17,
 };
 
 static float _vq_quantthresh_res0_160_128_3[] = {

1.5       +7 -178    vorbis/lib/books/res0_160_128_4.vqh

Index: res0_160_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128_4.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_128_4.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_128_4.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -74,182 +75,10 @@
 };
 
 static long _vq_lengthlist_res0_160_128_4[] = {
-	 4, 4, 4, 6, 6, 7, 7, 7, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10, 8,
-	 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,
-	10,10,10,10,10, 4, 5, 5, 6, 7, 7, 7, 8, 8, 8, 8,
-	 9, 9, 9,10, 9, 9,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,10,
-	 9,10, 9,10,10,10,10,10,10,10, 4, 5, 5, 6, 7, 7,
-	 7, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,
-	10,10,10,10,10,10,10,11,10, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10, 7,
-	 7, 7, 9, 9,10, 9,10,10,11,11,11,11,11,11,11,11,
-	12,12,11,12,12,12,12,12,13,12,12,13,12,13,11,11,
-	11,11,11,11,11,11,11,11,11,12,11,11,12,12,11,12,
-	12,12,12,12, 7, 7, 7, 9, 9,10,10,10,10,10,10,11,
-	11,11,11,12,11,12,12,11,12,11,12,12,12,12,12,12,
-	12,12,12,11,11,11,11,11,11,11,11,11,11,11,11,11,
-	12,11,12,12,11,12,13,12,12, 9, 9, 9,10,11,11,11,
-	11,12,13,12,12,13,12,13,14,13,14,13,13,13,13,13,
-	13,16,13,13,14,14,13,14,13,13,13,13,12,12,12,13,
-	12,12,13,13,12,12,13,13,13,13,13,13,13,14, 9, 9,
-	 9,10,10,12,11,12,11,12,12,13,12,13,13,13,13,13,
-	14,14,13,14,13,14,13,14,13,13,14,15,13,12,12,13,
-	12,12,13,13,12,13,12,13,12,13,13,13,13,13,13,14,
-	14,13,14,10,10,11,11,12,12,12,13,13,14,13,13,14,
-	14,14,14,14,14,14,14,14,14,15,14,15,14,16,15,15,
-	14,15,15,14,14,13,14,13,14,13,15,14,13,13,14,14,
-	14,14,14,14,14,15,14,16,10,10,10,12,12,12,12,14,
-	13,14,13,13,13,14,13,14,14,14,15,14,14,14,15,15,
-	14,14,14,15,15,15,15,13,14,14,15,14,13,13,13,14,
-	14,14,15,14,14,14,13,14,14,15,14,15,14,11,11,12,
-	13,13,14,14,15,14,15,14,14,15,14,15,15,14,15,15,
-	15,16,15,15,15,15,15,14,15,15,15,15,14,14,15,14,
-	14,15,15,16,14,14,14,14,14,14,15,15,14,15,15,15,
-	15,15,11,11,11,13,13,13,13,15,13,14,14,15,15,14,
-	14,16,15,15,16,15,16,16,15,14,16,14,15,16,16,15,
-	15,14,15,14,14,14,14,14,14,14,14,15,15,16,14,15,
-	16,14,16,15,14,15,15,11,12,12,14,13,14,14,13,14,
-	15,14,16,15,15,14,16,16,15,16,16,15,15,15,15,16,
-	15,16,15,15,16,16,15,15,15,15,15,16,14,15,15,15,
-	14,15,15,16,15,15,15,15,16,15,16,16,11,12,12,13,
-	13,13,13,14,15,15,15,14,15,14,16,16,14,14,16,15,
-	15,16,16,15,15,15,15,15,16,16,16,16,14,15,14,15,
-	15,16,14,16,16,15,15,15,16,15,15,15,15,16,15,16,
-	16,12,12,13,14,13,14,14,14,15,15,16,16,15,15,14,
-	15,15,16,15,15,15,14,15,16,16,16,16,16,16,15,16,
-	15,15,15,15,14,16,15,15,15,15,16,15,16,15,16,16,
-	16,15,16,16,16,16,12,13,13,14,14,15,15,14,16,15,
-	15,15,15,16,15,15,15,15,15,16,16,15,15,15,15,16,
-	16,16,16,15,15,16,15,14,15,15,16,16,16,15,16,16,
-	16,16,15,16,15,16,15,16,16,16,16,12,13,14,15,14,
-	15,15,15,16,16,15,15,15,15,16,16,15,16,15,16,15,
-	16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,15,
-	16,15,15,16,16,15,16,16,16,15,16,16,16,16,15,16,
-	13,13,13,14,14,15,15,15,15,15,15,16,15,15,16,16,
-	16,16,16,15,16,16,16,16,15,16,15,16,16,16,16,14,
-	14,16,15,16,16,15,15,15,15,16,16,15,16,16,16,16,
-	16,16,15,16,16,13,13,14,15,14,15,15,16,16,15,16,
-	16,15,15,16,16,15,15,16,16,15,16,16,16,16,15,16,
-	16,16,16,15,16,15,16,16,15,16,16,15,16,16,15,16,
-	16,16,16,16,16,15,16,16,16,16,13,14,14,15,13,16,
-	14,15,16,16,15,16,15,15,15,16,15,16,16,16,16,15,
-	16,16,16,15,16,15,16,16,16,14,16,16,16,15,16,15,
-	15,15,16,16,15,16,16,16,16,16,16,16,16,16,16,14,
-	14,14,15,15,15,15,15,16,16,16,16,15,16,16,15,16,
-	16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,16,
-	15,16,16,16,16,16,15,16,15,16,16,15,16,16,16,15,
-	16,16,16,16,13,14,13,15,14,15,16,16,15,15,16,16,
-	15,15,15,16,16,16,15,16,16,15,15,16,16,15,16,16,
-	15,15,16,15,16,16,16,15,16,16,16,16,15,16,15,16,
-	15,16,16,16,16,15,16,16,15,14,14,14,15,14,16,15,
-	15,16,15,16,16,15,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,15,
-	16,15,16,16,16,16,16,16,15,16,16,16,16,16,14,15,
-	14,16,16,16,16,16,16,15,16,16,15,16,16,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,15,16,16,16,16,16,15,16,15,16,
-	16,16,16,14,14,14,15,15,16,16,16,15,16,16,16,16,
-	15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,15,16,16,16,15,15,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,14,14,15,16,15,15,16,16,
-	15,15,16,16,16,16,16,16,16,16,16,16,16,16,16,15,
-	16,16,15,15,16,16,16,16,15,15,16,16,16,16,16,16,
-	15,16,16,16,16,16,15,16,16,15,16,16,16,14,14,15,
-	15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,15,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,15,16,15,16,16,16,15,16,16,16,15,16,16,16,15,
-	16,16,15,15,15,16,15,15,16,16,16,16,16,15,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,15,16,16,16,15,15,16,16,15,16,16,16,16,16,
-	16,16,16,16,16,16,16,15,14,15,16,16,16,16,15,16,
-	16,16,16,16,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,16,16,
-	16,16,16,16,16,16,16,16,16,15,16,16,16,15,14,16,
-	15,15,16,15,16,16,15,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,15,16,16,16,16,16,16,16,16,16,16,15,
-	15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,15,16,15,16,15,16,15,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,15,15,15,14,16,15,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,15,16,16,16,16,16,16,16,16,15,
-	16,15,15,16,16,16,16,16,16,16,16,14,16,15,15,15,
-	15,15,16,16,15,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,16,16,
-	16,16,16,16,15,16,16,16,16,16,16,16,16,16,16,15,
-	14,16,14,15,16,16,16,16,16,15,16,16,16,16,16,15,
-	16,16,16,16,16,15,16,16,16,16,16,16,15,16,16,16,
-	16,15,16,16,16,16,16,16,16,16,15,16,16,16,16,16,
-	16,16,16,16,15,15,15,14,16,15,15,16,14,16,16,16,
-	16,16,16,15,16,16,16,15,16,16,16,16,16,16,16,16,
-	15,16,16,16,16,16,16,16,16,15,16,16,16,16,16,16,
-	16,16,16,15,15,16,16,16,16,16,14,14,15,16,16,16,
-	15,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,16,16,16,16,16,16,
-	16,16,15,16,16,16,16,16,16,16,16,16,16,16,16,15,
-	16,15,16,15,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,15,16,16,16,16,16,16,16,16,16,16,16,15,
-	16,16,16,16,14,16,16,16,16,15,16,16,16,16,16,16,
-	16,15,16,16,16,16,15,16,16,15,16,16,16,16,16,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,14,15,16,15,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,15,
-	16,16,15,16,15,16,16,16,16,16,15,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,15,16,15,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,15,15,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,15,14,15,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,15,16,16,16,16,16,16,16,
-	16,16,16,15,15,16,16,15,16,16,16,16,16,16,16,15,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	15,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,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,15,16,16,16,16,16,16,16,15,
-	16,16,15,15,16,15,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,
-	16,16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,
-	15,16,16,16,16,16,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,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,15,16,16,16,16,16,16,
-	15,16,16,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,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,15,16,16,16,16,16,
-	16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,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,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,
-	16,16,16,16,16,16,16,16,16,
+	 2, 2, 2, 5, 5, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 8,
+	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 7,
+	 7, 8, 7, 8, 8, 8, 8, 9, 8, 9, 8, 9, 9,10, 9,10,
+	10,10,10,10,10,
 };
 
 static float _vq_quantthresh_res0_160_128_4[] = {
@@ -280,7 +109,7 @@
 };
 
 static static_codebook _vq_book_res0_160_128_4 = {
-	2, 2809,
+	1, 53,
         _vq_lengthlist_res0_160_128_4,
         1, -526778368, 1611661312, 6, 0,
         _vq_quantlist_res0_160_128_4,

1.5       +21 -20    vorbis/lib/books/res0_160_128_5.vqh

Index: res0_160_128_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128_5.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_128_5.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_128_5.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -322,25 +323,25 @@
 };
 
 static long _vq_lengthlist_res0_160_128_5[] = {
-	 2, 2, 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8,
-	 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,10,10,10,10,10,10,10,11,11,11,13,12,
-	13,12,14,12,13, 8, 8, 8, 9, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9,10,10,10,10,10,10,10,11,10,10,11,11,11,11,
-	11,12,12,12,11,12,12,13,12,13,12,13,12,13,13,15,
-	13,13,12,13,13,14,13,16,13,14,14,13,14,14,14,14,
-	15,15,15,15,13,14,13,14,15,16,16,15,15,16,15,16,
-	15,16,16,16,15,16,16,15,16,16,16,16,16,16,16,15,
-	15,16,16,16,16,16,15,16,16,16,16,16,15,16,16,16,
-	16,16,15,16,16,16,16,15,16,16,16,16,16,16,16,16,
-	15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,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,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,15,
+	 2, 2, 3, 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8,
+	 8, 8, 8, 9, 8, 9, 8, 9, 9,10,10,11, 9,12,11,12,
+	11,13,12,13,12,13,13,12,13,15,13,15,14,14,13,15,
+	15,14,15,14,14, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,
+	10, 9,10, 9,10, 9,11,10,11,10,11,10,11,10,11,10,
+	11,11,11,10,12,11,13,10,11,11,12,11,11,11,12,12,
+	13,11,12,12,12,12,12,12,13,12,13,13,13,12,13,12,
+	13,13,15,12,13,13,14,12,13,13,13,13,14,12,14,14,
+	15,13,15,13,13,13,15,12,15,13,14,13,15,15,14,13,
+	15,14,15,15,14,14,13,13,13,15,15,15,13,14,15,13,
+	14,15,15,13,13,15,15,14,15,14,14,15,14,14,15,14,
+	15,15,15,14,13,15,14,15,15,15,15,15,14,14,15,14,
+	15,15,14,14,15,15,15,14,15,15,15,14,15,15,15,15,
+	14,15,15,15,15,15,13,15,15,15,14,15,15,15,15,15,
+	15,15,15,14,15,13,15,14,15,15,15,15,15,14,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,15,14,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	15,15,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,14,13,
 };
 
 static float _vq_quantthresh_res0_160_128_5[] = {

1.5       +20 -19    vorbis/lib/books/res0_160_128aux.vqh

Index: res0_160_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128aux.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_160_128aux.vqh	2001/02/02 03:52:07	1.4
+++ res0_160_128aux.vqh	2001/02/18 09:53:03	1.5
@@ -1,12 +1,13 @@
 /********************************************************************
  *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
  * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
+ * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
@@ -19,20 +20,20 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res0_160_128aux[] = {
-	13,15,16,16,16,16,13,11,13,16,16,15,11,11,12,15,
-	15,15,10,14,15,15,15,15,15,15,15,15,15,15,15,15,
-	15,15,15,15, 9,10,12,13,15,15, 5, 2, 5,13,15,15,
-	 7, 5, 8,12,15,15,10,11,13,15,15,15,15,15,15,15,
-	15,15,15,15,15,15,15,15, 9, 9,10,10,15,15, 5, 4,
-	 8,12,15,15, 9, 7,10,12,15,15,12,12,13,13,15,15,
-	15,15,15,15,15,15,15,15,15,15,15,15,11,11,12,12,
-	15,15, 9, 4, 5,10,15,15,12, 4, 6,10,15,15,13, 8,
-	 9,10,15,15,15,14,15,15,15,15,15,15,15,15,15,15,
-	12,13,15,15,15,15,13, 3, 5,10,15,15,15, 4, 5,10,
-	15,15,14, 8, 9,10,15,15,15,15,15,15,15,15,15,15,
-	15,15,15,15,13,14,15,15,15,15,15, 5, 6,12,15,15,
-	15, 6, 7,11,15,15,15,10,11,13,15,15,15,15,15,15,
-	15,15,15,15,15,15,15,15,
+	13,16,16,16,16,16,15,14,15,16,16,16,14,12,14,14,
+	15,16,10,12,14,13,16,16,15,16,15,16,16,16,16,16,
+	16,16,16,16,12,13,14,16,16,16, 8, 4, 7,13,16,16,
+	 7, 4, 7,12,16,16, 9, 9,11,13,16,16,14,16,16,16,
+	16,16,15,16,16,16,16,16,10,10,13,11,16,16, 5, 3,
+	 7,11,16,16, 5, 3, 7,13,16,16, 9, 9,12,14,16,16,
+	15,16,16,16,16,16,16,16,16,16,16,16,10,10,11,12,
+	16,16, 8, 3, 4,10,16,16, 8, 4, 5, 9,16,16,12, 8,
+	 9,12,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	14,13,15,16,16,16,13, 4, 5,10,16,16,14, 4, 6,10,
+	16,16,15, 9,10,13,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,14,16,16,16,16,16,14, 7, 8,12,16,16,
+	16, 7, 8,12,16,16,16,13,13,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,
 };
 
 static static_codebook _huff_book_res0_160_128aux = {

1.4       +6 -5      vorbis/lib/books/res0_192_1024_1.vqh

Index: res0_192_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_1.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_192_1024_1.vqh	2001/02/02 03:52:07	1.3
+++ res0_192_1024_1.vqh	2001/02/18 09:53:03	1.4
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -25,10 +26,10 @@
 
 static long _vq_lengthlist_res0_192_1024_1[] = {
          1, 4, 4, 4, 8, 8, 4, 8, 8, 5, 8, 8, 8,12,12, 8,
-	12,12, 4, 8, 8, 8,12,12, 8,12,12, 5, 9, 8, 9,12,
-	12, 8,12,12, 9,12,12,13,16,16,12,16,16, 8,12,12,
-	12,17,16,12,16,16, 5, 8, 8, 8,12,12, 8,12,12, 9,
-	12,12,12,16,16,12,16,16, 8,12,12,13,17,16,12,16,
+	12,12, 4, 8, 8, 8,12,12, 8,12,12, 5, 8, 8, 9,12,
+	12, 8,12,12, 9,12,12,12,16,16,12,17,16, 9,12,12,
+	12,16,16,12,17,16, 5, 8, 8, 8,12,12, 8,12,12, 9,
+	12,12,13,16,16,12,16,16, 8,12,12,13,16,16,12,16,
         15,
 };
 

1.5       +2 -1      vorbis/lib/books/res0_192_1024_2.vqh

Index: res0_192_1024_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_1024_2.vqh	2001/02/02 03:52:07	1.4
+++ res0_192_1024_2.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.5       +39 -38    vorbis/lib/books/res0_192_1024_3.vqh

Index: res0_192_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_1024_3.vqh	2001/02/02 03:52:07	1.4
+++ res0_192_1024_3.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -28,44 +29,44 @@
 static long _vq_lengthlist_res0_192_1024_3[] = {
          3, 5, 5, 7, 7, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 7,
          9, 9,12,12, 7, 9, 9,12,12, 5, 7, 6, 9, 9, 7, 8,
-	 8,11,11, 7, 8, 8,11,10, 9,11,11,14,14, 9,11,11,
-	13,14, 5, 6, 6, 9, 9, 7, 8, 8,11,10, 7, 8, 8,10,
-	10, 9,11,11,14,14, 9,11,11,14,14, 7, 9, 9,12,12,
-	 9,11,11,14,14, 9,11,11,14,14,12,14,14,17,17,12,
-	14,14,17,17, 7, 9, 9,12,12, 9,11,11,14,14, 9,11,
+	 8,10,10, 7, 8, 8,10,10, 9,11,11,14,14, 9,11,11,
+	14,14, 5, 6, 6, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,
+	10, 9,11,11,14,13, 9,11,11,14,14, 8, 9, 9,12,12,
+	 9,11,11,14,14, 9,11,11,14,14,13,14,14,17,18,13,
+	14,14,17,18, 8, 9, 9,12,12, 9,11,11,14,14, 9,11,
         11,14,14,12,14,14,17,17,12,14,14,17,18, 5, 7, 7,
-	 9, 9, 7, 8, 8,11,11, 7, 8, 8,11,11, 9,11,11,14,
-	14, 9,11,11,14,14, 7, 8, 8,11,11, 8,10,10,12,12,
-	 8,10,10,12,12,11,12,13,15,16,11,13,12,16,16, 7,
-	 8, 8,11,11, 8,10,10,12,12, 8,10,10,12,12,11,13,
-	12,16,16,11,12,12,15,16, 9,11,11,14,14,11,12,12,
-	16,16,11,13,12,16,16,14,16,16,19,19,14,16,16,19,
-	18, 9,11,11,14,14,11,12,12,15,15,11,12,12,15,16,
-	14,16,16,19,18,14,16,16,19,19, 5, 7, 6, 9, 9, 7,
-	 8, 8,11,11, 7, 8, 8,11,11, 9,11,11,14,14, 9,11,
-	11,14,14, 7, 8, 8,11,11, 8,10,10,12,12, 8,10,10,
-	12,12,11,13,13,16,16,11,12,12,16,16, 7, 8, 8,11,
-	11, 8,10,10,12,12, 8,10, 9,12,12,11,12,12,15,16,
-	11,12,12,15,15, 9,11,11,14,14,11,12,12,16,16,11,
-	12,12,16,16,14,16,16,18,19,14,16,15,18,20, 9,11,
-	11,14,14,11,12,12,15,16,11,12,12,16,15,14,16,16,
-	18,18,14,16,16,19,19, 7, 9, 9,12,12, 9,11,11,14,
-	14, 9,11,11,14,14,12,14,14,17,17,12,14,14,18,17,
-	 9,11,11,14,14,11,12,12,16,15,11,13,12,16,16,14,
-	16,16,18,19,14,16,16,18,18, 9,11,11,14,14,11,13,
-	12,16,15,11,13,12,16,16,14,16,16,20,18,14,16,16,
-	19,18,12,14,14,17,17,14,15,16,18,19,14,16,16,19,
-	18,17,19,18,20,21,18,20,18,21,20,12,14,14,17,17,
-	14,16,16,19,18,14,16,17,18,18,17,19,17,21,20,17,
-	19,19,20,20, 7, 9, 9,12,12, 9,11,11,14,14, 9,11,
-	11,14,14,12,14,14,17,17,12,14,14,17,17, 9,11,11,
-	14,14,11,12,12,16,16,11,12,12,16,16,14,16,16,19,
-	19,14,16,16,19,18, 9,11,11,14,14,11,12,13,15,16,
-	11,12,12,16,16,14,16,16,18,19,14,16,16,18,18,12,
-	14,14,17,17,14,15,16,19,19,14,15,16,18,20,18,18,
-	19,20,21,17,19,18,20,21,12,14,14,17,17,14,16,16,
-	19,18,14,16,16,20,18,17,20,19,21,20,17,18,18,20,
-	19,
+	 9, 9, 7, 8, 8,11,11, 7, 8, 8,10,11, 9,11,11,14,
+	14, 9,11,11,14,14, 7, 8, 8,11,11, 8, 9,10,12,12,
+	 8,10, 9,12,12,11,12,12,15,15,11,12,12,15,16, 7,
+	 8, 8,11,11, 8,10, 9,12,12, 8, 9, 9,12,12,11,12,
+	12,15,15,11,12,12,16,16, 9,11,11,14,14,11,12,13,
+	16,15,11,12,12,16,16,14,16,15,20,19,14,16,15,19,
+	18, 9,11,11,14,14,11,12,12,16,16,11,12,13,15,16,
+	14,16,15,19,18,14,16,16,19,19, 5, 7, 7, 9, 9, 7,
+	 8, 8,10,10, 7, 8, 8,10,11, 9,11,11,14,14, 9,11,
+	11,14,14, 7, 8, 8,11,10, 8,10, 9,12,12, 8, 9, 9,
+	12,12,11,12,12,15,15,11,12,12,15,15, 7, 8, 8,11,
+	10, 8, 9,10,12,12, 8, 9, 9,12,12,11,12,12,16,16,
+	11,12,12,16,15, 9,11,11,14,14,11,12,12,15,15,11,
+	12,12,16,15,14,16,15,19,18,14,15,16,19,18, 9,11,
+	11,14,14,11,12,13,16,15,11,12,12,16,15,14,16,16,
+	19,19,14,16,15,19,18, 7, 9, 9,12,12, 9,11,11,14,
+	14, 9,11,11,14,14,12,14,14,17,17,12,14,14,17,17,
+	 9,11,11,14,14,11,12,12,16,15,11,12,12,16,15,14,
+	15,16,19,19,14,17,15,21,19, 9,11,11,14,14,11,12,
+	12,16,15,11,12,12,15,16,14,16,16,19,18,14,16,16,
+	19,18,12,14,14,17,18,14,15,16,19,18,14,16,16,19,
+	18,18,19,18,20,20,17,19,19,20,21,12,14,14,17,17,
+	14,15,15,21,18,14,16,16,18,18,17,18,19,20,21,18,
+	20,18,21,21, 7, 9, 9,12,12, 9,11,11,14,14, 9,11,
+	11,14,14,12,14,14,17,17,12,14,14,17,18, 9,11,11,
+	14,14,11,12,12,16,16,11,12,12,15,16,14,16,15,19,
+	19,14,15,15,18,19, 9,11,11,14,14,11,12,12,16,15,
+	11,12,12,15,15,14,16,16,18,19,14,16,15,18,19,12,
+	14,14,17,17,14,16,15,18,20,14,16,16,18,18,16,18,
+	19,21,21,18,17,19,21,21,12,14,14,17,17,14,16,16,
+	18,20,14,16,15,18,18,17,18,20,19,21,17,18,19,21,
+	20,
 };
 
 static float _vq_quantthresh_res0_192_1024_3[] = {

1.5       +24 -23    vorbis/lib/books/res0_192_1024_4.vqh

Index: res0_192_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_4.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_1024_4.vqh	2001/02/02 03:52:07	1.4
+++ res0_192_1024_4.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -27,44 +28,44 @@
 
 static long _vq_lengthlist_res0_192_1024_4[] = {
          6, 7, 7, 8, 8, 7, 7, 7, 9, 9, 7, 7, 7, 9, 9, 8,
-	 9, 9,11,11, 8, 9, 9,11,11, 7, 7, 7, 9, 9, 7, 7,
+	 9, 9,10,10, 8, 9, 9,10,10, 7, 7, 7, 9, 9, 7, 7,
          7, 9, 9, 7, 7, 7, 9, 9, 9, 9, 9,11,11, 9, 9, 9,
         11,11, 7, 7, 7, 9, 9, 7, 7, 7, 9, 9, 7, 7, 7, 9,
          9, 9, 9, 9,11,11, 9, 9, 9,11,11, 8, 9, 9,11,11,
-	 9, 9, 9,11,11, 9, 9, 9,11,11,11,11,11,13,14,11,
+	 9, 9, 9,11,11, 9, 9, 9,11,11,11,11,11,13,13,11,
         11,11,13,13, 8, 9, 9,11,11, 9, 9, 9,11,11, 9, 9,
          9,11,11,11,11,11,13,13,11,11,11,13,13, 7, 7, 7,
          9, 9, 7, 8, 8, 9, 9, 7, 7, 7, 9, 9, 9, 9, 9,11,
-	11, 9, 9, 9,11,11, 7, 8, 7, 9, 9, 7, 8, 8,10,10,
-	 7, 8, 8,10,10, 9,10,10,12,12, 9,10,10,12,12, 7,
-	 8, 8, 9, 9, 8, 8, 8,10,10, 8, 8, 8,10,10, 9,10,
-	10,12,12, 9,10,10,12,12, 9,10, 9,12,11, 9,10,10,
-	12,12, 9,10,10,12,12,11,12,12,14,14,11,12,12,14,
+	11, 9, 9, 9,11,11, 7, 8, 7, 9, 9, 8, 8, 8,10,10,
+	 8, 8, 8,10,10, 9,10,10,12,12, 9,10,10,12,12, 7,
+	 8, 8, 9, 9, 7, 8, 8,10,10, 8, 8, 8,10,10, 9,10,
+	10,12,12, 9,10,10,12,12, 9, 9, 9,11,11, 9,10,10,
+	12,12, 9,10,10,12,12,11,12,12,13,14,11,12,12,14,
         14, 9, 9, 9,11,11, 9,10,10,12,12, 9,10,10,12,12,
-	11,12,12,14,13,11,12,12,14,14, 7, 7, 7, 9, 9, 7,
-	 8, 7, 9, 9, 7, 8, 7, 9, 9, 9, 9, 9,11,11, 9, 9,
-	 9,11,11, 7, 8, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,
+	11,12,12,14,13,11,12,12,13,14, 7, 7, 7, 9, 9, 7,
+	 7, 7, 9, 9, 7, 8, 7, 9, 9, 9, 9, 9,11,11, 9, 9,
+	 9,11,11, 7, 8, 7, 9, 9, 8, 8, 8,10,10, 8, 8, 8,
         10,10, 9,10,10,12,12, 9,10,10,12,12, 7, 7, 7, 9,
          9, 7, 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12,
-	 9,10,10,12,12, 9, 9, 9,11,11, 9,10,10,12,12, 9,
-	10,10,12,12,11,12,12,14,14,11,12,12,14,14, 9, 9,
+	 9,10,10,12,11, 9, 9, 9,11,11, 9,10,10,12,12, 9,
+	10,10,12,12,11,12,12,14,14,11,12,12,13,13, 9, 9,
          9,11,11, 9,10,10,12,12, 9,10,10,12,12,11,12,12,
-	14,14,11,12,12,14,13, 8, 9, 9,11,11, 9,10,10,12,
-	11, 9, 9, 9,11,11,11,11,12,13,13,11,11,11,13,13,
-	 9, 9, 9,12,11, 9,10,10,12,12, 9,10,10,12,12,11,
+	14,14,11,12,12,14,13, 8, 9, 9,11,11, 9, 9, 9,11,
+	11, 9, 9, 9,11,11,11,11,11,13,13,11,11,11,13,13,
+	 9, 9, 9,11,11, 9,10,10,12,12, 9,10,10,12,12,11,
         12,12,14,14,11,12,12,14,14, 9, 9, 9,11,11, 9,10,
         10,12,12, 9,10,10,12,12,11,12,12,14,14,11,12,12,
-	14,14,11,12,11,13,13,11,12,12,14,14,11,12,12,14,
-	14,13,14,14,15,16,14,14,14,16,16,11,11,11,13,13,
-	11,12,12,14,14,11,12,12,14,14,13,14,14,17,15,13,
-	14,14,16,16, 8, 9, 9,11,11, 9, 9, 9,11,11, 9, 9,
-	 9,11,11,11,11,11,13,13,11,11,11,14,13, 9, 9, 9,
+	14,14,11,11,11,13,13,11,12,12,14,14,11,12,12,14,
+	13,13,13,14,15,15,13,14,14,15,16,11,11,11,13,13,
+	11,12,12,14,14,11,12,12,13,14,13,14,13,15,15,13,
+	14,14,15,15, 8, 9, 9,11,11, 9, 9, 9,11,11, 9, 9,
+	 9,11,11,11,11,11,13,13,11,11,11,13,13, 9, 9, 9,
         11,11, 9,10,10,12,12, 9,10,10,12,12,11,12,12,14,
         14,11,12,12,14,14, 9, 9, 9,11,11, 9,10,10,12,12,
          9,10,10,12,12,11,12,12,14,14,11,12,12,14,14,11,
         11,11,13,13,11,12,12,14,14,11,12,12,14,14,13,14,
-	14,16,17,13,14,14,15,16,11,11,11,13,13,11,12,12,
-	14,14,11,12,12,14,14,13,14,14,15,16,13,14,14,16,
+	14,16,16,13,13,14,15,15,10,11,11,13,13,11,12,12,
+	14,14,11,12,12,14,13,13,14,14,15,15,13,14,13,16,
         15,
 };
 

1.5       +13 -12    vorbis/lib/books/res0_192_1024_5.vqh

Index: res0_192_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_5.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_1024_5.vqh	2001/02/02 03:52:07	1.4
+++ res0_192_1024_5.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist_res0_192_1024_5[] = {
-	 2, 4, 3, 6, 5, 7, 7, 8, 8,10,10,11,11, 4, 5, 5,
-	 7, 7, 8, 8,10,10,12,12,13,13, 3, 5, 5, 7, 7, 8,
-	 8,10,10,12,12,13,13, 6, 7, 7, 9, 9,11,10,12,13,
-	14,14,15,15, 6, 7, 7, 9, 9,10,10,13,13,14,14,15,
-	15, 7, 8, 8,11,10,13,13,14,14,15,15,16,16, 7, 8,
-	 8,11,11,13,13,14,14,15,15,17,16, 8,10,10,13,13,
-	14,14,16,16,16,16,18,17, 9,11,10,13,13,14,14,16,
-	16,16,17,17,17,10,12,12,14,14,15,15,17,16,17,18,
-	19,18,10,12,12,14,14,16,15,16,16,18,17,18,20,11,
-	13,13,15,15,16,17,18,17,18,19,19,19,11,13,13,15,
-	15,16,16,17,17,18,18,19,20,
+	 2, 3, 3, 5, 5, 7, 7, 9, 9,10,10,11,11, 4, 5, 5,
+	 7, 7, 8, 8,11,11,12,12,14,14, 4, 5, 5, 7, 7, 8,
+	 8,11,11,13,12,14,14, 6, 7, 7, 9, 9,11,11,13,13,
+	15,15,16,16, 6, 7, 7, 9, 9,11,11,13,13,15,15,16,
+	16, 7, 9, 8,11,11,13,13,15,15,16,16,17,18, 7, 8,
+	 8,11,11,13,13,15,15,17,17,18,18, 9,11,11,13,13,
+	15,15,17,17,18,18,18,18, 9,11,11,13,13,15,15,17,
+	17,18,18,18,19,10,13,13,15,15,17,16,17,18,18,18,
+	19,21,10,13,13,15,15,17,17,17,18,18,20,19,20,11,
+	14,14,16,16,18,18,19,18,18,18,19,21,12,14,14,16,
+	16,18,18,19,18,19,20,20,20,
 };
 
 static float _vq_quantthresh_res0_192_1024_5[] = {

1.4       +10 -9     vorbis/lib/books/res0_192_1024_6.vqh

Index: res0_192_1024_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_6.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_192_1024_6.vqh	2001/02/02 03:52:07	1.3
+++ res0_192_1024_6.vqh	2001/02/18 09:53:03	1.4
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,15 +37,15 @@
 static long _vq_lengthlist_res0_192_1024_6[] = {
          4, 4, 4, 5, 5, 7, 7, 8, 8, 9, 9,10,10, 4, 5, 4,
          6, 6, 7, 7, 9, 9,10,10,11,11, 4, 4, 4, 6, 6, 7,
-	 7, 9, 9,10,10,11,11, 5, 6, 6, 7, 7, 9, 9,10,10,
+	 7, 9, 9,10,10,11,11, 5, 6, 6, 7, 7, 9, 8,10,10,
         11,11,12,12, 5, 6, 6, 7, 7, 9, 9,10,10,11,11,12,
-	12, 7, 7, 7, 9, 9,10,10,11,11,13,12,13,13, 7, 7,
-	 7, 9, 9,10,10,11,11,12,12,13,13, 8, 9, 9,10,10,
-	12,12,13,12,13,14,14,14, 8, 9, 9,10,10,12,12,13,
-	13,13,13,14,14, 9,10,10,11,12,13,13,14,14,15,15,
-	15,15, 9,10,10,12,12,13,13,14,14,15,14,15,15,10,
-	11,11,13,13,14,14,15,15,16,15,16,16,10,11,11,13,
-	13,14,14,15,15,16,15,16,16,
+	12, 7, 7, 7, 9, 9,10,10,11,11,12,12,14,14, 7, 7,
+	 7, 9, 9,10,10,11,11,12,12,14,14, 8, 9, 9,10,10,
+	11,11,12,13,14,14,15,15, 8, 9, 9,10,10,11,11,13,
+	13,13,14,15,15,10,10,10,11,12,13,13,14,14,15,15,
+	16,15,10,10,10,11,11,13,13,14,14,15,15,16,16,11,
+	11,11,13,13,14,14,15,15,16,16,17,17,11,11,11,13,
+	13,14,14,15,15,16,16,16,16,
 };
 
 static float _vq_quantthresh_res0_192_1024_6[] = {

1.4       +125 -124  vorbis/lib/books/res0_192_1024_7.vqh

Index: res0_192_1024_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_7.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_192_1024_7.vqh	2001/02/02 03:52:07	1.3
+++ res0_192_1024_7.vqh	2001/02/18 09:53:03	1.4
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -66,133 +67,133 @@
 };
 
 static long _vq_lengthlist_res0_192_1024_7[] = {
-	 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9,
-	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,11,11,11,11,
-	11,11,11,11,11,12,12,12,12,12,12,12,12, 5, 6, 6,
-	 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, 9,10,10,10,10,
-	11,11,11,11,11,12,12,12,12,12,12,12,12,13,13,13,
-	13,13,13,13,13,13,14,13,14,14, 5, 6, 6, 7, 7, 8,
-	 8, 8, 9, 9, 9,10,10,10, 9,10,10,10,10,11,11,11,
-	11,12,11,12,12,12,12,12,12,12,12,13,13,13,13,13,
-	13,13,13,13,13,14,14, 6, 7, 7, 8, 8, 9, 9, 9, 9,
-	10,10,10,10,11,11,11,11,12,12,12,12,12,12,12,13,
+	 3, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9,
+	 9, 9, 9,10,10,10,10,10,10,10,10,11,11,11,11,11,
+	11,11,11,11,12,12,12,12,12,12,12,12,12, 5, 5, 5,
+	 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,
+	11,11,11,11,11,11,12,12,12,12,12,12,12,12,13,13,
+	13,13,13,13,13,13,14,14,14,14, 4, 5, 5, 7, 7, 8,
+	 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11,11,11,
+	11,11,11,12,12,12,12,12,12,12,12,13,13,13,13,13,
+	13,13,13,14,13,14,14, 6, 7, 7, 8, 8, 9, 9, 9, 9,
+	10,10,10,11,11,11,11,11,12,12,12,12,12,12,13,13,
         13,13,13,13,13,13,14,14,14,14,14,14,14,14,14,14,
-	15,14,15,15, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
-	10,11,11,11,11,12,11,12,12,12,12,13,13,13,13,13,
-	13,13,13,14,14,14,14,14,14,14,14,14,14,15,14,15,
-	15, 7, 8, 8, 9, 9,10,10,10,10,11,11,11,11,12,11,
+	15,15,15,15, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
+	10,11,11,11,11,12,12,12,12,12,12,13,13,13,13,13,
+	13,13,13,14,14,14,14,14,14,14,14,15,15,15,15,15,
+	15, 7, 8, 8, 9, 9,10,10,10,10,11,11,11,11,11,11,
         12,12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,
-	14,14,15,15,15,15,15,15,15,15,16,15,15,16, 7, 8,
-	 8, 9, 9,10,10,10,10,11,11,11,11,12,11,12,12,12,
-	12,13,13,13,13,13,13,13,14,14,14,14,14,14,14,15,
-	15,15,15,15,15,15,15,16,15,16,16, 8, 9, 9,10,10,
-	10,10,11,11,12,12,12,12,12,12,13,13,13,13,13,14,
+	15,14,15,15,15,15,15,15,16,15,16,16,16,16, 7, 8,
+	 8, 9, 9,10, 9,10,10,11,11,11,11,11,11,12,12,12,
+	12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,
+	15,15,15,15,15,15,15,16,16,16,16, 8, 8, 8,10, 9,
+	10,10,11,11,12,12,12,12,12,12,13,13,13,13,14,14,
         14,14,14,14,14,14,15,15,15,15,15,15,15,15,16,15,
-	16,16,16,16,16,16,16,16, 8, 9, 9,10,10,10,10,11,
-	11,12,12,12,12,12,12,13,13,13,13,14,13,14,14,14,
-	14,14,14,15,15,15,15,15,15,15,15,16,15,16,15,16,
-	16,16,16,16,16, 8,10,10,10,10,11,11,12,12,12,12,
+	16,16,16,16,16,16,16,16, 8, 8, 8, 9,10,10,10,11,
+	11,12,12,12,12,12,12,13,13,13,13,13,14,14,14,14,
+	14,14,14,15,15,15,15,15,15,15,15,15,16,16,16,16,
+	16,17,17,17,16, 8, 9, 9,10,10,11,11,12,12,12,12,
         13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,15,
-	15,15,15,15,16,16,16,16,16,16,16,17,16,17,17,17,
-	17,17, 8,10,10,10,10,11,11,12,12,12,12,13,13,13,
-	13,13,13,14,14,14,14,14,14,15,15,14,15,15,15,15,
-	15,16,15,16,16,16,16,16,16,17,16,17,17,17,16, 9,
-	10,10,11,11,12,12,12,12,13,13,13,13,13,13,14,14,
-	14,14,15,14,15,15,15,15,16,15,15,15,16,16,16,16,
-	16,16,16,17,17,16,17,17,17,17,17,17, 9,10,10,11,
-	11,12,12,12,12,13,13,13,13,14,14,14,14,15,14,15,
-	15,15,15,15,15,16,15,16,16,16,16,16,16,16,16,17,
-	16,17,16,16,17,17,17,17,17, 9,10,10,11,11,12,12,
-	13,12,13,13,14,13,14,14,14,14,15,15,15,15,15,15,
-	15,16,16,16,16,16,17,16,16,17,17,17,17,17,17,17,
-	17,18,17,17,17,17, 9,10,10,11,11,12,12,12,13,13,
-	13,14,13,14,14,14,14,15,15,15,15,15,15,15,15,16,
-	16,16,16,16,16,16,16,17,17,16,17,17,17,17,17,17,
-	17,18,17, 9,11,11,12,12,12,12,13,13,14,14,14,14,
-	14,14,15,15,15,15,16,16,16,16,16,16,16,16,16,16,
-	16,16,17,17,17,17,18,17,17,17,18,17,18,18,18,18,
-	 9,11,11,12,12,12,12,13,13,14,14,14,14,15,15,15,
-	15,15,15,16,15,15,15,16,16,16,16,16,16,17,17,17,
-	16,17,16,17,17,17,17,17,17,18,17,18,18,10,11,11,
-	12,12,13,13,13,14,14,14,15,15,15,15,15,15,15,15,
-	16,16,16,16,16,16,16,16,17,17,17,17,17,17,17,17,
-	18,17,18,17,18,18,19,18,18,18,10,11,11,12,12,13,
-	13,14,14,14,14,14,14,15,15,15,15,15,16,16,16,16,
-	16,16,16,17,16,17,17,17,17,17,17,18,17,17,17,18,
-	17,18,17,18,18,18,18,10,12,12,12,12,13,13,14,14,
-	14,15,15,15,15,15,16,16,16,16,16,16,16,17,16,17,
-	17,17,17,17,17,17,17,17,17,17,18,18,18,18,18,19,
-	18,18,19,18,10,11,11,13,13,13,13,14,14,15,14,15,
-	15,15,15,16,16,16,16,16,16,16,17,17,16,17,17,17,
-	17,17,17,17,18,17,18,18,18,17,18,18,18,18,18,18,
-	19,10,12,12,13,13,14,14,14,14,15,15,15,15,16,16,
-	16,16,16,16,16,17,16,16,17,17,17,17,17,18,17,18,
-	18,17,18,18,19,17,19,18,18,18,19,19,19,20,10,12,
-	12,13,13,14,14,14,14,15,15,15,15,16,15,16,16,17,
-	16,17,17,17,17,17,17,17,17,17,17,18,18,18,18,18,
-	18,17,18,19,18,18,18,20,18,19,19,11,12,12,13,13,
-	14,14,15,15,15,15,16,16,16,16,17,16,16,16,17,17,
-	17,17,17,17,18,17,18,18,18,18,19,18,18,18,19,19,
-	18,18,19,18,18,19,19,19,11,12,12,13,13,14,14,15,
-	15,15,15,16,16,16,16,16,17,16,17,17,17,17,17,17,
-	17,17,17,17,18,18,18,18,18,18,19,18,19,19,18,19,
-	18,19,19,19,19,11,13,13,14,14,14,14,15,15,15,15,
-	16,16,17,16,17,17,17,17,17,17,17,17,17,18,18,17,
-	18,18,18,18,18,18,18,18,19,19,19,18,18,19,19,19,
-	19,19,11,13,13,14,13,14,14,15,15,16,15,16,16,16,
-	16,17,16,17,17,17,17,18,17,18,17,18,17,18,18,18,
-	18,18,18,18,19,19,18,20,19,19,18,19,18,18,20,11,
-	13,13,14,14,15,15,16,15,16,16,16,16,16,17,17,17,
-	17,17,17,17,18,18,18,18,18,18,17,18,18,18,19,19,
-	19,18,19,19,19,19,19,19,20,19,19,19,11,13,13,14,
-	14,15,15,15,15,16,16,17,16,17,17,17,17,17,17,18,
-	17,18,17,18,18,18,18,18,18,19,19,19,18,18,18,19,
-	18,19,19,21,18,19,20,19,19,12,13,13,14,14,15,15,
-	16,16,16,16,17,17,17,17,17,17,17,18,17,18,17,17,
-	19,18,18,18,18,19,19,18,19,19,19,19,18,19,19,19,
-	19,20,20,19,19,19,12,13,13,14,14,15,15,16,16,16,
-	16,17,17,17,17,17,17,17,18,18,18,18,18,19,18,18,
-	18,18,18,18,18,18,20,19,19,19,19,19,19,20,19,18,
-	20,20,19,12,14,14,15,14,15,15,16,16,16,17,17,17,
-	17,17,17,18,17,18,18,18,18,18,19,18,19,18,19,19,
-	18,19,19,20,18,20,19,19,20,18,20,19,19,19,20,19,
-	12,14,13,15,14,15,15,16,16,16,17,17,17,17,17,18,
-	17,18,18,18,18,18,18,18,18,18,18,19,18,19,19,18,
-	19,19,19,20,21,19,19,20,19,19,19,20,19,12,14,14,
-	15,15,16,16,16,16,17,17,17,17,17,18,18,18,18,18,
-	20,19,18,18,18,18,19,19,19,18,19,19,19,18,22,19,
-	19,19,19,18,20,19,22,20,20,19,12,14,14,15,15,16,
-	16,16,17,17,17,17,17,18,17,17,17,18,18,18,18,19,
-	19,18,19,18,20,19,18,19,19,19,19,18,19,19,20,19,
-	19,19,19,20,19,20,19,12,14,14,15,15,16,16,17,16,
-	17,17,18,18,18,17,18,17,18,18,18,19,19,18,18,18,
-	18,19,18,18,19,19,20,19,21,19,20,19,19,19,19,20,
-	20,20,20,20,13,14,14,15,15,16,16,16,17,17,17,17,
-	18,17,17,18,18,18,18,18,18,19,19,19,19,20,18,18,
-	19,19,19,20,19,19,19,19,20,20,18,20,20,19,20,20,
-	20,13,14,14,15,15,16,16,17,17,17,17,17,17,18,19,
-	18,18,19,18,18,18,18,19,19,19,19,19,19,19,19,19,
-	20,20,19,20,19,20,19,20,19,20,19,20,21,20,13,15,
-	14,15,15,17,16,17,17,17,18,18,18,18,18,19,18,19,
-	18,19,19,18,19,19,18,20,18,20,19,19,19,19,19,19,
-	20,19,19,19,19,20,20,19,21,22,19,13,14,14,15,16,
-	16,16,17,17,18,17,18,18,18,18,18,18,19,19,19,18,
-	19,18,19,19,19,19,19,20,19,19,20,20,20,20,19,20,
-	21,20,20,21,21,20,20,22,13,14,14,15,16,16,17,17,
-	17,18,17,18,18,18,19,19,18,18,19,19,19,18,19,18,
-	20,19,19,20,19,19,19,20,20,20,19,20,20,21,20,19,
-	20,21,19,20,20,13,15,15,16,16,17,17,17,17,17,18,
-	18,18,19,19,20,19,19,20,19,19,19,19,19,19,20,19,
-	20,20,20,20,19,19,20,20,20,20,21,20,20,21,20,21,
-	20,22,13,15,15,16,16,17,17,17,17,18,18,18,18,18,
-	18,19,18,18,20,19,19,19,19,22,19,19,20,20,20,19,
-	20,19,19,19,20,21,19,20,20,20,20,20,22,21,20,13,
-	15,15,16,16,16,17,17,17,18,18,18,18,18,18,19,19,
-	18,20,19,20,20,20,20,19,19,20,20,20,20,20,21,20,
-	21,20,20,21,19,20,20,20,20,20,21,22,14,15,15,16,
-	16,17,17,17,18,17,18,19,19,18,19,19,19,20,19,20,
-	19,20,20,20,20,20,19,19,20,20,21,19,21,21,21,21,
-	20,20,19,20,20,21,21,21,21,
+	15,15,15,16,16,16,16,16,16,16,16,16,16,17,17,17,
+	17,17, 8, 9, 9,10,10,11,11,12,12,12,12,13,13,13,
+	13,13,13,14,14,14,14,14,14,15,15,15,15,15,15,16,
+	15,16,16,16,16,16,16,17,16,17,17,17,17,17,17, 9,
+	10,10,11,11,11,11,12,12,13,13,13,13,13,13,14,14,
+	14,14,15,14,15,15,15,15,15,15,16,15,16,16,16,16,
+	16,16,17,17,17,16,17,17,17,17,18,17, 9,10,10,11,
+	11,12,12,12,12,13,13,13,13,13,14,14,14,14,14,14,
+	15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,17,
+	16,16,17,17,17,17,17,17,17, 9,10,10,11,11,12,12,
+	12,12,13,13,13,13,14,14,14,14,15,15,15,15,15,15,
+	15,16,16,16,16,16,16,16,16,17,17,17,17,17,18,17,
+	17,17,17,17,17,17, 9,10,10,11,11,12,12,12,12,13,
+	13,13,14,14,14,14,14,15,15,15,15,15,15,16,16,16,
+	16,16,16,16,16,16,17,17,17,17,17,17,17,17,17,18,
+	18,18,18, 9,10,10,11,11,12,12,13,13,13,13,14,14,
+	14,14,15,15,15,15,15,15,16,16,16,16,16,17,16,16,
+	17,16,17,17,17,17,17,17,18,18,18,17,18,18,18,18,
+	 9,10,10,11,11,12,12,13,13,13,13,14,14,14,15,15,
+	15,15,15,15,15,16,16,16,16,16,16,17,16,17,17,17,
+	17,17,17,17,18,17,18,18,18,18,18,18,18,10,11,11,
+	12,12,13,13,13,13,14,14,14,14,15,15,15,15,15,15,
+	16,16,16,16,16,16,16,16,17,17,17,17,17,17,17,18,
+	18,17,18,18,18,18,18,18,18,19,10,11,11,12,12,13,
+	13,13,13,14,14,14,14,15,15,15,15,16,15,16,16,16,
+	16,16,16,17,17,17,17,17,17,17,17,18,17,18,17,18,
+	18,18,18,18,18,18,18,10,11,11,12,12,13,13,14,14,
+	15,14,15,15,15,15,15,16,16,16,16,16,16,16,17,16,
+	17,17,17,17,17,17,18,17,17,18,18,18,18,18,19,19,
+	18,19,19,19,10,11,11,12,12,13,13,14,14,14,14,15,
+	15,15,15,15,15,16,16,16,16,16,16,17,17,17,17,17,
+	17,17,17,17,17,18,18,17,18,18,18,18,18,18,18,19,
+	18,10,11,11,13,13,14,14,14,14,15,15,15,15,15,15,
+	16,16,17,16,16,17,17,17,17,17,17,17,18,17,18,17,
+	18,18,18,18,18,18,18,18,19,19,18,18,19,19,10,12,
+	11,13,13,14,13,14,14,15,15,15,15,16,16,16,16,16,
+	16,16,17,16,16,17,17,17,17,18,17,17,18,17,18,18,
+	18,18,18,18,19,19,18,19,19,19,18,11,12,12,13,13,
+	14,14,15,14,15,15,16,15,16,16,16,16,17,17,17,17,
+	17,17,17,18,17,17,18,18,18,18,18,18,19,18,19,20,
+	18,18,18,19,19,19,19,19,11,12,12,13,13,14,14,15,
+	15,15,15,15,15,16,16,16,16,17,17,17,17,17,17,17,
+	17,18,17,17,17,18,18,18,18,17,18,18,18,19,19,19,
+	19,19,19,19,19,11,12,12,14,13,14,14,15,15,15,15,
+	16,16,16,16,17,17,17,17,17,17,17,18,17,18,17,18,
+	18,18,18,18,19,18,19,19,19,18,18,19,19,19,19,19,
+	19,19,11,12,12,13,13,14,14,15,15,15,15,16,16,16,
+	16,17,17,17,17,17,17,17,17,17,18,18,17,18,18,19,
+	18,18,19,19,18,19,19,19,19,19,19,19,19,19,19,11,
+	12,12,14,14,14,15,15,15,16,15,16,17,16,17,16,17,
+	17,17,17,17,17,17,18,18,17,18,18,18,19,18,19,19,
+	19,18,20,19,18,18,19,19,21,19,20,19,11,13,12,14,
+	14,15,14,16,15,16,16,16,16,17,16,17,17,17,17,17,
+	17,17,18,18,18,18,18,18,18,19,19,19,18,19,19,19,
+	18,20,19,19,18,19,19,19,20,12,13,13,14,14,15,15,
+	16,16,16,16,16,16,16,17,17,18,17,17,18,18,17,18,
+	18,18,18,18,19,18,18,19,19,18,19,19,19,19,19,19,
+	19,20,20,21,20,20,12,13,13,14,14,15,15,15,16,16,
+	16,16,16,17,17,17,17,17,17,18,18,18,18,18,18,18,
+	17,19,18,18,19,19,19,19,19,19,19,19,19,19,20,19,
+	19,21,21,12,13,13,14,14,15,15,16,16,17,16,16,17,
+	17,17,18,17,18,18,17,18,19,18,18,19,19,19,18,18,
+	19,19,19,19,19,18,20,19,19,20,20,20,19,19,19,19,
+	12,13,13,14,14,15,15,16,16,16,17,16,17,17,17,18,
+	17,18,17,18,18,18,18,18,18,18,18,18,18,18,19,18,
+	19,19,19,19,19,20,21,19,19,20,19,19,21,12,13,13,
+	15,15,15,16,16,16,17,17,17,17,17,17,18,17,18,18,
+	18,19,18,18,19,18,19,19,19,18,18,19,19,19,19,20,
+	21,20,20,20,21,19,20,20,20,21,12,13,13,15,15,16,
+	15,16,16,17,17,17,17,17,17,18,18,18,18,19,18,18,
+	19,19,18,19,18,19,18,19,19,19,20,20,19,19,21,19,
+	21,20,19,19,20,20,20,12,14,14,15,15,16,16,16,16,
+	17,17,17,17,17,18,18,18,18,18,18,19,19,18,18,19,
+	19,19,19,19,19,19,19,20,19,19,19,19,19,20,19,19,
+	21,20,20,19,12,14,14,15,15,16,16,17,16,17,17,17,
+	17,18,18,17,17,18,18,19,18,19,18,18,19,19,19,18,
+	19,20,19,19,19,19,19,21,19,20,20,20,20,20,19,21,
+	21,13,14,14,15,15,16,16,17,17,17,17,18,18,18,18,
+	18,18,19,19,19,19,18,19,19,19,19,20,19,19,20,19,
+	19,20,20,20,19,19,20,19,20,20,20,19,20,21,13,14,
+	14,15,15,16,16,17,17,17,18,18,18,18,18,18,18,18,
+	18,19,18,19,19,19,20,19,18,19,19,20,20,20,19,20,
+	20,19,19,20,19,21,21,21,22,20,21,13,14,14,15,15,
+	16,16,17,17,18,17,18,18,18,18,19,18,19,18,19,18,
+	19,19,20,19,19,19,19,19,20,20,19,19,19,19,22,20,
+	19,20,21,20,21,20,20,20,13,14,14,15,15,16,16,17,
+	17,17,17,18,18,19,18,18,18,18,18,19,18,19,18,19,
+	19,19,19,20,20,20,19,20,20,20,20,20,20,21,22,21,
+	20,19,20,21,22,13,14,14,15,16,17,16,17,17,17,18,
+	18,19,18,18,19,19,18,19,20,20,20,19,19,19,19,20,
+	21,20,20,20,21,19,21,21,21,21,20,20,21,21,20,22,
+	20,20,13,14,14,16,16,17,17,17,17,17,17,19,18,18,
+	18,19,19,19,19,19,19,19,19,20,19,20,20,20,20,19,
+	19,19,19,20,20,20,20,20,19,20,20,21,21,21,22,13,
+	15,15,16,16,17,17,17,17,18,18,18,19,20,18,19,19,
+	19,20,19,19,19,19,19,20,19,21,20,21,20,20,21,20,
+	19,20,21,20,21,21,20,21,20,20,21,21,13,15,15,16,
+	16,17,17,18,17,18,19,18,18,19,18,19,19,19,19,18,
+	20,20,19,20,20,20,20,20,21,19,19,19,20,20,20,20,
+	20,20,19,20,20,21,21,21,19,
 };
 
 static float _vq_quantthresh_res0_192_1024_7[] = {

1.4       +8 -412    vorbis/lib/books/res0_192_1024_8.vqh

Index: res0_192_1024_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_8.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_192_1024_8.vqh	2001/02/02 03:52:07	1.3
+++ res0_192_1024_8.vqh	2001/02/18 09:53:03	1.4
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -102,417 +103,12 @@
 };
 
 static long _vq_lengthlist_res0_192_1024_8[] = {
-	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8,
-	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	10,10,10,10,10,10,10,10,10,10,10,11,11, 9, 9,10,
-	10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,
-	11,11,11,11,11,12,11,12,12,12,12,12,12,12,12,13,
-	12, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,
-	11,11,11,11,11,11,11,11,11,11,12,11,12,12,11,11,
-	11,11,11,11,11,11,11,12,12,12,12,12,12,12,12,12,
-	12,12,13,13,13,12,13,13,13,13,13,13,13,13,13,13,
-	14,13, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9,10, 9,10,10,10,10,10,10,10,10,10,10,11,10,11,
-	11,11,11,11,11,11,11,11,11,12,11,12,12,12,11,11,
-	11,11,11,11,11,11,11,12,12,12,12,12,12,12,12,12,
-	12,12,13,13,12,13,13,13,13,13,13,13,13,13,13,14,
-	14,14,13, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,
-	10,10,10,10,11,10,11,11,11,11,11,11,11,11,11,11,
-	11,11,11,11,12,11,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,13,12,13,13,
-	13,13,13,13,13,13,13,13,13,13,14,13,14,14,14,14,
-	14,14,14,14, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,
+	 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 9,
+	 8, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,
         10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,
-	11,11,11,11,11,12,11,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,13,12,13,
-	13,13,13,13,13,13,13,14,13,13,14,14,14,14,14,14,
-	14,14,14,14,14, 8, 9, 9, 9, 9,10,10,10,10,10,10,
-	10,10,11,11,11,11,11,11,11,11,11,11,11,11,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,13,13,12,13,
-	13,13,12,12,12,12,13,13,13,13,13,13,13,13,13,13,
-	13,13,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,15, 8, 9, 8, 9, 9,10,10,10,10,10,
-	10,10,10,11,11,11,11,11,11,11,11,11,11,12,11,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,13,12,13,
-	12,13,13,12,12,12,12,13,12,13,13,13,13,13,13,13,
-	13,13,13,14,13,14,13,14,13,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14, 8, 9, 9,10,10,10,10,10,11,
-	11,11,11,11,11,11,11,11,12,12,12,12,12,12,12,12,
-	12,12,12,12,13,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,
-	14,14,14,14,14,14,14,14,15,14,14,14,14,14,15,14,
-	14,14,15,14,15,15,15,15, 8, 9, 9,10,10,10,10,10,
-	11,11,11,11,11,11,11,11,11,12,11,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,13,
-	13,13,13,14,13,13,13,13,13,13,13,13,13,13,13,14,
-	14,14,14,14,14,14,14,14,14,14,14,15,15,14,14,14,
-	15,15,15,15,15,15,15,15,15, 9,10,10,10,10,11,11,
-	11,11,11,11,11,11,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,13,12,13,13,13,13,13,13,13,13,13,13,
-	13,14,13,14,14,14,13,13,13,13,14,14,14,14,14,14,
-	14,14,14,14,14,14,15,14,15,14,15,14,14,14,15,15,
-	15,15,15,15,15,15,15,16,15,15, 9,10,10,10,10,11,
-	11,11,11,11,11,11,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,13,12,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,14,13,13,14,13,13,13,13,14,13,14,13,14,
-	14,14,14,14,14,14,14,14,14,15,14,14,14,14,15,15,
-	15,15,15,15,15,15,15,15,15,15,16, 9,10,10,11,11,
-	11,11,11,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,13,13,13,13,13,13,13,13,13,13,13,13,14,13,
-	14,13,14,14,14,13,14,14,13,13,14,14,14,14,14,14,
-	14,14,14,14,15,14,15,14,15,15,15,15,15,15,15,15,
-	15,15,15,15,14,15,15,16,15,16,15,15, 9,10,10,11,
-	11,11,11,11,12,12,12,12,12,12,12,12,12,12,12,12,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,14,13,14,
-	13,13,13,14,14,14,14,14,14,13,14,14,14,14,14,14,
-	14,14,14,14,15,15,14,14,15,15,15,15,14,15,15,15,
-	15,15,15,15,15,15,15,15,15,15,15,16,16,10,10,11,
-	11,11,12,12,12,12,12,12,12,12,12,12,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,14,13,13,13,13,13,
-	13,14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,15,15,15,15,15,15,15,15,15,15,15,15,
-	15,15,15,16,16,16,15,16,15,16,16,16,15,16,10,11,
-	10,11,11,11,11,12,12,12,12,12,12,12,12,12,13,13,
-	12,13,13,13,13,13,13,13,13,13,13,14,13,14,14,14,
-	14,14,14,14,14,14,14,14,15,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,15,15,15,15,14,15,15,15,
-	15,15,15,15,15,15,16,15,16,16,16,15,16,16,16,10,
-	11,11,11,11,12,12,12,12,12,12,12,13,13,13,13,13,
-	13,13,13,13,13,13,14,13,13,14,14,13,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,15,15,14,14,14,14,
-	14,14,15,14,15,15,15,15,15,15,15,15,15,15,15,15,
-	15,15,16,16,16,16,16,15,16,16,15,16,15,17,16,16,
-	10,11,11,11,11,12,12,12,12,12,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,14,13,14,13,14,
-	14,14,14,14,14,14,14,14,14,15,14,15,15,14,14,14,
-	14,14,14,15,14,15,15,15,15,15,15,15,15,15,16,15,
-	15,15,15,16,15,15,15,16,16,15,16,16,16,18,16,16,
-	16,10,11,11,12,12,12,12,12,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,14,14,14,13,14,14,14,14,14,14,
-	14,14,14,14,15,14,14,14,15,14,14,14,15,15,14,15,
-	15,14,15,15,15,15,15,15,15,14,15,15,16,16,16,15,
-	16,16,16,15,16,16,16,16,16,16,16,17,17,17,16,16,
-	16,16,10,11,11,12,12,12,12,12,13,13,13,13,13,13,
-	13,13,13,13,13,13,14,14,14,14,13,14,14,14,14,14,
-	14,14,14,14,14,14,14,15,14,15,15,15,15,15,15,14,
-	14,15,15,14,15,14,15,15,15,15,15,15,15,15,16,15,
-	16,15,16,16,16,16,16,16,16,17,16,16,16,17,16,16,
-	17,17,16,11,11,11,12,12,12,12,13,13,13,13,13,13,
-	13,13,13,14,14,14,13,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,15,15,15,15,15,15,15,16,15,
-	15,14,15,14,15,15,15,15,15,15,15,15,16,15,16,16,
-	15,15,16,16,15,17,16,15,17,16,17,16,17,16,16,16,
-	17,16,16,16,11,12,12,12,12,12,12,13,13,13,13,13,
-	13,13,13,14,14,14,13,14,14,14,14,14,14,14,14,14,
-	14,14,14,15,14,15,14,14,14,15,15,15,15,15,14,15,
-	15,15,15,15,15,15,15,15,15,16,15,15,15,16,15,16,
-	16,17,15,16,16,16,16,16,16,16,16,16,17,17,16,16,
-	17,17,18,17,17,11,12,12,12,12,13,13,13,13,13,13,
-	14,14,14,13,14,13,14,14,14,14,14,14,15,14,15,14,
-	14,14,15,15,15,14,15,14,15,15,15,14,15,15,15,15,
-	15,16,15,15,16,15,15,15,15,15,15,15,16,16,16,16,
-	16,16,16,15,16,16,16,16,16,16,17,16,17,16,18,16,
-	17,18,16,17,16,17,11,12,12,12,12,13,13,13,13,13,
-	13,13,13,13,13,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,15,15,15,14,15,15,15,15,15,15,15,
-	15,15,15,15,15,15,15,15,15,15,15,16,16,16,16,15,
-	15,16,16,16,16,16,16,17,16,16,16,16,17,17,16,16,
-	17,17,18,17,17,17,18,11,12,12,13,12,13,13,13,13,
-	14,13,14,14,14,14,14,14,15,14,14,14,14,14,14,14,
-	14,15,15,15,15,15,15,15,15,15,15,15,15,15,16,15,
-	15,15,16,15,15,15,15,15,15,16,15,16,16,16,16,16,
-	16,16,16,16,17,16,17,16,17,16,17,16,17,17,17,16,
-	17,17,17,17,17,17,16,17,11,12,12,13,13,13,13,13,
-	13,13,13,14,14,14,14,14,14,15,14,15,14,14,14,15,
-	14,15,14,15,14,15,14,15,14,16,15,15,15,16,15,15,
-	15,16,16,15,16,15,15,15,15,15,15,15,15,17,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,
-	16,17,16,16,17,17,17,16,18,11,12,12,13,13,13,13,
-	14,14,13,14,14,14,14,14,14,14,14,14,14,14,15,14,
-	15,15,15,14,15,15,15,16,15,15,15,15,16,15,16,15,
-	15,16,16,16,16,16,15,16,16,15,16,16,16,16,16,16,
-	17,16,16,16,16,16,16,17,16,16,16,17,17,16,17,17,
-	16,17,17,17,17,17,20,17,17,17,11,12,12,13,13,13,
-	13,13,13,14,14,14,14,14,14,14,14,14,14,14,14,14,
-	14,15,15,15,14,15,15,15,15,16,15,15,15,16,16,16,
-	16,16,16,16,16,16,16,15,15,15,16,15,16,16,16,16,
-	15,17,16,16,16,16,16,17,16,17,17,16,17,16,16,17,
-	17,17,17,17,17,17,18,17,17,17,19,12,13,12,13,13,
-	13,13,14,14,14,14,14,14,14,14,14,15,14,15,15,15,
-	15,15,15,15,15,15,16,15,15,15,15,15,15,15,16,16,
-	16,15,16,16,16,16,16,16,16,15,16,15,16,16,16,16,
-	17,16,16,16,16,16,17,16,16,17,16,16,17,17,18,16,
-	17,17,17,16,17,18,17,16,18,18,18,17,12,13,12,13,
-	13,13,13,14,14,14,14,14,14,14,14,15,14,15,15,15,
-	15,15,15,15,15,16,15,15,15,16,15,15,15,16,15,16,
-	15,16,16,17,15,16,17,16,16,16,15,16,16,17,16,16,
-	16,16,16,17,16,16,17,16,16,17,17,16,16,17,17,17,
-	16,17,16,18,17,17,17,18,17,17,18,17,17,12,13,13,
-	13,13,14,14,14,14,14,14,14,14,15,14,15,15,15,15,
-	15,15,15,15,15,15,15,15,15,15,15,16,16,15,15,15,
-	16,16,16,15,15,16,16,16,17,17,17,16,16,16,15,17,
-	16,16,16,16,16,17,16,16,18,17,17,17,17,17,17,17,
-	18,17,17,17,18,19,18,17,18,17,17,18,18,17,12,13,
-	13,13,13,14,14,14,14,14,14,14,14,14,15,15,15,15,
-	15,15,15,15,15,16,15,15,15,16,16,15,16,16,16,15,
-	15,15,15,16,16,16,16,17,16,16,16,16,16,16,15,16,
-	16,17,16,16,17,18,17,16,17,16,16,16,16,16,16,16,
-	17,17,17,17,17,16,18,18,18,20,17,18,18,17,18,12,
-	13,13,13,14,14,14,14,14,15,14,15,15,15,15,14,15,
-	15,15,15,15,15,15,15,15,16,15,15,16,16,16,16,17,
-	16,16,16,16,16,16,16,16,16,17,16,16,17,16,16,16,
-	16,17,18,16,16,16,16,16,18,16,17,17,18,17,18,18,
-	18,17,17,17,18,17,17,17,18,18,17,17,18,17,17,18,
-	12,13,13,13,13,14,14,14,14,14,14,15,15,15,15,15,
-	15,15,15,15,15,15,15,15,15,16,15,16,16,15,16,17,
-	16,15,16,16,16,17,15,16,16,16,16,17,16,16,16,16,
-	16,16,16,16,17,16,16,17,16,17,17,16,16,18,18,17,
-	17,18,18,18,17,19,18,18,17,18,18,17,18,18,18,18,
-	18,12,13,13,13,14,14,14,14,14,14,14,15,15,15,16,
-	15,15,15,15,16,16,15,15,16,15,17,15,16,17,16,16,
-	17,16,16,17,16,16,18,17,16,16,17,16,17,16,16,16,
-	17,16,17,16,16,17,17,16,18,17,17,17,18,17,17,17,
-	17,16,17,17,17,18,18,17,17,17,17,20,18,17,19,18,
-	18,19,12,13,13,14,14,14,14,14,14,14,15,15,15,15,
-	15,16,15,15,16,15,16,15,15,15,15,16,15,16,16,16,
-	16,16,16,16,16,17,15,17,16,17,17,16,16,17,17,16,
-	16,17,16,16,16,16,17,16,17,16,16,16,17,16,18,17,
-	17,18,17,18,17,17,17,17,17,18,17,18,18,18,18,18,
-	18,18,17,12,13,13,14,14,14,14,15,14,15,15,15,15,
-	15,15,15,15,15,15,16,16,16,15,16,15,16,16,16,16,
-	16,17,16,16,16,16,17,16,18,15,16,17,17,16,16,16,
-	16,17,17,18,17,17,16,16,17,17,17,17,17,17,18,17,
-	18,18,18,17,17,18,17,18,18,18,18,18,18,18,18,20,
-	18,19,18,18,12,13,13,14,14,14,14,14,15,15,15,15,
-	15,15,14,15,15,15,16,16,15,16,16,16,15,15,16,16,
-	16,16,16,16,16,16,16,16,17,17,16,16,17,16,17,16,
-	16,17,17,16,16,17,17,17,16,17,16,16,16,17,17,17,
-	17,18,18,18,17,18,17,18,18,19,17,17,17,18,18,18,
-	17,18,18,18,18,13,13,14,14,14,14,14,14,15,15,15,
-	16,15,15,15,15,15,15,16,16,16,16,15,16,16,16,16,
-	16,16,16,17,17,16,17,16,16,16,17,16,17,17,18,16,
-	16,16,17,16,17,17,16,17,17,18,16,18,17,17,17,17,
-	18,19,18,18,19,18,17,18,18,18,18,17,18,17,18,17,
-	20,18,18,18,18,17,13,14,13,14,13,14,14,15,15,14,
-	15,15,15,15,15,15,15,15,16,17,15,15,15,16,15,16,
-	16,16,16,16,15,17,17,17,16,16,16,16,16,16,17,17,
-	17,17,17,16,16,17,17,16,16,17,17,17,17,17,18,17,
-	17,18,18,19,17,18,17,18,19,18,18,18,18,18,18,19,
-	18,17,17,17,17,18,18,13,14,14,14,14,15,15,15,15,
-	15,15,15,15,16,16,16,16,15,15,16,16,17,16,16,16,
-	16,16,16,16,16,16,17,16,16,16,17,16,17,17,17,16,
-	17,17,17,17,17,17,17,18,17,17,17,17,17,17,17,17,
-	18,17,18,18,17,18,17,17,18,18,18,17,18,17,19,17,
-	19,18,18,19,19,18,20,18,13,14,14,14,14,15,15,14,
-	15,15,15,16,15,16,15,15,15,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,17,16,17,16,17,17,18,17,17,
-	17,17,16,17,17,17,16,17,17,16,18,18,17,18,17,17,
-	17,18,17,18,17,19,19,20,17,19,18,17,18,19,18,18,
-	18,18,18,18,18,20,19,18,18,13,14,14,14,15,15,15,
-	15,15,15,16,16,16,15,16,16,16,16,15,16,16,16,16,
-	16,16,16,16,17,16,17,16,18,17,17,17,17,17,18,17,
-	18,17,17,17,17,17,17,18,17,17,17,17,18,17,17,17,
-	18,17,18,17,17,18,18,18,18,18,17,18,18,17,17,20,
-	18,20,18,18,18,18,20,19,19,19,13,14,14,14,14,14,
-	15,15,15,15,16,16,15,16,15,16,15,16,16,16,16,16,
-	16,16,17,17,16,16,16,17,16,17,17,18,17,17,17,16,
-	16,17,17,17,18,17,17,18,17,17,16,18,16,17,17,18,
-	17,17,18,17,17,18,17,19,18,17,18,18,17,17,17,19,
-	18,18,18,18,18,18,18,20,17,18,20,13,14,14,14,14,
-	15,15,15,15,15,16,16,15,16,16,16,16,16,16,16,16,
-	17,16,17,16,16,16,16,18,16,17,17,17,16,18,18,16,
-	18,20,17,18,17,16,17,17,16,17,17,18,18,16,17,17,
-	17,17,17,17,18,17,18,18,18,18,18,18,18,18,20,18,
-	18,18,18,18,17,18,18,18,20,18,18,18,13,14,14,15,
-	15,15,15,15,15,16,16,15,16,16,16,16,16,17,16,18,
-	16,17,16,17,16,16,16,18,16,17,17,17,17,16,16,17,
-	18,17,17,17,17,20,17,18,17,17,17,17,17,17,18,18,
-	18,18,17,18,18,18,17,19,18,17,18,19,18,18,17,18,
-	18,18,20,17,18,18,20,18,17,19,18,18,19,11,13,13,
-	14,14,15,14,15,15,15,15,16,15,16,15,15,15,16,16,
-	15,15,16,16,17,17,16,16,16,17,17,17,16,17,17,16,
-	16,16,17,18,16,17,17,17,17,19,17,17,18,17,18,17,
-	18,17,17,17,19,18,17,19,19,17,18,17,18,17,19,19,
-	20,18,19,20,18,18,18,18,18,18,18,18,18,18,11,13,
-	13,14,13,14,14,14,15,15,15,15,15,15,16,15,15,16,
-	16,16,15,16,16,15,17,16,17,17,16,16,16,17,16,17,
-	18,17,17,17,17,18,16,17,17,17,16,17,18,17,17,18,
-	17,18,18,19,18,17,18,18,18,19,20,19,19,17,18,18,
-	18,19,18,20,18,18,17,18,18,20,18,18,17,18,18,12,
-	13,13,14,14,14,15,14,15,15,15,15,15,15,16,16,16,
-	16,16,16,16,16,17,16,16,17,17,17,17,17,16,16,17,
-	17,17,17,17,18,17,17,18,17,18,18,17,18,17,17,17,
-	18,18,18,18,17,20,19,19,18,18,18,18,18,18,19,19,
-	18,18,18,18,19,19,19,18,19,18,19,19,20,19,18,19,
-	12,13,13,14,14,15,14,15,15,15,15,15,15,15,17,15,
-	16,16,16,16,16,16,16,16,16,16,17,17,17,17,16,17,
-	17,17,17,17,17,16,18,18,18,17,17,17,17,17,18,18,
-	17,19,17,18,17,18,18,17,18,18,18,18,19,18,18,18,
-	18,18,18,19,18,18,18,19,18,18,20,19,20,19,19,19,
-	18,12,13,13,14,14,15,15,15,15,15,15,16,15,16,17,
-	17,16,16,16,17,16,17,16,16,16,17,16,17,17,16,17,
-	16,18,17,16,18,18,17,17,17,17,19,17,18,18,18,19,
-	17,17,18,18,18,18,18,18,18,18,18,18,18,18,18,17,
-	20,18,19,18,18,18,18,20,19,18,20,18,19,18,19,18,
-	19,20,12,13,13,14,14,14,15,15,15,15,15,16,16,16,
-	16,16,16,16,16,16,16,17,16,17,16,17,17,16,17,17,
-	16,17,17,17,17,17,17,17,17,17,16,17,18,17,18,18,
-	17,18,17,18,17,18,18,18,18,18,18,18,17,18,17,19,
-	18,18,18,18,18,20,18,18,20,18,18,18,18,18,20,20,
-	20,20,20,12,13,14,14,14,14,15,15,16,15,16,16,16,
-	16,16,16,16,16,17,17,16,17,16,17,17,17,17,17,17,
-	18,17,17,16,17,17,18,17,18,18,17,17,17,17,18,17,
-	18,17,17,18,18,18,19,18,18,18,19,18,17,19,19,18,
-	18,20,18,18,19,17,20,18,18,18,20,19,18,19,19,18,
-	20,19,18,20,12,13,13,14,14,15,15,15,15,16,15,15,
-	16,16,16,16,16,16,17,17,17,17,17,17,17,18,16,17,
-	16,18,17,17,17,18,17,17,17,17,17,19,18,17,17,17,
-	17,17,18,17,18,18,17,17,18,18,19,18,18,18,20,18,
-	18,18,18,20,20,18,20,20,18,18,18,18,18,19,18,18,
-	19,20,18,18,20,13,14,14,14,15,15,15,15,16,15,16,
-	16,16,16,16,17,16,16,17,17,17,16,16,18,16,17,17,
-	17,19,18,17,17,17,18,17,17,17,17,17,18,17,19,17,
-	17,18,18,18,18,18,20,18,18,18,18,18,18,18,19,19,
-	18,18,20,18,20,19,20,20,20,18,18,19,18,19,18,20,
-	19,19,18,19,18,18,13,14,14,15,14,15,15,15,15,16,
-	16,16,16,16,16,17,16,17,17,16,17,17,17,17,16,17,
-	18,18,16,18,17,17,17,17,18,18,18,17,17,18,18,18,
-	17,18,17,19,18,18,18,18,18,18,18,18,18,19,18,18,
-	17,18,18,17,18,20,20,18,19,17,18,20,20,19,20,18,
-	20,19,20,18,19,19,20,13,14,14,15,15,15,15,16,16,
-	16,16,16,17,16,17,16,16,17,16,17,16,17,17,16,18,
-	17,17,17,17,17,18,18,17,17,18,17,18,18,18,18,18,
-	18,17,18,18,18,18,18,17,18,18,18,18,20,18,18,18,
-	19,19,19,19,18,19,20,20,18,18,20,19,19,19,18,19,
-	19,20,19,20,20,19,20,18,13,14,14,14,15,15,15,15,
-	16,16,16,16,16,17,16,17,17,17,17,17,16,17,18,17,
-	17,17,17,17,18,18,16,18,16,17,17,18,18,18,18,20,
-	18,18,17,17,18,18,18,18,18,18,19,19,20,18,20,18,
-	18,20,19,19,19,19,19,20,19,18,18,18,19,20,19,20,
-	19,20,18,18,19,18,20,19,20,13,14,14,15,15,16,15,
-	16,16,16,16,17,16,17,17,17,17,17,17,17,18,16,17,
-	17,16,18,17,18,17,17,17,18,18,19,18,18,17,17,19,
-	18,18,19,17,17,18,18,19,18,19,18,18,19,19,19,19,
-	17,19,20,18,18,18,19,18,19,20,20,19,19,20,20,19,
-	18,19,20,19,19,20,18,20,20,20,13,14,14,15,15,16,
-	16,17,17,16,16,16,16,17,17,17,18,18,18,17,16,18,
-	17,17,17,18,17,18,18,17,17,17,17,19,18,18,17,18,
-	18,18,18,18,18,18,18,18,18,18,20,17,18,19,18,18,
-	18,18,19,19,18,19,18,18,19,18,19,19,18,19,18,20,
-	18,19,19,19,20,20,20,18,19,20,18,13,15,15,15,15,
-	16,16,16,16,16,16,16,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,18,17,17,18,18,17,18,19,20,18,18,19,
-	18,18,19,18,20,20,19,19,19,18,18,19,18,19,19,18,
-	18,18,20,17,20,18,19,18,20,18,18,20,20,20,19,19,
-	20,18,19,19,18,18,19,20,18,20,19,18,13,15,15,15,
-	15,16,16,15,17,16,16,16,17,16,17,17,17,17,16,17,
-	17,18,17,17,18,18,18,19,17,17,18,19,18,18,18,18,
-	18,17,18,18,17,19,18,18,18,18,18,17,19,18,18,18,
-	18,19,18,17,19,18,18,20,19,18,20,20,19,19,20,19,
-	18,20,19,20,20,20,20,20,19,19,20,19,20,13,15,15,
-	16,15,15,16,16,17,16,16,18,17,18,18,16,17,18,18,
-	17,17,18,17,17,17,18,17,19,19,17,18,18,18,18,19,
-	18,17,18,18,19,19,20,18,18,17,20,18,20,17,20,18,
-	20,20,18,18,18,19,19,18,18,20,20,19,19,20,19,19,
-	19,19,18,19,20,19,19,19,19,20,20,18,20,20,13,15,
-	14,16,15,16,16,16,16,18,16,17,17,17,17,17,17,17,
-	18,18,17,18,18,18,18,18,18,19,18,18,17,19,18,18,
-	18,18,17,19,18,19,19,18,18,20,19,19,19,18,18,19,
-	18,20,20,18,18,19,19,18,20,20,18,18,19,18,18,20,
-	18,19,19,20,20,20,19,20,20,20,20,19,19,19,20,14,
-	15,15,16,16,16,16,17,18,18,17,17,18,18,18,17,18,
-	17,18,18,18,18,17,18,18,18,18,18,18,18,18,18,19,
-	20,18,18,17,18,17,18,18,18,18,18,19,19,18,19,18,
-	19,20,20,18,18,19,20,18,20,19,20,19,18,20,20,19,
-	20,19,20,18,18,20,20,18,20,18,20,19,18,20,20,20,
-	14,15,15,16,16,15,17,16,17,17,17,17,18,17,18,17,
-	17,17,18,18,18,20,18,19,18,17,18,18,18,18,19,18,
-	18,19,18,18,18,18,18,18,20,19,18,18,19,18,18,18,
-	18,18,19,20,19,19,20,18,19,19,20,18,20,19,18,20,
-	20,20,19,19,20,19,19,20,18,19,20,19,19,18,19,20,
-	19,14,15,15,17,16,18,17,17,18,18,17,18,18,20,18,
-	18,20,18,17,17,18,18,18,18,18,20,19,19,18,20,18,
-	20,18,18,20,19,18,19,19,19,18,20,19,20,18,19,20,
-	18,19,19,19,19,19,19,20,20,20,20,18,18,19,18,20,
-	20,19,19,20,19,20,19,20,19,20,18,20,20,20,19,20,
-	20,20,14,15,16,16,16,17,17,17,17,17,17,18,18,20,
-	20,18,18,18,19,17,20,18,18,18,20,18,18,20,18,19,
-	17,18,18,20,18,19,18,19,18,18,20,19,19,18,19,18,
-	19,20,18,18,20,20,18,20,20,19,19,20,19,19,20,20,
-	18,20,19,18,20,20,20,20,20,20,19,20,20,20,20,20,
-	20,20,20,14,16,15,16,16,16,17,17,17,17,18,18,18,
-	18,18,18,18,18,17,18,19,18,17,19,18,20,18,20,17,
-	19,18,18,18,19,18,18,18,18,20,19,19,19,20,20,19,
-	19,18,18,18,18,19,20,20,19,19,19,19,19,20,20,20,
-	20,19,20,19,19,20,19,19,20,20,19,20,19,20,20,20,
-	20,20,20,19,15,16,15,16,17,16,16,17,17,17,18,17,
-	18,20,19,18,17,18,17,19,17,18,20,18,17,19,18,19,
-	19,18,19,20,18,18,20,20,18,19,19,20,20,19,19,18,
-	20,18,19,18,20,20,18,18,19,19,19,19,19,20,19,18,
-	20,19,20,20,20,20,19,19,20,19,19,20,20,19,20,18,
-	18,20,20,20,20,15,17,16,18,16,17,17,17,18,18,17,
-	18,17,19,20,18,19,18,18,18,18,18,19,18,18,19,18,
-	18,19,19,20,20,20,18,18,19,18,19,19,18,18,20,20,
-	20,19,20,18,19,20,18,20,19,19,19,19,19,20,20,20,
-	20,19,20,20,20,20,19,20,18,20,19,18,20,19,19,19,
-	20,20,20,20,19,20,15,16,16,17,17,17,18,17,18,18,
-	20,18,17,18,18,20,20,18,19,18,18,18,19,18,19,19,
-	18,18,18,19,18,18,19,20,18,18,20,19,18,18,19,20,
-	20,19,19,19,20,18,20,20,20,18,19,18,19,19,20,20,
-	20,18,18,20,20,20,19,18,20,20,20,20,19,20,18,19,
-	20,20,20,20,20,20,19,15,17,17,17,17,18,18,18,18,
-	18,17,19,18,17,19,19,18,18,18,20,19,19,19,18,19,
-	18,18,18,20,20,18,19,19,18,18,18,18,20,19,19,20,
-	19,19,20,20,18,20,18,18,20,20,20,19,19,20,20,18,
-	19,20,20,19,20,19,20,19,18,20,20,20,18,20,20,19,
-	20,20,20,20,20,20,20,20,15,16,16,17,17,18,17,18,
-	18,18,17,18,18,18,18,19,18,18,18,19,19,20,20,19,
-	20,18,18,19,19,20,18,18,20,19,20,18,19,20,19,19,
-	20,20,19,18,20,20,18,20,20,19,20,20,19,18,18,20,
-	19,19,20,20,20,20,18,20,20,19,18,20,19,20,20,19,
-	20,19,20,20,20,20,18,20,20,16,17,17,18,18,18,18,
-	19,17,18,17,19,19,19,17,18,18,20,19,19,18,19,18,
-	18,19,18,20,19,20,20,18,20,18,18,18,19,18,20,20,
-	20,20,20,19,18,19,20,20,20,19,19,20,19,20,20,20,
-	20,20,20,20,20,20,20,20,20,20,20,20,18,20,20,19,
-	19,20,20,19,19,20,20,20,19,20,16,17,17,18,17,18,
-	20,18,18,17,18,18,19,19,18,18,20,20,19,19,19,20,
-	18,20,18,20,19,19,19,20,19,18,19,18,20,19,20,20,
-	19,20,19,20,19,19,18,18,20,20,20,19,20,20,19,20,
-	20,20,20,20,19,19,19,20,19,20,20,20,20,20,20,20,
-	20,20,18,20,20,20,20,19,20,20,20,16,17,17,18,18,
-	18,18,18,19,18,18,19,19,20,18,19,18,18,19,19,18,
-	19,18,18,20,20,20,19,19,20,20,20,20,19,19,20,18,
-	19,20,20,20,19,19,20,19,19,20,20,20,20,20,20,20,
-	19,19,19,20,19,19,20,19,20,20,20,20,20,20,20,20,
-	19,20,19,19,19,19,19,20,19,20,20,20,16,17,17,18,
-	18,19,18,18,18,20,19,20,20,20,19,18,20,19,20,20,
-	18,20,19,19,18,20,19,20,19,20,20,20,20,19,19,18,
-	19,18,20,20,19,20,19,18,20,20,19,20,19,20,20,20,
-	20,20,20,20,20,19,20,20,18,18,20,20,20,20,19,19,
-	20,20,20,20,20,20,20,20,20,20,20,20,20,16,17,18,
-	19,18,18,18,17,18,19,19,19,19,18,18,19,19,19,19,
-	19,20,20,19,19,20,18,19,19,19,19,18,20,20,20,19,
-	20,20,20,20,19,20,19,20,20,20,19,19,20,19,19,20,
-	18,20,20,20,19,19,20,20,20,20,20,20,20,20,20,20,
-	20,19,20,20,20,20,20,20,20,20,20,20,20,20,16,16,
-	17,20,18,18,19,17,19,19,19,19,20,19,20,19,18,20,
-	19,19,19,19,19,20,20,19,19,20,18,20,19,20,20,20,
-	20,19,20,19,18,20,20,18,20,20,19,20,20,20,18,20,
-	20,20,19,20,20,20,20,20,20,20,20,20,20,19,20,20,
-	20,20,20,19,20,20,20,19,20,20,20,18,20,19,20,17,
-	19,18,18,18,18,20,18,20,19,20,19,20,19,20,19,18,
-	18,19,20,18,20,18,20,20,20,20,20,20,19,20,18,19,
-	19,20,19,20,19,20,20,20,20,20,18,20,20,20,20,20,
-	20,20,19,20,20,19,19,20,19,20,20,19,20,20,20,20,
-	20,20,20,20,20,20,20,20,20,20,20,20,19,20,20,20,
-	18,16,18,19,18,17,18,19,20,17,19,19,18,20,18,19,
-	19,20,20,18,19,20,20,20,19,20,20,20,18,20,19,20,
-	20,20,20,20,19,20,20,20,20,20,19,20,20,20,20,20,
-	20,20,20,20,18,20,19,20,19,19,20,20,20,20,20,20,
-	20,19,20,20,20,20,20,20,20,20,20,20,20,19,20,20,
-	20,
+	11,
 };
 
 static float _vq_quantthresh_res0_192_1024_8[] = {
@@ -550,7 +146,7 @@
 };
 
 static static_codebook _vq_book_res0_192_1024_8 = {
-	2, 6561,
+	1, 81,
         _vq_lengthlist_res0_192_1024_8,
         1, -525074432, 1611661312, 7, 0,
         _vq_quantlist_res0_192_1024_8,

1.4       +31 -30    vorbis/lib/books/res0_192_1024_9.vqh

Index: res0_192_1024_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_9.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_192_1024_9.vqh	2001/02/02 03:52:07	1.3
+++ res0_192_1024_9.vqh	2001/02/18 09:53:03	1.4
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -583,40 +584,40 @@
 
 static long _vq_lengthlist_res0_192_1024_9[] = {
          3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
          8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
          9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
-	10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,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,12,11,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,13,12,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,14,13,
-	13,13,13,13,13,14,13,14,14,14,14,13,14,14,14,14,
+	10, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	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,13,13,13,12,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,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,15,14,14,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,16,
-	15,15,16,15,15,16,16,16,16,15,16,16,16,15,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,16,
-	16,17,16,16,17,16,17,16,16,16,17,16,16,17,17,17,
-	16,17,16,17,17,17,17,17,17,17,18,17,17,18,17,17,
-	17,17,18,17,18,18,18,18,17,17,17,18,20,18,17,18,
-	19,19,17,18,18,17,19,19,19,18,18,18,18,18,18,18,
-	18,17,18,19,19,19,19,18,18,19,19,20,18,18,19,21,
-	18,19,21,19,18,18,18,19,19,18,20,19,19,19,20,19,
-	21,19,19,19,19,20,18,19,19,19,21,20,19,20,20,19,
-	20,20,19,21,20,20,21,19,20,19,21,19,20,20,19,20,
-	20,21,19,19,21,21,19,20,21,21,19,20,21,20,21,20,
-	21,21,19,21,21,21,19,21,21,20,21,21,21,21,21,21,
-	20,21,21,20,20,21,21,21,21,21,21,21,20,21,21,21,
-	21,21,21,21,21,20,21,21,21,21,21,21,21,20,20,21,
-	21,21,21,21,21,21,21,21,21,21,21,21,20,20,20,20,
-	20,20,20,20,19,20,20,20,20,20,20,20,20,20,20,20,
+	14,14,14,14,14,14,14,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,15,16,15,16,15,16,15,16,16,15,16,15,16,
+	16,15,16,16,16,16,16,15,16,16,16,16,16,17,16,16,
+	16,17,16,16,15,17,17,16,17,16,16,16,17,16,17,17,
+	16,17,16,16,16,16,18,16,17,17,17,16,16,17,17,17,
+	17,17,17,16,17,18,17,18,17,17,18,18,17,17,17,17,
+	17,18,18,17,17,18,17,17,18,18,19,17,18,17,18,18,
+	18,18,18,18,18,18,18,18,18,19,18,18,18,18,18,19,
+	18,20,18,19,19,18,18,19,19,18,19,19,18,20,19,19,
+	19,18,19,19,18,19,18,20,19,20,20,18,19,18,20,20,
+	19,19,18,20,19,19,20,20,19,20,19,20,20,19,18,19,
+	19,19,20,19,18,20,20,18,19,18,19,19,20,20,20,19,
+	19,20,20,19,19,19,20,20,20,20,19,19,20,20,20,20,
+	19,20,20,20,19,20,19,20,20,19,19,19,20,19,20,19,
+	20,20,20,20,19,20,19,20,20,20,20,20,20,20,20,20,
+	20,19,20,20,20,19,20,20,20,20,20,20,20,19,20,19,
+	20,20,20,20,20,20,20,20,19,20,19,20,20,20,20,20,
+	20,19,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
         20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
         20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
-	20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
-	20,20,20,20,20,19,20,20,20,20,20,20,20,20,20,20,
+	20,20,20,20,20,20,20,20,19,20,20,20,20,20,20,20,
         20,
 };
 

1.5       +13 -12    vorbis/lib/books/res0_192_1024aux.vqh

Index: res0_192_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024aux.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_1024aux.vqh	2001/02/02 03:52:07	1.4
+++ res0_192_1024aux.vqh	2001/02/18 09:53:03	1.5
@@ -1,12 +1,13 @@
 /********************************************************************
  *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
  * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
+ * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
@@ -19,13 +20,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res0_192_1024aux[] = {
-	 2, 7,12,11,16,10,14,11,17,22, 5, 4, 7, 8,11, 9,
-	10,10,14,22, 9, 6, 6, 6, 8, 8, 8,11,15,20, 9, 6,
-	 6, 5, 6, 6, 7, 9,13,21,15,10, 7, 5, 5, 6, 6,11,
-	18,21, 9, 8, 7, 5, 6, 5, 6, 7,13,21,14, 9, 8, 6,
-	 6, 5, 5, 8,13,20, 9, 9,10, 8, 9, 6, 6, 5, 9,15,
-	11,12,13,11,13, 9, 8, 6, 8,14,13,12,13,12,13,10,
-	 9, 5, 8,13,
+	 3, 7,12,11,17,10,15,11,15,21, 5, 5, 8, 8,11, 9,
+	10,10,13,21, 9, 6, 6, 7, 8, 8, 8,11,15,21, 9, 6,
+	 6, 6, 6, 6, 6, 9,13,19,14,10, 7, 6, 5, 5, 5,10,
+	16,21,10, 8, 7, 6, 5, 5, 5, 7,12,19,14, 9, 7, 6,
+	 5, 5, 4, 6,11,19, 9, 9, 9, 8, 8, 6, 5, 4, 7,13,
+	11,11,13,11,12, 9, 7, 5, 7,13,12,12,13,11,13,10,
+	 8, 5, 8,13,
 };
 
 static static_codebook _huff_book_res0_192_1024aux = {

1.5       +8 -7      vorbis/lib/books/res0_192_128_1.vqh

Index: res0_192_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_128_1.vqh	2001/02/02 03:52:07	1.4
+++ res0_192_128_1.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,12 +25,12 @@
 };
 
 static long _vq_lengthlist_res0_192_128_1[] = {
-	 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6,
-	 8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 5, 7, 7, 7, 8,
-	 8, 6, 8, 8, 7, 8, 8, 8, 9,10, 8,10, 9, 7, 8, 8,
-	 8,10, 9, 8, 9,10, 5, 7, 7, 7, 8, 8, 7, 8, 8, 7,
-	 8, 8, 8,10, 9, 8, 9,10, 7, 8, 8, 8, 9,10, 8,10,
-	 9,
+	 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 6, 7, 7, 8, 6,
+	 7, 8, 5, 6, 7, 6, 8, 7, 6, 8, 7, 5, 7, 7, 7, 8,
+	 8, 7, 8, 8, 7, 8, 8, 8, 8, 9, 8, 9, 9, 7, 8, 8,
+	 8, 9, 8, 8, 9, 9, 5, 7, 7, 7, 8, 8, 7, 8, 8, 7,
+	 8, 8, 8, 9, 9, 8, 8, 9, 7, 8, 8, 8, 9, 9, 8, 9,
+	 8,
 };
 
 static float _vq_quantthresh_res0_192_128_1[] = {

1.5       +6 -152    vorbis/lib/books/res0_192_128_2.vqh

Index: res0_192_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_128_2.vqh	2001/02/02 03:52:07	1.4
+++ res0_192_128_2.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -28,156 +29,9 @@
 };
 
 static long _vq_lengthlist_res0_192_128_2[] = {
-	 4, 5, 5, 7, 7,10,10, 5, 6, 6, 8, 8,12,12, 5, 6,
-	 6, 8, 9,12,12, 7, 8, 8,12,13,15,16, 7, 8, 9,12,
-	12,15,15,10,12,12,17,16,17,18,10,12,12,15,17,18,
-	17, 5, 7, 6, 9, 8,12,12, 7, 8, 8,10,10,13,13, 7,
-	 8, 8,10,10,13,13, 9,10,10,14,14,16,15, 9,10,10,
-	13,14,16,18,12,14,13,17,16,18,18,12,14,13,16,18,
-	17,18, 5, 6, 7, 8, 8,12,12, 7, 8, 8,10,10,13,13,
-	 7, 8, 8,10,10,13,13, 9,10,10,14,14,18,15, 9,10,
-	10,14,13,17,16,12,14,13,17,16,18,18,12,13,14,15,
-	16,17,17, 7, 9, 9,12,12,15,14, 9,10,10,14,13,18,
-	16, 9,10,10,14,14,16,16,13,14,14,18,18,18,18,12,
-	14,14,18,18,18,18,14,18,15,18,18,18,18,14,17,17,
-	18,18,18,18, 7, 9, 9,12,12,14,14, 9,10,10,14,14,
-	15,15, 9,10,10,13,15,16,15,13,14,14,17,16,18,18,
-	12,14,15,17,16,18,18,16,17,17,18,18,18,18,16,18,
-	16,18,18,18,18,10,12,12,16,15,16,16,12,14,13,17,
-	17,18,17,13,14,14,16,16,18,17,15,17,18,18,18,18,
-	18,17,18,17,18,16,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,10,12,13,15,14,17,18,12,14,13,
-	17,16,18,18,12,14,14,17,17,18,17,18,16,18,18,18,
-	18,18,16,17,18,18,18,18,18,16,18,18,18,18,18,18,
-	17,18,18,18,18,18,18, 6, 7, 7, 9, 9,12,12, 7, 8,
-	 8,10,10,14,13, 7, 8, 8,10,10,13,14, 9,11,10,14,
-	15,16,18, 9,10,10,14,14,16,17,12,13,14,17,16,18,
-	18,12,14,14,17,18,18,18, 7, 8, 8,10,10,13,13, 8,
-	 9, 9,12,11,15,14, 8, 9, 9,11,11,14,14,11,12,12,
-	16,15,16,18,10,12,12,17,17,17,18,14,15,16,18,18,
-	17,18,13,15,16,17,16,18,18, 7, 8, 8,10,10,13,13,
-	 8, 9, 9,11,11,14,14, 8, 9, 9,11,12,14,14,10,12,
-	11,16,15,18,17,11,12,12,15,16,18,18,14,15,15,18,
-	16,18,18,14,17,15,18,18,18,18, 9,11,10,14,14,18,
-	16,10,12,12,15,16,17,18,10,12,12,16,15,16,18,14,
-	15,16,16,18,17,18,14,16,17,18,17,18,18,16,17,18,
-	18,18,18,18,17,18,16,18,18,18,18, 9,10,11,15,14,
-	16,16,10,12,11,14,15,18,17,11,12,12,15,16,16,17,
-	14,15,15,18,18,18,18,14,18,17,18,18,18,18,18,18,
-	17,18,18,18,18,17,18,18,18,18,18,17,13,14,15,17,
-	16,18,18,13,14,16,18,17,18,18,14,17,15,18,18,18,
-	18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,12,14,13,
-	15,18,17,17,14,16,15,18,18,18,18,14,16,15,18,17,
-	18,18,17,17,18,18,18,18,18,16,18,18,18,18,18,18,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,18, 5, 7,
-	 7, 9, 9,12,12, 7, 8, 8,10,10,13,13, 7, 8, 8,10,
-	10,13,13, 9,10,10,14,13,16,18, 9,10,10,13,15,17,
-	17,12,13,14,17,16,18,18,12,14,13,16,16,18,18, 7,
-	 8, 8,10,10,14,13, 8, 9, 9,12,11,14,15, 8, 9, 9,
-	11,11,14,15,10,12,11,16,16,18,17,10,11,12,16,15,
-	16,18,14,15,14,17,18,18,18,13,15,15,17,18,18,18,
-	 7, 8, 8,10,10,13,13, 8, 9, 9,11,11,14,14, 8, 9,
-	 9,11,11,14,15,10,12,12,15,15,18,18,10,12,11,15,
-	15,18,18,15,16,14,17,18,18,18,14,14,17,18,18,18,
-	18, 9,11,10,13,14,15,17,10,12,12,15,15,18,18,10,
-	11,12,14,15,18,17,16,16,16,18,18,18,18,14,17,17,
-	16,18,18,18,17,18,18,18,18,18,18,18,17,18,18,18,
-	18,18, 9,10,11,14,15,17,16,10,12,12,14,15,17,18,
-	10,12,12,16,14,17,18,14,17,17,18,18,18,18,15,16,
-	15,17,17,18,18,18,18,18,18,18,18,18,17,18,17,18,
-	18,18,18,12,15,15,17,17,17,18,14,15,17,17,17,18,
-	18,14,15,15,18,18,18,18,18,18,18,18,18,18,18,17,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,
-	18,18,18,18,13,14,14,17,16,18,17,14,16,17,16,18,
-	18,18,14,15,14,18,18,18,18,17,18,18,18,18,18,18,
-	18,17,17,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18, 8, 9, 9,13,13,15,16, 9,11,11,14,
-	13,16,17, 9,11,11,14,14,16,16,14,15,14,18,18,18,
-	18,13,15,16,17,17,18,17,16,17,16,18,18,18,18,16,
-	17,18,18,18,18,17, 9,11,11,14,14,18,17,11,12,12,
-	16,15,17,18,11,13,12,15,15,17,18,15,15,17,17,18,
-	18,18,14,15,16,18,17,18,18,18,18,18,18,18,18,18,
-	17,16,18,18,18,18,18, 9,11,11,14,15,18,15,11,12,
-	12,16,15,18,18,10,12,12,15,15,17,18,15,17,18,18,
-	17,18,18,14,15,17,18,18,18,18,18,17,18,18,18,18,
-	18,18,18,18,18,18,18,18,13,15,14,17,16,18,18,14,
-	16,16,18,18,18,18,15,18,16,17,18,18,18,18,17,18,
-	15,18,18,18,17,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,13,15,15,18,18,18,18,
-	14,16,16,18,18,18,17,16,16,16,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,18,17,18,18,18,18,18,18,18,17,18,18,18,18,18,
-	18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,
-	18,18,18,18,17,18,17,18,18,18,18,17,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18, 8, 9, 9,13,
-	13,16,15, 9,11,11,14,14,18,17, 9,11,11,15,14,18,
-	18,13,14,15,16,17,17,18,13,15,15,17,18,18,18,16,
-	16,18,18,18,18,18,16,18,17,18,18,18,18, 9,11,10,
-	14,14,17,17,11,13,12,15,14,18,18,10,12,12,15,16,
-	15,17,15,17,16,18,17,18,18,14,17,16,18,18,18,18,
-	17,18,18,18,18,18,18,18,18,16,18,18,18,18, 9,11,
-	11,14,14,17,16,11,12,12,14,15,17,18,11,12,12,16,
-	15,18,17,15,15,17,18,18,18,18,15,17,16,18,18,18,
-	18,18,17,18,18,18,18,16,17,18,18,18,18,18,18,13,
-	14,14,16,18,18,18,14,18,16,18,17,18,18,14,15,15,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	13,15,15,16,18,18,18,16,15,16,18,18,18,18,15,17,
-	16,18,18,18,18,18,18,18,18,18,18,18,17,18,16,18,
-	15,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,16,18,18,18,18,18,18,16,18,18,18,18,18,18,18,
-	18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,16,17,17,18,18,18,18,18,18,18,18,18,18,18,
-	16,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,16,11,13,14,16,17,18,18,13,15,15,17,16,18,
-	17,13,15,15,16,18,18,18,17,18,18,18,18,18,18,16,
-	17,16,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,18,13,14,14,17,18,18,18,14,16,16,16,18,
-	18,16,14,16,14,18,18,18,18,18,17,18,18,18,18,18,
-	17,18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,18,18,13,14,15,17,18,18,18,14,15,17,17,
-	17,18,18,14,15,16,17,18,18,18,18,18,18,18,18,18,
-	18,17,18,18,18,18,18,18,17,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,16,17,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,16,18,18,18,18,18,18,18,16,
-	18,18,18,18,18,16,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,18,
-	15,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,11,13,13,16,15,18,
-	18,13,15,15,18,16,16,18,13,15,15,17,18,17,18,17,
-	18,17,18,18,18,18,17,18,16,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,12,15,13,16,18,
-	18,18,14,16,17,17,17,18,17,15,15,17,17,18,18,18,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,13,14,15,16,
-	16,17,18,15,17,16,17,18,18,18,16,16,16,18,18,18,
-	18,18,17,18,18,18,18,18,18,18,17,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,17,18,17,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	16,17,18,18,18,16,17,18,18,18,18,18,17,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,17,17,17,17,17,
+	 3, 3, 3, 5, 5, 8, 8, 4, 4, 4, 6, 6, 9, 9, 4, 4,
+	 4, 6, 6, 9, 9, 6, 7, 6, 9, 9,12,12, 5, 7, 7, 9,
+	 9,12,12, 8,10, 9,12,12,15,15, 8,10, 9,12,13,15,
         15,
 };
 
@@ -197,7 +51,7 @@
 };
 
 static static_codebook _vq_book_res0_192_128_2 = {
-	4, 2401,
+	2, 49,
         _vq_lengthlist_res0_192_128_2,
         1, -533200896, 1611661312, 3, 0,
         _vq_quantlist_res0_192_128_2,

1.5       +153 -152  vorbis/lib/books/res0_192_128_3.vqh

Index: res0_192_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128_3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_128_3.vqh	2001/02/02 03:52:08	1.4
+++ res0_192_128_3.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -70,157 +71,157 @@
 };
 
 static long _vq_lengthlist_res0_192_128_3[] = {
-	 4, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
-	10, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,
-	10,10, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 8, 8, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,
-	10, 9, 9, 9,10, 9, 9, 9,10,10,10,10,10,10,10,10,
-	10,10,10, 7, 7, 7, 8, 8, 9, 9,10, 9,10,10,10,10,
-	11,11,11,11,11,11,11,11,11,11,11,11,12,11,11,11,
-	11,12,11,11,11,11,11,11,11,11,11,12,12,12,12,12,
-	12,12,12,12, 7, 7, 7, 8, 8, 9, 9, 9,10,10,10,10,
-	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,12,11,11,12,11,12,11,
-	12,12,12,12,12, 9, 9, 9,10,10,11,11,11,11,12,12,
-	12,13,12,12,13,13,13,12,12,13,13,13,13,13,13,14,
-	13,13,13,13,13,14,13,13,13,14,13,13,13,13,13,13,
-	14,14,14,13,13,13, 9, 9, 9,10,10,11,11,11,11,12,
-	12,12,12,13,12,12,12,13,12,13,13,13,13,13,13,13,
-	12,13,12,13,14,13,13,13,13,13,13,13,13,14,13,14,
-	13,14,14,13,13,14,14, 9,10,10,11,11,12,12,13,13,
-	13,13,13,14,14,14,13,14,15,13,13,14,14,14,16,15,
-	14,15,14,15,13,15,14,14,15,15,14,15,14,14,14,15,
-	14,15,15,14,15,15,15,15, 9,10,10,12,11,12,12,13,
-	12,13,13,14,13,14,13,14,14,15,14,13,14,14,15,14,
-	14,14,15,14,14,15,15,15,14,14,15,14,15,14,15,15,
-	14,14,14,14,14,14,14,15,16,10,11,11,13,12,13,13,
-	13,13,14,14,14,14,15,14,14,14,15,14,14,14,15,14,
-	14,16,15,15,17,14,15,16,15,15,16,16,16,14,15,15,
-	15,15,15,16,16,15,17,15,16,16,10,11,11,12,12,14,
-	13,13,13,13,14,14,14,14,15,14,14,15,15,15,15,15,
-	15,15,14,15,15,15,14,16,15,15,17,16,15,16,16,16,
-	15,15,15,16,15,16,15,14,15,16,17,12,12,12,13,14,
-	14,14,14,14,14,14,15,16,15,15,16,17,14,16,16,16,
-	15,15,17,16,14,17,15,16,15,16,16,16,16,16,16,15,
-	15,17,15,15,17,17,16,16,17,16,16,16,11,12,12,13,
-	14,14,14,14,15,14,15,15,15,17,15,16,15,16,16,15,
-	16,14,16,16,16,16,17,16,16,15,16,15,17,15,15,16,
-	16,16,17,17,15,16,17,16,15,16,15,16,16,12,13,13,
-	14,14,14,15,15,15,15,16,15,15,15,16,16,15,15,16,
-	15,17,17,16,16,16,17,15,16,17,16,17,17,16,17,16,
-	17,17,16,16,17,17,17,17,17,16,17,16,17,17,12,13,
-	13,14,15,14,14,14,15,15,15,16,15,15,16,15,16,16,
-	15,16,15,15,16,17,17,17,16,16,15,17,16,16,16,16,
-	15,17,16,17,16,16,17,16,16,16,17,16,16,17,16,12,
-	13,13,14,15,15,16,15,16,16,16,17,16,16,17,16,16,
-	17,16,17,15,16,17,15,17,17,17,16,16,16,17,16,17,
-	17,16,17,16,16,17,16,17,16,17,16,17,16,17,17,15,
-	12,13,13,16,14,16,15,16,15,16,14,17,16,15,17,17,
-	17,17,17,16,16,16,17,16,16,17,17,17,17,17,17,17,
-	17,17,16,17,17,17,16,17,16,17,16,17,16,17,16,17,
-	16,13,15,14,16,15,15,16,16,15,16,15,16,17,15,17,
-	17,16,16,17,17,16,17,16,17,16,16,16,17,16,16,17,
-	17,15,16,17,16,17,17,16,17,16,17,17,17,16,16,17,
-	17,17,13,14,13,15,15,16,15,16,16,15,15,16,17,16,
-	17,17,17,16,17,16,16,17,17,15,17,16,16,17,16,17,
-	17,16,17,17,16,17,17,17,16,16,16,17,17,17,17,16,
-	16,16,17,14,14,14,16,14,17,16,15,16,16,16,17,17,
-	16,17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,16,16,16,17,17,17,17,16,17,17,17,17,
-	16,17,17,17,14,16,14,15,14,15,16,16,16,16,16,16,
-	17,17,16,17,17,17,17,17,17,17,16,16,17,17,17,17,
-	16,16,17,16,17,17,17,16,17,16,17,16,17,16,15,17,
-	17,17,17,17,16,14,14,14,15,16,15,17,15,16,17,17,
-	16,16,17,17,17,17,16,16,17,17,17,16,17,16,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,
-	17,17,17,17,17,17,14,15,15,15,15,17,16,17,17,17,
-	17,16,16,16,17,17,17,16,17,16,17,17,17,17,16,17,
-	16,17,17,17,17,16,17,16,16,17,16,17,16,17,17,16,
-	17,17,17,17,17,16,17,14,16,15,15,15,17,16,16,16,
-	17,17,16,16,16,17,17,16,17,17,17,17,17,17,17,17,
-	17,16,17,17,17,17,17,16,17,16,17,17,17,17,17,17,
-	17,17,16,17,17,17,17,17,14,15,16,16,15,16,16,16,
-	17,16,17,17,17,17,16,17,17,17,17,17,17,17,17,17,
-	17,17,17,16,17,16,16,17,17,17,16,16,17,17,17,16,
-	17,17,16,16,17,17,16,17,17,14,16,14,15,16,16,17,
-	17,16,17,17,17,17,17,17,17,17,17,17,16,17,17,17,
-	16,17,17,17,17,17,17,17,17,17,17,17,17,16,16,17,
-	17,17,17,17,17,17,17,17,17,17,16,15,16,16,16,16,
-	15,16,17,16,17,17,17,17,17,16,17,17,17,16,17,17,
-	17,17,16,17,16,17,17,17,17,17,17,17,17,17,16,16,
-	17,17,16,17,17,17,16,17,17,17,17,15,16,16,16,16,
-	17,17,17,17,17,17,16,17,17,17,16,17,17,17,16,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,16,16,14,17,
-	17,16,15,16,15,17,17,17,17,17,17,17,16,17,17,16,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,16,17,16,17,17,17,17,17,17,17,17,16,16,15,
-	17,16,17,17,16,17,16,17,16,16,17,17,17,17,17,17,
-	17,17,16,17,17,17,17,17,17,17,16,17,17,17,17,16,
-	17,16,17,17,17,17,17,17,17,17,17,17,17,17,15,15,
-	15,16,16,16,17,17,15,16,17,16,17,17,16,17,17,17,
-	17,17,17,17,17,16,17,17,16,17,17,17,16,17,17,16,
-	17,17,16,17,17,17,17,17,17,17,17,17,17,17,17,14,
-	16,15,16,16,16,16,17,16,17,17,17,16,16,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,16,17,17,17,16,17,17,17,17,17,17,
-	15,16,16,16,17,17,17,16,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,16,17,16,17,17,
-	17,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,15,15,15,16,17,17,17,17,17,16,17,16,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,15,16,16,17,17,16,17,17,17,17,17,17,17,17,
-	17,17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,16,16,16,16,17,17,17,17,17,
-	17,17,17,17,16,16,17,17,17,16,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,16,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,16,16,16,16,17,17,17,17,16,16,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,16,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,16,17,17,17,17,16,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,16,16,16,16,16,16,17,17,17,
-	17,17,17,17,17,16,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,16,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,16,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,16,
-	17,17,17,17,17,17,17,17,17,17,17,16,16,17,17,16,
-	17,17,17,17,17,17,17,17,16,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,16,17,17,16,17,17,17,
-	17,17,17,17,16,17,17,17,17,17,17,17,17,17,17,16,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,
-	17,17,17,17,17,17,17,17,16,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,17,
-	17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,17,
-	17,17,17,17,17,16,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,16,17,17,17,17,17,17,17,
-	17,17,16,16,17,16,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,16,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-	17,
+	 4, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9,
+	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,
+	10,11,11,11,11,12,11,12,11,12,12,13,12,13,12,13,
+	12, 5, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,
+	11,10,11,10,11,10,11,11,12,12,12,12,12,12,13,12,
+	13,13, 5, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,10,
+	10,11,10,11,10,11,11,11,11,12,11,12,12,12,12,13,
+	12,13,13, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,10,10,
+	10,10,10,10,10,11,10,11,10,11,11,11,11,11,11,11,
+	11,11,11,11,12,11,12,11,13,12,13,12,14,13,14,13,
+	14,13,14,14, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,11,10,11,11,11,11,11,11,
+	11,11,11,12,11,12,11,12,12,13,12,13,12,13,13,13,
+	13,14,13,15,14, 8, 8, 8, 9, 9,10,10,10,10,11,11,
+	11,11,11,11,11,12,11,12,11,12,12,12,11,12,12,12,
+	12,12,12,12,13,12,13,12,14,13,13,13,15,13,14,13,
+	15,14,15,14,15,15, 8, 8, 8, 9, 9,10,10,11,10,10,
+	11,11,11,11,11,11,11,12,12,11,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,13,12,13,13,13,13,14,13,14,
+	14,14,14,15,15,15,15, 8, 9, 9,10,10,11,11,11,11,
+	12,12,12,12,12,12,12,12,12,13,12,13,12,13,12,13,
+	12,12,13,12,13,13,13,13,14,14,15,14,14,14,15,14,
+	14,15,14,14,16,15,15,16, 8, 9, 9,10,10,11,11,11,
+	12,12,12,12,12,12,13,12,13,12,12,12,13,12,12,12,
+	13,13,13,13,12,13,13,13,13,14,13,14,13,15,14,15,
+	14,16,15,16,15,16,15,15,15, 9,10,10,11,11,12,12,
+	12,13,12,13,13,13,13,13,13,14,12,14,13,14,13,14,
+	14,13,13,13,14,14,13,14,13,14,14,13,15,14,15,14,
+	16,15,15,15,16,15,16,15,16,16, 9,10,10,11,11,12,
+	12,12,12,12,12,13,13,13,13,14,13,13,13,13,13,13,
+	13,13,13,14,14,14,14,14,14,14,14,15,14,15,14,15,
+	14,15,15,16,15,16,15,16,16,16,16,10,11,11,12,12,
+	13,13,13,13,13,14,14,13,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,15,14,15,15,15,14,15,15,
+	16,15,17,15,16,16,17,16,17,16,16,17,10,11,11,12,
+	12,13,13,13,13,13,13,14,13,13,13,14,14,13,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,15,15,14,16,
+	14,16,15,15,15,17,15,17,15,17,16,17,17,11,12,11,
+	13,13,13,13,13,14,13,14,14,14,14,15,14,15,14,14,
+	14,15,14,15,14,14,14,15,14,15,15,14,15,15,15,15,
+	16,16,17,15,16,17,16,16,17,16,17,16,18,17,11,12,
+	11,12,13,13,14,14,14,14,13,14,15,15,14,15,15,14,
+	14,14,15,14,15,15,15,14,14,15,15,17,15,15,16,15,
+	16,16,15,16,15,17,15,17,16,17,16,18,17,17,17,12,
+	12,12,13,14,14,14,14,14,14,15,14,15,15,15,15,15,
+	14,15,15,15,14,15,15,15,15,16,15,16,16,15,15,16,
+	17,15,18,15,16,16,16,16,17,17,16,17,16,17,18,18,
+	12,12,12,13,13,14,14,14,14,14,14,14,16,15,15,16,
+	15,16,15,15,15,16,15,16,15,16,15,16,15,17,15,17,
+	16,15,16,17,16,18,16,17,17,17,16,17,17,17,18,16,
+	16,12,13,13,14,13,15,14,15,15,15,16,16,15,15,16,
+	15,16,15,16,16,15,16,17,15,16,16,16,17,16,18,16,
+	17,16,17,17,17,17,17,16,17,17,18,17,18,18,18,18,
+	16,17,12,12,12,14,13,14,15,14,15,15,15,15,15,15,
+	15,15,16,14,15,16,16,16,15,16,15,16,17,16,16,15,
+	16,16,17,16,16,16,16,17,16,17,17,16,16,17,17,17,
+	17,17,17,13,13,13,15,14,15,15,16,16,16,16,16,16,
+	15,17,15,16,15,16,15,16,15,17,15,16,16,17,16,16,
+	16,16,18,16,18,17,17,17,17,16,18,18,18,17,18,16,
+	17,17,18,18,13,13,13,14,14,16,15,16,15,16,16,16,
+	16,16,15,15,16,15,16,16,15,16,16,16,17,16,16,16,
+	16,16,16,17,17,17,16,17,16,17,17,18,17,18,16,18,
+	18,17,17,18,18,13,14,13,15,15,15,16,15,16,16,16,
+	15,17,16,17,15,16,16,17,16,17,16,16,17,16,18,15,
+	16,17,17,16,16,17,18,16,17,16,17,17,17,18,18,17,
+	17,17,17,18,18,18,13,14,13,15,15,15,15,16,15,16,
+	16,16,16,16,16,16,16,16,16,17,17,17,16,17,16,17,
+	16,17,16,17,16,18,16,17,16,17,16,18,17,18,17,17,
+	17,18,17,17,18,18,18,13,14,14,16,15,15,16,16,16,
+	16,17,17,15,16,17,16,16,15,17,16,17,17,16,16,16,
+	16,17,16,17,17,17,18,17,16,17,17,17,18,17,17,17,
+	18,17,18,18,17,18,18,18,13,14,14,15,16,15,14,16,
+	16,16,17,17,16,17,16,18,16,16,16,17,16,17,18,17,
+	15,17,17,17,17,18,16,16,16,18,17,17,18,17,17,18,
+	17,17,17,18,18,18,17,17,17,13,15,14,16,15,15,16,
+	17,15,16,17,16,15,17,17,16,17,17,17,15,16,18,17,
+	17,17,16,17,17,18,17,16,17,17,17,17,18,17,17,17,
+	18,17,18,18,17,18,18,18,18,18,15,14,15,16,15,16,
+	15,16,17,16,16,16,17,17,18,16,17,16,17,17,16,16,
+	16,17,16,17,16,18,17,17,18,18,18,17,17,18,17,17,
+	17,17,17,17,18,17,17,18,18,17,18,14,15,15,15,16,
+	16,16,16,16,16,17,16,18,17,16,16,16,16,17,18,17,
+	17,18,17,17,17,17,17,17,17,17,18,18,18,17,18,18,
+	17,17,18,18,18,17,18,17,18,18,17,18,14,15,15,16,
+	16,16,15,16,18,16,16,16,17,17,16,17,17,17,17,17,
+	17,16,18,18,17,17,16,18,17,18,17,17,17,17,17,17,
+	17,18,17,18,18,17,17,18,18,18,17,18,18,14,15,15,
+	16,16,16,17,17,17,16,16,17,17,17,17,17,17,17,18,
+	18,18,16,17,17,18,17,17,18,17,17,17,18,18,18,18,
+	18,16,18,18,18,18,18,18,18,18,18,18,18,18,15,16,
+	16,16,16,16,16,17,16,16,16,17,18,16,18,17,17,17,
+	17,16,18,16,17,18,16,17,16,17,16,18,18,18,17,17,
+	17,18,17,18,17,18,18,17,18,18,18,18,18,17,18,16,
+	16,15,16,17,16,16,17,17,16,17,17,18,18,18,16,18,
+	17,18,17,17,17,17,18,18,17,17,17,17,18,18,18,17,
+	17,17,17,17,17,18,18,18,18,18,18,18,17,18,18,18,
+	14,15,15,16,15,15,17,17,16,15,17,17,16,16,18,17,
+	17,17,17,17,16,17,17,17,17,16,17,17,18,18,17,17,
+	18,18,17,17,17,18,17,18,17,17,17,18,18,18,18,18,
+	18,15,16,15,17,17,18,17,16,18,17,16,17,17,18,17,
+	17,17,18,17,16,18,18,17,18,17,17,16,17,17,17,18,
+	18,17,18,18,18,18,18,18,18,18,17,18,18,18,18,18,
+	17,18,15,15,17,16,17,17,17,16,16,18,17,17,18,18,
+	17,17,18,17,17,18,18,17,17,17,18,17,17,18,16,18,
+	18,17,18,18,18,18,18,18,18,18,17,18,18,18,18,18,
+	17,18,18,16,17,16,16,16,16,17,18,17,17,17,17,18,
+	17,18,16,18,18,18,18,18,18,17,18,18,17,18,18,17,
+	18,18,18,17,17,18,18,18,17,18,18,17,18,18,18,18,
+	18,18,18,18,16,16,17,16,16,17,18,18,17,16,17,17,
+	18,17,17,17,18,16,18,17,17,18,17,17,17,18,18,18,
+	17,17,17,17,18,17,17,18,17,18,17,18,18,18,18,18,
+	18,18,18,18,18,16,16,16,17,17,17,17,17,18,18,18,
+	17,17,18,18,17,17,18,18,18,18,18,18,18,17,18,18,
+	17,18,17,18,17,18,18,17,18,18,18,18,18,18,18,18,
+	18,18,18,18,18,18,16,17,17,17,17,16,16,18,16,18,
+	17,18,18,18,18,18,18,17,17,17,18,17,18,18,17,18,
+	18,17,17,17,18,18,18,18,18,18,17,18,17,18,18,18,
+	18,18,18,18,18,18,18,17,16,17,16,18,18,17,18,18,
+	18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,18,
+	18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,16,
+	18,18,18,17,18,18,18,18,16,18,18,18,16,18,17,16,
+	17,17,18,18,18,16,18,18,18,18,18,17,18,18,18,18,
+	18,17,18,18,18,18,18,17,18,17,17,18,18,18,18,18,
+	17,18,18,18,18,18,18,18,18,17,17,17,17,17,17,18,
+	18,18,18,17,18,18,18,18,18,17,18,18,18,18,18,18,
+	18,17,18,17,17,17,18,17,18,18,18,18,17,17,18,18,
+	18,18,18,18,18,18,18,18,18,18,16,16,17,18,17,17,
+	18,17,17,18,17,18,17,18,17,18,18,18,18,18,17,17,
+	18,18,18,17,17,17,17,18,17,18,18,18,17,18,18,18,
+	17,18,18,18,18,18,18,18,18,17,18,17,17,18,18,17,
+	17,18,17,17,18,18,17,17,18,17,18,18,18,18,18,18,
+	18,18,18,17,18,18,18,18,18,18,18,18,18,18,18,18,
+	18,17,18,17,18,18,18,18,18,18,18,18,16,17,17,16,
+	18,17,17,18,18,18,18,17,18,18,18,18,18,18,18,18,
+	18,18,17,18,18,18,18,17,18,18,18,18,18,18,18,18,
+	18,18,18,18,18,18,17,18,18,18,18,18,18,17,17,18,
+	18,17,18,17,18,17,17,18,17,18,18,18,18,18,18,17,
+	18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,18,
+	18,18,18,18,18,18,18,18,18,18,18,18,18,18,16,18,
+	17,18,17,18,18,17,17,18,18,17,18,18,17,18,18,17,
+	17,18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,
+	17,18,18,18,17,18,18,18,18,18,18,18,18,18,18,17,
+	17,18,18,18,17,17,17,17,18,18,18,18,18,18,17,18,
+	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+	16,17,17,17,18,18,18,18,17,18,18,18,18,17,18,18,
+	18,18,18,18,18,17,18,18,18,18,18,18,18,18,18,18,
+	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+	18,
 };
 
 static float _vq_quantthresh_res0_192_128_3[] = {

1.5       +9 -413    vorbis/lib/books/res0_192_128_4.vqh

Index: res0_192_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128_4.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_128_4.vqh	2001/02/02 03:52:08	1.4
+++ res0_192_128_4.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -102,417 +103,12 @@
 };
 
 static long _vq_lengthlist_res0_192_128_4[] = {
-	 5, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
-	 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	10, 9,10, 9,10,10,10,10,10,10,10,11,10,11,11,11,
-	12, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
-	10,10,10,10,10,10,11,11,10,11,10,11,11,12,12,12,
-	12, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,11,11,11,11,11,11,11,12,11,
-	12,12, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,
-	10,11,11,11,11,11,11,11,11,11,11,12,12,12,12,12,
-	12,12, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,
-	10,10,10,10,11,10,10,10,10,10,11,11,12,11,11,12,
-	12,12,12, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,
-	10,10,10,11,11,11,11,11,11,11,11,11,11,12,12,12,
-	12,12,12, 7, 7, 7, 8, 8, 9, 9,10,10,10,10,10,10,
-	11,11,11,11,11,11,11,12,11,11,12,11,11,12,12,12,
-	12,12,12,12,12,12,13,13,12,13,13,13,13,13,14,13,
-	13,14,14,14,11,11,11,11,11,11,11,12,12,12,12,13,
-	12,12,13,13,13,13,13,13,14,12,14,14,13,13,14,13,
-	14,16,13,14, 7, 7, 7, 8, 8, 9, 9,10,10,10,10,10,
-	10,11,11,11,11,11,11,11,11,11,11,11,11,11,12,12,
-	12,12,12,11,12,12,12,12,13,12,13,13,13,14,13,13,
-	12,13,14,13,13,11,11,11,11,11,11,11,11,11,12,12,
-	12,12,13,12,12,12,14,13,13,13,12,12,13,13,14,15,
-	14,13,12,14,14, 9, 9, 9,10,10,11,11,12,11,12,12,
-	12,12,12,12,13,12,13,13,13,13,12,14,13,13,14,14,
-	13,13,13,14,13,13,13,13,13,14,15,14,14,14,13,13,
-	15,16,15,15,15,15,12,12,14,13,13,13,13,13,14,14,
-	13,13,13,15,14,14,14,14,15,15,15,15,14,15,15,15,
-	14,14,16,15,15,15, 9, 9, 9,10,10,11,11,11,12,12,
-	12,12,12,13,12,13,13,14,13,13,12,13,13,14,14,14,
-	13,13,14,14,13,14,12,13,12,14,14,15,14,15,16,16,
-	14,14,14,15,15,15,14,12,13,12,12,13,12,14,13,15,
-	13,14,13,14,14,14,15,14,15,13,15,14,16,14,15,14,
-	15,16,16,16,14,15,15,10,10,10,11,12,12,13,12,13,
-	14,13,13,14,14,13,14,13,14,14,14,14,15,15,14,16,
-	14,14,14,14,15,15,15,14,14,15,15,14,13,16,15,15,
-	16,15,15,15,15,15,16,16,14,15,14,14,13,15,15,14,
-	14,14,16,15,14,16,16,16,14,16,16,15,15,16,15,15,
-	15,15,16,16,16,15,16,16,10,11,10,12,11,12,11,13,
-	12,13,13,13,14,14,13,15,14,14,13,14,14,14,14,14,
-	15,14,15,15,14,15,14,15,13,15,16,15,15,15,15,15,
-	16,16,16,16,15,16,15,16,15,14,14,14,14,13,15,14,
-	13,13,15,15,14,15,14,15,15,16,16,16,15,15,16,15,
-	15,16,16,15,16,15,16,15,15,11,11,12,12,12,14,14,
-	14,14,13,14,14,14,14,15,15,14,15,15,14,15,15,15,
-	14,16,15,16,14,15,15,15,15,14,15,15,15,15,16,15,
-	15,15,16,16,16,15,16,16,16,16,15,15,14,15,15,14,
-	15,15,14,15,16,15,15,16,15,16,15,16,16,16,15,16,
-	16,15,16,16,16,15,16,16,16,16,11,11,11,13,13,14,
-	14,14,13,15,15,14,14,15,15,14,15,14,14,14,16,15,
-	16,15,16,16,14,15,16,15,14,15,15,15,15,16,15,14,
-	15,15,15,16,16,16,16,15,16,16,16,15,14,16,15,14,
-	14,15,15,15,15,16,15,16,16,16,15,16,15,15,16,16,
-	16,16,16,15,15,16,15,16,16,16,15,12,12,13,14,14,
-	14,14,15,14,14,14,14,15,15,15,14,16,15,14,14,16,
-	15,15,16,15,16,16,16,15,15,16,14,16,16,15,16,16,
-	16,16,16,16,16,15,16,16,16,15,16,16,14,15,15,16,
-	15,16,16,15,16,15,16,16,16,16,15,16,16,16,16,16,
-	16,16,16,16,16,16,15,16,16,15,16,16,12,12,13,13,
-	13,16,15,16,14,14,14,14,16,16,16,15,15,14,15,16,
-	15,15,16,16,16,16,16,15,15,15,16,16,15,16,16,15,
-	15,16,15,16,15,15,16,16,15,16,16,16,16,15,15,16,
-	15,16,15,16,15,16,16,16,16,15,15,16,16,16,16,15,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,14,14,13,
-	13,15,14,15,15,15,15,15,15,15,16,16,15,15,16,15,
-	16,16,15,16,15,16,16,16,15,16,15,16,16,16,16,16,
-	15,15,16,16,15,16,16,15,16,16,16,15,16,16,16,15,
-	16,15,16,16,16,16,16,16,16,15,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,13,14,
-	13,14,15,15,15,16,16,16,16,16,14,16,14,15,14,15,
-	16,16,16,16,16,16,15,15,16,15,16,16,15,16,15,16,
-	16,16,15,16,16,16,16,16,16,16,15,16,16,16,16,15,
-	15,15,15,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,
-	15,14,15,15,14,15,15,15,16,16,15,15,16,16,16,16,
-	16,15,15,16,16,15,16,16,16,15,15,16,16,16,16,15,
-	16,15,16,15,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,15,15,16,15,16,15,15,15,16,16,16,16,16,15,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	14,14,15,15,15,15,16,16,15,15,15,15,16,15,15,16,
-	16,16,16,16,16,15,16,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,16,16,16,16,16,16,16,16,16,16,16,
-	16,15,15,16,16,16,16,15,16,16,16,16,16,16,16,16,
-	16,15,14,14,16,15,16,16,16,16,15,15,15,16,16,16,
-	16,16,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,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,15,14,14,16,16,16,15,16,15,15,16,16,15,15,
-	16,15,16,16,16,16,16,16,16,16,15,16,16,16,16,16,
-	16,15,16,15,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,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,16,16,16,16,
-	16,16,16,15,14,15,16,16,16,16,16,16,15,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	15,16,16,16,16,16,16,15,16,15,16,16,16,16,16,16,
-	16,16,16,16,16,15,16,16,16,16,15,15,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,16,14,16,16,16,16,16,15,16,16,15,
-	16,15,16,16,16,16,16,16,16,15,16,15,16,15,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,15,16,15,16,16,16,
-	16,16,15,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,15,14,16,16,15,16,16,16,16,16,16,
-	15,16,15,16,16,15,16,16,16,16,16,16,16,16,15,16,
-	15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,15,15,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,15,15,15,16,15,15,16,15,15,16,
-	15,16,16,16,16,16,15,16,16,16,16,16,16,16,16,16,
-	15,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,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,15,15,16,16,16,16,16,16,
-	16,15,16,16,16,16,16,16,16,16,16,15,16,16,16,16,
-	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,16,16,16,16,16,16,
-	16,16,16,16,16,16,15,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,15,15,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,15,16,16,
-	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,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,16,16,16,16,16,16,16,15,16,16,16,16,
-	16,16,16,16,15,16,16,15,16,16,16,16,16,15,16,16,
-	16,16,16,16,16,15,16,16,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,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,
-	16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,15,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,15,16,16,16,16,16,16,16,15,
-	15,15,16,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,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	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,16,16,15,16,15,16,
-	16,16,15,16,15,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,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,15,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,15,
-	16,15,16,16,16,15,15,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,
-	16,15,15,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	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,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,15,16,16,16,16,16,16,16,16,16,16,15,16,15,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,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,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,15,15,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,15,16,16,16,16,15,16,16,16,16,16,
-	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,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,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,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,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,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,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,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,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,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,15,16,15,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,15,15,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,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,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,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,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,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,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,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,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,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,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,
+	 2, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7,
+	 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9,10,
+	10,11,10,11,10,11,11,11,11,12,12,13,11,12,12,13,
+	12, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9, 8, 9, 9,
+	 9, 9,10, 9,10, 9,10, 9,11,10,11, 9,10,10,11,10,
+	11,
 };
 
 static float _vq_quantthresh_res0_192_128_4[] = {
@@ -550,7 +146,7 @@
 };
 
 static static_codebook _vq_book_res0_192_128_4 = {
-	2, 6561,
+	1, 81,
         _vq_lengthlist_res0_192_128_4,
         1, -525074432, 1611661312, 7, 0,
         _vq_quantlist_res0_192_128_4,

1.5       +20 -19    vorbis/lib/books/res0_192_128_5.vqh

Index: res0_192_128_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128_5.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_128_5.vqh	2001/02/02 03:52:08	1.4
+++ res0_192_128_5.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -322,25 +323,25 @@
 };
 
 static long _vq_lengthlist_res0_192_128_5[] = {
-	 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 6, 7, 7, 7,
-	 7, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 9, 8, 9,
-	 9, 9, 9, 9, 9,11,10,11,11,12,10,12,12,12,11,12,
-	12,12,10,13,11,12,12,13,12,13,13,12,13,13,13,13,
-	13,13,13,12,12,13,13,12,13,13,12,12,13,13,13,13,
-	13, 7, 8, 8, 8, 8, 8, 9, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9,11, 9,11,10,11, 9,10,10,10,10,12,10,11,
-	10,11,10,11,11,12,10,12,12,12,12,12,11,12,12,11,
-	13,12,12,13,13,11,13,13,13,13,13,13,12,13,12,13,
-	12,12,12,11,12,13,13,12,13,13,13,13,13,12,13,13,
-	13,13,12,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,12,13,13,13,13,13,12,13,13,13,13,13,13,13,
-	12,13,12,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	 3, 3, 2, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 6, 7,
+	 7, 7, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9,11, 9,10,10,
+	11,10,11,12,10,11,11,10,11,11,11,11,13,12,11,10,
+	12,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,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13, 8, 9, 8, 9, 8, 9, 8, 9, 9, 9,10,10,10,10,10,
+	10, 9,10, 9,10, 9,10, 9,12, 9,11,10,11,10,11,10,
+	10,10,11,12,12,10,10,11,11, 9,12,10,12,10,11,11,
+	13,11,12,11,12,11,12,11,13,12,11,11,12,11,11,10,
+	12,12,12,10,12,13,13,12,13,12,13,13,13,13,13,11,
+	11,13,12,13,13,12,12,13,11,11,12,12,13,11,11,12,
+	12,11,13,13,13,12,13,13,12,13,12,12,13,13,12,13,
+	13,12,13,12,13,13,13,12,13,13,13,13,13,13,13,13,
+	12,13,13,11,12,13,12,13,13,13,12,13,12,13,13,13,
+	13,13,13,13,13,13,13,11,13,13,13,13,13,12,13,13,
+	13,13,13,13,13,13,13,12,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,12,13,13,13,13,
+	13,13,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,12,12,
 };
 
 static float _vq_quantthresh_res0_192_128_5[] = {

1.5       +56 -55    vorbis/lib/books/res0_192_128aux.vqh

Index: res0_192_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128aux.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_192_128aux.vqh	2001/02/02 03:52:08	1.4
+++ res0_192_128aux.vqh	2001/02/18 09:53:03	1.5
@@ -1,12 +1,13 @@
 /********************************************************************
  *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
  * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
+ * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
@@ -19,87 +20,87 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res0_192_128aux[] = {
-	 9,16,16,16,16,16,12,14,16,16,16,16,15,16,16,16,
-	16,16,12,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16, 9,14,16,16,16,16,10,11,15,16,16,16,
-	14,14,16,16,16,16,15,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,11,16,16,16,16,16,12,14,
-	15,16,16,16,15,16,16,16,16,16,15,16,16,16,16,16,
+	10,16,16,16,16,16,12,16,16,16,16,16,15,16,16,16,
+	16,16,13,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,10,14,16,16,16,16,12,15,16,16,16,16,
+	14,16,16,16,16,16,14,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,12,16,16,16,16,16,13,16,
+	16,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,16,10,16,16,16,
         16,16,12,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16, 4,10,13,14,16,16, 8, 9,
-	14,16,16,16,14,13,14,16,16,16,12,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16, 4, 8,11,12,
-	16,16, 5, 3, 6,10,16,16,10, 6, 8,15,16,16,13,15,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	 9,12,16,16,16,16, 8, 5, 8,13,16,16,11, 7,10,16,
-	16,16,13,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,11,15,16,16,16,16,13,13,15,16,16,16,
-	14,15,15,16,16,16,14,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,16, 5,12,14,16,16,16, 9,12,
+	16,16,16,16,13,14,16,16,16,16,12,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,16,16,16,16, 4, 9,12,13,
+	16,16, 5, 5, 9,11,16,16,10, 8, 9,16,16,16,13,15,
+	15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	 8,12,16,13,16,16, 7, 7,10,13,16,16,11, 9, 9,14,
+	16,16,14,14,15,15,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,11,16,16,16,16,16,15,13,14,16,16,16,
+	16,16,14,16,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,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	 6,11,16,16,16,16,10,10,16,16,16,16,14,13,13,16,
-	16,16,15,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16, 6, 9,11,14,16,16, 6, 5, 8,11,16,16,
-	11, 7, 9,15,16,16,16,14,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16, 9,12,15,16,16,16, 9, 7,
-	10,16,16,16,12, 9,11,16,16,16,14,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,13,16,16,16,
-	16,16,13,13,15,16,16,16,15,16,16,16,16,16,13,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	 5,11,14,16,16,16, 9,11,16,16,16,16,15,13,14,16,
+	16,16,16,16,15,16,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16, 4, 8,11,13,16,16, 4, 4, 9,10,16,16,
+	10, 8, 9,16,16,16,16,14,15,15,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,16, 7,11,15,12,16,16, 6, 6,
+	 9,11,16,16,10, 8, 9,14,16,16,14,15,14,15,16,16,
+	16,16,16,16,16,16,16,16,16,16,16,16,11,14,16,16,
+	16,16,13,13,14,16,16,16,13,13,15,14,16,16,14,14,
+	13,14,16,16,16,16,16,16,16,16,16,16,16,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,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16, 9,12,16,16,16,16,11,13,
-	15,16,16,16,15,14,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,11,14,13,14,
-	16,16,11, 4, 6,10,16,16,11, 5, 7,13,16,16,14,11,
-	12,14,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	12,14,13,12,16,16,13, 4, 4, 9,15,16,11, 4, 6,10,
-	16,16,13,10,11,14,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,14,15,13,13,16,16,16, 8, 8,10,15,16,
-	16, 8, 9,12,16,16,16,12,14,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,16, 8,12,16,16,16,16,11,12,
+	15,15,16,16,16,15,16,16,16,16,16,15,16,16,16,16,
+	16,16,16,16,16,16,16,16,16,16,16,16, 7,12,15,15,
+	16,16, 9, 7, 7,11,16,16,12, 7, 6, 9,16,16,14,11,
+	 9,11,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	10,14,16,15,16,16,10, 6, 4, 8,16,16,12, 4, 3, 6,
+	16,16,12, 8, 6, 8,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,12,14,14,13,16,16,14, 9, 7, 8,14,16,
+	14, 7, 5, 7,16,16,14, 9, 7, 8,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	16,15,16,16,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,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	13,15,16,16,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,16,16,
-	16,16,16,16,15,15,14,16,16,16,13, 6, 7,12,16,16,
-	14, 7, 8,13,16,16,16,12,13,15,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,15,16,16,16,13, 5,
-	 6,10,16,16,13, 6, 7,11,16,16,16,11,12,15,16,16,
+	14,14,16,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,16,16,16,
-	16,16,16, 9, 9,14,16,16,16, 9,11,14,16,16,16,14,
-	14,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,
+	16,16,16,16,16,15,16,16,16,16,14,11,10,15,16,16,
+	16,11, 9,13,16,16,15,13,12,14,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 9,
+	 8,11,16,16,14, 8, 6, 9,16,16,15,12,10,11,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,12,10,13,16,16,16,10, 8,11,16,16,15,14,
+	11,12,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,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,
-	16,16,16, 9,10,15,16,16,16,10,11,16,16,16,16,14,
+	16,16,16,16,16,16,16,16,16,16,16,16,16,15,16,16,
+	16,16,16,13,13,16,16,16,16,14,12,14,16,16,16,16,
+	15,15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,12,10,14,16,16,16,10, 9,11,
+	16,16,16,13,12,15,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,16,16,16,15,13,16,16,16,
+	16,15,11,13,16,16,16,16,13,15,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16, 8, 9,13,16,16,15, 9,10,16,
-	16,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,13,12,16,16,16,
-	16,15,13,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
         16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,15,
 };
 
 static static_codebook _huff_book_res0_192_128aux = {

1.5       +37 -36    vorbis/lib/books/res0_256_1024_1.vqh

Index: res0_256_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_1024_1.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_1024_1.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -27,45 +28,45 @@
 
 static long _vq_lengthlist_res0_256_1024_1[] = {
          2, 4, 4, 8, 8, 5, 7, 7,10,10, 5, 7, 7,10,10, 9,
-	10,10,12,13, 9,10,10,12,12, 5, 7, 7,10,10, 7, 8,
+	10,10,12,12, 9,10,10,12,12, 5, 7, 7,10,10, 7, 8,
          8,11,11, 7, 8, 8,11,11,10,11,11,13,13,10,11,11,
-	13,14, 5, 7, 7,10,10, 7, 8, 8,11,11, 7, 8, 8,11,
-	11,10,11,11,13,13,10,11,11,13,13, 9,10,10,13,13,
-	10,12,11,14,13,10,12,11,14,14,13,14,14,15,16,13,
-	14,14,15,15, 9,10,10,13,13,10,11,11,14,13,10,11,
-	11,14,13,13,14,14,15,15,13,14,14,15,15, 5, 7, 7,
-	10,10, 7, 8, 8,11,11, 7, 8, 8,11,11,10,11,11,13,
+	13,13, 5, 7, 7,10,10, 7, 8, 8,11,11, 7, 8, 8,11,
+	11,10,11,11,13,13,10,11,11,13,13, 9,10,10,12,12,
+	10,11,11,13,13,10,11,11,13,13,13,13,13,15,15,13,
+	13,14,15,15, 9,10,10,12,12,10,11,11,13,13,10,11,
+	11,13,13,13,14,13,15,15,13,13,13,15,15, 5, 7, 7,
+	10,10, 7, 9, 9,11,11, 7, 9, 8,11,11,10,11,11,13,
         13,10,11,11,13,13, 7, 9, 9,11,11, 9,10,10,12,12,
          9,10,10,12,12,11,12,12,14,14,11,12,12,14,14, 7,
          9, 9,11,11, 9,10,10,12,12, 9,10,10,12,12,11,12,
-	12,15,14,12,12,12,14,14,11,12,12,14,14,12,12,12,
-	14,15,12,12,12,14,14,14,14,14,16,16,14,14,14,16,
-	16,10,12,12,14,14,11,12,12,15,14,12,12,13,14,14,
-	14,14,14,16,15,14,15,15,16,16, 5, 7, 7,10,10, 7,
-	 8, 8,11,11, 7, 8, 8,11,11,10,11,11,13,13,10,11,
-	11,13,13, 7, 9, 8,11,11, 9,10,10,12,12, 9,10,10,
-	12,12,12,12,12,14,14,11,12,12,14,14, 7, 8, 8,11,
-	11, 9,10,10,12,12, 8,10,10,12,12,11,12,12,14,14,
-	11,12,12,14,14,11,12,12,14,14,12,12,12,14,14,12,
-	12,12,15,14,14,14,15,16,17,14,14,15,16,16,10,12,
-	12,14,14,12,12,12,14,14,11,12,12,15,14,14,14,14,
-	16,16,14,14,14,16,16, 9,11,11,13,13,10,12,12,14,
-	14,10,12,12,14,14,13,14,14,15,16,13,14,14,16,15,
-	10,12,12,14,14,12,12,13,15,14,12,13,12,15,14,14,
-	14,15,16,16,14,15,15,16,16,10,12,12,14,14,12,13,
-	12,15,14,12,12,12,14,15,14,15,14,16,16,14,15,15,
-	16,16,13,14,14,16,15,14,14,14,16,17,14,15,15,16,
-	16,15,16,16,17,18,16,16,16,17,17,13,14,14,16,16,
-	14,14,14,17,16,14,15,15,16,16,16,16,16,18,17,16,
-	17,17,18,18, 9,11,10,13,13,10,12,11,14,14,10,12,
-	12,14,14,13,14,14,16,15,13,14,14,15,15,10,12,12,
-	14,14,12,13,12,14,14,12,12,13,14,14,14,15,14,16,
-	16,14,14,14,16,16,10,12,11,14,13,12,12,12,15,15,
-	12,13,12,14,14,14,14,15,16,16,14,14,15,16,16,13,
-	14,14,15,15,14,15,15,16,16,14,14,14,16,16,16,16,
-	16,18,18,16,16,16,17,18,13,14,14,15,16,14,15,15,
-	17,16,14,15,14,16,16,16,16,16,17,17,15,16,16,18,
-	17,
+	12,14,14,11,12,12,14,14,10,11,11,13,13,11,12,12,
+	14,14,11,12,12,14,14,13,14,14,15,16,14,14,14,16,
+	16,10,11,11,13,13,11,12,12,14,14,11,12,12,14,14,
+	14,14,14,16,15,14,14,14,15,15, 5, 7, 7,10,10, 7,
+	 8, 8,11,11, 7, 9, 9,11,11,10,11,11,13,13,10,11,
+	11,13,13, 7, 9, 9,11,11, 9,10,10,12,12, 9,10,10,
+	12,12,11,12,12,14,14,11,12,12,14,14, 7, 9, 9,11,
+	11, 9,10,10,12,12, 9,10,10,12,12,11,12,12,14,14,
+	11,12,12,14,14,10,11,11,13,13,11,12,12,14,14,11,
+	12,12,14,14,14,14,14,16,16,13,14,14,15,16,10,11,
+	11,13,13,11,12,12,14,14,11,12,12,14,14,14,14,14,
+	16,16,13,14,14,16,15, 9,10,10,13,13,10,11,11,14,
+	13,10,11,11,14,13,13,14,14,15,15,13,14,14,15,15,
+	10,11,11,14,13,11,12,12,14,14,11,12,12,14,14,14,
+	14,15,16,16,14,14,14,16,16,10,11,11,14,13,11,12,
+	12,14,14,11,12,12,14,14,14,14,14,16,16,14,14,14,
+	16,15,13,14,13,15,15,13,14,14,16,16,13,14,14,16,
+	16,15,16,16,16,17,15,16,16,17,17,13,14,14,15,15,
+	13,14,14,16,15,14,14,14,16,16,15,16,16,17,16,15,
+	16,16,17,17, 9,10,10,13,13,10,11,11,13,14,10,11,
+	11,13,13,13,14,14,15,15,13,13,14,15,15,10,11,11,
+	13,14,11,12,12,14,14,11,12,12,14,14,14,14,14,16,
+	16,14,14,14,15,16,10,11,11,13,13,11,12,12,14,14,
+	11,12,12,14,14,14,14,14,16,16,13,14,14,16,16,13,
+	14,13,15,15,14,14,14,16,16,13,14,14,16,16,15,16,
+	16,18,18,15,15,16,17,17,13,14,14,15,15,14,14,14,
+	16,16,13,14,14,16,16,16,16,16,17,17,16,16,15,17,
+	16,
 };
 
 static float _vq_quantthresh_res0_256_1024_1[] = {

1.5       +9 -413    vorbis/lib/books/res0_256_1024_2.vqh

Index: res0_256_1024_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_1024_2.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_1024_2.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,417 +31,12 @@
 };
 
 static long _vq_lengthlist_res0_256_1024_2[] = {
-	 5, 7, 7, 8, 8, 9, 9,10,10, 7, 8, 8, 9, 9,10,10,
-	12,12, 7, 8, 8, 9, 9,10,10,12,12, 8, 9, 9,10,10,
-	12,12,13,13, 8, 9, 9,10,10,12,12,13,13, 9,10,10,
-	12,12,13,13,14,14, 9,10,10,12,12,13,13,14,14,10,
-	12,12,14,13,15,14,16,16,10,12,12,13,13,14,15,16,
-	16, 7, 8, 8, 9, 9,10,10,12,12, 8, 9, 9,10,10,11,
-	11,13,13, 8, 9, 9,10,10,11,11,13,13, 9,10,10,11,
-	11,12,12,13,14, 9,10,10,11,11,12,12,14,14,11,11,
-	11,12,12,14,13,15,15,11,11,11,12,12,13,13,15,15,
-	12,13,13,14,14,15,15,16,17,12,13,13,14,14,15,15,
-	16,16, 7, 8, 8, 9, 9,10,10,12,12, 8, 9, 9,10,10,
-	11,11,13,12, 8, 9, 9,10,10,11,11,13,12, 9,10,10,
-	11,11,12,12,14,14, 9,10,10,11,11,12,12,14,14,11,
-	11,11,12,12,14,13,15,15,11,11,11,12,12,14,14,15,
-	15,12,13,13,14,14,15,15,16,16,12,13,13,14,14,15,
-	15,16,16, 8, 9, 9,11,11,12,12,13,13, 9,10,10,11,
-	11,12,12,14,14, 9,10,10,11,11,12,12,14,14,11,11,
-	11,12,12,13,13,14,14,11,11,11,12,12,13,13,14,15,
-	12,12,13,13,13,14,15,15,15,12,12,12,13,13,14,14,
-	16,16,14,14,14,15,15,16,16,17,18,14,14,14,15,15,
-	15,16,16,18, 8, 9, 9,11,11,12,12,13,13, 9,10,10,
-	11,11,12,12,14,14, 9,10,10,11,11,12,12,14,14,11,
-	11,11,12,12,13,13,15,15,11,11,11,12,12,13,13,14,
-	15,12,12,12,13,13,14,15,15,16,12,12,12,13,13,15,
-	14,15,16,14,14,14,15,15,16,16,17,17,14,14,14,15,
-	15,16,16,17,17, 9,11,11,12,12,13,13,15,14,11,11,
-	11,12,12,14,14,15,15,11,11,11,12,12,14,14,15,15,
-	12,12,12,14,13,15,14,15,16,12,13,12,14,13,15,15,
-	16,16,13,14,14,15,15,16,16,17,17,13,14,14,15,15,
-	15,16,17,17,15,15,15,16,16,16,16,17,18,15,15,15,
-	16,16,17,17,18,18, 9,11,11,12,12,13,13,15,14,11,
-	11,11,12,12,14,14,15,15,11,11,11,12,12,14,14,15,
-	15,12,13,13,14,13,15,14,16,16,12,12,12,13,13,15,
-	15,16,15,13,14,14,14,15,16,16,17,16,13,14,14,15,
-	15,16,15,18,17,15,15,16,15,16,16,17,18,18,15,15,
-	15,16,16,17,16,18,18,11,12,12,13,14,15,15,16,16,
-	12,13,13,14,14,15,15,17,16,12,13,13,14,14,15,16,
-	16,16,14,14,14,15,15,16,16,17,17,14,14,14,15,15,
-	16,16,17,17,15,15,15,16,16,16,17,18,17,15,15,15,
-	16,16,17,17,18,18,16,16,17,17,18,18,19,18,19,16,
-	17,16,17,18,17,18,19,20,11,12,12,14,14,15,15,16,
-	16,12,13,13,14,14,16,15,16,16,12,13,13,14,14,15,
-	15,16,16,13,14,14,15,15,16,16,17,17,13,14,14,15,
-	15,16,16,17,17,15,15,15,16,16,17,17,19,18,15,15,
-	15,16,16,17,17,17,18,16,16,16,17,17,17,18,19,21,
-	16,17,17,17,17,18,18,18,19, 7, 8, 8, 9, 9,10,10,
-	12,12, 8, 9, 9,10,10,11,11,13,13, 8, 9, 9,10,10,
-	11,11,13,13, 9,10,10,11,11,12,12,14,14, 9,10,10,
-	11,11,12,12,13,14,10,11,11,12,12,14,14,15,15,11,
-	11,11,12,12,14,13,15,15,12,13,13,14,14,15,15,17,
-	16,12,13,13,14,14,15,15,16,16, 8, 9, 9,10,10,11,
-	11,13,13, 9, 9, 9,10,10,12,12,13,13, 9, 9, 9,10,
-	10,12,12,13,13,10,10,10,11,12,12,13,14,14,10,10,
-	11,12,11,13,13,14,14,11,12,12,13,13,14,14,16,15,
-	11,12,12,13,13,14,14,16,15,13,13,13,14,14,16,15,
-	16,16,13,13,13,14,14,15,15,16,17, 8, 9, 9,10,10,
-	11,11,13,13, 9, 9, 9,10,10,12,12,13,13, 9, 9, 9,
-	10,10,12,12,13,13,10,10,10,11,11,13,13,14,14,10,
-	10,10,11,11,13,13,14,14,11,12,12,13,13,14,14,15,
-	15,11,12,12,13,13,14,14,15,15,13,13,13,14,14,15,
-	16,16,16,13,13,13,14,14,15,15,17,16, 9,10,10,11,
-	11,12,12,14,14,10,10,10,12,12,13,13,14,14,10,10,
-	11,12,12,13,13,14,14,11,11,12,12,13,14,14,15,15,
-	11,12,12,13,13,14,14,15,15,12,13,13,14,14,15,15,
-	16,16,12,13,13,14,14,15,15,16,16,14,14,14,15,15,
-	16,16,17,18,14,14,14,15,15,16,16,18,17, 9,10,10,
-	11,11,12,12,14,14,10,11,10,12,12,13,13,14,14,10,
-	10,11,12,12,13,13,14,14,11,12,12,12,12,14,13,15,
-	15,11,12,12,13,13,14,14,15,15,12,13,13,14,14,15,
-	14,16,16,12,13,13,14,14,15,14,16,16,14,15,14,15,
-	15,16,16,17,17,14,14,14,15,15,16,16,18,17,11,11,
-	11,12,12,14,14,15,15,11,12,12,13,13,14,14,15,16,
-	11,12,12,13,13,14,14,16,15,12,13,13,14,14,15,15,
-	17,16,13,13,13,14,14,15,15,16,16,14,14,14,15,15,
-	16,16,17,17,14,14,14,15,15,16,16,17,17,15,15,16,
-	16,16,17,17,18,17,15,16,16,16,16,17,17,18,18,11,
-	11,11,13,12,14,14,15,15,11,12,12,13,13,14,14,16,
-	15,11,12,12,13,13,14,14,15,16,12,13,13,14,14,15,
-	15,16,16,12,13,13,14,14,15,15,16,16,14,14,14,15,
-	15,16,16,17,17,14,14,14,15,15,16,16,17,17,15,15,
-	16,16,16,17,17,17,18,15,16,15,16,16,17,17,18,19,
-	12,13,13,14,14,15,15,16,17,13,14,13,15,15,16,15,
-	18,16,13,13,14,14,14,16,15,17,16,14,14,14,15,15,
-	16,16,18,17,14,14,15,15,15,16,16,17,18,15,16,16,
-	16,16,18,17,18,18,16,15,15,16,17,17,17,18,18,17,
-	17,17,18,17,18,18,20,21,16,16,17,18,17,19,19,20,
-	18,12,13,13,14,14,15,15,17,17,13,13,14,14,15,16,
-	16,17,17,13,14,14,14,15,16,15,17,17,14,15,14,15,
-	15,16,17,18,17,14,14,14,15,15,16,17,17,17,15,16,
-	15,17,16,18,18,19,19,15,16,15,16,16,17,17,18,17,
-	17,17,17,18,17,19,18,19,19,16,17,17,17,17,18,19,
-	19,19, 7, 8, 8, 9, 9,10,10,12,12, 8, 9, 9,10,10,
-	11,11,13,13, 8, 9, 9,10,10,11,11,13,13, 9,10,10,
-	11,11,12,12,14,13, 9,10,10,11,11,12,12,14,14,10,
-	11,11,12,12,13,14,15,15,10,11,11,12,12,14,14,15,
-	15,12,13,13,14,14,15,15,17,17,12,13,13,14,14,15,
-	15,16,16, 8, 9, 9,10,10,11,11,13,13, 9, 9, 9,11,
-	10,12,12,13,13, 9, 9, 9,10,10,12,12,13,13,10,10,
-	11,11,11,13,13,14,14,10,10,10,11,12,13,13,14,14,
-	11,12,12,13,13,14,14,16,15,11,12,12,13,13,14,14,
-	16,15,13,13,13,14,14,15,15,17,17,13,13,13,14,14,
-	15,16,17,17, 8, 9, 9,10,10,11,11,13,13, 9, 9, 9,
-	10,10,12,12,13,13, 9, 9, 9,10,10,12,12,13,13,10,
-	11,10,12,11,13,13,14,14,10,10,10,11,11,13,13,14,
-	14,11,12,12,13,13,14,14,15,15,11,12,12,13,13,14,
-	14,15,15,13,14,14,14,14,15,16,17,17,13,13,13,14,
-	14,16,16,17,17, 9,10,10,11,11,12,12,14,14,10,11,
-	10,12,11,13,13,14,14,10,11,11,12,11,13,13,14,14,
-	11,12,12,13,13,14,13,15,14,11,12,12,12,12,13,13,
-	15,15,13,13,13,14,14,15,15,16,16,12,13,13,14,14,
-	15,15,16,16,14,14,14,15,15,16,16,18,17,14,14,15,
-	15,15,16,16,17,18, 9,10,10,11,11,12,12,14,14,10,
-	10,11,12,12,13,13,14,14,10,11,10,12,11,13,13,14,
-	14,11,12,12,12,13,14,14,15,15,11,12,12,13,12,13,
-	14,15,15,13,13,13,14,14,15,15,16,16,12,13,13,14,
-	14,15,14,16,16,14,14,14,15,15,16,16,17,17,14,14,
-	14,15,15,16,16,17,17,11,11,11,13,12,14,14,15,15,
-	11,12,12,13,13,14,14,15,15,11,12,12,13,13,14,14,
-	15,15,12,13,13,14,14,15,15,16,16,12,13,13,14,14,
-	15,15,16,16,14,14,14,15,15,16,16,18,17,14,14,14,
-	15,15,16,16,17,17,15,16,15,16,16,18,18,18,18,15,
-	16,15,16,17,17,17,18,18,11,11,11,12,13,14,14,15,
-	15,11,12,12,13,13,14,14,15,15,11,12,12,13,13,14,
-	14,16,15,13,13,13,14,14,15,15,16,16,12,13,13,14,
-	14,15,15,16,16,14,14,14,15,15,16,16,18,17,14,14,
-	14,15,15,16,16,17,17,15,16,15,16,16,17,17,18,18,
-	15,16,16,16,16,17,17,20,18,12,13,13,14,14,15,15,
-	16,17,13,14,14,14,15,16,15,18,16,13,13,13,15,14,
-	16,16,16,17,14,14,14,16,15,16,16,17,18,14,14,14,
-	15,15,16,17,17,17,15,16,16,16,16,17,17,18,18,15,
-	16,15,16,17,17,17,18,19,17,17,17,17,18,18,20,20,
-	20,17,17,17,17,17,19,19,20,19,12,13,13,14,14,15,
-	16,16,16,13,14,13,14,15,16,15,17,17,13,13,13,14,
-	14,16,15,17,17,14,14,14,15,16,16,16,18,17,14,14,
-	14,15,15,16,16,17,17,15,16,16,16,16,17,17,18,18,
-	15,15,15,16,16,17,17,19,18,17,17,17,17,17,18,18,
-	20,19,16,17,16,17,18,20,19,18,19, 9, 9, 9,11,11,
-	12,12,13,13, 9,10,10,11,11,12,12,14,14, 9,10,10,
-	11,11,12,12,14,14,11,11,11,12,12,14,13,15,15,11,
-	11,11,12,12,13,13,15,15,12,13,13,13,14,15,15,17,
-	16,12,12,12,13,13,14,14,16,16,13,14,14,15,15,16,
-	16,17,18,13,14,14,15,15,16,16,17,17, 9,10,10,11,
-	11,12,12,14,14,10,11,11,12,12,13,13,14,14,10,11,
-	10,12,12,13,13,14,14,11,12,12,12,13,14,14,15,15,
-	11,12,12,13,13,14,14,15,15,13,13,13,14,14,15,15,
-	16,16,13,13,13,14,14,15,15,16,16,14,14,14,15,16,
-	16,16,18,17,14,15,15,15,15,16,17,18,17, 9,10,10,
-	11,11,13,12,14,14,10,11,10,12,12,13,13,14,14,10,
-	11,11,12,12,13,13,14,14,11,12,12,13,13,14,14,15,
-	15,11,12,12,13,13,14,14,16,15,12,13,13,14,14,15,
-	15,16,16,12,13,13,14,14,15,15,16,16,14,14,14,15,
-	15,16,16,17,18,14,14,14,15,15,16,16,18,17,11,11,
-	11,12,12,14,13,15,15,11,12,12,13,13,14,14,15,15,
-	11,12,12,13,13,14,14,15,15,12,12,13,13,14,14,15,
-	16,16,12,13,13,14,13,15,15,16,16,13,14,14,15,15,
-	16,16,17,17,13,14,14,14,15,16,16,17,17,15,15,15,
-	16,16,17,17,18,18,15,15,15,16,16,17,16,18,17,11,
-	11,11,12,12,13,13,15,15,11,12,12,13,12,14,14,15,
-	15,11,12,12,13,13,14,14,15,15,12,13,13,14,13,14,
-	14,16,15,12,13,13,13,13,15,14,16,16,13,14,14,15,
-	15,16,16,17,17,14,14,14,15,15,16,16,16,17,15,15,
-	15,16,16,17,17,18,18,15,15,15,16,16,17,17,18,18,
-	12,13,13,14,13,14,15,16,16,12,13,13,14,14,15,15,
-	16,16,12,13,13,14,14,15,15,16,16,13,14,14,14,15,
-	16,16,17,17,13,14,14,15,15,16,15,18,17,15,15,15,
-	16,16,16,17,17,18,15,15,15,16,16,17,16,17,18,16,
-	16,16,16,17,18,18,18,20,16,16,16,17,18,19,18,19,
-	18,12,12,13,14,13,14,15,16,16,12,13,13,14,14,15,
-	15,16,16,12,13,13,14,14,15,15,16,17,13,14,14,14,
-	15,16,15,17,17,14,14,14,14,15,16,16,17,17,15,15,
-	15,16,15,17,16,18,17,15,15,15,15,16,17,17,18,17,
-	16,16,16,17,17,18,17,19,18,16,17,16,17,17,18,18,
-	18,18,14,14,14,15,15,16,16,17,18,14,14,14,15,15,
-	17,17,17,17,14,15,14,15,15,17,17,18,17,15,15,15,
-	16,16,17,16,18,18,15,15,15,16,16,17,16,19,19,16,
-	17,16,17,17,18,17,18,19,16,16,16,17,17,18,17,18,
-	19,17,18,18,19,18,18,18,20,20,17,18,18,18,18,19,
-	18,20,21,14,14,14,15,15,16,16,18,17,14,14,15,15,
-	15,16,16,17,18,14,14,14,16,16,16,17,17,18,15,15,
-	15,16,16,17,17,18,19,15,15,15,16,16,17,16,18,18,
-	16,16,16,17,16,17,18,19,18,16,16,16,17,17,17,20,
-	19,19,17,17,17,19,19,19,18,19,20,18,17,17,18,18,
-	18,18,19,20, 8, 9, 9,11,11,12,12,13,13, 9,10,10,
-	11,11,12,12,14,14, 9,10,10,11,11,12,12,14,14,11,
-	11,11,12,12,13,14,15,15,11,11,11,12,12,13,13,15,
-	15,12,13,12,13,13,15,15,16,16,12,13,12,13,13,15,
-	15,16,16,13,14,14,15,15,16,16,18,17,13,14,14,15,
-	15,16,16,17,17, 9,10,10,11,11,12,13,14,14,10,11,
-	11,12,12,13,13,14,14,10,11,11,12,12,13,13,14,14,
-	11,12,12,13,12,14,14,15,15,11,12,12,13,13,14,14,
-	15,15,12,13,13,14,14,15,15,16,16,13,13,13,14,14,
-	15,15,16,16,14,14,15,15,15,16,16,17,18,14,14,14,
-	15,15,16,16,17,18, 9,10,10,11,11,12,13,14,14,10,
-	11,11,11,12,13,13,14,14,10,11,11,12,12,13,13,14,
-	14,11,12,12,13,13,13,14,15,15,11,12,12,13,12,14,
-	14,15,15,12,13,13,14,14,15,15,16,16,12,13,13,14,
-	14,15,15,17,16,14,14,15,15,15,16,16,17,17,14,14,
-	14,16,15,16,16,17,18,11,11,11,12,12,14,13,15,15,
-	11,12,12,13,12,14,14,15,15,11,12,12,13,13,14,14,
-	15,15,12,13,13,13,13,15,15,16,16,12,13,13,13,13,
-	14,15,15,16,13,14,14,15,14,16,16,17,17,13,14,14,
-	15,15,15,16,17,17,15,15,15,16,16,18,17,18,18,15,
-	15,15,16,16,17,17,18,18,11,11,11,12,12,13,13,15,
-	15,11,12,12,13,13,13,14,15,15,11,12,12,13,13,14,
-	14,15,15,12,13,13,13,13,14,15,17,16,12,13,13,13,
-	13,15,14,16,16,14,14,14,15,15,16,15,18,18,13,14,
-	14,15,14,16,15,17,17,15,15,15,16,16,17,17,17,18,
-	15,15,15,16,16,17,17,19,17,12,12,12,14,13,14,15,
-	16,16,12,13,13,14,14,15,15,16,17,12,13,13,14,14,
-	15,15,16,16,14,14,14,15,15,16,15,18,17,14,14,14,
-	14,15,16,16,16,16,15,15,15,15,16,17,16,18,18,15,
-	15,15,15,16,16,16,18,18,16,17,16,17,17,18,18,18,
-	19,16,17,16,17,17,18,18,19,18,12,13,13,13,14,15,
-	15,16,16,12,13,13,14,14,15,15,16,16,12,13,13,14,
-	14,15,15,16,17,14,14,14,15,15,16,16,17,17,13,14,
-	14,14,14,16,16,17,17,15,15,15,16,16,17,16,18,17,
-	15,15,15,16,16,17,16,18,17,16,16,16,18,17,18,17,
-	18,19,16,16,16,17,17,18,17,18,18,14,14,14,15,15,
-	16,16,17,18,14,15,14,16,15,17,16,18,18,14,14,15,
-	15,15,16,16,17,17,15,16,15,16,16,17,17,18,18,15,
-	15,15,16,15,17,17,18,18,16,17,17,17,17,17,18,18,
-	19,16,16,16,17,17,17,18,18,19,17,17,17,19,18,19,
-	18,20,19,18,17,18,18,18,18,19,19,20,13,14,14,15,
-	15,16,16,17,17,14,15,14,15,15,16,16,17,17,14,14,
-	14,15,16,16,16,18,18,15,15,15,16,16,17,17,18,18,
-	15,15,15,16,16,17,17,18,19,17,16,16,17,17,18,18,
-	20,19,16,16,16,17,17,17,17,19,19,18,17,17,18,17,
-	19,19,19,19,17,17,17,18,18,18,18,21,20, 9,11,11,
-	12,12,13,13,15,15,11,11,11,13,13,14,14,15,15,11,
-	11,11,13,13,14,14,15,15,12,13,13,14,13,15,15,16,
-	16,12,13,13,13,14,15,15,16,15,13,14,14,15,15,16,
-	16,17,17,13,14,14,15,15,16,16,17,17,15,15,16,16,
-	16,17,17,18,18,15,15,15,16,16,17,17,18,18,11,11,
-	11,12,13,14,14,15,15,11,12,12,13,13,14,14,16,15,
-	11,12,12,13,13,14,14,16,15,13,13,13,14,14,15,15,
-	16,16,13,13,13,14,14,15,15,16,16,14,14,14,15,15,
-	16,16,18,17,14,14,14,15,15,16,16,17,17,15,15,16,
-	16,17,17,17,18,18,15,16,16,16,16,18,17,20,18,11,
-	11,11,13,13,14,14,15,15,11,12,12,13,13,14,14,16,
-	15,11,12,12,13,13,14,14,15,16,13,13,13,14,14,15,
-	15,16,16,12,13,13,14,14,15,15,17,16,14,14,14,15,
-	15,16,15,18,17,14,14,14,15,15,16,16,18,18,15,16,
-	16,16,16,17,17,19,17,15,15,15,16,16,17,17,18,18,
-	12,13,12,13,13,15,15,16,16,12,13,13,14,14,15,15,
-	17,17,12,13,13,14,14,15,15,17,16,13,14,14,14,15,
-	16,16,17,17,14,14,14,15,14,16,16,17,17,15,15,15,
-	16,16,17,16,18,18,15,15,15,16,16,17,17,18,18,16,
-	16,16,17,17,18,18,19,18,16,16,17,17,17,17,18,18,
-	19,12,12,13,13,14,15,14,16,17,12,13,13,14,14,15,
-	15,16,17,12,13,13,14,14,15,15,16,16,14,14,14,15,
-	15,16,16,17,18,14,14,14,15,15,16,16,17,17,14,15,
-	15,15,16,17,16,18,17,15,15,15,16,16,16,17,18,18,
-	16,17,16,17,17,17,18,18,19,16,17,17,17,17,18,18,
-	18,18,13,14,14,15,15,16,16,17,17,14,14,14,15,15,
-	16,16,17,17,14,14,14,15,15,16,16,17,17,14,15,15,
-	15,16,17,17,17,18,15,15,15,16,15,17,17,18,18,16,
-	16,16,16,17,17,19,18,19,16,16,16,16,16,18,17,19,
-	18,17,17,17,17,18,17,18,21,19,17,17,17,17,18,19,
-	18,21,20,13,14,14,15,15,16,16,17,17,13,14,14,15,
-	15,16,16,17,17,14,14,14,15,15,16,16,17,18,15,15,
-	15,16,16,17,16,18,18,15,15,15,16,15,16,17,17,18,
-	16,16,16,17,16,18,18,17,18,16,16,16,17,17,17,19,
-	19,18,17,17,18,18,17,18,18,20,19,17,17,17,18,18,
-	18,19,21,20,15,15,15,16,16,17,16,18,18,15,15,15,
-	17,16,18,17,18,18,15,15,15,17,17,17,17,18,18,16,
-	16,16,17,17,17,18,19,19,16,16,16,17,17,18,17,18,
-	20,17,17,17,17,19,18,18,19,19,17,18,18,19,17,18,
-	19,19,19,17,18,18,19,18,18,20,20,21,18,19,19,19,
-	19,19,20,19,21,15,15,16,16,16,17,18,18,17,15,16,
-	16,16,16,17,17,19,19,15,16,16,16,16,18,17,18,18,
-	16,16,16,17,17,17,18,19,19,16,16,16,17,17,18,18,
-	19,19,17,17,17,18,18,19,19,19,20,17,17,18,18,18,
-	18,20,18,21,18,18,19,19,18,20,20,20,19,18,19,19,
-	19,18,19,21,19,20, 9,11,11,12,12,13,13,15,15,11,
-	11,11,13,13,14,14,15,15,11,11,11,13,13,14,14,15,
-	15,12,13,13,13,14,15,14,16,16,12,12,13,14,13,15,
-	15,16,16,13,14,14,15,15,16,16,17,17,13,14,14,15,
-	15,16,16,17,17,15,15,15,16,16,17,17,17,18,15,15,
-	15,16,16,17,17,18,18,10,11,11,12,13,14,14,15,15,
-	11,12,12,13,13,14,14,15,16,11,12,12,13,13,14,14,
-	15,16,13,13,13,14,14,15,15,17,16,13,13,13,14,14,
-	15,15,16,16,14,14,14,15,15,16,16,17,17,14,14,14,
-	15,15,16,16,17,17,15,16,16,17,16,18,17,19,19,15,
-	15,15,17,16,17,18,19,18,10,11,11,12,12,14,14,15,
-	15,11,12,12,13,13,14,14,16,15,11,12,12,13,13,14,
-	14,16,15,12,13,13,14,14,15,15,17,16,13,13,13,14,
-	14,15,15,16,16,14,14,14,15,15,16,16,17,17,14,14,
-	14,15,15,16,16,18,17,15,15,16,16,16,17,17,18,18,
-	15,16,16,17,16,17,17,18,18,12,12,13,14,14,15,15,
-	16,16,12,13,13,14,14,15,15,17,16,12,13,13,14,14,
-	15,15,17,16,14,14,14,15,14,16,16,17,17,13,14,14,
-	14,15,15,16,17,17,15,15,15,16,15,17,17,18,17,15,
-	15,15,16,16,17,16,17,18,16,16,16,17,17,19,18,18,
-	19,16,16,16,17,17,17,18,18,18,12,12,12,13,14,15,
-	15,16,16,12,13,13,14,14,15,15,16,16,12,13,13,14,
-	14,15,15,16,16,13,14,14,15,15,15,16,17,17,13,14,
-	14,15,14,16,16,16,16,15,15,15,16,16,16,17,18,18,
-	15,15,15,16,15,17,16,18,18,16,16,17,17,18,18,18,
-	21,19,16,16,16,17,17,17,18,19,19,13,14,14,15,15,
-	16,16,17,18,14,14,14,15,15,16,16,17,17,14,14,14,
-	15,15,16,16,18,17,15,15,15,16,15,17,17,18,18,15,
-	15,15,15,15,17,17,17,18,16,16,16,17,17,17,18,19,
-	19,16,16,16,16,16,17,18,18,18,17,17,18,18,17,19,
-	18,20,19,17,17,17,17,18,18,19,19,19,13,14,14,15,
-	15,16,16,17,17,14,14,14,15,15,16,16,17,17,14,14,
-	14,15,15,16,16,17,17,14,15,15,16,16,17,17,17,18,
-	15,15,15,16,15,17,16,17,17,16,16,16,17,17,17,18,
-	19,18,16,16,16,17,16,17,17,18,18,17,17,17,18,17,
-	18,18,19,20,17,17,17,17,17,20,18,19,19,15,15,15,
-	16,16,17,17,18,18,15,15,15,16,16,18,17,18,18,15,
-	16,16,16,16,18,18,17,18,16,17,17,17,17,17,18,19,
-	19,16,16,16,17,17,17,18,18,18,17,17,17,18,20,19,
-	19,19,20,16,17,18,18,18,18,19,19,19,18,20,19,18,
-	19,19,20,19,20,18,18,18,19,19,18,19,20,20,15,15,
-	15,16,16,17,17,18,19,15,16,16,16,16,17,17,18,18,
-	15,16,15,16,16,17,17,19,19,16,16,16,16,17,18,19,
-	19,20,16,16,16,17,17,19,18,18,18,17,18,19,18,17,
-	18,19,20,21,17,17,17,17,17,20,18,19,19,18,19,18,
-	20,19,19,19,19,21,18,18,19,19,18,19,19,20,20,11,
-	12,12,14,14,15,15,16,16,12,13,13,14,14,16,15,16,
-	17,12,13,13,14,14,15,16,17,17,13,14,14,15,15,16,
-	16,17,17,13,14,14,15,15,16,17,17,17,15,15,16,16,
-	16,17,17,18,18,15,15,15,16,16,17,17,18,18,16,17,
-	16,17,17,18,18,20,20,16,16,17,17,17,18,18,19,19,
-	12,13,13,14,14,15,15,17,16,13,13,14,14,14,15,16,
-	17,17,13,13,13,15,15,16,16,16,17,14,14,15,15,15,
-	17,16,18,17,14,15,14,15,16,16,17,18,17,15,16,16,
-	17,16,17,17,19,18,15,16,15,16,16,17,17,19,19,17,
-	17,17,18,18,18,18,20,20,17,17,17,18,17,19,19,19,
-	19,12,13,13,14,14,15,15,16,17,13,14,13,14,15,15,
-	15,17,17,13,14,13,14,14,16,16,17,17,14,15,15,15,
-	16,16,16,17,18,14,14,15,15,15,16,17,17,17,15,16,
-	16,16,16,18,17,19,18,15,16,15,16,17,17,17,18,18,
-	16,17,18,18,18,19,18,19,20,17,18,17,18,17,18,18,
-	19,21,13,14,14,15,15,16,16,17,17,14,14,14,15,15,
-	16,16,17,18,14,14,14,15,15,17,16,19,18,15,15,15,
-	16,16,17,17,19,18,15,15,15,16,16,17,17,17,18,16,
-	16,16,16,17,18,18,21,20,16,16,16,16,16,17,17,19,
-	18,17,18,18,18,19,18,20,20,19,18,18,17,18,18,20,
-	19,20,18,13,14,14,15,15,16,16,18,17,14,14,14,16,
-	15,17,16,17,17,14,14,15,16,15,16,17,17,18,15,15,
-	15,16,16,17,17,18,18,15,15,16,16,16,17,16,19,18,
-	16,17,16,17,16,18,18,19,20,16,16,16,17,17,17,17,
-	19,19,17,17,17,18,18,20,18,20,20,17,17,17,18,18,
-	19,18,20,19,15,15,15,16,16,17,17,18,18,15,16,16,
-	16,16,17,17,19,18,15,16,16,17,17,18,17,19,19,16,
-	16,16,17,16,18,17,20,19,16,16,16,17,17,18,18,20,
-	20,17,17,17,17,18,19,19,19,20,17,18,17,18,18,19,
-	19,19,21,18,19,18,18,19,20,19,21,19,20,19,19,19,
-	20,20,19,20,20,15,15,16,16,16,17,17,19,18,15,15,
-	15,16,16,17,17,18,18,15,15,16,16,16,17,17,19,19,
-	16,16,17,17,17,18,18,20,18,16,16,16,17,18,18,18,
-	18,20,17,17,17,17,17,18,18,20,19,17,18,18,18,18,
-	19,18,20,19,18,18,18,19,18,20,20,19,20,18,18,19,
-	20,18,20,21,21,19,16,17,17,17,17,18,18,18,19,17,
-	17,17,17,18,18,19,18,20,17,16,17,18,18,18,19,20,
-	18,18,17,17,18,18,18,18,20,20,17,20,17,17,18,20,
-	18,20,20,18,18,18,19,19,19,20,20,21,18,18,18,18,
-	19,20,18,21,20,19,18,19,20,19,18,19,20,21,19,18,
-	19,21,21,20,20,21,21,16,16,17,17,17,18,18,19,20,
-	17,17,17,18,18,19,19,20,20,17,16,18,19,18,18,19,
-	20,20,17,17,18,18,18,19,19,19,19,17,17,18,18,18,
-	18,18,19,20,18,18,18,19,20,19,20,21,19,19,18,20,
-	19,19,20,20,20,21,20,19,19,21,19,20,20,20,21,19,
-	19,19,20,21,20,21,21,20,11,12,12,14,13,15,15,16,
-	16,12,13,13,14,14,15,15,16,16,12,13,13,14,14,15,
-	16,17,16,13,14,14,15,15,16,16,17,18,13,14,14,15,
-	15,16,16,17,18,15,15,15,16,16,17,17,18,19,15,15,
-	15,16,16,17,17,18,18,16,16,16,17,17,18,18,19,18,
-	16,16,17,18,18,18,18,19,18,12,13,13,14,14,15,15,
-	16,17,13,14,13,15,15,16,16,17,16,13,14,14,14,15,
-	16,16,17,17,14,14,14,15,15,16,16,18,18,14,15,14,
-	15,15,16,16,17,18,15,16,15,17,16,17,17,19,19,15,
-	16,16,17,16,18,17,19,18,16,17,16,18,17,19,18,19,
-	19,16,17,17,18,17,19,18,19,20,12,13,13,14,14,15,
-	16,17,16,13,13,13,15,15,15,16,16,17,13,14,13,15,
-	15,16,16,17,16,14,14,15,15,15,16,17,17,18,14,14,
-	14,15,15,17,16,17,17,15,15,16,16,16,18,18,18,18,
-	15,16,16,17,16,17,17,18,19,17,16,17,18,18,18,19,
-	20,18,16,17,16,17,18,19,18,19,20,14,14,14,15,15,
-	16,16,17,17,14,15,15,15,15,16,17,17,17,14,14,14,
-	15,15,16,17,17,18,15,15,15,16,16,17,16,18,18,15,
-	15,15,16,16,17,17,18,18,16,17,16,17,17,18,19,19,
-	18,16,17,16,17,17,18,17,19,19,18,17,17,18,18,19,
-	19,21,20,17,17,17,18,18,18,19,19,19,14,14,14,15,
-	15,15,16,17,18,14,15,14,15,15,16,16,17,17,14,14,
-	14,15,15,17,16,18,17,15,15,15,16,16,17,17,18,18,
-	15,15,15,16,16,17,17,18,18,16,16,16,17,16,18,18,
-	20,18,16,16,16,17,17,18,17,19,19,17,18,18,18,18,
-	18,18,20,20,17,18,17,19,18,19,20,20,19,15,15,15,
-	16,16,17,17,17,18,15,16,15,16,17,18,17,19,18,16,
-	16,16,16,17,17,17,18,18,16,17,16,17,17,18,17,18,
-	19,16,16,16,17,17,18,18,18,19,17,17,17,18,18,19,
-	21,19,18,17,18,18,18,19,18,18,20,20,18,18,17,19,
-	19,20,20,21,19,18,18,18,19,19,20,19,21,21,15,15,
-	15,16,16,18,17,18,18,15,15,16,17,16,17,17,18,18,
-	15,15,16,16,16,17,17,18,18,16,17,16,17,17,18,18,
-	18,19,16,16,16,17,16,18,18,18,19,17,18,17,18,18,
-	18,18,19,20,17,18,17,18,17,19,18,19,20,19,19,18,
-	19,19,19,20,20,19,18,19,19,18,20,19,20,20,20,16,
-	17,16,17,18,18,19,20,19,16,17,17,17,17,19,18,19,
-	21,16,17,17,17,17,18,18,19,20,17,17,17,18,19,19,
-	19,20,21,17,17,18,18,19,19,18,19,19,18,18,18,19,
-	18,21,19,20,20,19,19,19,20,20,19,18,21,20,21,19,
-	20,20,18,21,20,20,21,18,20,20,20,21,20,20,20,21,
-	16,16,16,17,17,17,19,20,20,16,17,17,17,18,18,19,
-	18,19,16,17,17,17,18,19,18,19,20,17,18,17,18,18,
-	20,18,20,20,17,17,17,17,18,18,20,20,19,19,19,18,
-	19,19,20,20,19,20,18,18,18,18,18,19,19,20,21,19,
-	19,19,21,19,20,20,21,20,20,19,18,19,20,19,19,20,
-	21,
+	 3, 4, 4, 5, 5, 6, 6, 8, 8, 4, 5, 5, 6, 6, 7, 7,
+	 8, 8, 4, 5, 5, 6, 6, 7, 7, 8, 8, 5, 6, 6, 7, 7,
+	 8, 8, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 9, 7, 7, 7,
+	 8, 8, 9, 9,10,10, 6, 7, 7, 8, 8, 9, 9,10,10, 8,
+	 9, 9, 9, 9,11,11,12,12, 8, 9, 9, 9, 9,10,10,12,
+	12,
 };
 
 static float _vq_quantthresh_res0_256_1024_2[] = {
@@ -460,7 +56,7 @@
 };
 
 static static_codebook _vq_book_res0_256_1024_2 = {
-	4, 6561,
+	2, 81,
         _vq_lengthlist_res0_256_1024_2,
         1, -531628032, 1611661312, 4, 0,
         _vq_quantlist_res0_256_1024_2,

1.5       +26 -25    vorbis/lib/books/res0_256_1024_3.vqh

Index: res0_256_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_1024_3.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_1024_3.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -42,34 +43,34 @@
 };
 
 static long _vq_lengthlist_res0_256_1024_3[] = {
-	 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
-	11,11,11,12,12, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,
+	 3, 4, 4, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
+	11,11,11,12,12, 5, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,
         10,10,11,11,12,12,13,13,13,13, 4, 5, 5, 6, 6, 7,
          7, 8, 8, 9, 9,10,10,11,11,12,12,13,13,13,13, 6,
          6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,12,12,13,13,
-	14,14,15,15, 6, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,
+	14,14,15,15, 6, 6, 6, 7, 7, 8, 8, 9, 9, 9,10,11,
         11,12,12,13,13,14,14,15,15, 7, 7, 7, 8, 8, 9, 9,
-	11,10,11,11,12,12,14,13,15,15,16,15,16,16, 7, 7,
-	 7, 8, 8, 9, 9,10,10,11,11,12,12,13,14,15,15,16,
-	15,16,16, 8, 9, 9,10, 9,11,11,12,12,12,12,13,14,
-	15,15,16,16,16,16,17,17, 8, 9, 9,10, 9,11,11,12,
-	12,12,12,13,13,15,14,16,16,16,17,17,17, 8, 9, 9,
-	10,10,11,11,12,12,13,13,15,15,16,16,16,17,17,17,
-	17,17, 8, 9, 9,10,10,11,11,12,12,14,13,15,15,16,
-	16,17,16,17,17,18,18, 9,10,10,11,11,12,12,13,14,
-	15,15,16,15,17,17,17,18,18,17,18,18, 9,10,10,11,
-	11,12,12,13,14,15,15,16,16,16,17,17,17,17,18,18,
-	18,10,11,11,13,12,14,14,15,15,16,16,17,16,17,17,
-	18,18,19,18,18,18,10,11,11,13,13,14,14,15,15,16,
-	16,17,17,17,17,18,18,18,18,18,18,11,12,12,14,14,
-	15,15,16,16,16,16,17,18,18,18,19,18,19,19,19,19,
-	11,12,12,14,14,15,15,16,16,17,17,17,17,18,18,18,
-	19,18,18,19,19,11,13,13,15,15,16,16,17,17,17,17,
-	18,17,18,18,18,19,19,19,19,19,12,13,13,15,15,16,
-	16,16,17,17,17,18,18,18,18,19,19,18,19,18,20,12,
-	14,14,15,15,16,17,17,17,18,18,18,18,19,19,20,19,
-	19,19,20,20,12,14,14,15,15,17,16,17,18,18,18,18,
-	18,18,19,19,19,19,20,20,19,
+	10,10,11,11,12,12,13,13,15,15,15,15,16,16, 7, 7,
+	 7, 8, 8, 9, 9,10,10,11,11,12,12,13,13,15,15,15,
+	15,16,16, 8, 8, 8, 9, 9,10,10,11,11,12,12,13,13,
+	14,15,15,15,17,16,17,17, 8, 8, 8, 9, 9,10,10,11,
+	11,12,12,13,13,14,14,15,15,16,16,17,17, 8, 9, 9,
+	10,10,11,11,12,12,13,13,14,15,16,15,16,16,17,17,
+	17,17, 8, 9, 9,10,10,11,11,12,12,13,13,14,14,16,
+	15,17,17,17,17,18,18, 9,10,10,11,11,12,12,13,13,
+	14,14,16,16,16,17,17,17,18,18,18,18, 9,10,10,11,
+	11,12,12,13,13,14,14,15,16,16,16,17,17,18,18,19,
+	18,10,11,11,12,12,14,13,15,14,16,16,17,17,17,17,
+	18,18,18,18,18,18,10,11,11,12,12,14,13,15,14,16,
+	16,16,16,17,18,18,17,18,18,18,19,11,12,12,13,14,
+	15,15,16,16,16,17,17,17,18,18,18,18,19,19,19,19,
+	11,12,12,14,14,15,15,16,16,17,17,17,17,18,18,19,
+	18,18,18,18,19,11,13,13,14,15,16,16,17,17,17,17,
+	17,18,18,19,18,18,19,19,20,19,12,13,13,15,14,16,
+	16,16,17,17,17,18,18,18,19,19,18,19,19,20,20,12,
+	14,14,15,15,16,17,18,17,18,18,18,19,18,18,19,19,
+	19,19,19,20,12,14,14,15,15,16,16,17,17,17,17,18,
+	19,18,18,19,19,20,19,19,20,
 };
 
 static float _vq_quantthresh_res0_256_1024_3[] = {

1.5       +22 -21    vorbis/lib/books/res0_256_1024_4.vqh

Index: res0_256_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_4.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_1024_4.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_1024_4.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -42,33 +43,33 @@
 };
 
 static long _vq_lengthlist_res0_256_1024_4[] = {
-	 6, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9,10,
+	 6, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,
         10,11,11,11,11, 6, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8,
-	 9, 9, 9, 9,10,10,11,11,11,11, 6, 6, 6, 6, 6, 7,
-	 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,11,11, 6,
-	 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9,10,10,10,10,
-	11,11,12,12, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9,
-	 9,10,10,10,10,11,11,12,12, 7, 7, 7, 7, 7, 7, 7,
+	 9, 9, 9, 9,10,10,11,11,12,12, 6, 6, 6, 6, 6, 7,
+	 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,11,12, 6,
+	 6, 6, 7, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,11,
+	11,11,12,12, 6, 6, 6, 6, 7, 7, 7, 8, 8, 8, 8, 9,
+	 9,10,10,11,11,11,11,12,12, 7, 7, 7, 7, 7, 7, 7,
          8, 8, 9, 9, 9, 9,10,10,11,11,12,12,12,12, 7, 7,
          7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,12,
         12,12,12, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,
-	11,11,11,11,12,12,13,13, 7, 7, 7, 8, 8, 8, 8, 9,
-	 9, 9, 9,10,10,11,11,11,11,12,12,13,13, 8, 8, 8,
+	11,11,12,12,12,12,13,13, 7, 7, 7, 8, 8, 8, 8, 9,
+	 9, 9, 9,10,10,11,11,12,12,12,12,13,13, 8, 8, 8,
          8, 8, 9, 9, 9, 9,10,10,11,11,11,11,12,12,13,13,
-	13,13, 8, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11,11,
-	11,12,12,12,13,13,13, 9, 9, 9, 9, 9, 9, 9,10,10,
-	11,11,11,11,12,12,13,12,13,13,14,14, 9, 9, 9, 9,
-	 9, 9, 9,10,10,11,11,11,11,12,12,13,13,13,13,14,
-	14, 9, 9,10,10,10,10,10,11,11,11,11,12,12,13,13,
-	13,13,14,14,14,14, 9,10,10,10,10,10,10,11,11,11,
-	11,12,12,13,13,13,13,14,14,14,14,10,10,10,11,11,
+	13,14, 8, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11,11,
+	11,12,12,13,13,13,13, 9, 9, 9, 9, 9,10,10,10,10,
+	11,11,11,11,12,12,13,13,13,13,14,14, 9, 9, 9, 9,
+	 9,10,10,10,10,11,11,11,11,12,12,13,13,13,13,14,
+	14, 9,10,10,10,10,10,10,11,11,12,11,12,12,13,13,
+	13,13,14,14,15,15, 9,10,10,10,10,10,10,11,11,12,
+	11,12,12,13,13,13,13,14,14,15,15,10,10,10,11,11,
         11,11,12,12,12,12,13,13,13,13,14,14,14,14,15,15,
         10,10,10,11,11,11,11,12,12,12,12,13,13,13,13,14,
-	14,15,14,15,15,11,11,11,11,11,12,12,12,12,13,13,
-	13,13,14,14,15,14,15,15,15,16,11,11,11,11,11,12,
-	12,12,12,13,13,13,13,14,14,14,14,15,15,15,16,11,
-	12,12,12,12,13,13,13,13,14,13,14,14,15,15,15,15,
-	16,15,16,16,11,12,12,12,12,12,13,13,13,13,13,14,
+	14,15,14,15,15,11,11,11,12,12,12,12,13,12,13,13,
+	14,13,14,14,15,14,15,15,15,16,11,11,11,12,12,12,
+	12,13,12,13,13,14,14,14,14,15,14,15,15,16,16,12,
+	12,12,12,12,13,13,13,13,14,14,14,14,15,15,15,15,
+	16,16,16,16,12,12,12,12,12,13,13,13,13,14,14,14,
         14,15,15,15,15,15,16,16,16,
 };
 

1.5       +76 -75    vorbis/lib/books/res0_256_1024_5.vqh

Index: res0_256_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_5.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_1024_5.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_1024_5.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -66,13 +67,13 @@
          9, 9, 9,10,10, 9, 9,10,10,10,10,10,10,11,11,11,
         11,11,11,11,11,12,12,12,12, 5, 6, 6, 7, 7, 8, 8,
          8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10,
-	10,10,11,11,11,11,11,11,12,12,12,12,12,12,12,13,
+	10,10,11,11,11,11,11,11,12,12,12,12,12,12,13,13,
         13,13, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
          9,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,
-	11,12,12,12,12,12,12,13,13,13,13, 7, 7, 7, 8, 8,
+	11,12,12,12,12,12,12,12,12,13,13, 6, 7, 7, 8, 8,
          8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,11,11,
-	11,11,11,11,11,11,12,12,12,12,12,12,13,13,13,13,
-	13,13,14,14, 6, 7, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9,
+	11,11,11,11,11,11,12,12,12,12,12,13,13,13,13,13,
+	13,13,14,14, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
          9,10,10,10,10,10,10,11,11,11,11,11,11,11,11,12,
         12,12,12,12,12,13,13,13,13,13,13,14,14, 7, 8, 8,
          8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,11,11,
@@ -81,92 +82,92 @@
          9,10,10,10,10,10,10,11,11,11,11,11,11,12,12,12,
         12,12,12,13,13,13,13,13,13,14,14,14,14,14,14, 8,
          8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11,10,11,11,
+	11,11,12,12,12,12,12,12,12,12,13,13,13,13,13,13,
+	14,14,14,14,15,14,15,15, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9,10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
+	12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,15,
+	15, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11,10,11,11,
         11,11,12,12,12,12,12,12,12,12,13,13,13,13,14,13,
-	14,14,14,14,14,14,15,15, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9,10,10,10,10,11,10,11,11,11,11,12,12,12,11,12,
-	12,12,12,13,13,13,13,13,13,14,14,14,14,14,15,15,
-	15, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11,11,11,11,
-	11,11,12,12,12,12,12,12,12,12,13,13,13,13,14,14,
-	14,14,14,14,14,14,15,15,15,15, 8, 9, 9, 9, 9, 9,
+	14,14,14,14,14,15,15,15,15,15, 8, 9, 9, 9, 9, 9,
          9,10,10,10,10,10,11,11,11,11,11,12,12,12,12,12,
-	12,12,12,13,13,13,13,13,14,14,14,14,14,15,14,15,
+	12,12,12,13,13,13,13,14,13,14,14,14,14,15,15,15,
         15,15,15, 9, 9, 9, 9, 9,10,10,10,10,11,11,11,11,
-	11,11,12,12,12,12,12,12,12,12,13,13,13,13,14,14,
+	11,11,12,12,12,12,12,12,12,12,13,13,13,13,13,14,
         14,14,14,14,15,15,15,15,15,15,16,15, 9, 9, 9, 9,
          9,10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
-	12,12,12,13,13,13,13,13,13,14,14,14,14,15,14,15,
-	15,15,15,15,16, 9, 9, 9,10,10,10,10,11,11,11,11,
-	11,11,12,12,12,12,12,12,13,13,13,13,13,13,14,13,
+	12,12,12,13,13,13,13,14,14,14,14,14,14,15,14,15,
+	15,15,15,15,15, 9, 9, 9,10,10,10,10,11,11,11,11,
+	11,11,12,12,12,12,12,12,13,13,13,13,13,13,13,13,
         14,14,14,14,15,15,15,15,15,15,16,16,16,16, 9, 9,
          9,10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
-	12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,
-	15,15,15,16,16,16,16, 9,10,10,10,10,11,11,11,11,
-	11,11,12,12,12,12,12,12,13,13,13,13,13,13,14,14,
-	14,14,14,14,15,15,15,15,15,15,16,16,16,16,16,16,
+	12,13,13,13,13,13,13,14,14,14,14,14,14,15,14,15,
+	15,15,15,15,16,16,16, 9,10,10,10,10,11,11,11,11,
+	11,11,12,12,12,12,12,12,13,13,13,13,13,13,14,13,
+	14,14,14,14,15,15,15,15,15,15,15,16,16,16,16,16,
          9,10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
-	12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,
+	12,13,13,13,13,13,13,13,14,14,14,14,14,15,14,15,
         15,15,15,16,16,16,16,16,16,10,10,10,11,11,11,11,
+	11,11,12,12,12,12,13,12,13,13,13,13,14,13,13,14,
+	14,14,14,14,15,15,15,15,15,15,15,15,16,16,16,16,
+	16,16,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
+	12,13,13,13,13,13,13,13,13,14,14,14,14,14,15,15,
+	15,15,15,16,15,16,16,16,16,17,17,10,11,11,11,11,
         11,11,12,12,12,12,12,12,13,13,13,13,13,13,14,14,
-	14,14,14,14,14,15,15,15,15,15,16,16,16,16,16,16,
-	16,17,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
-	13,13,13,13,13,14,14,13,14,14,14,14,14,15,14,15,
-	15,15,15,16,16,16,16,16,16,17,16,10,11,11,11,11,
-	11,11,12,12,12,12,13,12,13,13,13,13,13,14,14,14,
-	14,14,14,14,15,15,15,15,15,16,16,16,16,16,16,16,
-	17,17,16,17,10,11,11,11,11,11,11,12,12,12,12,13,
-	12,13,13,13,13,14,14,14,14,14,14,14,14,14,15,15,
-	15,15,16,16,16,16,16,17,16,17,16,17,17,10,10,10,
-	11,11,11,11,12,12,12,12,13,13,13,13,13,13,14,14,
         14,14,14,14,15,15,15,15,15,15,16,16,16,16,16,16,
-	17,17,17,17,17,17,10,10,10,11,11,11,11,12,12,12,
-	12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,
-	15,15,16,16,16,16,16,17,16,17,17,17,17,17,17,10,
-	11,11,11,11,12,12,12,12,13,13,13,13,13,13,14,14,
+	17,16,17,17,10,11,11,11,11,11,11,12,12,12,12,12,
+	12,13,13,13,13,14,13,14,14,14,14,14,14,15,15,15,
+	15,15,15,15,16,16,16,16,16,16,16,16,17,10,10,10,
+	11,11,11,11,12,12,12,12,12,12,13,13,13,13,14,13,
         14,14,14,14,15,15,15,15,15,15,16,16,16,16,16,16,
-	17,17,17,17,17,17,17,18,10,11,11,11,11,12,12,12,
+	17,16,17,17,18,17,10,10,10,11,11,11,11,12,12,12,
+	12,13,12,13,13,13,13,14,14,14,14,14,14,15,15,15,
+	15,15,15,16,16,16,16,16,16,17,17,17,17,17,17,10,
+	11,11,11,11,12,12,12,12,13,13,13,13,13,13,14,14,
+	14,14,14,14,15,15,15,15,15,15,16,15,16,16,16,16,
+	16,16,17,17,17,17,17,18,10,11,11,11,11,12,12,12,
         12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,
+	15,16,15,16,16,16,16,16,17,17,16,17,17,17,17,17,
+	17,10,11,11,12,12,12,12,13,13,13,13,13,13,14,14,
+	14,14,14,14,15,14,15,15,15,16,15,16,16,16,16,16,
+	17,17,17,17,17,17,17,18,17,18,10,11,11,12,12,12,
+	12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,
+	15,15,15,16,16,16,16,16,16,17,17,17,17,17,17,17,
+	18,18,18,11,12,12,12,12,13,13,13,13,14,13,14,14,
+	14,14,14,14,15,15,15,15,16,15,16,16,16,16,16,16,
+	16,17,17,17,17,17,17,17,18,18,18,18,11,12,12,12,
+	12,13,13,13,13,13,13,14,14,14,14,14,15,15,15,15,
         15,15,15,16,16,16,16,16,16,17,17,17,17,17,17,17,
-	17,10,11,11,12,12,12,12,13,13,13,13,14,13,14,14,
-	14,14,14,14,15,15,15,15,16,15,16,16,16,16,17,17,
-	16,17,17,17,17,17,18,17,18,18,10,11,11,12,12,12,
-	12,13,13,13,13,13,14,14,14,14,14,15,14,15,15,15,
-	15,16,15,16,16,16,16,16,16,17,17,17,17,17,18,18,
-	17,19,17,11,12,12,12,12,13,13,13,13,14,14,14,14,
-	14,14,15,14,15,15,15,15,16,15,16,16,16,16,16,16,
-	17,17,17,17,17,17,17,17,18,17,17,18,11,12,12,12,
-	12,13,13,13,13,14,13,14,14,14,14,15,15,15,15,15,
-	15,16,16,16,16,16,16,16,17,16,16,17,17,17,17,17,
-	18,18,18,18,17,11,12,12,13,13,13,13,13,14,14,14,
-	14,14,15,15,15,15,15,15,15,16,16,16,16,16,17,17,
-	17,17,17,17,17,18,17,18,18,18,18,18,19,19,11,12,
+	18,18,17,18,18,11,12,12,13,13,13,13,13,13,14,14,
+	14,14,15,15,15,15,15,15,15,15,16,16,16,16,16,16,
+	17,16,17,17,18,17,18,17,17,18,18,18,18,18,11,12,
         12,13,13,13,13,13,14,14,14,14,14,15,15,15,15,15,
-	15,16,15,16,16,16,16,16,16,16,17,17,17,17,17,17,
-	18,17,18,18,18,18,18,12,12,12,13,13,13,13,14,14,
-	14,14,15,14,15,15,15,15,15,16,16,16,16,16,16,16,
-	17,17,17,17,17,17,17,17,18,18,18,18,18,18,19,18,
-	11,12,12,13,13,14,13,14,14,14,14,15,15,15,15,15,
-	15,16,16,16,16,17,16,17,17,17,17,17,17,17,17,17,
-	18,18,18,17,18,18,18,18,19,12,13,13,13,13,14,14,
-	14,14,15,15,15,15,15,15,16,16,16,16,17,16,17,17,
-	17,17,17,17,17,18,18,17,17,18,18,18,19,19,18,18,
-	19,18,12,13,13,13,13,14,14,14,14,15,15,15,15,16,
-	15,16,16,16,16,16,16,17,17,17,17,17,17,18,17,18,
-	18,18,18,18,19,18,18,18,18,18,18,12,13,13,14,14,
-	14,14,15,14,15,15,16,15,16,16,16,16,16,16,17,17,
-	17,17,17,17,17,18,18,17,17,18,18,18,17,19,18,19,
-	18,18,19,19,12,13,13,14,14,14,14,15,15,15,15,16,
-	15,16,16,16,16,16,17,17,17,17,17,17,17,17,17,17,
-	18,19,18,18,18,18,18,18,18,19,19,19,20,12,13,13,
+	15,15,15,16,16,16,16,16,16,17,17,17,17,17,17,17,
+	17,17,18,19,18,18,18,11,12,12,13,13,14,14,14,14,
+	14,14,15,14,15,15,15,15,15,16,16,16,16,16,17,17,
+	17,16,17,17,17,17,18,18,17,18,18,18,18,18,18,18,
+	11,12,12,13,13,14,13,14,14,14,14,14,15,15,15,15,
+	15,16,16,16,16,16,16,16,16,16,17,17,17,17,18,18,
+	17,18,18,19,18,18,19,19,18,12,13,13,13,13,14,14,
+	14,14,14,14,15,15,15,15,16,16,16,16,16,16,16,16,
+	17,17,17,18,18,17,17,17,18,18,18,18,18,18,18,19,
+	18,18,12,13,13,13,13,14,14,14,14,15,15,15,15,16,
+	15,16,16,16,16,16,16,16,17,17,17,17,17,17,17,18,
+	18,18,19,18,18,18,19,18,19,19,19,12,13,13,14,14,
+	14,14,15,15,15,15,15,15,16,16,16,16,16,16,16,17,
+	16,17,17,17,17,18,17,17,17,18,18,18,18,18,19,19,
+	18,18,18,18,12,13,13,14,14,14,14,15,15,15,15,15,
+	15,16,16,16,16,16,16,16,17,17,17,17,17,17,18,17,
+	17,18,18,18,18,18,18,18,18,19,18,19,19,12,13,13,
         14,14,15,15,15,15,15,15,16,16,16,16,16,16,17,16,
-	17,17,17,17,18,17,18,18,18,18,18,19,18,19,18,19,
-	19,19,19,19,18,18,12,13,13,14,14,15,15,15,15,15,
-	15,16,16,16,16,17,16,16,16,17,17,17,17,17,17,18,
-	18,18,18,18,18,18,18,18,19,18,18,19,19,19,19,13,
-	14,14,14,14,15,15,15,16,16,16,16,16,16,17,17,16,
-	17,17,17,17,18,17,18,17,18,18,18,18,18,18,18,18,
-	20,18,18,20,20,18,19,20,13,14,14,14,15,15,15,15,
-	15,16,16,16,16,16,17,16,17,17,17,17,17,17,18,17,
-	19,18,18,18,18,18,18,18,19,18,18,19,20,19,19,19,
+	17,17,17,17,17,18,18,18,18,18,18,17,18,18,19,19,
+	19,18,19,18,19,18,12,13,13,14,14,15,15,15,15,15,
+	16,16,16,16,16,16,16,17,17,17,16,17,17,17,17,17,
+	18,18,17,18,19,18,18,19,18,19,19,19,18,19,18,13,
+	14,14,14,15,15,15,15,16,16,16,16,16,17,16,17,17,
+	17,17,17,17,18,17,17,18,18,18,18,18,18,19,18,18,
+	19,18,19,20,19,19,20,19,13,14,14,14,14,15,15,15,
+	15,16,16,16,16,16,16,16,17,17,17,17,17,17,17,18,
+	18,18,17,19,18,18,19,19,18,18,19,19,19,19,18,19,
         19,
 };
 

1.4       +393 -392  vorbis/lib/books/res0_256_1024_6.vqh

Index: res0_256_1024_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_6.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_256_1024_6.vqh	2001/02/02 03:52:08	1.3
+++ res0_256_1024_6.vqh	2001/02/18 09:53:03	1.4
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -104,414 +105,414 @@
 static long _vq_lengthlist_res0_256_1024_6[] = {
          4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9,
          9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,
-	10,10,10,10,10,11,11,11,11,10,10,10,10,10,10,11,
-	10,11,11,11,11,11,11,11,11,11,12,12,12,12,12,12,
-	12,12,12,13,12,13,12,13,13,13,13,13,13,13,13,14,
-	13, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,10,10,10,10,10,10,11,10,11,11,11,11,
-	11,11,11,11,11,11,12,12,12,12,11,11,11,11,11,11,
+	10,10,10,10,11,11,11,11,11,10,10,10,10,10,10,11,
+	10,11,11,11,11,11,11,11,11,11,11,12,12,12,12,12,
+	12,12,12,13,13,13,13,13,13,13,13,13,13,14,13,14,
+	14, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+	 9,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
+	11,11,11,11,12,11,12,12,12,12,11,11,11,11,11,11,
         12,12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,
-	13,13,13,13,14,13,14,14,14,14,14,14,15,14,15,15,
-	15,15, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9,10,10,10,10,10,10,10,10,10,11,10,11,11,11,
-	11,11,11,11,11,11,11,12,12,12,12,11,11,11,11,11,
-	11,12,12,12,12,12,12,12,12,12,12,12,13,13,13,13,
+	13,13,13,13,14,14,14,14,14,14,14,14,14,14,15,14,
+	15,14, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9,10,10,10,10,10,10,10,10,10,11,11,11,11,
+	11,11,11,11,11,11,11,12,11,12,12,11,11,11,11,11,
+	11,12,11,12,12,12,12,12,12,12,12,13,13,13,13,13,
         13,13,13,13,13,14,14,14,14,14,14,14,14,14,14,14,
-	14,15,14, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,10,10,
-	10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,11,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,
-	14,14,14,14,14,14,14,14,14,14,15,14,15,15,15,15,
-	15,15,15,15, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9,10,
+	14,15,15, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9,10,10,
         10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,
+	12,12,12,12,12,12,12,12,12,12,13,13,12,12,12,12,
+	12,12,12,12,13,12,13,13,13,13,13,13,13,13,13,13,
+	14,14,14,14,14,14,14,14,15,14,15,14,15,14,15,15,
+	15,15,15,15, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,
         11,12,11,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,13,13,13,13,13,13,13,13,14,
-	13,13,13,14,14,14,14,14,14,14,14,14,14,14,15,15,
-	15,15,15,15,15, 7, 8, 8, 9, 9, 9, 9, 9, 9,10,10,
+	12,12,12,12,12,12,12,13,13,13,13,13,13,13,13,13,
+	13,14,14,14,14,14,14,14,14,14,14,15,15,15,15,15,
+	14,15,15,15,16, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,
         10,10,10,10,11,11,11,11,11,11,11,11,11,11,12,12,
-	12,12,12,12,12,12,12,12,12,12,13,13,13,13,12,12,
+	12,12,12,12,12,12,12,12,13,12,13,13,13,13,12,12,
         12,12,13,13,13,13,13,13,13,13,13,13,14,14,14,14,
-	14,14,14,14,14,14,14,15,15,15,15,15,15,15,15,15,
-	15,15,16,16,15,16, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,
-	10,10,10,10,10,11,10,11,11,11,11,11,11,12,11,12,
+	14,14,14,14,14,14,15,15,14,15,15,15,15,15,15,15,
+	15,15,16,15,16,15, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,
+	10,10,10,10,10,11,11,11,11,11,11,11,11,11,11,12,
         12,12,12,12,12,12,12,12,12,13,12,13,13,13,13,12,
-	12,12,12,13,13,13,13,13,13,13,13,13,13,14,14,14,
-	14,14,14,14,14,14,14,15,15,14,15,15,15,15,15,15,
-	15,15,16,15,15,15,16, 8, 9, 9, 9, 9,10,10,10,10,
-	10,10,11,11,11,11,11,11,11,11,11,11,12,12,12,12,
-	12,12,12,12,12,12,13,12,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,14,14,14,14,14,14,
-	14,14,15,14,14,15,15,15,15,15,15,15,15,15,15,16,
-	16,16,16,16,16,16,16,16, 8, 9, 9, 9, 9,10,10,10,
-	10,10,10,11,11,11,11,11,11,11,11,11,11,12,12,12,
-	12,12,12,12,12,12,12,13,12,13,13,13,13,13,13,13,
+	12,13,12,13,13,13,13,13,13,13,13,13,13,14,14,14,
+	14,14,14,14,14,14,14,15,14,15,15,15,15,15,15,15,
+	15,15,15,16,16,15,15, 8, 9, 9, 9, 9,10,10,10,10,
+	10,10,11,10,11,11,11,11,11,11,11,11,12,12,12,12,
+	12,12,12,12,13,12,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,14,13,14,14,14,14,14,14,
+	14,14,14,14,15,15,15,15,15,15,16,15,15,15,15,15,
+	16,15,16,16,16,16,16,16, 8, 9, 9, 9, 9,10,10,10,
+	10,10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,13,
         13,13,13,13,13,13,13,13,13,14,13,14,14,14,14,14,
-	14,14,14,14,14,15,15,15,15,15,15,15,15,16,15,15,
-	15,16,15,16,16,16,16,16,16, 9, 9, 9,10,10,10,10,
+	14,14,15,14,14,15,15,15,15,15,15,15,15,15,15,15,
+	15,16,15,15,16,16,16,16,16, 9, 9, 9,10,10,10,10,
+	10,10,11,11,11,11,11,11,11,11,11,11,12,12,12,12,
+	12,12,12,12,13,12,13,13,13,13,13,13,13,13,13,13,
+	14,14,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
+	15,14,15,14,15,15,15,15,15,15,15,15,16,15,16,16,
+	16,16,16,16,16,16,16,16,16,16, 9, 9, 9,10,10,10,
+	10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,
+	12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,13,
+	14,14,14,13,13,13,13,14,13,13,14,14,14,14,14,14,
+	14,14,14,15,14,15,15,15,15,15,15,15,15,16,15,16,
+	16,16,15,16,16,16,16,16,16,16,16, 9, 9, 9,10,10,
         10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,12,
-	12,12,12,12,13,12,13,13,13,13,13,13,13,13,14,13,
-	13,14,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
-	14,14,15,14,15,15,15,15,15,15,15,16,16,16,16,16,
-	16,16,16,16,16,16,17,16,16,17, 9, 9, 9,10,10,10,
+	12,12,12,12,13,13,13,13,13,13,13,13,13,13,14,13,
+	14,14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,
+	14,15,15,15,15,15,15,15,15,15,15,15,16,16,16,16,
+	16,16,16,16,16,16,16,17,17,17,17,16, 9, 9, 9,10,
         10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,
         12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,14,
-	14,14,14,13,13,13,13,13,14,13,14,14,14,14,14,14,
-	14,14,14,15,14,15,14,15,15,15,15,15,15,16,15,16,
-	16,16,16,16,16,16,16,16,16,16,17, 9, 9, 9,10,10,
-	10,10,11,11,11,11,11,11,12,11,12,12,12,12,12,12,
-	12,12,13,13,13,13,13,13,13,13,13,13,13,13,14,13,
-	14,14,14,14,13,13,14,14,14,14,14,14,14,14,14,14,
-	14,15,15,15,15,15,15,15,16,15,15,15,16,16,16,15,
-	16,16,16,16,16,16,16,16,17,17,17,16, 9, 9, 9,10,
-	10,10,10,11,11,11,11,11,11,11,12,12,12,12,12,12,
-	12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,14,
-	14,14,14,14,14,13,13,14,14,14,14,14,14,14,14,14,
-	14,14,14,15,15,15,15,15,15,15,15,16,16,16,16,16,
-	15,16,15,16,16,17,16,16,16,17,17,17,16, 9,10,10,
-	10,10,11,11,11,11,11,11,12,12,12,12,12,12,12,12,
+	14,14,14,14,14,13,13,14,13,14,14,14,14,14,14,14,
+	14,15,14,15,15,15,15,15,15,15,16,15,16,16,16,16,
+	15,17,16,16,16,17,16,17,16,17,16,17,16, 9,10,10,
+	10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,12,
         12,12,13,13,13,13,13,13,13,13,13,13,14,13,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,15,14,
-	15,14,15,15,15,15,15,15,16,15,16,15,16,16,16,16,
-	16,16,16,16,17,16,17,16,17,17,17,18,17,17, 9,10,
-	10,10,10,11,11,11,11,11,11,12,12,12,12,12,12,12,
-	12,12,12,13,13,13,13,13,13,13,13,13,13,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,16,16,16,16,16,
+	16,16,16,17,16,16,17,17,16,16,16,17,18,17, 9,10,
+	10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,
+	12,12,12,13,13,13,13,13,13,13,13,13,13,13,14,13,
         14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,15,
-	14,15,15,15,15,15,15,15,15,16,15,16,15,15,16,16,
-	16,16,16,16,16,16,17,16,16,16,16,16,17,17,17,10,
-	10,10,11,11,11,11,11,11,12,12,12,12,12,12,12,12,
-	12,12,13,13,13,13,13,13,13,13,13,14,14,13,14,14,
-	14,14,14,14,14,15,15,14,14,14,14,14,15,14,15,14,
-	15,15,15,15,15,15,15,15,15,16,16,15,16,16,16,17,
-	16,16,16,16,17,16,16,16,16,17,17,17,17,17,17,17,
-	10,10,10,11,11,11,11,11,11,12,12,12,12,12,12,12,
-	12,12,13,13,13,13,13,13,13,13,13,14,14,14,13,14,
-	14,14,14,14,14,14,14,14,15,14,14,14,14,14,14,15,
-	14,15,15,15,15,15,15,15,15,15,15,16,16,15,16,16,
-	16,16,16,16,17,17,17,17,16,16,17,17,17,17,17,17,
+	15,15,15,15,15,15,15,15,15,15,15,16,15,16,16,16,
+	16,16,16,17,16,16,16,16,16,17,16,17,16,17,16,10,
+	10,10,11,11,11,11,11,11,11,12,12,12,12,12,12,12,
+	13,12,13,13,13,13,13,13,13,13,13,13,14,14,14,14,
+	14,14,14,14,14,14,15,14,14,14,14,14,14,14,15,15,
+	15,15,15,15,15,15,15,15,15,15,16,16,16,16,16,16,
+	16,16,16,16,17,17,16,16,17,17,17,17,18,18,17,17,
+	10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,12,
+	12,13,12,13,13,13,13,13,13,13,13,14,13,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,15,15,15,15,15,15,15,16,16,15,15,16,16,16,
+	16,16,16,16,16,17,17,17,17,16,17,17,17,17,17,17,
         17,10,10,10,11,11,11,11,12,12,12,12,12,12,12,12,
+	12,12,13,13,13,13,13,13,13,13,14,14,14,14,14,14,
+	14,14,14,14,14,14,15,14,15,15,14,14,15,14,15,15,
+	15,15,15,15,15,15,15,16,16,16,15,16,16,16,16,16,
+	17,16,17,16,16,17,16,17,17,17,17,17,17,17,17,17,
+	18,17,10,10,10,11,11,11,11,11,12,12,12,12,12,12,
+	12,13,13,13,13,13,13,13,13,13,13,13,13,14,14,14,
+	14,14,14,14,14,14,14,14,14,15,15,14,14,14,14,15,
+	15,15,15,15,15,15,15,16,16,16,15,16,15,16,15,16,
+	16,16,16,16,17,16,16,17,16,18,17,16,17,17,17,17,
+	17,17,17,10,11,11,11,11,11,12,12,12,12,12,12,12,
         13,13,13,13,13,13,13,13,13,13,14,13,14,14,14,14,
-	14,14,14,14,14,14,15,14,15,15,14,14,14,14,15,15,
-	15,15,15,15,15,15,15,15,16,15,15,15,16,17,16,16,
-	16,16,17,17,16,17,17,17,17,17,17,17,16,17,17,17,
-	17,18,10,10,10,11,11,11,11,12,12,12,12,12,12,12,
-	13,13,13,13,13,13,13,13,13,14,13,14,13,14,14,14,
-	14,14,14,14,14,14,14,15,15,15,15,14,14,14,15,15,
-	15,15,15,15,15,15,15,15,15,16,15,15,16,16,16,16,
-	16,16,16,16,16,17,16,17,17,17,17,18,17,17,17,18,
-	18,17,17,10,11,11,11,11,11,12,12,12,12,12,13,12,
+	14,14,14,14,14,15,15,15,15,15,15,15,15,15,15,15,
+	15,15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,
+	16,16,18,17,17,16,17,17,17,18,18,18,18,17,18,18,
+	18,19,17,17,10,11,11,11,11,12,12,12,12,12,12,12,
+	12,13,13,13,13,13,13,13,13,13,13,14,14,14,14,14,
+	14,14,14,14,14,15,15,15,15,15,15,15,15,14,15,15,
+	14,15,15,15,15,15,15,16,16,16,16,16,16,16,16,17,
+	16,16,16,16,17,17,17,17,17,17,16,17,17,17,17,17,
+	17,18,18,18,17,10,11,11,11,11,12,12,12,12,12,12,
+	13,13,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
+	14,14,14,15,15,15,15,14,15,15,15,15,16,15,15,15,
+	15,15,15,15,15,15,16,16,16,16,16,16,16,16,16,16,
+	17,16,16,16,17,17,17,18,17,17,17,17,17,17,18,17,
+	19,17,18,18,17,18,10,11,11,11,11,12,12,12,12,12,
+	12,13,13,13,13,13,13,13,13,13,13,14,14,14,14,14,
+	14,14,14,14,15,15,15,15,15,15,15,15,15,15,15,15,
+	15,15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,18,17,17,17,17,18,17,17,17,
+	18,18,18,17,18,18,18,11,11,11,12,12,12,12,12,12,
         13,13,13,13,13,13,13,13,13,13,14,14,14,14,14,14,
-	14,14,14,14,14,14,15,15,15,15,15,15,15,14,15,15,
-	15,15,15,15,15,15,16,16,16,15,16,16,16,16,16,16,
-	16,16,17,16,17,17,17,17,17,17,18,17,18,17,17,17,
-	18,18,18,17,10,11,11,11,11,12,12,12,12,12,12,12,
-	12,13,13,13,13,13,13,13,13,13,14,14,14,14,14,14,
-	14,14,14,14,14,15,14,15,14,15,15,15,15,15,14,15,
-	15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,16,
-	16,17,17,17,16,17,17,16,17,17,17,17,17,17,17,18,
-	17,17,19,17,17,10,11,11,12,11,12,12,12,12,12,12,
-	13,13,13,13,13,13,13,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,15,14,14,14,15,15,15,15,15,15,15,14,
-	15,15,15,15,15,15,16,15,15,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,17,17,17,17,18,17,18,17,17,17,
-	17,18,18,18,18,18,10,11,11,11,11,12,12,12,12,12,
+	14,14,14,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	15,15,15,15,16,16,16,16,16,16,16,16,16,16,16,16,
+	17,17,17,16,16,17,17,17,18,17,17,17,18,17,18,17,
+	17,18,18,18,18,18,18,18,11,11,11,12,12,12,12,12,
         12,13,13,13,13,13,13,13,13,14,13,14,14,14,14,14,
-	14,14,14,14,14,14,14,15,15,15,15,15,15,15,15,15,
-	15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,16,
-	16,16,17,16,16,17,17,17,17,17,17,17,17,17,17,18,
-	18,17,17,18,18,18,18,11,11,11,12,12,12,12,13,12,
-	13,13,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
-	15,14,15,15,15,15,15,14,15,15,15,15,15,15,15,15,
-	15,16,15,15,16,16,16,16,16,16,16,16,16,16,17,16,
-	16,16,16,16,16,16,17,17,17,17,17,18,17,17,17,18,
-	18,18,18,17,17,17,17,17,11,11,11,12,12,12,12,13,
-	12,13,13,13,13,13,13,14,13,14,14,14,14,14,14,14,
-	14,15,14,14,14,15,15,15,15,15,15,15,15,15,15,16,
-	15,15,15,15,15,15,15,16,16,15,16,16,15,16,16,16,
-	16,17,17,17,16,17,17,17,17,16,17,18,17,17,17,17,
-	18,17,18,18,18,17,18,17,18,11,12,11,12,12,12,12,
-	13,13,13,13,13,13,14,13,14,13,14,14,14,14,14,14,
-	14,14,15,15,15,15,15,15,15,15,16,16,15,15,16,16,
-	16,16,15,15,15,15,16,15,16,16,16,16,16,16,17,16,
-	17,16,17,16,17,17,17,17,17,17,17,18,18,17,18,17,
-	18,18,18,18,17,18,18,18,19,18,11,11,11,12,12,12,
-	12,13,13,13,13,13,13,14,14,14,14,14,14,14,14,14,
-	14,14,14,15,14,15,15,15,15,15,15,15,15,16,15,16,
-	16,16,16,15,15,15,15,16,16,16,16,16,16,16,16,17,
-	16,16,17,17,16,17,17,17,16,18,17,18,17,17,18,17,
-	17,18,18,18,18,18,18,18,18,18,18,11,12,12,12,12,
-	12,13,13,13,13,13,14,13,14,14,14,14,14,14,14,14,
-	14,14,15,15,15,15,15,15,15,15,15,15,16,15,16,15,
-	16,16,16,16,16,16,16,16,16,16,17,16,17,17,16,16,
-	17,16,17,16,17,16,17,17,18,18,17,17,17,17,17,18,
-	18,18,18,17,18,18,17,18,18,18,19,18,11,12,12,12,
-	12,13,12,13,13,13,13,14,13,14,14,14,14,14,14,14,
-	14,15,14,15,15,15,15,15,15,15,15,15,15,15,15,16,
-	16,15,15,16,16,16,15,16,15,16,16,16,16,17,16,16,
-	16,17,16,16,17,17,17,18,17,17,17,17,17,17,17,18,
-	17,18,17,18,18,18,18,18,19,18,18,18,18,11,12,12,
-	12,12,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
-	15,15,15,15,15,15,15,15,15,15,16,15,15,15,16,15,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	17,17,17,16,17,17,17,17,18,18,18,18,18,18,17,18,
-	18,18,18,18,18,18,18,18,20,19,18,19,18,19,11,12,
-	12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,14,
-	14,15,14,15,15,15,15,15,15,15,15,15,15,16,15,16,
-	15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,
-	16,17,16,17,17,17,17,17,18,17,17,18,17,18,17,18,
-	18,18,18,18,18,18,18,18,19,18,18,18,18,18,18,11,
-	12,12,13,13,13,13,13,14,14,14,14,14,14,14,14,14,
-	15,14,15,15,15,15,15,15,15,15,16,15,15,16,16,16,
-	16,16,16,16,16,16,17,16,16,16,16,16,16,16,17,16,
-	17,16,17,17,17,16,18,17,17,17,17,18,18,17,17,18,
-	18,17,18,18,18,18,18,18,18,18,18,18,18,18,19,18,
-	11,12,12,13,13,13,13,13,13,14,14,14,14,14,14,15,
-	15,14,14,15,15,15,15,15,15,16,16,16,16,16,16,16,
-	16,16,15,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	17,17,17,17,17,17,17,17,18,17,17,17,18,17,18,17,
-	18,17,19,18,19,19,18,18,19,20,18,18,19,18,18,19,
-	19,12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,
-	14,15,15,15,15,15,15,15,15,15,16,15,16,15,16,16,
-	16,15,16,16,16,16,16,17,17,16,16,16,16,16,16,17,
-	17,17,16,17,17,17,17,17,17,17,18,17,18,18,18,17,
-	17,18,18,18,18,18,18,18,21,19,18,19,18,19,18,18,
-	18,19,12,12,12,13,13,13,14,14,13,14,14,14,14,14,
-	14,15,15,15,15,15,15,15,15,15,15,16,15,16,16,16,
-	16,16,16,16,16,16,16,17,16,16,16,16,16,16,16,16,
-	16,16,17,17,17,17,17,17,17,17,17,17,17,17,18,18,
-	17,18,17,18,18,18,17,18,17,18,18,19,19,18,19,19,
-	19,19,19,12,13,13,13,13,14,13,14,14,14,14,14,15,
-	15,15,15,15,15,15,15,15,16,16,16,15,16,16,16,16,
-	16,15,16,16,16,16,16,16,17,17,17,16,17,16,17,16,
-	17,16,17,17,17,17,17,16,17,17,18,17,18,17,18,18,
-	17,18,18,18,18,18,19,18,19,18,18,18,19,18,18,19,
-	19,19,19,18,12,13,13,13,13,14,14,14,14,14,14,14,
-	15,15,15,15,15,15,15,15,15,15,15,15,16,16,15,16,
-	16,16,16,16,17,16,16,17,17,17,16,17,17,16,16,16,
-	16,17,17,17,16,17,17,17,17,17,17,17,18,17,17,18,
-	17,18,18,18,18,19,19,19,18,19,18,18,18,18,18,18,
-	19,19,19,19,19,12,13,13,13,13,14,14,14,14,14,14,
-	15,15,15,15,15,15,15,15,16,15,16,16,16,16,16,16,
-	16,16,16,17,17,16,16,16,17,16,16,17,16,17,17,16,
-	17,17,17,17,17,17,17,17,18,18,18,17,17,18,18,17,
-	18,17,18,17,18,17,19,18,18,19,18,19,18,18,18,20,
-	18,18,18,19,19,18,12,13,13,13,13,14,14,14,14,14,
-	14,15,15,15,15,15,15,16,15,15,15,16,15,16,16,16,
-	16,17,16,16,16,16,16,16,16,17,16,16,16,17,17,16,
-	16,17,17,18,17,17,17,18,17,17,17,17,17,18,17,19,
-	18,18,18,19,18,19,18,18,18,19,19,18,19,19,18,19,
-	21,19,19,19,19,18,19,12,13,13,14,14,14,14,14,14,
-	15,15,15,15,15,15,15,15,16,15,16,16,16,16,16,16,
-	17,16,16,16,16,16,16,17,17,17,17,17,17,17,17,17,
-	17,17,18,16,17,17,17,17,17,18,17,18,18,18,18,18,
-	18,17,18,17,17,17,19,18,18,19,19,18,19,19,18,19,
-	20,19,19,19,19,19,19,20,12,13,13,13,14,14,14,14,
-	15,15,14,15,15,15,15,16,15,16,15,16,16,15,16,16,
-	16,16,16,17,16,16,16,16,16,16,17,17,16,17,17,17,
-	17,17,16,17,17,18,17,17,17,17,17,17,17,18,18,18,
-	18,18,18,18,18,19,17,19,18,18,19,18,18,18,19,19,
-	18,18,18,19,18,18,19,18,19,11,12,12,13,13,13,13,
-	14,14,14,14,14,14,15,14,15,15,15,15,15,15,16,16,
-	16,15,16,15,16,16,16,16,16,17,16,17,16,17,17,16,
-	16,16,16,17,17,17,17,17,18,18,18,18,17,17,18,18,
-	17,18,18,18,18,18,18,19,21,19,18,18,19,18,18,18,
-	20,20,18,19,18,19,19,19,19,18,11,12,12,13,13,13,
-	13,14,14,14,14,14,14,15,15,15,15,15,15,15,15,15,
-	15,15,16,16,16,16,15,16,16,16,16,16,17,17,16,16,
-	17,17,16,17,17,16,17,18,17,18,17,18,17,18,17,18,
-	17,18,18,18,17,19,18,19,18,18,18,18,19,19,18,18,
-	19,19,19,19,20,19,18,18,20,21,20,11,12,12,13,13,
-	13,13,14,14,14,14,14,14,15,15,15,15,15,15,15,15,
-	16,16,16,16,16,16,16,16,16,16,17,16,16,17,16,17,
-	17,17,18,18,17,17,18,18,17,17,17,17,18,18,18,18,
-	17,18,18,19,18,18,19,18,18,19,18,18,19,19,19,19,
-	20,18,19,19,19,19,20,21,19,18,21,20,11,12,12,13,
-	13,13,13,14,14,14,14,14,14,15,15,15,15,15,15,16,
-	15,16,16,16,16,16,15,16,16,16,16,17,16,17,16,17,
-	16,16,17,17,16,17,17,17,18,18,18,18,17,18,18,18,
-	18,18,18,19,18,19,18,19,18,18,18,19,18,18,19,18,
-	19,18,19,18,19,19,19,18,19,20,19,19,20,12,12,13,
-	13,13,14,14,14,14,14,15,15,14,15,15,15,15,16,16,
-	16,16,15,15,16,16,16,16,16,16,16,16,17,17,17,17,
-	17,17,17,17,17,17,17,17,18,17,17,18,17,17,18,17,
-	18,18,19,18,18,18,18,18,18,19,20,18,19,19,19,21,
-	19,18,19,19,20,20,19,20,19,18,19,21,18,20,12,13,
-	12,13,13,14,14,14,14,14,15,15,15,15,15,15,15,16,
-	15,16,16,15,16,17,16,16,16,16,16,16,16,17,17,17,
-	17,16,17,17,17,18,17,17,17,18,18,17,18,17,18,18,
-	18,19,18,18,18,19,18,19,19,18,18,19,20,19,20,20,
-	19,19,19,19,19,20,20,19,19,19,19,19,20,19,20,12,
-	13,13,14,13,14,14,14,14,14,15,15,15,15,15,15,16,
-	16,16,16,16,16,16,16,16,17,16,17,16,16,17,17,16,
-	17,18,17,17,17,17,17,17,18,18,17,17,18,18,18,17,
-	18,18,18,18,18,19,18,18,18,19,18,18,18,18,19,18,
-	19,19,20,20,20,19,19,19,19,19,20,19,19,20,20,18,
-	12,13,13,13,14,14,14,14,15,15,15,15,15,15,15,15,
-	15,16,16,16,16,16,16,16,15,17,16,17,17,16,17,17,
-	17,18,17,17,17,18,18,17,17,18,17,18,17,18,18,18,
-	18,18,18,18,18,18,18,19,18,18,18,19,18,18,19,18,
-	19,18,18,18,19,19,19,19,20,20,19,19,19,20,19,20,
-	20,12,13,13,14,14,14,14,15,14,15,15,15,15,15,15,
-	16,16,16,16,16,17,16,16,16,16,17,17,17,17,17,17,
-	17,16,18,17,18,18,17,18,18,18,18,17,18,17,18,18,
-	17,19,18,18,18,19,18,19,18,18,19,19,19,19,18,18,
-	19,19,19,20,20,20,21,18,21,19,20,20,18,19,19,20,
-	20,20,12,13,13,13,14,14,14,15,15,15,15,15,15,16,
-	15,16,16,16,16,16,16,17,16,16,16,16,16,17,17,17,
-	16,18,17,17,17,17,17,18,17,17,18,18,17,17,17,19,
-	19,18,18,18,18,18,18,18,18,19,18,19,18,19,19,19,
-	19,19,20,19,19,18,19,19,21,18,20,19,19,20,20,18,
-	21,20,19,13,13,13,14,14,15,15,15,15,15,15,16,16,
-	16,16,16,16,16,16,16,17,16,17,17,16,17,17,17,17,
-	17,17,17,18,17,18,17,17,17,18,19,17,18,18,17,18,
-	18,17,18,18,19,18,19,19,19,18,19,19,19,18,19,18,
-	20,19,20,21,20,19,21,20,21,19,19,19,19,19,20,19,
-	19,19,20,20,12,13,13,14,14,15,15,15,15,15,15,16,
-	15,15,16,16,16,16,16,17,16,17,17,17,17,17,17,17,
-	17,17,18,17,17,18,17,17,18,18,18,19,18,18,18,19,
-	18,18,19,18,18,18,18,19,18,19,19,19,19,20,20,19,
-	19,18,18,19,21,20,20,19,21,21,19,19,19,19,19,19,
-	20,20,20,20,19,13,13,14,14,14,15,15,15,15,15,15,
-	16,16,16,16,16,16,17,17,17,17,17,17,17,17,17,17,
-	18,17,17,17,17,17,18,18,18,18,18,18,18,18,18,17,
-	18,19,18,18,19,18,19,19,18,18,19,19,20,19,19,19,
-	19,19,20,19,20,19,19,20,19,20,19,19,21,21,20,21,
-	20,19,21,20,19,21,13,14,13,14,14,15,15,15,15,15,
-	15,16,16,16,17,16,16,16,17,17,17,17,16,16,17,17,
-	18,17,17,18,17,19,18,18,17,18,18,18,18,18,17,18,
-	18,19,18,17,19,19,18,19,18,18,19,19,19,19,19,19,
-	19,19,19,21,19,20,19,19,20,19,20,19,21,20,19,21,
-	21,20,21,19,21,20,19,13,14,14,15,15,15,15,15,16,
-	16,16,16,17,16,16,17,17,17,17,17,17,17,18,17,17,
-	18,17,17,18,18,17,18,18,18,18,18,18,19,18,19,19,
-	18,18,19,18,19,19,19,19,19,19,18,19,18,19,19,19,
-	19,19,18,19,20,19,20,19,21,20,19,21,21,19,21,19,
-	19,20,21,20,20,20,20,20,13,14,14,15,14,15,15,16,
-	15,15,16,16,16,16,17,17,17,17,17,16,18,17,17,17,
-	18,17,17,18,17,18,17,18,19,18,18,18,18,18,18,18,
-	18,19,18,18,18,18,18,18,19,18,19,19,18,19,20,19,
-	20,19,19,20,20,20,20,19,21,20,20,19,19,19,20,19,
-	21,19,21,20,21,20,19,19,20,13,14,14,15,15,15,15,
-	16,16,16,16,16,16,17,16,17,17,17,17,17,17,18,17,
-	18,18,17,18,18,17,17,18,17,19,18,18,18,18,18,18,
-	18,19,19,19,21,19,18,19,18,20,18,18,19,19,20,21,
-	19,20,19,19,20,19,20,19,19,19,19,21,19,20,21,21,
-	19,20,19,19,21,19,20,20,21,20,13,15,14,15,15,16,
-	16,15,16,16,16,17,17,17,17,17,17,17,17,17,17,19,
-	17,17,17,18,17,18,18,18,18,17,18,18,18,18,18,18,
-	19,18,20,19,19,19,18,18,19,19,19,18,19,21,19,19,
-	20,19,21,19,18,18,20,19,19,19,20,19,21,20,20,19,
-	20,19,20,21,20,21,20,20,20,19,19,13,14,15,15,15,
-	15,16,16,16,16,16,16,17,17,17,16,17,18,17,18,17,
-	17,17,17,18,18,17,18,17,18,18,18,18,19,18,19,18,
-	18,19,18,19,19,19,19,20,19,19,21,19,20,19,20,19,
-	19,19,19,19,19,20,19,21,21,19,20,21,21,21,20,20,
-	20,21,19,21,20,21,20,21,19,21,20,21,13,15,14,15,
-	15,16,15,16,16,16,16,16,17,17,17,17,17,17,17,19,
-	18,18,18,17,18,18,18,18,18,19,18,19,18,19,18,18,
-	19,19,18,18,19,19,19,21,19,19,19,19,19,19,18,19,
-	19,19,19,19,20,20,20,20,19,20,19,21,20,20,21,20,
-	20,20,19,20,21,21,21,20,21,19,20,21,21,14,15,15,
-	16,15,16,16,16,17,17,17,17,17,17,17,17,17,18,17,
-	17,18,18,18,18,18,18,18,19,17,19,18,19,18,19,18,
-	19,19,19,20,19,18,19,19,19,19,21,19,19,19,19,18,
-	20,20,19,21,20,19,20,20,20,20,21,19,21,21,21,19,
-	20,21,19,20,20,20,20,21,20,21,19,20,19,21,14,15,
-	15,16,15,16,16,16,16,17,17,16,17,17,17,17,17,17,
-	17,19,18,18,17,19,17,18,18,18,18,18,18,18,18,19,
-	18,19,19,19,19,19,19,19,19,19,19,19,18,21,18,19,
-	19,19,19,19,19,19,20,19,20,19,19,20,19,20,20,20,
-	19,21,20,20,20,21,20,21,19,21,21,19,19,21,20,14,
-	15,15,16,16,16,16,16,16,17,17,17,17,18,17,18,18,
-	18,19,18,18,18,19,18,18,19,19,18,18,18,18,20,18,
-	19,18,19,19,19,18,19,19,20,18,19,19,20,19,19,19,
-	19,18,20,20,21,20,21,21,21,20,21,21,20,20,19,20,
-	20,19,20,21,21,19,19,20,20,21,20,21,20,21,21,20,
-	14,15,15,16,16,16,16,17,17,17,17,17,17,17,18,18,
-	18,17,17,18,19,17,19,19,18,18,18,18,18,18,18,20,
-	18,19,18,19,19,19,19,21,18,18,21,19,21,19,19,19,
-	19,20,20,20,19,20,21,20,21,21,20,20,20,21,21,20,
-	20,20,21,21,21,21,20,21,20,18,21,20,21,21,21,21,
-	21,14,15,15,16,16,16,17,17,17,18,18,18,18,18,18,
-	18,18,18,18,17,18,18,18,19,18,19,18,19,20,19,18,
-	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,21,
-	19,19,20,18,20,19,19,20,19,21,20,21,20,19,20,21,
-	21,20,21,21,21,19,20,19,21,21,21,21,20,20,21,19,
-	21,21,15,15,15,16,16,16,17,17,18,18,17,17,17,18,
-	18,18,18,17,17,18,18,18,18,18,18,18,19,18,19,19,
-	18,19,19,18,19,19,19,19,19,20,19,19,19,19,19,19,
-	19,20,20,19,20,21,20,21,19,19,21,19,20,21,20,20,
-	20,21,21,21,20,20,20,21,21,20,21,21,19,21,20,20,
-	21,21,21,15,16,16,16,17,16,17,18,18,17,17,18,17,
-	18,18,19,18,18,18,18,18,20,18,18,18,19,19,20,19,
-	19,19,19,18,19,19,20,20,20,21,19,19,20,19,20,20,
-	20,19,20,20,20,20,20,21,20,20,21,20,20,20,19,19,
-	20,19,21,21,21,21,21,21,21,20,20,19,20,20,21,20,
-	20,20,20,21,15,16,15,16,17,17,17,17,17,17,17,18,
-	17,19,18,19,18,19,19,20,18,18,19,19,18,19,19,19,
-	20,21,19,18,19,19,18,20,19,20,18,19,20,20,21,20,
-	19,20,20,21,19,20,19,20,21,19,20,21,20,21,21,21,
-	21,20,21,20,20,19,21,19,20,21,19,21,21,20,21,21,
-	20,20,21,21,21,15,16,16,16,17,17,17,17,17,18,17,
-	18,19,18,18,18,18,18,18,19,19,19,19,18,18,19,18,
-	20,19,19,19,19,21,19,21,21,20,20,19,20,20,20,19,
-	20,19,21,19,20,19,19,20,19,19,20,20,19,19,20,21,
-	21,21,21,20,20,20,20,19,21,21,20,20,21,20,21,20,
-	19,21,21,21,21,20,15,16,16,17,17,17,17,17,17,18,
-	18,17,19,19,18,19,18,19,19,18,18,19,19,19,19,19,
-	19,19,19,19,19,19,21,20,19,19,19,19,20,21,19,21,
-	20,19,20,19,21,19,20,20,20,21,21,21,20,19,20,21,
-	21,21,21,20,21,19,21,20,19,21,19,20,20,21,21,21,
-	21,20,21,20,21,21,21,15,16,17,17,17,17,18,18,18,
-	18,18,19,18,19,18,19,20,19,19,19,19,19,19,19,18,
-	18,19,19,21,18,19,20,21,20,20,20,19,19,19,21,21,
-	21,19,20,19,21,19,21,20,21,19,21,19,21,21,21,19,
-	20,21,21,21,21,20,21,21,21,21,20,20,21,21,21,21,
-	21,20,20,21,21,21,21,20,15,16,16,17,17,17,17,18,
-	17,18,18,18,19,18,18,19,18,19,19,21,18,19,19,21,
-	20,19,19,19,19,19,21,19,19,20,19,19,20,21,19,19,
-	19,19,20,21,21,19,19,20,21,21,20,21,19,19,21,21,
-	21,20,21,20,21,20,21,21,20,20,21,19,21,21,20,21,
-	21,21,20,20,21,21,21,21,20,16,17,16,18,17,18,17,
-	18,18,19,18,18,18,19,19,19,19,19,19,19,21,19,19,
-	19,19,20,21,20,19,20,19,20,21,19,21,20,20,20,21,
-	20,19,21,20,21,21,20,20,20,20,20,20,21,21,21,20,
-	20,21,21,20,21,21,21,21,21,21,19,21,21,21,21,20,
-	20,19,20,19,20,21,21,21,21,21,16,17,16,18,17,18,
-	18,18,19,20,19,19,19,19,18,20,21,20,20,21,20,21,
-	20,18,19,19,19,20,20,20,19,20,21,19,21,20,20,19,
-	19,21,20,19,20,19,20,18,20,19,21,20,20,21,21,21,
-	20,19,19,21,20,20,20,21,21,20,21,21,21,20,21,21,
-	21,21,21,21,21,20,21,21,20,20,21,16,17,17,18,17,
-	19,17,18,19,18,19,19,18,19,19,18,20,20,19,19,18,
-	20,19,19,20,19,21,18,20,20,19,20,21,21,21,19,19,
-	19,20,20,20,21,21,21,19,20,20,20,21,21,21,21,21,
-	21,21,21,20,21,19,21,19,21,20,21,19,21,21,21,21,
-	19,20,21,21,21,20,21,21,20,21,20,21,16,17,17,17,
-	17,18,18,19,18,18,19,19,20,20,19,20,20,21,21,20,
-	21,20,20,20,19,21,20,19,19,19,21,20,20,20,20,21,
-	19,20,21,21,21,20,20,21,19,19,20,21,21,21,20,20,
-	20,20,21,21,20,21,21,21,21,21,20,20,21,21,21,19,
-	21,21,21,21,21,21,21,21,21,21,21,21,21,16,17,17,
-	18,18,18,18,18,19,18,19,19,19,21,18,18,19,19,19,
-	18,20,21,20,20,20,21,19,20,21,19,21,19,20,21,20,
-	19,20,19,19,20,19,21,20,21,21,20,20,21,20,20,20,
-	20,20,20,21,19,21,20,21,20,20,21,21,21,21,21,21,
-	21,20,21,21,21,21,21,21,21,20,21,20,21,21,17,17,
-	17,19,18,18,18,20,18,18,20,19,19,19,19,20,20,19,
-	19,20,20,19,18,20,20,20,19,20,21,21,20,21,20,19,
-	19,19,19,20,21,19,20,21,21,21,20,21,21,19,21,21,
-	21,20,21,20,20,21,21,21,21,20,20,21,21,21,21,21,
-	20,21,20,21,21,21,21,21,21,21,21,21,21,21,21,16,
-	17,18,19,18,19,19,20,18,20,20,20,21,20,20,19,21,
-	21,21,19,20,19,21,20,20,20,20,21,21,21,20,21,21,
-	21,20,21,21,19,19,21,21,19,19,20,21,21,20,20,21,
-	21,20,20,21,21,20,21,21,19,21,21,21,21,21,21,21,
-	21,20,21,21,21,21,21,21,21,21,21,21,20,21,21,21,
-	17,17,18,18,19,19,19,19,18,19,19,19,21,19,20,20,
-	21,21,20,19,21,21,20,20,21,19,21,21,20,19,20,21,
-	19,21,21,20,21,19,21,21,21,21,20,20,21,20,21,21,
-	21,21,21,21,20,21,21,20,21,21,21,21,21,21,21,21,
-	21,20,21,21,21,21,21,21,20,21,21,21,21,20,21,21,
+	14,14,14,15,14,15,15,15,15,15,15,15,15,15,15,16,
+	16,15,15,15,15,16,16,16,16,15,16,16,16,16,15,16,
+	16,16,17,18,16,17,17,18,17,18,16,17,17,17,17,17,
+	17,18,19,18,17,18,18,18,18,11,11,11,12,12,12,12,
+	13,13,13,13,13,13,14,13,14,14,14,14,14,14,14,14,
+	14,15,14,14,15,15,15,15,15,15,15,15,16,15,15,15,
+	16,16,15,15,15,15,16,16,16,15,16,16,16,16,16,16,
+	17,16,17,16,17,17,17,17,18,17,17,17,17,18,17,17,
+	17,18,17,18,18,18,18,18,18,18,11,11,11,12,12,12,
+	12,13,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
+	14,14,15,15,15,15,15,15,15,15,15,16,15,16,16,16,
+	16,16,15,15,15,15,15,16,15,16,16,16,16,16,17,16,
+	17,17,17,17,17,17,17,18,17,18,17,17,18,18,17,18,
+	17,18,18,18,17,17,17,17,18,18,18,11,12,12,12,12,
+	13,13,13,13,13,13,13,14,14,14,14,14,14,14,15,14,
+	15,14,15,15,15,15,15,15,15,15,15,15,15,15,16,16,
+	16,16,16,16,15,15,16,16,16,16,16,17,16,16,16,16,
+	17,16,17,16,17,17,17,17,17,17,17,18,18,18,18,18,
+	19,18,18,18,19,18,19,18,18,17,18,18,11,12,12,12,
+	12,12,13,13,13,13,13,14,14,14,13,14,14,14,14,14,
+	15,14,14,15,15,15,15,15,15,15,15,15,15,16,15,16,
+	16,16,16,16,16,16,16,16,16,16,16,17,16,16,16,17,
+	16,17,16,17,16,17,17,17,17,18,17,17,17,18,17,18,
+	18,18,17,19,18,17,18,18,19,18,18,18,18,11,12,12,
+	13,12,13,13,13,13,13,14,14,14,14,14,14,14,14,14,
+	14,15,15,15,15,15,15,15,15,15,16,15,15,16,15,16,
+	16,16,16,16,16,17,16,16,16,16,16,17,17,17,16,17,
+	16,17,17,17,17,17,17,17,17,17,17,18,18,17,18,18,
+	18,18,19,18,19,18,19,20,18,19,18,19,18,19,11,12,
+	12,13,13,13,13,13,13,13,13,14,14,14,14,14,14,14,
+	14,15,14,14,15,15,15,15,15,15,15,15,15,16,16,16,
+	15,16,16,16,16,16,16,16,15,16,16,16,16,16,16,16,
+	16,17,16,17,17,17,17,17,17,18,18,18,17,17,18,17,
+	17,17,17,18,18,18,18,17,18,18,19,18,18,18,18,11,
+	12,12,13,13,13,13,13,13,14,14,14,14,14,14,14,15,
+	15,14,15,15,15,15,15,15,16,15,15,15,16,16,16,16,
+	15,16,16,16,16,16,16,16,16,16,16,17,16,17,16,17,
+	17,16,17,17,17,17,17,17,17,18,17,18,18,17,17,17,
+	18,18,18,18,18,18,19,18,18,19,19,18,19,18,19,19,
+	11,12,12,13,13,13,13,13,14,14,14,14,14,14,14,15,
+	14,14,15,15,14,15,15,15,15,15,16,16,16,16,16,15,
+	16,16,16,16,16,17,16,16,16,16,16,16,16,17,17,17,
+	17,16,16,17,16,17,17,18,17,17,17,18,18,18,18,18,
+	17,18,18,18,17,19,19,18,18,18,18,18,18,19,19,19,
+	18,12,12,12,13,13,13,13,14,14,14,14,14,14,14,14,
+	15,14,15,15,15,15,15,16,15,15,16,15,16,15,16,16,
+	16,15,16,16,16,16,16,17,17,16,16,16,16,16,17,16,
+	16,17,17,17,17,17,17,17,17,17,18,17,18,18,18,18,
+	18,17,18,18,19,18,18,18,18,18,19,19,19,19,19,19,
+	19,19,12,12,12,13,13,13,13,14,13,14,14,14,14,14,
+	14,14,14,15,15,15,15,15,15,15,15,16,15,16,16,16,
+	16,16,16,16,16,16,17,16,16,17,16,16,17,17,16,16,
+	17,17,17,17,17,17,17,17,18,18,17,17,17,18,18,18,
+	18,18,18,18,18,18,18,18,18,19,18,19,19,18,18,18,
+	20,20,18,12,13,13,13,13,14,13,14,14,14,14,14,14,
+	15,15,15,15,15,15,15,15,15,15,16,15,16,16,16,16,
+	16,17,16,16,16,16,17,16,17,17,17,17,17,16,16,17,
+	17,17,17,16,17,17,17,18,18,18,17,18,18,17,18,18,
+	18,18,19,19,19,18,19,18,18,18,21,18,19,19,18,19,
+	19,19,20,20,12,13,13,13,13,13,14,14,14,14,14,15,
+	14,15,15,15,15,15,15,15,15,16,15,16,15,16,16,16,
+	16,16,16,16,16,16,16,16,17,16,16,17,17,16,16,17,
+	17,17,16,17,17,17,17,17,18,17,18,18,18,17,17,17,
+	17,18,18,18,17,19,18,19,19,19,19,19,19,18,19,18,
+	18,19,18,19,20,12,13,13,14,13,14,14,14,14,14,14,
+	14,15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,
+	16,16,17,16,17,16,17,16,17,17,17,17,17,18,17,16,
+	17,17,17,17,17,17,18,17,17,18,18,18,18,18,17,17,
+	18,18,19,18,19,17,18,19,18,18,18,19,20,19,19,19,
+	18,19,18,19,18,19,12,13,13,13,13,14,14,14,14,14,
+	14,15,15,15,15,15,15,15,16,16,16,16,15,16,16,17,
+	16,16,16,17,16,17,16,16,17,17,17,17,17,17,18,16,
+	16,17,16,17,17,17,17,17,17,18,17,18,18,18,18,17,
+	18,18,18,19,17,19,19,18,19,18,18,19,19,19,19,19,
+	18,20,19,19,19,19,19,12,13,13,14,14,14,14,15,14,
+	15,15,15,15,15,15,15,15,15,16,16,16,15,15,16,16,
+	16,16,16,17,17,17,17,16,17,17,17,17,18,17,17,17,
+	17,17,18,17,17,17,17,17,18,18,17,18,18,18,18,18,
+	18,18,19,18,18,18,18,18,20,19,19,18,21,18,19,20,
+	19,19,19,19,19,19,19,19,13,13,13,14,14,14,14,14,
+	14,15,15,15,15,15,15,15,16,15,15,16,16,16,16,16,
+	16,16,16,16,16,17,17,17,17,17,16,17,17,17,17,17,
+	17,17,16,17,17,17,17,17,17,17,18,17,18,18,18,18,
+	19,18,19,18,18,18,18,18,18,19,18,18,19,19,19,19,
+	19,20,18,19,19,20,19,20,20,11,12,12,13,13,13,13,
+	13,14,14,14,14,14,14,15,15,15,15,15,15,15,16,15,
+	15,15,16,15,16,16,16,16,16,17,16,16,17,17,17,17,
+	17,17,16,17,17,17,17,17,18,18,18,17,18,18,18,18,
+	18,18,18,18,19,18,18,19,20,19,18,19,19,18,18,19,
+	19,18,19,19,19,19,21,21,19,18,11,12,12,13,13,13,
+	13,14,14,14,14,15,14,15,15,15,15,15,15,15,15,15,
+	15,15,15,16,16,16,16,16,15,16,16,17,16,16,16,17,
+	17,17,16,17,17,17,17,17,18,18,18,18,17,18,18,18,
+	18,18,18,18,18,18,18,18,18,19,18,18,18,18,18,18,
+	19,20,19,19,18,19,19,19,20,19,19,11,12,12,13,13,
+	13,13,14,14,14,14,14,15,14,15,15,15,15,15,15,16,
+	16,16,16,16,16,16,16,16,16,16,16,17,16,17,17,16,
+	17,17,17,18,17,18,18,17,17,17,18,19,18,18,17,18,
+	18,18,21,18,18,17,19,19,18,18,18,19,20,18,18,18,
+	19,19,19,18,18,20,21,19,18,19,19,20,11,12,12,13,
+	13,14,13,14,14,14,14,14,14,15,15,15,15,15,15,15,
+	16,16,16,16,16,16,16,16,16,16,16,18,16,17,16,17,
+	16,17,17,17,17,18,17,18,17,18,18,18,18,18,18,17,
+	18,17,18,18,18,18,17,20,18,18,18,19,19,19,18,18,
+	19,19,19,19,19,19,19,19,19,18,19,19,20,12,13,13,
+	13,13,14,14,14,14,15,15,15,15,15,15,15,15,15,16,
+	16,15,16,16,16,15,16,16,16,17,17,16,17,16,17,17,
+	18,17,17,17,17,17,17,17,18,17,18,18,18,18,18,18,
+	18,17,19,20,18,18,18,18,19,18,19,20,19,19,19,20,
+	19,19,19,19,18,19,20,20,19,19,19,21,19,19,12,12,
+	13,13,13,14,14,14,14,14,14,15,15,15,15,15,15,15,
+	15,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,
+	17,16,17,17,17,17,17,17,17,17,18,17,17,17,18,19,
+	18,18,18,19,18,18,17,19,18,19,18,19,19,19,19,19,
+	21,19,20,19,19,19,19,19,21,19,20,20,20,19,21,12,
+	13,13,13,13,14,14,14,14,15,15,15,15,15,15,15,15,
+	16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,17,
+	18,17,18,17,17,17,18,17,18,18,18,17,19,18,18,19,
+	18,18,18,19,18,18,18,20,19,18,19,18,19,19,19,19,
+	19,20,20,18,19,20,20,21,19,19,19,19,19,21,20,21,
+	12,13,13,14,14,14,14,14,14,14,15,15,15,15,15,16,
+	15,15,16,16,16,16,16,16,16,17,16,17,16,17,17,16,
+	17,17,18,17,18,17,18,17,18,17,17,18,18,18,17,18,
+	18,18,18,18,17,19,19,18,18,19,19,18,19,19,19,18,
+	19,21,19,18,20,19,19,19,21,19,20,19,20,19,20,21,
+	21,12,13,13,14,14,14,15,15,15,15,15,15,15,16,16,
+	16,16,16,16,16,16,16,16,17,16,17,17,18,17,17,17,
+	17,17,18,17,18,18,18,17,18,18,17,18,18,18,18,19,
+	19,19,18,19,18,18,18,19,18,18,19,18,19,19,19,19,
+	19,20,20,20,19,21,19,20,20,19,20,19,19,20,19,19,
+	20,21,12,13,13,14,14,14,14,15,15,15,15,16,15,15,
+	15,16,15,16,16,17,16,16,16,17,16,17,17,16,17,17,
+	17,17,17,17,17,17,17,18,18,17,18,18,18,18,17,18,
+	18,18,19,20,19,19,18,19,19,18,19,19,19,19,19,19,
+	20,19,19,19,21,19,18,20,19,19,19,20,19,20,20,21,
+	21,19,20,12,13,14,14,14,14,15,15,15,15,15,16,16,
+	16,16,16,16,17,16,16,17,17,16,17,17,17,16,17,17,
+	17,17,18,18,18,17,18,18,18,17,18,18,20,18,17,19,
+	19,19,19,19,18,18,19,18,18,18,20,19,18,19,19,19,
+	19,18,19,19,18,19,19,18,21,19,20,19,19,21,19,20,
+	19,20,21,20,12,13,13,14,14,15,14,15,15,15,16,16,
+	15,16,16,16,16,16,16,17,16,16,16,17,16,17,17,18,
+	17,17,17,18,17,18,18,17,18,18,18,19,18,18,18,19,
+	19,18,19,18,19,17,19,18,19,19,19,18,21,19,21,18,
+	18,19,19,19,19,21,20,19,19,19,19,19,19,19,20,20,
+	19,20,20,21,19,13,14,14,14,14,15,15,15,16,15,15,
+	16,16,16,16,16,16,16,17,17,17,17,17,17,17,17,17,
+	17,17,18,17,18,18,18,18,18,18,18,18,18,19,18,18,
+	18,19,17,18,20,18,18,19,19,19,20,20,19,19,19,19,
+	19,19,19,21,19,20,21,19,19,19,21,19,19,19,19,20,
+	19,19,19,21,20,19,13,14,14,14,14,15,15,15,15,15,
+	16,16,16,16,17,16,16,17,16,17,17,17,17,18,17,18,
+	17,17,17,18,17,18,17,18,17,18,18,18,18,19,19,18,
+	18,19,19,20,19,20,19,19,18,18,19,19,19,19,19,18,
+	19,20,19,19,19,19,20,19,21,19,20,19,20,19,20,20,
+	21,21,21,20,19,20,20,13,14,14,15,15,15,15,15,15,
+	16,16,16,16,17,17,16,17,17,17,17,18,17,17,18,17,
+	17,18,18,18,18,18,18,19,18,17,18,18,18,18,19,19,
+	19,19,19,19,19,18,19,19,19,18,20,19,20,19,19,20,
+	20,19,18,20,20,21,19,19,19,20,19,20,19,20,21,19,
+	20,21,20,20,21,19,19,21,13,14,14,14,14,15,15,16,
+	16,16,16,16,16,16,16,17,17,18,17,17,18,17,17,18,
+	18,18,18,19,18,18,18,18,18,18,18,18,18,18,18,18,
+	19,19,18,19,19,18,19,19,19,21,18,21,18,20,19,19,
+	19,21,20,20,18,20,19,20,21,21,19,19,20,20,20,20,
+	21,19,19,21,21,19,21,21,21,13,14,14,15,15,15,16,
+	15,16,16,16,16,17,17,17,18,17,17,17,17,18,18,17,
+	18,17,17,17,19,18,18,18,18,18,18,19,18,20,19,19,
+	19,19,18,19,19,21,20,18,18,19,18,18,21,18,19,19,
+	20,19,19,19,19,19,21,21,21,21,20,19,20,19,21,21,
+	19,21,21,20,19,20,19,20,21,20,13,14,14,15,15,15,
+	16,16,16,16,16,16,17,17,16,17,16,17,17,17,18,18,
+	17,18,17,18,17,18,18,18,18,19,18,18,18,17,18,19,
+	19,18,18,21,18,18,18,19,21,19,19,19,19,19,20,18,
+	19,19,20,19,19,19,19,19,20,21,20,20,20,19,19,19,
+	21,19,21,21,19,21,19,20,21,20,20,13,15,14,15,15,
+	15,16,16,16,17,17,17,17,18,17,17,18,17,17,17,17,
+	17,17,19,18,18,18,18,18,18,18,18,18,18,19,18,19,
+	19,20,20,19,19,20,20,19,20,19,19,19,20,19,19,20,
+	19,20,20,21,20,20,19,19,19,20,20,21,19,21,21,21,
+	19,20,19,19,19,21,20,19,21,20,20,21,13,14,14,15,
+	15,16,16,16,16,16,16,17,17,17,17,17,18,17,17,18,
+	18,18,18,18,18,19,18,18,18,20,19,18,18,19,18,18,
+	19,19,19,19,18,18,21,18,19,19,19,21,19,19,19,21,
+	20,20,21,19,21,21,21,19,20,21,19,19,20,20,20,20,
+	21,20,20,20,20,20,21,20,21,20,21,19,21,14,15,15,
+	15,16,16,16,17,16,17,17,17,18,18,17,17,17,17,18,
+	17,18,18,18,19,18,18,18,18,18,18,18,20,18,19,19,
+	19,19,19,19,19,19,19,19,20,20,20,21,20,19,19,20,
+	21,19,19,19,21,19,20,20,20,19,20,20,20,20,21,19,
+	20,20,21,20,19,21,21,21,21,21,20,19,21,20,14,15,
+	15,15,15,16,16,16,17,17,16,17,17,18,17,17,17,18,
+	18,19,18,18,18,18,18,19,19,18,19,18,19,18,19,19,
+	19,19,19,20,19,19,19,20,19,19,19,19,18,19,20,19,
+	19,19,20,20,20,21,19,19,19,20,20,21,21,20,19,20,
+	20,20,20,19,21,20,20,19,21,19,21,21,20,21,20,14,
+	15,15,16,16,17,16,17,16,17,17,17,17,17,18,18,19,
+	17,18,17,18,19,18,18,19,19,18,19,18,18,19,20,18,
+	21,19,19,18,19,20,18,19,20,20,19,19,19,19,20,20,
+	19,20,21,20,21,19,20,19,20,20,20,21,21,19,19,21,
+	21,20,21,20,21,21,20,20,21,19,21,21,21,19,19,20,
+	14,15,15,16,15,16,16,17,17,17,17,17,18,18,18,18,
+	18,18,17,17,19,19,19,18,19,19,19,19,19,19,19,19,
+	18,19,19,18,19,19,19,19,20,20,20,19,21,20,19,20,
+	19,20,19,19,20,20,21,18,20,19,20,21,19,20,20,21,
+	21,21,19,19,20,20,19,19,20,21,20,21,21,21,21,21,
+	21,14,15,15,16,16,16,17,17,18,17,17,18,17,18,17,
+	18,18,18,17,18,18,18,19,20,18,19,19,19,18,18,19,
+	20,19,19,19,20,19,21,21,19,20,20,19,19,18,21,20,
+	21,19,20,20,19,19,20,21,20,20,20,20,21,20,20,19,
+	18,21,19,20,21,20,20,20,20,21,20,21,20,21,19,21,
+	21,20,14,15,15,16,16,16,18,17,17,17,17,17,18,18,
+	18,18,18,18,18,18,19,18,19,18,18,19,19,18,19,19,
+	18,20,19,19,18,19,20,19,20,19,19,19,19,20,19,19,
+	20,21,20,21,19,20,19,19,20,20,20,20,19,20,20,20,
+	21,19,20,21,21,21,21,21,21,20,20,21,21,21,21,20,
+	21,20,20,14,16,16,16,16,17,17,17,17,17,17,18,18,
+	18,18,18,19,18,18,18,18,18,18,19,18,19,18,19,19,
+	19,19,19,20,19,19,21,20,19,19,20,20,20,19,19,21,
+	20,19,21,21,19,21,20,19,20,20,21,20,21,21,20,21,
+	20,21,21,21,20,21,21,21,20,21,21,20,20,21,21,21,
+	20,21,20,21,15,16,15,17,17,18,17,17,18,17,18,19,
+	18,18,17,18,20,18,18,18,18,18,19,20,19,18,19,21,
+	20,20,19,19,20,21,19,20,19,19,18,21,19,19,20,20,
+	21,19,19,20,19,20,20,21,20,20,20,20,21,21,20,21,
+	21,20,21,20,20,21,19,21,19,19,21,21,21,19,21,20,
+	21,21,21,21,20,15,16,16,17,17,17,17,18,17,18,18,
+	18,18,18,18,18,19,19,19,19,21,18,19,19,19,19,19,
+	19,19,20,19,20,19,21,21,19,19,20,19,21,19,21,19,
+	20,19,19,21,21,19,20,20,21,21,20,21,20,19,20,20,
+	21,21,21,21,20,19,21,20,20,20,21,19,21,21,21,21,
+	21,21,21,20,20,21,15,16,16,17,17,17,17,17,18,18,
+	19,18,18,18,21,18,19,19,19,20,18,20,20,19,19,18,
+	18,18,21,21,19,20,19,20,19,19,19,21,20,20,21,20,
+	19,19,20,21,19,19,21,20,20,21,19,20,21,20,21,21,
+	20,20,20,21,21,19,21,20,20,21,20,21,19,21,21,21,
+	20,21,20,21,20,21,20,15,16,17,17,18,17,18,18,18,
+	18,18,17,18,19,19,19,18,19,18,19,19,19,20,21,19,
+	19,19,20,19,20,19,20,20,20,19,20,19,19,21,21,19,
+	20,21,21,20,21,19,21,20,21,21,20,21,21,19,20,21,
+	21,21,20,19,21,21,21,21,21,21,21,21,20,21,21,21,
+	21,21,21,19,20,21,21,20,15,16,17,17,18,18,18,18,
+	18,18,18,18,19,18,19,19,19,19,19,19,20,19,19,20,
+	19,20,19,21,19,20,19,19,19,20,21,19,21,21,19,20,
+	19,20,21,20,20,21,21,21,20,20,20,21,21,20,19,20,
+	21,20,19,20,21,21,21,21,21,21,21,21,21,21,21,20,
+	21,21,19,21,20,20,21,21,21,15,16,17,17,18,18,18,
+	20,18,19,18,20,19,18,19,19,18,19,19,19,19,20,19,
+	19,19,20,19,19,20,19,21,19,19,21,20,20,19,20,20,
+	21,19,19,20,21,21,21,21,20,19,19,21,20,21,20,20,
+	21,21,21,21,21,21,21,21,21,21,21,21,21,21,20,21,
+	21,21,21,21,21,20,21,21,19,21,16,17,17,18,18,18,
+	18,18,20,18,19,18,19,18,19,18,19,20,21,21,21,19,
+	21,19,20,21,20,19,20,21,19,19,21,20,21,19,21,20,
+	21,21,20,21,19,19,19,19,21,20,20,20,21,19,21,19,
+	21,20,19,21,21,21,21,21,21,21,21,21,20,21,21,21,
+	21,20,21,21,21,21,20,21,21,21,21,16,17,16,18,18,
+	19,18,19,19,19,19,19,18,20,18,19,19,19,21,19,19,
+	19,20,21,21,20,20,19,19,19,19,20,21,19,20,21,20,
+	21,21,19,21,20,20,21,21,19,21,21,21,21,19,21,21,
+	21,21,20,21,20,21,21,20,21,20,20,21,21,21,21,21,
+	20,20,21,21,21,21,21,21,21,21,21,21,16,17,18,18,
+	18,18,18,17,19,19,20,20,19,19,19,20,19,19,18,19,
+	20,20,19,20,21,21,19,20,20,21,19,21,21,21,19,21,
+	20,21,19,20,21,21,19,20,20,19,21,21,21,20,21,21,
+	21,20,20,20,21,21,21,21,21,20,21,21,20,21,21,20,
+	21,20,21,21,21,21,20,21,21,21,21,21,21,16,17,18,
+	19,19,19,19,18,19,19,20,19,19,21,19,19,19,19,20,
+	21,19,20,21,21,19,21,21,19,19,21,21,21,21,21,21,
+	21,21,20,19,21,21,21,20,21,20,19,21,21,21,21,21,
+	20,21,21,21,21,21,21,21,21,21,21,20,20,21,21,21,
+	21,21,21,21,21,21,21,21,20,21,20,21,21,21,16,17,
+	17,18,18,18,19,19,21,19,19,19,19,21,21,20,20,19,
+	19,21,20,21,20,20,21,21,21,20,20,21,21,20,21,19,
+	19,19,20,21,20,21,21,21,20,21,21,21,21,21,21,21,
+	21,21,21,20,21,21,21,21,21,19,21,21,21,21,21,21,
+	20,19,21,21,21,21,21,20,21,21,21,21,21,21,21,16,
+	17,18,18,18,19,18,18,19,19,19,19,20,21,20,19,21,
+	21,21,21,20,21,20,20,21,21,21,21,21,20,20,20,21,
+	21,21,21,21,21,21,20,20,20,21,21,21,21,20,20,20,
+	21,20,21,21,20,20,21,21,20,21,21,21,20,21,21,21,
+	21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
+	17,18,18,19,18,19,19,18,18,20,19,19,21,19,20,20,
+	21,21,19,20,20,20,19,20,20,21,20,21,21,20,21,21,
+	20,21,20,21,20,21,20,19,21,19,19,20,21,21,21,21,
+	21,21,21,21,20,21,21,21,20,21,20,21,20,21,21,20,
+	21,21,21,21,20,21,21,21,21,21,21,21,21,20,21,21,
         20,
 };
 

1.4       +484 -457  vorbis/lib/books/res0_256_1024_7.vqh

Index: res0_256_1024_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_7.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_256_1024_7.vqh	2001/02/02 03:52:08	1.3
+++ res0_256_1024_7.vqh	2001/02/18 09:53:03	1.4
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -18,766 +19,792 @@
 #include "codebook.h"
 
 static long _vq_quantlist_res0_256_1024_7[] = {
+	290,
+	289,
+	291,
+	288,
+	292,
+	287,
+	293,
+	286,
+	294,
+	285,
+	295,
+	284,
+	296,
+	283,
+	297,
+	282,
+	298,
+	281,
+	299,
         280,
+	300,
         279,
-	281,
+	301,
         278,
-	282,
+	302,
         277,
-	283,
+	303,
         276,
-	284,
+	304,
         275,
-	285,
+	305,
         274,
-	286,
+	306,
         273,
-	287,
+	307,
         272,
-	288,
+	308,
         271,
-	289,
+	309,
         270,
-	290,
+	310,
         269,
-	291,
+	311,
         268,
-	292,
+	312,
         267,
-	293,
+	313,
         266,
-	294,
+	314,
         265,
-	295,
+	315,
         264,
-	296,
+	316,
         263,
-	297,
+	317,
         262,
-	298,
+	318,
         261,
-	299,
+	319,
         260,
-	300,
+	320,
         259,
-	301,
+	321,
         258,
-	302,
+	322,
         257,
-	303,
+	323,
         256,
-	304,
+	324,
         255,
-	305,
+	325,
         254,
-	306,
+	326,
         253,
-	307,
+	327,
         252,
-	308,
+	328,
         251,
-	309,
+	329,
         250,
-	310,
+	330,
         249,
-	311,
+	331,
         248,
-	312,
+	332,
         247,
-	313,
+	333,
         246,
-	314,
+	334,
         245,
-	315,
+	335,
         244,
-	316,
+	336,
         243,
-	317,
+	337,
         242,
-	318,
+	338,
         241,
-	319,
+	339,
         240,
-	320,
+	340,
         239,
-	321,
+	341,
         238,
-	322,
+	342,
         237,
-	323,
+	343,
         236,
-	324,
+	344,
         235,
-	325,
+	345,
         234,
-	326,
+	346,
         233,
-	327,
+	347,
         232,
-	328,
+	348,
         231,
-	329,
+	349,
         230,
-	330,
+	350,
         229,
-	331,
+	351,
         228,
-	332,
+	352,
         227,
-	333,
+	353,
         226,
-	334,
+	354,
         225,
-	335,
+	355,
         224,
-	336,
+	356,
         223,
-	337,
+	357,
         222,
-	338,
+	358,
         221,
-	339,
+	359,
         220,
-	340,
+	360,
         219,
-	341,
+	361,
         218,
-	342,
+	362,
         217,
-	343,
+	363,
         216,
-	344,
+	364,
         215,
-	345,
+	365,
         214,
-	346,
+	366,
         213,
-	347,
+	367,
         212,
-	348,
+	368,
         211,
-	349,
+	369,
         210,
-	350,
+	370,
         209,
-	351,
+	371,
         208,
-	352,
+	372,
         207,
-	353,
+	373,
         206,
-	354,
+	374,
         205,
-	355,
+	375,
         204,
-	356,
+	376,
         203,
-	357,
+	377,
         202,
-	358,
+	378,
         201,
-	359,
+	379,
         200,
-	360,
+	380,
         199,
-	361,
+	381,
         198,
-	362,
+	382,
         197,
-	363,
+	383,
         196,
-	364,
+	384,
         195,
-	365,
+	385,
         194,
-	366,
+	386,
         193,
-	367,
+	387,
         192,
-	368,
+	388,
         191,
-	369,
+	389,
         190,
-	370,
+	390,
         189,
-	371,
+	391,
         188,
-	372,
+	392,
         187,
-	373,
+	393,
         186,
-	374,
+	394,
         185,
-	375,
+	395,
         184,
-	376,
+	396,
         183,
-	377,
+	397,
         182,
-	378,
+	398,
         181,
-	379,
+	399,
         180,
-	380,
+	400,
         179,
-	381,
+	401,
         178,
-	382,
+	402,
         177,
-	383,
+	403,
         176,
-	384,
+	404,
         175,
-	385,
+	405,
         174,
-	386,
+	406,
         173,
-	387,
+	407,
         172,
-	388,
+	408,
         171,
-	389,
+	409,
         170,
-	390,
+	410,
         169,
-	391,
+	411,
         168,
-	392,
+	412,
         167,
-	393,
+	413,
         166,
-	394,
+	414,
         165,
-	395,
+	415,
         164,
-	396,
+	416,
         163,
-	397,
+	417,
         162,
-	398,
+	418,
         161,
-	399,
+	419,
         160,
-	400,
+	420,
         159,
-	401,
+	421,
         158,
-	402,
+	422,
         157,
-	403,
+	423,
         156,
-	404,
+	424,
         155,
-	405,
+	425,
         154,
-	406,
+	426,
         153,
-	407,
+	427,
         152,
-	408,
+	428,
         151,
-	409,
+	429,
         150,
-	410,
+	430,
         149,
-	411,
+	431,
         148,
-	412,
+	432,
         147,
-	413,
+	433,
         146,
-	414,
+	434,
         145,
-	415,
+	435,
         144,
-	416,
+	436,
         143,
-	417,
+	437,
         142,
-	418,
+	438,
         141,
-	419,
+	439,
         140,
-	420,
+	440,
         139,
-	421,
+	441,
         138,
-	422,
+	442,
         137,
-	423,
+	443,
         136,
-	424,
+	444,
         135,
-	425,
+	445,
         134,
-	426,
+	446,
         133,
-	427,
+	447,
         132,
-	428,
+	448,
         131,
-	429,
+	449,
         130,
-	430,
+	450,
         129,
-	431,
+	451,
         128,
-	432,
+	452,
         127,
-	433,
+	453,
         126,
-	434,
+	454,
         125,
-	435,
+	455,
         124,
-	436,
+	456,
         123,
-	437,
+	457,
         122,
-	438,
+	458,
         121,
-	439,
+	459,
         120,
-	440,
+	460,
         119,
-	441,
+	461,
         118,
-	442,
+	462,
         117,
-	443,
+	463,
         116,
-	444,
+	464,
         115,
-	445,
+	465,
         114,
-	446,
+	466,
         113,
-	447,
+	467,
         112,
-	448,
+	468,
         111,
-	449,
+	469,
         110,
-	450,
+	470,
         109,
-	451,
+	471,
         108,
-	452,
+	472,
         107,
-	453,
+	473,
         106,
-	454,
+	474,
         105,
-	455,
+	475,
         104,
-	456,
+	476,
         103,
-	457,
+	477,
         102,
-	458,
+	478,
         101,
-	459,
+	479,
         100,
-	460,
+	480,
         99,
-	461,
+	481,
         98,
-	462,
+	482,
         97,
-	463,
+	483,
         96,
-	464,
+	484,
         95,
-	465,
+	485,
         94,
-	466,
+	486,
         93,
-	467,
+	487,
         92,
-	468,
+	488,
         91,
-	469,
+	489,
         90,
-	470,
+	490,
         89,
-	471,
+	491,
         88,
-	472,
+	492,
         87,
-	473,
+	493,
         86,
-	474,
+	494,
         85,
-	475,
+	495,
         84,
-	476,
+	496,
         83,
-	477,
+	497,
         82,
-	478,
+	498,
         81,
-	479,
+	499,
         80,
-	480,
+	500,
         79,
-	481,
+	501,
         78,
-	482,
+	502,
         77,
-	483,
+	503,
         76,
-	484,
+	504,
         75,
-	485,
+	505,
         74,
-	486,
+	506,
         73,
-	487,
+	507,
         72,
-	488,
+	508,
         71,
-	489,
+	509,
         70,
-	490,
+	510,
         69,
-	491,
+	511,
         68,
-	492,
+	512,
         67,
-	493,
+	513,
         66,
-	494,
+	514,
         65,
-	495,
+	515,
         64,
-	496,
+	516,
         63,
-	497,
+	517,
         62,
-	498,
+	518,
         61,
-	499,
+	519,
         60,
-	500,
+	520,
         59,
-	501,
+	521,
         58,
-	502,
+	522,
         57,
-	503,
+	523,
         56,
-	504,
+	524,
         55,
-	505,
+	525,
         54,
-	506,
+	526,
         53,
-	507,
+	527,
         52,
-	508,
+	528,
         51,
-	509,
+	529,
         50,
-	510,
+	530,
         49,
-	511,
+	531,
         48,
-	512,
+	532,
         47,
-	513,
+	533,
         46,
-	514,
+	534,
         45,
-	515,
+	535,
         44,
-	516,
+	536,
         43,
-	517,
+	537,
         42,
-	518,
+	538,
         41,
-	519,
+	539,
         40,
-	520,
+	540,
         39,
-	521,
+	541,
         38,
-	522,
+	542,
         37,
-	523,
+	543,
         36,
-	524,
+	544,
         35,
-	525,
+	545,
         34,
-	526,
+	546,
         33,
-	527,
+	547,
         32,
-	528,
+	548,
         31,
-	529,
+	549,
         30,
-	530,
+	550,
         29,
-	531,
+	551,
         28,
-	532,
+	552,
         27,
-	533,
+	553,
         26,
-	534,
+	554,
         25,
-	535,
+	555,
         24,
-	536,
+	556,
         23,
-	537,
+	557,
         22,
-	538,
+	558,
         21,
-	539,
+	559,
         20,
-	540,
+	560,
         19,
-	541,
+	561,
         18,
-	542,
+	562,
         17,
-	543,
+	563,
         16,
-	544,
+	564,
         15,
-	545,
+	565,
         14,
-	546,
+	566,
         13,
-	547,
+	567,
         12,
-	548,
+	568,
         11,
-	549,
+	569,
         10,
-	550,
+	570,
         9,
-	551,
+	571,
         8,
-	552,
+	572,
         7,
-	553,
+	573,
         6,
-	554,
+	574,
         5,
-	555,
+	575,
         4,
-	556,
+	576,
         3,
-	557,
+	577,
         2,
-	558,
+	578,
         1,
-	559,
+	579,
         0,
-	560,
+	580,
 };
 
 static long _vq_lengthlist_res0_256_1024_7[] = {
          3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6,
          6, 6, 6, 6, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7,
          7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,
-	10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,11,10,11,11,11,11,11,11,11,11,11,11,11,11,
-	11,11,11,11,11,11,11,11,12,11,12,11,12,11,12,12,
+	 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,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,12,12,
         12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,13,12,13,12,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,14,13,14,13,13,
-	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,15,14,15,14,14,15,
-	14,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,16,15,
-	16,16,16,15,16,16,15,16,16,15,15,16,15,15,16,16,
-	16,16,17,16,16,16,16,16,16,16,16,16,16,16,17,16,
-	16,17,16,17,17,17,17,16,17,17,17,17,17,17,17,17,
-	17,17,16,16,18,17,17,17,17,17,16,17,17,18,17,17,
-	18,17,17,17,17,18,17,17,17,17,17,17,18,18,18,18,
-	18,18,19,18,17,17,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,18,19,18,19,18,19,20,17,19,18,19,19,18,
-	21,19,20,19,19,19,20,20,20,19,19,19,20,20,18,19,
-	19,19,19,19,19,19,20,21,21,19,19,20,20,20,20,19,
-	19,19,20,20,21,19,20,20,20,21,20,20,21,21,19,20,
-	20,21,19,19,20,19,19,20,21,21,20,20,21,21,21,20,
-	21,20,20,21,21,21,21,21,20,19,21,21,20,21,21,21,
-	21,21,21,21,21,21,19,21,21,21,21,21,21,21,21,20,
-	21,21,21,21,21,21,21,21,21,21,21,21,20,21,21,21,
-	21,21,21,21,20,21,21,21,21,21,21,21,21,21,21,21,
-	21,21,21,21,21,20,21,21,21,21,21,21,21,21,21,21,
-	21,21,21,21,21,21,21,21,21,20,21,21,21,20,21,21,
+	12,12,12,12,12,12,13,13,13,12,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	14,13,13,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,15,14,15,
+	14,15,14,15,15,14,15,15,15,15,15,15,15,14,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,16,15,15,15,
+	15,15,16,15,15,15,16,16,16,16,16,16,16,16,16,15,
+	16,15,16,16,16,16,16,16,16,16,16,16,16,16,16,17,
+	16,16,16,16,16,16,17,17,17,16,16,16,17,17,17,17,
+	16,16,17,17,16,17,17,17,17,17,17,17,19,16,17,16,
+	17,17,17,17,17,17,18,18,17,17,18,17,18,18,17,18,
+	17,18,18,17,18,18,18,17,18,19,18,17,18,18,19,18,
+	19,18,19,19,18,18,18,19,17,19,18,19,19,19,18,18,
+	20,18,19,20,18,18,18,18,20,18,18,18,20,21,21,19,
+	19,20,19,20,20,20,19,19,19,19,21,21,18,21,18,19,
+	19,20,19,19,20,19,21,20,21,20,19,18,21,21,19,21,
+	19,19,20,19,21,21,20,21,21,20,19,20,19,20,20,20,
+	20,20,19,19,19,21,20,21,21,20,20,21,20,19,20,21,
+	21,20,19,20,21,21,21,20,21,21,21,21,21,20,21,21,
+	20,20,21,21,21,20,20,21,21,21,21,21,20,21,21,21,
+	21,21,21,21,21,21,21,21,21,21,21,19,21,21,21,21,
+	21,21,21,20,21,21,21,21,21,21,20,21,21,21,21,21,
+	21,21,21,21,21,20,21,21,21,21,21,21,21,20,21,20,
         21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-	21,21,21,21,21,21,21,21,21,21,21,20,20,20,20,20,
-	20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
-	20,
+	21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
+	21,21,20,21,21,21,21,21,21,21,21,21,21,21,21,21,
+	21,20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
+	21,21,21,20,20,
 };
 
 static float _vq_quantthresh_res0_256_1024_7[] = {
-	-279.5, -278.5, -277.5, -276.5, -275.5, -274.5, -273.5, -272.5, 
-	-271.5, -270.5, -269.5, -268.5, -267.5, -266.5, -265.5, -264.5, 
-	-263.5, -262.5, -261.5, -260.5, -259.5, -258.5, -257.5, -256.5, 
-	-255.5, -254.5, -253.5, -252.5, -251.5, -250.5, -249.5, -248.5, 
-	-247.5, -246.5, -245.5, -244.5, -243.5, -242.5, -241.5, -240.5, 
-	-239.5, -238.5, -237.5, -236.5, -235.5, -234.5, -233.5, -232.5, 
-	-231.5, -230.5, -229.5, -228.5, -227.5, -226.5, -225.5, -224.5, 
-	-223.5, -222.5, -221.5, -220.5, -219.5, -218.5, -217.5, -216.5, 
-	-215.5, -214.5, -213.5, -212.5, -211.5, -210.5, -209.5, -208.5, 
-	-207.5, -206.5, -205.5, -204.5, -203.5, -202.5, -201.5, -200.5, 
-	-199.5, -198.5, -197.5, -196.5, -195.5, -194.5, -193.5, -192.5, 
-	-191.5, -190.5, -189.5, -188.5, -187.5, -186.5, -185.5, -184.5, 
-	-183.5, -182.5, -181.5, -180.5, -179.5, -178.5, -177.5, -176.5, 
-	-175.5, -174.5, -173.5, -172.5, -171.5, -170.5, -169.5, -168.5, 
-	-167.5, -166.5, -165.5, -164.5, -163.5, -162.5, -161.5, -160.5, 
-	-159.5, -158.5, -157.5, -156.5, -155.5, -154.5, -153.5, -152.5, 
-	-151.5, -150.5, -149.5, -148.5, -147.5, -146.5, -145.5, -144.5, 
-	-143.5, -142.5, -141.5, -140.5, -139.5, -138.5, -137.5, -136.5, 
-	-135.5, -134.5, -133.5, -132.5, -131.5, -130.5, -129.5, -128.5, 
-	-127.5, -126.5, -125.5, -124.5, -123.5, -122.5, -121.5, -120.5, 
-	-119.5, -118.5, -117.5, -116.5, -115.5, -114.5, -113.5, -112.5, 
-	-111.5, -110.5, -109.5, -108.5, -107.5, -106.5, -105.5, -104.5, 
-	-103.5, -102.5, -101.5, -100.5, -99.5, -98.5, -97.5, -96.5, 
-	-95.5, -94.5, -93.5, -92.5, -91.5, -90.5, -89.5, -88.5, 
-	-87.5, -86.5, -85.5, -84.5, -83.5, -82.5, -81.5, -80.5, 
-	-79.5, -78.5, -77.5, -76.5, -75.5, -74.5, -73.5, -72.5, 
-	-71.5, -70.5, -69.5, -68.5, -67.5, -66.5, -65.5, -64.5, 
-	-63.5, -62.5, -61.5, -60.5, -59.5, -58.5, -57.5, -56.5, 
-	-55.5, -54.5, -53.5, -52.5, -51.5, -50.5, -49.5, -48.5, 
-	-47.5, -46.5, -45.5, -44.5, -43.5, -42.5, -41.5, -40.5, 
-	-39.5, -38.5, -37.5, -36.5, -35.5, -34.5, -33.5, -32.5, 
-	-31.5, -30.5, -29.5, -28.5, -27.5, -26.5, -25.5, -24.5, 
-	-23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, 
-	-15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, 
-	-7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 
-	0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 
-	8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 
-	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
-	24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 
-	32.5, 33.5, 34.5, 35.5, 36.5, 37.5, 38.5, 39.5, 
-	40.5, 41.5, 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 
-	48.5, 49.5, 50.5, 51.5, 52.5, 53.5, 54.5, 55.5, 
-	56.5, 57.5, 58.5, 59.5, 60.5, 61.5, 62.5, 63.5, 
-	64.5, 65.5, 66.5, 67.5, 68.5, 69.5, 70.5, 71.5, 
-	72.5, 73.5, 74.5, 75.5, 76.5, 77.5, 78.5, 79.5, 
-	80.5, 81.5, 82.5, 83.5, 84.5, 85.5, 86.5, 87.5, 
-	88.5, 89.5, 90.5, 91.5, 92.5, 93.5, 94.5, 95.5, 
-	96.5, 97.5, 98.5, 99.5, 100.5, 101.5, 102.5, 103.5, 
-	104.5, 105.5, 106.5, 107.5, 108.5, 109.5, 110.5, 111.5, 
-	112.5, 113.5, 114.5, 115.5, 116.5, 117.5, 118.5, 119.5, 
-	120.5, 121.5, 122.5, 123.5, 124.5, 125.5, 126.5, 127.5, 
-	128.5, 129.5, 130.5, 131.5, 132.5, 133.5, 134.5, 135.5, 
-	136.5, 137.5, 138.5, 139.5, 140.5, 141.5, 142.5, 143.5, 
-	144.5, 145.5, 146.5, 147.5, 148.5, 149.5, 150.5, 151.5, 
-	152.5, 153.5, 154.5, 155.5, 156.5, 157.5, 158.5, 159.5, 
-	160.5, 161.5, 162.5, 163.5, 164.5, 165.5, 166.5, 167.5, 
-	168.5, 169.5, 170.5, 171.5, 172.5, 173.5, 174.5, 175.5, 
-	176.5, 177.5, 178.5, 179.5, 180.5, 181.5, 182.5, 183.5, 
-	184.5, 185.5, 186.5, 187.5, 188.5, 189.5, 190.5, 191.5, 
-	192.5, 193.5, 194.5, 195.5, 196.5, 197.5, 198.5, 199.5, 
-	200.5, 201.5, 202.5, 203.5, 204.5, 205.5, 206.5, 207.5, 
-	208.5, 209.5, 210.5, 211.5, 212.5, 213.5, 214.5, 215.5, 
-	216.5, 217.5, 218.5, 219.5, 220.5, 221.5, 222.5, 223.5, 
-	224.5, 225.5, 226.5, 227.5, 228.5, 229.5, 230.5, 231.5, 
-	232.5, 233.5, 234.5, 235.5, 236.5, 237.5, 238.5, 239.5, 
-	240.5, 241.5, 242.5, 243.5, 244.5, 245.5, 246.5, 247.5, 
-	248.5, 249.5, 250.5, 251.5, 252.5, 253.5, 254.5, 255.5, 
-	256.5, 257.5, 258.5, 259.5, 260.5, 261.5, 262.5, 263.5, 
-	264.5, 265.5, 266.5, 267.5, 268.5, 269.5, 270.5, 271.5, 
-	272.5, 273.5, 274.5, 275.5, 276.5, 277.5, 278.5, 279.5, 
+	-289.5, -288.5, -287.5, -286.5, -285.5, -284.5, -283.5, -282.5, 
+	-281.5, -280.5, -279.5, -278.5, -277.5, -276.5, -275.5, -274.5, 
+	-273.5, -272.5, -271.5, -270.5, -269.5, -268.5, -267.5, -266.5, 
+	-265.5, -264.5, -263.5, -262.5, -261.5, -260.5, -259.5, -258.5, 
+	-257.5, -256.5, -255.5, -254.5, -253.5, -252.5, -251.5, -250.5, 
+	-249.5, -248.5, -247.5, -246.5, -245.5, -244.5, -243.5, -242.5, 
+	-241.5, -240.5, -239.5, -238.5, -237.5, -236.5, -235.5, -234.5, 
+	-233.5, -232.5, -231.5, -230.5, -229.5, -228.5, -227.5, -226.5, 
+	-225.5, -224.5, -223.5, -222.5, -221.5, -220.5, -219.5, -218.5, 
+	-217.5, -216.5, -215.5, -214.5, -213.5, -212.5, -211.5, -210.5, 
+	-209.5, -208.5, -207.5, -206.5, -205.5, -204.5, -203.5, -202.5, 
+	-201.5, -200.5, -199.5, -198.5, -197.5, -196.5, -195.5, -194.5, 
+	-193.5, -192.5, -191.5, -190.5, -189.5, -188.5, -187.5, -186.5, 
+	-185.5, -184.5, -183.5, -182.5, -181.5, -180.5, -179.5, -178.5, 
+	-177.5, -176.5, -175.5, -174.5, -173.5, -172.5, -171.5, -170.5, 
+	-169.5, -168.5, -167.5, -166.5, -165.5, -164.5, -163.5, -162.5, 
+	-161.5, -160.5, -159.5, -158.5, -157.5, -156.5, -155.5, -154.5, 
+	-153.5, -152.5, -151.5, -150.5, -149.5, -148.5, -147.5, -146.5, 
+	-145.5, -144.5, -143.5, -142.5, -141.5, -140.5, -139.5, -138.5, 
+	-137.5, -136.5, -135.5, -134.5, -133.5, -132.5, -131.5, -130.5, 
+	-129.5, -128.5, -127.5, -126.5, -125.5, -124.5, -123.5, -122.5, 
+	-121.5, -120.5, -119.5, -118.5, -117.5, -116.5, -115.5, -114.5, 
+	-113.5, -112.5, -111.5, -110.5, -109.5, -108.5, -107.5, -106.5, 
+	-105.5, -104.5, -103.5, -102.5, -101.5, -100.5, -99.5, -98.5, 
+	-97.5, -96.5, -95.5, -94.5, -93.5, -92.5, -91.5, -90.5, 
+	-89.5, -88.5, -87.5, -86.5, -85.5, -84.5, -83.5, -82.5, 
+	-81.5, -80.5, -79.5, -78.5, -77.5, -76.5, -75.5, -74.5, 
+	-73.5, -72.5, -71.5, -70.5, -69.5, -68.5, -67.5, -66.5, 
+	-65.5, -64.5, -63.5, -62.5, -61.5, -60.5, -59.5, -58.5, 
+	-57.5, -56.5, -55.5, -54.5, -53.5, -52.5, -51.5, -50.5, 
+	-49.5, -48.5, -47.5, -46.5, -45.5, -44.5, -43.5, -42.5, 
+	-41.5, -40.5, -39.5, -38.5, -37.5, -36.5, -35.5, -34.5, 
+	-33.5, -32.5, -31.5, -30.5, -29.5, -28.5, -27.5, -26.5, 
+	-25.5, -24.5, -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, 
+	-17.5, -16.5, -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, 
+	-9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, 
+	-1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 
+	6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 
+	14.5, 15.5, 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 
+	22.5, 23.5, 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 
+	30.5, 31.5, 32.5, 33.5, 34.5, 35.5, 36.5, 37.5, 
+	38.5, 39.5, 40.5, 41.5, 42.5, 43.5, 44.5, 45.5, 
+	46.5, 47.5, 48.5, 49.5, 50.5, 51.5, 52.5, 53.5, 
+	54.5, 55.5, 56.5, 57.5, 58.5, 59.5, 60.5, 61.5, 
+	62.5, 63.5, 64.5, 65.5, 66.5, 67.5, 68.5, 69.5, 
+	70.5, 71.5, 72.5, 73.5, 74.5, 75.5, 76.5, 77.5, 
+	78.5, 79.5, 80.5, 81.5, 82.5, 83.5, 84.5, 85.5, 
+	86.5, 87.5, 88.5, 89.5, 90.5, 91.5, 92.5, 93.5, 
+	94.5, 95.5, 96.5, 97.5, 98.5, 99.5, 100.5, 101.5, 
+	102.5, 103.5, 104.5, 105.5, 106.5, 107.5, 108.5, 109.5, 
+	110.5, 111.5, 112.5, 113.5, 114.5, 115.5, 116.5, 117.5, 
+	118.5, 119.5, 120.5, 121.5, 122.5, 123.5, 124.5, 125.5, 
+	126.5, 127.5, 128.5, 129.5, 130.5, 131.5, 132.5, 133.5, 
+	134.5, 135.5, 136.5, 137.5, 138.5, 139.5, 140.5, 141.5, 
+	142.5, 143.5, 144.5, 145.5, 146.5, 147.5, 148.5, 149.5, 
+	150.5, 151.5, 152.5, 153.5, 154.5, 155.5, 156.5, 157.5, 
+	158.5, 159.5, 160.5, 161.5, 162.5, 163.5, 164.5, 165.5, 
+	166.5, 167.5, 168.5, 169.5, 170.5, 171.5, 172.5, 173.5, 
+	174.5, 175.5, 176.5, 177.5, 178.5, 179.5, 180.5, 181.5, 
+	182.5, 183.5, 184.5, 185.5, 186.5, 187.5, 188.5, 189.5, 
+	190.5, 191.5, 192.5, 193.5, 194.5, 195.5, 196.5, 197.5, 
+	198.5, 199.5, 200.5, 201.5, 202.5, 203.5, 204.5, 205.5, 
+	206.5, 207.5, 208.5, 209.5, 210.5, 211.5, 212.5, 213.5, 
+	214.5, 215.5, 216.5, 217.5, 218.5, 219.5, 220.5, 221.5, 
+	222.5, 223.5, 224.5, 225.5, 226.5, 227.5, 228.5, 229.5, 
+	230.5, 231.5, 232.5, 233.5, 234.5, 235.5, 236.5, 237.5, 
+	238.5, 239.5, 240.5, 241.5, 242.5, 243.5, 244.5, 245.5, 
+	246.5, 247.5, 248.5, 249.5, 250.5, 251.5, 252.5, 253.5, 
+	254.5, 255.5, 256.5, 257.5, 258.5, 259.5, 260.5, 261.5, 
+	262.5, 263.5, 264.5, 265.5, 266.5, 267.5, 268.5, 269.5, 
+	270.5, 271.5, 272.5, 273.5, 274.5, 275.5, 276.5, 277.5, 
+	278.5, 279.5, 280.5, 281.5, 282.5, 283.5, 284.5, 285.5, 
+	286.5, 287.5, 288.5, 289.5, 
 };
 
 static long _vq_quantmap_res0_256_1024_7[] = {
-	  559,  557,  555,  553,  551,  549,  547,  545,
-	  543,  541,  539,  537,  535,  533,  531,  529,
-	  527,  525,  523,  521,  519,  517,  515,  513,
-	  511,  509,  507,  505,  503,  501,  499,  497,
-	  495,  493,  491,  489,  487,  485,  483,  481,
-	  479,  477,  475,  473,  471,  469,  467,  465,
-	  463,  461,  459,  457,  455,  453,  451,  449,
-	  447,  445,  443,  441,  439,  437,  435,  433,
-	  431,  429,  427,  425,  423,  421,  419,  417,
-	  415,  413,  411,  409,  407,  405,  403,  401,
-	  399,  397,  395,  393,  391,  389,  387,  385,
-	  383,  381,  379,  377,  375,  373,  371,  369,
-	  367,  365,  363,  361,  359,  357,  355,  353,
-	  351,  349,  347,  345,  343,  341,  339,  337,
-	  335,  333,  331,  329,  327,  325,  323,  321,
-	  319,  317,  315,  313,  311,  309,  307,  305,
-	  303,  301,  299,  297,  295,  293,  291,  289,
-	  287,  285,  283,  281,  279,  277,  275,  273,
-	  271,  269,  267,  265,  263,  261,  259,  257,
-	  255,  253,  251,  249,  247,  245,  243,  241,
-	  239,  237,  235,  233,  231,  229,  227,  225,
-	  223,  221,  219,  217,  215,  213,  211,  209,
-	  207,  205,  203,  201,  199,  197,  195,  193,
-	  191,  189,  187,  185,  183,  181,  179,  177,
-	  175,  173,  171,  169,  167,  165,  163,  161,
-	  159,  157,  155,  153,  151,  149,  147,  145,
-	  143,  141,  139,  137,  135,  133,  131,  129,
-	  127,  125,  123,  121,  119,  117,  115,  113,
-	  111,  109,  107,  105,  103,  101,   99,   97,
-	   95,   93,   91,   89,   87,   85,   83,   81,
-	   79,   77,   75,   73,   71,   69,   67,   65,
-	   63,   61,   59,   57,   55,   53,   51,   49,
-	   47,   45,   43,   41,   39,   37,   35,   33,
-	   31,   29,   27,   25,   23,   21,   19,   17,
-	   15,   13,   11,    9,    7,    5,    3,    1,
-	    0,    2,    4,    6,    8,   10,   12,   14,
-	   16,   18,   20,   22,   24,   26,   28,   30,
-	   32,   34,   36,   38,   40,   42,   44,   46,
-	   48,   50,   52,   54,   56,   58,   60,   62,
-	   64,   66,   68,   70,   72,   74,   76,   78,
-	   80,   82,   84,   86,   88,   90,   92,   94,
-	   96,   98,  100,  102,  104,  106,  108,  110,
-	  112,  114,  116,  118,  120,  122,  124,  126,
-	  128,  130,  132,  134,  136,  138,  140,  142,
-	  144,  146,  148,  150,  152,  154,  156,  158,
-	  160,  162,  164,  166,  168,  170,  172,  174,
-	  176,  178,  180,  182,  184,  186,  188,  190,
-	  192,  194,  196,  198,  200,  202,  204,  206,
-	  208,  210,  212,  214,  216,  218,  220,  222,
-	  224,  226,  228,  230,  232,  234,  236,  238,
-	  240,  242,  244,  246,  248,  250,  252,  254,
-	  256,  258,  260,  262,  264,  266,  268,  270,
-	  272,  274,  276,  278,  280,  282,  284,  286,
-	  288,  290,  292,  294,  296,  298,  300,  302,
-	  304,  306,  308,  310,  312,  314,  316,  318,
-	  320,  322,  324,  326,  328,  330,  332,  334,
-	  336,  338,  340,  342,  344,  346,  348,  350,
-	  352,  354,  356,  358,  360,  362,  364,  366,
-	  368,  370,  372,  374,  376,  378,  380,  382,
-	  384,  386,  388,  390,  392,  394,  396,  398,
-	  400,  402,  404,  406,  408,  410,  412,  414,
-	  416,  418,  420,  422,  424,  426,  428,  430,
-	  432,  434,  436,  438,  440,  442,  444,  446,
-	  448,  450,  452,  454,  456,  458,  460,  462,
-	  464,  466,  468,  470,  472,  474,  476,  478,
-	  480,  482,  484,  486,  488,  490,  492,  494,
-	  496,  498,  500,  502,  504,  506,  508,  510,
-	  512,  514,  516,  518,  520,  522,  524,  526,
-	  528,  530,  532,  534,  536,  538,  540,  542,
-	  544,  546,  548,  550,  552,  554,  556,  558,
-	  560,
+	  579,  577,  575,  573,  571,  569,  567,  565,
+	  563,  561,  559,  557,  555,  553,  551,  549,
+	  547,  545,  543,  541,  539,  537,  535,  533,
+	  531,  529,  527,  525,  523,  521,  519,  517,
+	  515,  513,  511,  509,  507,  505,  503,  501,
+	  499,  497,  495,  493,  491,  489,  487,  485,
+	  483,  481,  479,  477,  475,  473,  471,  469,
+	  467,  465,  463,  461,  459,  457,  455,  453,
+	  451,  449,  447,  445,  443,  441,  439,  437,
+	  435,  433,  431,  429,  427,  425,  423,  421,
+	  419,  417,  415,  413,  411,  409,  407,  405,
+	  403,  401,  399,  397,  395,  393,  391,  389,
+	  387,  385,  383,  381,  379,  377,  375,  373,
+	  371,  369,  367,  365,  363,  361,  359,  357,
+	  355,  353,  351,  349,  347,  345,  343,  341,
+	  339,  337,  335,  333,  331,  329,  327,  325,
+	  323,  321,  319,  317,  315,  313,  311,  309,
+	  307,  305,  303,  301,  299,  297,  295,  293,
+	  291,  289,  287,  285,  283,  281,  279,  277,
+	  275,  273,  271,  269,  267,  265,  263,  261,
+	  259,  257,  255,  253,  251,  249,  247,  245,
+	  243,  241,  239,  237,  235,  233,  231,  229,
+	  227,  225,  223,  221,  219,  217,  215,  213,
+	  211,  209,  207,  205,  203,  201,  199,  197,
+	  195,  193,  191,  189,  187,  185,  183,  181,
+	  179,  177,  175,  173,  171,  169,  167,  165,
+	  163,  161,  159,  157,  155,  153,  151,  149,
+	  147,  145,  143,  141,  139,  137,  135,  133,
+	  131,  129,  127,  125,  123,  121,  119,  117,
+	  115,  113,  111,  109,  107,  105,  103,  101,
+	   99,   97,   95,   93,   91,   89,   87,   85,
+	   83,   81,   79,   77,   75,   73,   71,   69,
+	   67,   65,   63,   61,   59,   57,   55,   53,
+	   51,   49,   47,   45,   43,   41,   39,   37,
+	   35,   33,   31,   29,   27,   25,   23,   21,
+	   19,   17,   15,   13,   11,    9,    7,    5,
+	    3,    1,    0,    2,    4,    6,    8,   10,
+	   12,   14,   16,   18,   20,   22,   24,   26,
+	   28,   30,   32,   34,   36,   38,   40,   42,
+	   44,   46,   48,   50,   52,   54,   56,   58,
+	   60,   62,   64,   66,   68,   70,   72,   74,
+	   76,   78,   80,   82,   84,   86,   88,   90,
+	   92,   94,   96,   98,  100,  102,  104,  106,
+	  108,  110,  112,  114,  116,  118,  120,  122,
+	  124,  126,  128,  130,  132,  134,  136,  138,
+	  140,  142,  144,  146,  148,  150,  152,  154,
+	  156,  158,  160,  162,  164,  166,  168,  170,
+	  172,  174,  176,  178,  180,  182,  184,  186,
+	  188,  190,  192,  194,  196,  198,  200,  202,
+	  204,  206,  208,  210,  212,  214,  216,  218,
+	  220,  222,  224,  226,  228,  230,  232,  234,
+	  236,  238,  240,  242,  244,  246,  248,  250,
+	  252,  254,  256,  258,  260,  262,  264,  266,
+	  268,  270,  272,  274,  276,  278,  280,  282,
+	  284,  286,  288,  290,  292,  294,  296,  298,
+	  300,  302,  304,  306,  308,  310,  312,  314,
+	  316,  318,  320,  322,  324,  326,  328,  330,
+	  332,  334,  336,  338,  340,  342,  344,  346,
+	  348,  350,  352,  354,  356,  358,  360,  362,
+	  364,  366,  368,  370,  372,  374,  376,  378,
+	  380,  382,  384,  386,  388,  390,  392,  394,
+	  396,  398,  400,  402,  404,  406,  408,  410,
+	  412,  414,  416,  418,  420,  422,  424,  426,
+	  428,  430,  432,  434,  436,  438,  440,  442,
+	  444,  446,  448,  450,  452,  454,  456,  458,
+	  460,  462,  464,  466,  468,  470,  472,  474,
+	  476,  478,  480,  482,  484,  486,  488,  490,
+	  492,  494,  496,  498,  500,  502,  504,  506,
+	  508,  510,  512,  514,  516,  518,  520,  522,
+	  524,  526,  528,  530,  532,  534,  536,  538,
+	  540,  542,  544,  546,  548,  550,  552,  554,
+	  556,  558,  560,  562,  564,  566,  568,  570,
+	  572,  574,  576,  578,  580,
 };
 
 static encode_aux_threshmatch _vq_auxt_res0_256_1024_7 = {
         _vq_quantthresh_res0_256_1024_7,
         _vq_quantmap_res0_256_1024_7,
-	561,
-	561
+	581,
+	581
 };
 
 static static_codebook _vq_book_res0_256_1024_7 = {
-	1, 561,
+	1, 581,
         _vq_lengthlist_res0_256_1024_7,
-	1, -518946816, 1611661312, 10, 0,
+	1, -518905856, 1611661312, 10, 0,
         _vq_quantlist_res0_256_1024_7,
         NULL,
         &_vq_auxt_res0_256_1024_7,

1.5       +10 -9     vorbis/lib/books/res0_256_1024aux.vqh

Index: res0_256_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024aux.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_1024aux.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_1024aux.vqh	2001/02/18 09:53:03	1.5
@@ -1,12 +1,13 @@
 /********************************************************************
  *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
  * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
+ * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
@@ -19,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res0_256_1024aux[] = {
-	 2, 7,11,11,17,13,15,19, 5, 3, 6, 7,10,10,12,19,
-	10, 5, 4, 5, 7, 9,12,18, 9, 6, 5, 5, 6, 7,10,15,
-	15, 9, 6, 6, 5, 6,10,16,10, 9, 8, 6, 5, 4, 6,13,
-	11,10, 9, 7, 7, 5, 6,12,13,10,10, 9, 8, 6, 6,12,
+	 2, 8,11,11,18,13,15,20, 5, 3, 6, 7,10,10,13,20,
+	10, 5, 4, 5, 7, 9,13,19,10, 6, 4, 4, 6, 7,10,17,
+	17,10, 6, 5, 5, 6,10,17,10, 9, 8, 6, 6, 5, 7,14,
+	11,10,10, 8, 8, 5, 6,12,13,11,10, 9, 8, 6, 7,13,
 };
 
 static static_codebook _huff_book_res0_256_1024aux = {

1.5       +7 -6      vorbis/lib/books/res0_256_128_1.vqh

Index: res0_256_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_128_1.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_128_1.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
 };
 
 static long _vq_lengthlist_res0_256_128_1[] = {
-	 2, 4, 4, 4, 6, 6, 4, 6, 6, 5, 7, 6, 7, 8, 8, 7,
-	 8, 8, 5, 6, 7, 7, 8, 8, 7, 8, 8, 5, 7, 7, 7, 8,
-	 8, 7, 8, 8, 7, 9, 8, 8, 9,10, 8,10, 9, 7, 8, 8,
-	 8,10, 9, 9, 9, 9, 5, 7, 7, 7, 8, 8, 7, 8, 8, 7,
-	 8, 8, 9, 9, 9, 8, 9,10, 7, 8, 9, 9, 9,10, 8,10,
+	 2, 3, 3, 4, 6, 6, 4, 6, 6, 5, 7, 7, 7, 8, 8, 7,
+	 8, 8, 5, 7, 7, 7, 8, 8, 7, 8, 8, 6, 7, 8, 8, 9,
+	 9, 8, 9, 9, 8, 9, 9, 9, 9,10,10,10,10, 8, 9, 9,
+	 9,10, 9, 9,10,10, 6, 7, 7, 8, 8, 9, 8, 9, 9, 8,
+	 9, 9,10,10,10, 9, 9,10, 8, 9, 9, 9,10,10, 9,10,
          9,
 };
 

1.5       +42 -41    vorbis/lib/books/res0_256_128_2.vqh

Index: res0_256_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_128_2.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_128_2.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,46 +27,46 @@
 };
 
 static long _vq_lengthlist_res0_256_128_2[] = {
-	 5, 6, 6, 7, 7, 6, 7, 7, 8, 8, 6, 7, 7, 8, 8, 7,
-	 8, 8,10,10, 7, 8, 8,10,10, 6, 7, 7, 8, 8, 7, 8,
-	 8, 9, 9, 7, 8, 8, 9, 9, 8, 9, 9,11,11, 8, 9, 9,
-	11,11, 6, 7, 7, 8, 8, 7, 8, 8, 9, 9, 7, 8, 8, 9,
-	 9, 8, 9, 9,11,10, 8, 9, 9,11,11, 8, 9, 9,10,10,
-	 9, 9, 9,11,11, 9, 9, 9,11,11,10,11,11,12,13,10,
-	11,11,12,13, 8, 9, 9,10,10, 9, 9, 9,11,11, 9, 9,
-	 9,11,11,10,11,11,13,12,10,11,11,13,12, 6, 7, 7,
-	 9, 9, 7, 8, 8, 9, 9, 7, 8, 8, 9, 9, 9, 9, 9,11,
-	11, 8, 9, 9,11,11, 7, 8, 8, 9, 9, 8, 9, 9,10,10,
-	 8, 9, 9,10,10, 9,10,10,11,12, 9,10,10,12,12, 7,
-	 8, 8, 9, 9, 8, 9, 8,10,10, 8, 9, 9,10,10, 9,10,
-	10,12,11, 9,10,10,12,12, 9,10, 9,11,11, 9,10,10,
-	12,12,10,10,10,12,12,11,11,12,13,13,11,12,12,14,
-	14, 9, 9,10,11,11, 9,10,10,12,12,10,10,10,11,12,
-	11,12,11,13,12,11,12,12,14,14, 6, 7, 7, 9, 8, 7,
-	 8, 8, 9, 9, 7, 8, 8, 9, 9, 9, 9, 9,11,11, 9, 9,
-	 9,11,11, 7, 8, 8, 9, 9, 8, 9, 9,10,10, 8, 8, 9,
-	10,10, 9,10,10,12,12, 9,10,10,11,12, 7, 8, 8, 9,
-	 9, 8, 9, 9,10,10, 8, 9, 8,10,10, 9,10,10,12,12,
-	 9,10,10,12,11, 9,10, 9,11,11,10,10,10,12,12, 9,
-	10,10,12,12,12,12,12,14,14,11,11,12,12,14, 9, 9,
-	10,11,11, 9,10,10,12,12, 9,10,10,12,11,11,12,12,
-	14,13,11,12,11,13,12, 8, 9, 9,10,11, 9,10,10,11,
-	11, 9,10,10,11,11,11,12,12,13,13,11,11,11,13,13,
-	 9,10,10,12,11,10,10,10,12,12,10,11,10,13,12,11,
-	12,12,14,14,11,12,12,14,14, 9, 9,10,11,12,10,10,
-	10,12,12,10,10,10,12,12,12,12,12,14,13,11,12,12,
-	13,13,11,12,11,13,13,11,12,12,14,14,12,12,12,14,
-	13,13,14,14,14,15,13,14,14,15,16,11,11,12,13,13,
-	11,12,11,14,14,12,12,13,14,13,13,14,13,16,13,14,
-	14,14,15,16, 8, 9, 9,10,11, 9,10,10,11,11, 9,10,
-	10,11,11,10,11,11,13,13,11,12,12,13,13, 9,10,10,
-	11,11,10,10,10,12,12,10,10,10,12,12,11,12,12,14,
-	14,12,12,12,14,14, 9,10,10,11,11,10,10,10,12,12,
-	10,10,10,12,12,11,12,12,14,13,12,12,12,14,13,11,
-	12,11,13,13,11,13,12,14,14,11,12,12,13,14,14,15,
-	14,15,16,13,13,14,14,16,11,11,12,13,13,12,12,12,
-	14,15,11,12,12,14,13,14,14,14,15,16,14,14,13,15,
-	15,
+	 5, 6, 6, 7, 7, 6, 7, 7, 8, 8, 6, 7, 7, 8, 8, 8,
+	 8, 8,10,10, 8, 8, 8,10,10, 7, 7, 7, 8, 8, 7, 7,
+	 8, 8, 9, 7, 8, 8, 9, 9, 9, 9, 9,10,10, 9, 9, 9,
+	10,10, 7, 7, 7, 8, 8, 7, 8, 8, 8, 8, 7, 8, 8, 9,
+	 9, 9, 9, 9,10,10, 9, 9, 9,10,10, 8, 9, 9,10,10,
+	 9, 9, 9,10,10, 9, 9, 9,11,10,10,11,11,12,12,11,
+	10,11,11,12, 8, 9, 9,10,10, 9, 9, 9,10,10, 9, 9,
+	 9,10,10,10,11,10,12,12,10,11,11,12,12, 7, 8, 8,
+	 9, 9, 8, 8, 8, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9,11,
+	11, 9, 9, 9,10,11, 8, 8, 8, 9, 9, 8, 8, 8, 9,10,
+	 8, 8, 8,10, 9,10, 9,10,11,11, 9,10,10,11,11, 8,
+	 8, 8, 9, 9, 8, 8, 8,10, 9, 8, 8, 8, 9,10,10,10,
+	 9,11,10,10,10, 9,11,11, 9, 9, 9,11,10, 9, 9,10,
+	11,11,10,10,10,11,11,11,11,11,12,13,11,11,11,13,
+	12, 9, 9,10,10,11, 9,10, 9,11,11,10,10,10,11,11,
+	11,11,10,12,11,11,11,11,12,13, 7, 8, 8, 9, 9, 8,
+	 8, 8, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9,10,10, 9, 9,
+	 9,11,11, 8, 8, 8, 9, 9, 8, 8, 8,10, 9, 8, 8, 8,
+	 9, 9, 9,10,10,11,11,10, 9,10,10,11, 8, 8, 8, 9,
+	 9, 8, 8, 9, 9,10, 8, 8, 8, 9, 9, 9,10,10,11,10,
+	 9,10, 9,11,11,10,10, 9,11,11,10,10,10,11,11, 9,
+	10,10,11,11,11,11,11,12,13,11,11,11,12,13, 9, 9,
+	10,10,11,10, 9,10,11,11, 9,10, 9,11,11,11,11,11,
+	13,12,11,11,10,12,12, 9, 9, 9,11,11,10,10,10,12,
+	11, 9, 9, 9,11,11,10,11,11,13,13,11,11,11,12,12,
+	10,10, 9,11,11, 9,10,10,11,12,10,10,10,11,11,11,
+	11,11,13,13,11,11,11,13,13, 9, 9,10,11,11,10,10,
+	10,11,11, 9,10,10,11,11,11,11,11,13,13,11,11,11,
+	12,12,11,11,11,12,13,11,11,11,13,13,11,11,11,13,
+	12,12,12,13,12,13,13,13,13,14,14,11,11,11,12,12,
+	11,11,10,12,12,11,12,12,13,13,12,13,11,14,12,13,
+	13,13,13,13, 9, 9, 9,11,11, 9, 9, 9,11,11,10,10,
+	10,11,11,10,11,11,12,12,11,11,11,12,12, 9,10, 9,
+	11,11,10,10,10,11,11, 9,10,10,11,11,11,11,11,13,
+	12,11,11,11,12,13, 9, 9,10,11,11,10,10,10,11,11,
+	10,10, 9,11,11,11,11,12,12,13,12,12,11,13,13,11,
+	11,11,12,12,11,12,11,13,13,11,11,11,13,13,13,12,
+	13,14,15,12,12,12,12,15,11,11,11,12,12,11,11,12,
+	12,13,11,11,11,12,12,12,12,13,14,14,12,13,12,14,
+	13,
 };
 
 static float _vq_quantthresh_res0_256_128_2[] = {

1.5       +13 -12    vorbis/lib/books/res0_256_128_3.vqh

Index: res0_256_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128_3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_128_3.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_128_3.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist_res0_256_128_3[] = {
-	 3, 4, 4, 5, 5, 6, 6, 8, 8,10,10,11,11, 4, 5, 4,
-	 6, 6, 7, 7, 9, 9,11,11,13,13, 4, 4, 5, 6, 6, 7,
-	 7,10, 9,11,11,12,12, 5, 6, 6, 8, 8, 9, 9,11,11,
-	13,13,14,14, 5, 6, 6, 8, 8, 9, 9,11,11,12,13,14,
-	14, 7, 7, 7, 9, 9,12,11,13,13,14,15,16,16, 6, 7,
-	 7, 9, 9,12,12,14,13,15,15,17,16, 9,10,10,12,12,
-	14,14,15,15,16,16,16,18, 9,10,10,12,12,14,14,16,
-	15,16,16,17,17,10,12,12,13,14,16,16,15,19,17,18,
-	18,17,10,12,12,14,14,17,15,17,16,17,16,19,17,12,
-	13,13,15,15,16,16,17,18,18,17,18,19,11,13,13,15,
-	14,17,16,19,16,19,17,19,18,
+	 4, 4, 4, 5, 5, 6, 6, 7, 7, 9, 9,10,10, 4, 5, 5,
+	 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 5, 5, 6, 6, 7,
+	 6, 8, 8, 9, 9,10,10, 6, 6, 6, 7, 7, 8, 8, 9, 9,
+	10,10,12,11, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,12,
+	11, 6, 7, 7, 8, 8, 9, 9,10,10,12,12,13,13, 6, 7,
+	 7, 8, 8, 9, 9,10,10,11,12,13,13, 8, 8, 8, 9, 9,
+	10,10,12,11,13,13,14,14, 8, 8, 8, 9, 9,10,10,12,
+	12,13,13,14,14, 9,10, 9,11,11,12,12,13,13,14,14,
+	15,15, 9, 9, 9,11,11,12,12,13,13,14,14,15,15,10,
+	11,11,12,12,13,13,15,14,16,15,16,16,10,11,11,12,
+	12,13,13,14,14,15,16,16,16,
 };
 
 static float _vq_quantthresh_res0_256_128_3[] = {

1.5       +411 -410  vorbis/lib/books/res0_256_128_4.vqh

Index: res0_256_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128_4.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_128_4.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_128_4.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -102,417 +103,417 @@
 };
 
 static long _vq_lengthlist_res0_256_128_4[] = {
-	 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	 9,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,
-	11,11,11,11,12,11,12,12,12,12,12,12,12,12,12,13,
-	12, 7, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9,10,10,10,10,
-	10,10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,
-	11,12,12,12,12,12,12,12,12,13,12,12,12,13,13,13,
-	13,13, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,11,
-	11,12,11,11,12,12,12,12,12,12,13,12,13,13,13,13,
-	13,13,13, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,11,11,11,11,11,11,11,11,11,12,12,11,
-	12,12,12,12,12,12,13,13,13,13,12,13,13,13,14,14,
-	13,14,14,14, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,11,11,11,11,11,11,11,11,11,12,12,
-	12,12,12,12,12,12,13,13,13,13,12,13,13,13,13,13,
-	14,13,14,14,13, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
-	11,11,11,11,11,11,11,11,11,11,11,11,12,12,11,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,13,13,13,13,
-	13,14,13,14,15,13,13,14,14,14,15,14,15,15,15,15,
-	15,14,14,15,16,15, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,
-	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-	12,12,12,12,12,12,12,12,12,13,12,13,12,13,13,13,
-	13,13,14,13,13,13,14,14,14,14,14,14,14,15,14,15,
-	15,14,14,15,15,17,16,10,10,10,10,10,11,11,11,11,
+	 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 8, 8, 9,
+	 9, 9, 9,10,10,10,10,10,10,10,10,11,10,11,11,11,
+	11,11,11,11,11,11,11,12,12,12,12,12,12,13,12,13,
+	12,13,13,13,13,13,14,14,13,14,14,14,14,14,15,15,
+	15,15,15,15,15,16,17,15,18,17,17,17,17,16,17,18,
+	17, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,
+	10,10,10,11,11,11,11,11,11,11,11,11,12,11,12,11,
+	12,12,12,12,13,12,13,13,13,13,14,13,14,14,14,14,
+	14,14,14,14,15,15,15,15,15,16,15,16,15,15,16,17,
+	15,17, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
+	 8, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,11,10,11,11,11,11,11,11,12,12,12,
+	12,12,12,12,12,13,12,13,13,13,13,14,13,14,14,14,
+	13,14,14,14,14,14,15,15,16,14,15,16,16,15,15,16,
+	15,15,16, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,11,11,
         11,11,11,11,11,11,11,11,12,11,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,13,12,12,13,12,13,13,
-	13,13,13,13,13,13,13,14,13,13,14,13,14,13,14,14,
-	14,14,15,15,15,15,15,15,15,15,16,14,15,16,15,16,
-	15,17,17,15,16,16,15,17,10,10,10,10,10,11,10,11,
+	13,12,13,13,13,12,14,13,13,13,14,14,14,14,15,14,
+	14,15,15,15,15,15,14,15,16,15,16,16,15,16,15,17,
+	16,15,15,17, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,10,
         11,11,11,11,11,11,11,11,11,11,11,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,13,12,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,14,14,14,14,
-	14,14,14,14,15,15,15,15,14,14,15,15,15,15,15,15,
-	15,16,16,16,16,17,16,16,17,11,11,11,11,11,11,12,
-	12,12,12,12,12,12,12,12,12,13,12,13,12,13,13,13,
-	13,13,13,13,13,13,13,14,13,13,13,14,13,13,13,13,
-	13,13,13,13,13,14,14,14,14,14,15,14,15,14,15,15,
-	15,16,15,15,15,15,16,15,16,15,17,16,15,15,16,17,
-	17,15,16,16,18,17,16,16,17,18,11,11,11,11,11,12,
-	11,12,12,12,12,12,12,12,12,13,12,13,12,12,13,12,
-	13,13,13,13,13,13,13,13,12,13,13,13,13,13,13,13,
-	13,14,14,13,14,14,14,14,14,15,14,15,14,15,14,15,
-	14,15,14,15,15,15,15,15,15,15,16,16,15,15,15,17,
-	16,16,16,17,18,17,17,18,16,16,18,12,12,12,12,12,
-	13,13,13,12,13,13,13,13,13,13,13,13,14,13,13,13,
-	14,14,13,14,14,13,13,14,14,14,14,14,14,14,14,14,
-	14,14,14,15,15,15,15,15,14,14,14,15,15,15,15,15,
-	15,16,16,15,16,16,15,17,15,17,17,18,17,16,17,17,
-	16,17,17,17,17,18,18,17,18,17,16,18,12,12,12,12,
-	12,12,12,13,12,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,14,14,14,14,13,13,14,14,14,13,14,14,14,
-	14,14,15,14,14,14,15,15,15,15,15,14,14,15,14,16,
-	16,15,15,15,15,16,16,16,16,17,15,17,16,18,16,17,
-	18,16,17,16,18,17,18,17,17,17,16,17,17,12,12,12,
-	13,13,13,13,14,13,14,13,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,15,14,14,14,13,14,15,14,14,14,14,
-	15,15,15,16,15,15,16,15,14,15,15,15,16,15,16,16,
-	15,16,16,16,16,15,16,17,17,18,17,18,18,18,17,17,
-	17,17,18,18,17,17,18,18,18,17,18,18,18,17,11,12,
-	12,13,13,13,13,14,13,13,13,13,13,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,15,14,14,15,15,15,15,
-	15,15,15,15,14,15,15,15,15,16,16,15,15,17,16,15,
-	15,17,15,15,16,17,16,17,17,17,16,16,17,17,17,17,
-	18,18,17,18,17,18,16,18,17,18,17,17,17,18,18,12,
-	13,13,14,14,14,14,14,14,14,15,14,14,14,14,14,15,
-	15,14,14,14,15,15,15,15,15,15,15,15,16,15,15,15,
-	14,16,15,15,16,15,16,15,16,16,16,16,16,15,17,16,
-	16,16,17,16,16,17,18,17,17,16,17,17,17,17,18,17,
-	18,17,17,17,18,18,17,18,18,18,17,18,17,18,18,17,
-	12,13,13,14,13,13,14,14,14,15,14,14,15,14,14,14,
-	15,15,15,15,14,15,15,14,15,14,15,15,15,15,14,15,
-	15,15,15,15,15,16,15,15,15,17,17,15,15,16,15,17,
-	16,15,16,15,16,18,15,17,15,16,18,17,16,18,17,18,
-	17,18,17,18,18,18,17,18,18,18,18,18,18,18,18,18,
-	18,13,14,13,13,14,14,14,14,15,14,15,15,14,15,15,
-	15,16,15,15,15,15,15,15,15,15,15,16,16,16,15,16,
-	15,16,15,15,15,16,18,16,15,16,15,16,16,17,17,16,
-	16,16,16,17,16,18,16,17,16,16,16,17,17,18,17,16,
-	18,17,18,18,17,18,18,18,17,18,17,17,17,17,18,18,
-	17,18,12,14,14,14,14,14,14,15,15,15,15,15,15,15,
-	15,15,15,15,15,15,16,15,15,15,16,15,15,15,15,15,
-	16,16,16,16,15,15,16,16,15,16,17,16,17,15,16,17,
-	17,17,16,16,16,17,18,16,16,17,17,18,18,17,18,18,
-	17,18,18,18,17,18,18,18,17,18,18,18,17,18,18,18,
-	18,17,17,14,14,14,14,14,14,15,15,15,15,15,15,16,
-	15,16,16,15,15,15,17,15,17,16,15,16,16,16,15,16,
-	16,16,15,16,16,15,17,17,16,16,16,17,17,18,18,16,
-	18,16,18,17,17,15,17,17,16,16,16,18,17,18,16,17,
-	18,18,17,18,18,18,18,18,17,17,18,18,18,18,18,18,
-	18,18,18,18,14,14,14,15,14,14,15,15,15,14,15,15,
-	16,16,15,15,17,15,15,15,15,16,16,16,16,16,17,16,
-	17,15,15,16,16,17,15,16,16,16,16,17,16,17,17,17,
-	18,16,16,17,17,17,18,16,17,17,18,18,18,18,18,18,
-	16,17,17,17,17,17,17,18,17,18,18,18,18,18,17,18,
-	18,18,18,18,18,14,14,15,15,15,15,15,16,16,15,16,
-	15,15,16,15,16,16,15,17,16,16,15,15,17,16,16,17,
-	16,16,17,16,16,17,18,17,17,17,17,17,17,17,18,16,
-	17,17,17,18,18,18,17,16,18,18,17,17,18,17,18,18,
-	18,18,17,18,17,17,18,18,18,18,18,18,17,18,18,18,
-	18,18,18,18,18,18,13,14,14,15,16,15,15,15,16,16,
-	16,16,16,16,16,17,16,17,16,15,16,17,16,15,15,16,
-	16,17,17,16,16,16,17,16,16,16,16,17,17,18,17,17,
-	17,16,17,17,17,18,16,18,18,17,18,17,18,18,17,18,
-	17,18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,17,18,17,18,18,18,15,16,15,15,15,15,16,15,17,
-	15,16,18,16,16,16,16,16,16,18,17,17,17,17,17,16,
-	18,16,18,17,17,17,15,17,18,17,16,16,17,16,17,18,
-	17,17,17,18,17,17,17,17,18,18,18,17,18,18,18,18,
-	18,18,18,18,18,18,18,18,17,18,18,18,18,18,17,18,
-	18,18,18,18,18,18,18,18,15,17,16,15,15,15,16,15,
-	16,15,15,16,17,17,17,17,15,16,16,17,17,17,17,17,
-	17,16,15,16,16,17,17,17,17,17,17,17,16,18,17,17,
-	16,17,17,17,16,17,18,17,18,17,16,18,18,17,17,17,
-	17,18,18,18,17,17,18,18,18,18,18,18,17,18,17,17,
-	18,18,18,18,18,18,18,17,18,14,15,16,15,16,16,17,
-	17,18,16,15,16,17,17,16,16,17,17,17,16,17,18,16,
-	17,16,17,16,17,17,17,17,18,18,17,17,17,18,18,17,
-	17,18,17,18,18,18,17,17,18,18,17,17,16,18,18,18,
-	17,18,17,18,18,18,17,17,18,18,18,18,18,18,18,18,
-	18,17,18,18,18,18,18,18,18,18,14,15,16,16,15,16,
-	16,16,16,16,16,16,16,17,15,16,16,16,17,16,17,17,
-	17,17,18,16,17,15,17,18,18,18,16,16,18,17,18,18,
-	17,18,16,17,16,17,17,16,17,18,18,18,17,17,18,17,
-	17,18,17,18,17,17,18,18,17,18,18,18,17,17,17,18,
-	18,18,17,18,18,18,18,17,18,18,18,15,16,16,17,17,
-	16,16,16,16,16,16,16,16,17,17,16,17,17,17,18,17,
-	16,17,17,17,17,17,17,18,17,16,17,18,17,16,17,18,
-	17,18,18,17,18,18,18,16,17,18,17,18,17,18,18,17,
-	18,17,18,18,17,17,18,17,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,17,15,17,16,16,
-	15,16,16,17,16,17,15,16,16,16,17,17,17,18,17,17,
-	16,17,18,18,16,18,17,17,16,16,17,18,16,17,17,18,
-	18,17,17,17,18,18,18,18,18,18,17,18,17,17,18,17,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,
-	18,17,18,18,18,18,18,17,17,18,18,18,18,17,16,15,
-	15,16,17,18,17,17,16,16,18,17,17,17,16,17,16,17,
-	17,17,16,18,18,17,17,17,18,18,17,18,16,16,17,16,
-	18,17,17,18,18,17,17,18,18,17,18,18,18,18,17,18,
-	17,17,18,17,18,18,17,18,17,18,18,18,17,17,18,18,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,18,17,16,
-	17,16,17,17,18,18,17,17,16,17,16,18,17,17,17,17,
-	17,17,16,17,18,17,17,18,16,17,18,17,17,17,17,18,
-	17,18,17,17,16,17,18,17,17,18,18,18,17,17,17,17,
-	18,17,17,18,18,18,18,17,17,18,18,18,18,18,18,18,
-	18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,16,
-	17,17,17,17,17,17,17,17,18,16,17,16,18,17,17,17,
-	17,17,18,17,17,18,17,18,16,17,18,18,18,17,17,18,
-	18,18,17,18,18,17,18,18,18,18,18,18,18,18,18,18,
-	18,18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	16,17,16,18,16,18,17,17,17,16,16,17,16,18,16,18,
-	18,18,17,17,16,17,18,17,18,18,18,17,18,16,17,17,
-	17,18,18,18,18,18,18,18,17,18,17,18,18,18,17,18,
-	18,18,18,18,17,18,17,18,18,17,18,18,17,18,18,18,
-	18,18,17,18,18,18,17,18,18,18,18,18,18,18,18,18,
-	18,16,17,18,16,18,17,17,17,16,16,18,17,17,17,16,
-	16,18,17,17,16,17,17,18,16,18,17,18,17,18,17,17,
-	17,17,18,18,18,18,17,18,18,18,18,18,18,18,18,18,
-	17,18,18,18,18,18,18,17,18,18,18,18,18,18,17,18,
-	18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,18,
-	18,18,16,17,17,17,17,17,18,17,18,18,17,17,17,18,
-	17,18,16,17,17,17,17,18,18,18,17,18,18,18,18,18,
-	17,18,18,18,17,18,18,18,18,18,18,18,17,18,18,18,
-	18,18,18,18,18,18,17,18,18,18,18,17,18,18,17,18,
-	18,18,17,18,18,18,18,17,18,18,18,18,18,18,18,18,
-	18,18,18,17,17,17,17,16,16,18,16,17,16,18,18,17,
-	17,18,17,18,18,18,18,17,18,17,17,17,18,17,18,18,
-	18,18,18,18,18,18,17,18,18,18,18,18,17,17,18,18,
-	18,18,18,17,18,18,17,18,18,18,18,18,17,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,
-	18,18,18,18,17,17,16,17,17,17,17,17,17,17,18,17,
-	18,17,17,17,17,18,17,17,16,17,18,17,17,18,18,18,
-	17,17,17,18,18,18,18,17,18,18,17,17,17,17,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,17,18,18,17,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,17,17,16,17,16,18,17,18,18,17,16,
-	18,17,18,17,17,18,18,18,17,18,18,18,17,18,17,18,
-	18,17,18,18,18,17,18,18,18,18,18,18,17,18,18,17,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,
-	18,18,18,18,18,18,17,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,17,18,16,17,17,17,18,16,17,18,17,18,
-	16,17,18,18,18,17,17,17,18,18,18,18,18,16,17,18,
-	18,18,17,18,18,18,18,18,18,18,18,18,17,18,18,18,
-	18,18,18,18,18,17,17,18,18,17,18,17,18,18,18,18,
-	18,18,18,18,17,17,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,16,17,17,17,17,17,17,16,17,
-	18,17,17,17,18,18,18,18,18,18,17,18,18,18,18,17,
-	17,17,17,18,18,18,18,18,18,18,18,18,18,18,18,17,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,18,
-	18,18,18,18,18,18,18,18,17,17,18,18,16,18,17,17,
-	18,17,17,18,18,18,17,17,17,17,18,18,18,18,17,17,
-	17,17,18,18,18,18,17,18,17,18,17,18,18,18,17,18,
-	18,17,18,18,18,18,18,18,17,18,17,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,17,18,16,17,17,17,18,
-	18,17,18,17,18,17,18,17,18,18,18,17,18,18,16,18,
-	18,17,18,18,17,17,18,18,18,17,18,18,17,18,18,17,
-	18,18,18,18,18,17,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,17,16,18,17,17,17,
-	18,18,18,17,18,17,18,17,18,18,18,18,17,18,18,18,
-	18,18,18,18,17,17,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,17,18,18,18,18,18,18,18,18,18,17,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,17,17,17,18,18,
-	18,17,17,18,18,18,18,17,18,18,18,18,18,18,18,18,
-	18,17,18,17,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,17,17,18,18,
-	17,17,17,18,17,18,18,17,18,18,17,18,18,18,18,18,
-	18,18,18,17,18,18,17,18,18,17,18,18,18,18,18,18,
-	17,18,17,18,18,18,17,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,
-	18,17,18,18,17,18,18,18,17,18,18,18,18,18,18,18,
-	18,18,18,17,18,18,18,17,18,17,18,17,18,18,18,18,
-	18,18,18,18,17,18,18,18,18,18,18,18,18,17,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,18,17,18,
-	17,17,18,17,17,18,18,18,18,17,18,18,18,17,18,18,
-	18,18,18,18,18,18,17,18,17,18,18,18,18,17,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,17,18,18,17,18,
-	18,18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,
-	18,18,18,18,17,17,18,18,18,18,18,18,17,18,18,18,
-	18,18,18,18,18,18,18,18,17,18,18,18,18,18,17,18,
-	17,18,18,17,18,18,17,17,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,18,18,18,17,17,17,17,18,18,18,17,18,18,
-	17,18,18,18,18,18,17,18,18,18,18,18,18,18,17,17,
-	17,18,18,18,18,18,18,18,18,17,18,18,18,18,17,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,17,18,18,18,17,18,18,18,17,17,18,18,
-	18,18,18,18,18,17,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,17,18,17,18,18,18,18,18,18,18,18,18,
-	18,18,18,17,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,17,18,17,18,17,18,17,18,18,18,17,17,
-	18,17,18,18,18,17,18,18,18,18,17,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,16,18,17,18,17,18,18,18,18,18,17,
-	18,17,18,17,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,18,
-	18,18,18,18,17,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,17,18,17,17,18,18,18,18,18,18,
-	18,18,18,18,18,17,18,18,18,17,18,18,18,17,18,18,
-	18,17,17,18,18,17,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,17,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,17,18,18,18,18,18,17,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,17,18,17,18,18,17,18,17,18,18,18,18,18,
-	18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,17,18,18,18,17,18,18,18,
-	18,17,18,18,17,18,18,18,18,18,18,18,18,18,17,18,
-	18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,17,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,17,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,17,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,17,18,18,18,18,18,18,17,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,17,18,18,18,18,18,18,17,17,17,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,18,
-	18,18,18,18,18,18,18,17,18,18,18,18,18,18,18,18,
-	18,18,18,17,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,17,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,17,18,18,18,17,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,17,18,18,18,18,18,17,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,16,18,18,18,17,18,18,18,18,18,18,18,
-	18,17,18,18,18,18,17,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,17,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,17,17,18,18,18,18,17,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,18,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,17,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,17,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,
-	18,18,18,18,18,18,18,17,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,17,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,17,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
-	18,
+	12,13,12,13,12,13,13,13,13,14,13,14,14,14,14,14,
+	14,14,14,15,15,15,15,15,16,15,16,16,16,16,16,17,
+	16,16,16,16,18, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
+	11,11,11,11,12,11,12,12,12,12,12,12,12,12,13,12,
+	13,13,13,12,13,13,14,13,14,13,14,14,14,14,15,14,
+	14,15,15,15,15,15,15,16,14,15,15,15,16,17,16,16,
+	17,16,17,17,16,16, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,
+	11,11,11,11,11,12,11,12,12,12,12,12,12,12,12,13,
+	12,13,12,13,13,13,13,14,14,14,14,14,14,14,15,14,
+	14,14,14,16,15,15,16,15,16,15,15,16,16,17,16,16,
+	16,17,17,17,19,16,19, 8, 8, 8, 9, 9, 9, 9,10,10,
+	10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,11,
+	11,11,11,12,12,12,12,12,12,12,12,12,12,12,13,12,
+	13,12,13,13,13,13,14,13,14,13,14,14,14,14,15,14,
+	15,14,14,14,15,16,15,15,16,15,16,15,16,16,16,17,
+	17,17,16,19,16,17,16,18, 8, 8, 8, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,11,
+	11,11,11,12,12,12,11,12,12,12,12,12,12,13,13,13,
+	12,13,13,13,13,14,13,14,13,14,14,15,14,14,14,15,
+	14,15,15,14,15,15,15,16,15,16,16,17,16,16,16,16,
+	16,15,18,18,16,17,19,17,19, 9, 9, 9,10,10,10,10,
+	10,10,10,11,11,11,11,11,11,11,11,11,11,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,13,13,13,13,
+	13,13,13,13,13,13,14,13,14,13,14,14,14,14,15,14,
+	15,15,16,14,16,15,15,15,16,16,16,17,16,16,17,16,
+	16,17,16,16,16,17,18,17,17,17, 9, 9, 9,10,10,10,
+	10,10,10,10,11,11,11,11,11,11,11,11,11,12,11,11,
+	12,11,12,12,12,12,12,12,12,12,12,12,12,13,13,13,
+	13,13,13,13,13,14,13,14,13,14,14,15,14,14,14,15,
+	15,15,15,16,15,15,15,16,17,16,16,15,16,15,17,16,
+	16,16,17,17,19,18,18,17,18,17,19,10, 9, 9,10,10,
+	10,11,11,11,11,11,11,11,11,11,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,13,12,13,13,13,13,13,13,13,
+	13,13,14,13,14,14,14,13,14,14,14,14,15,14,14,14,
+	15,15,15,16,17,15,17,15,16,16,16,16,15,16,18,17,
+	16,18,16,17,17,17,17,17,19,16,17,17,10, 9, 9,10,
+	10,11,10,11,11,11,11,11,11,11,12,12,12,12,12,12,
+	12,12,12,12,12,12,13,12,12,13,12,13,12,13,13,13,
+	13,13,13,13,13,14,13,14,14,14,14,15,14,15,14,15,
+	14,16,15,16,15,15,15,16,16,16,15,15,15,15,17,16,
+	16,17,16,16,16,18,18,16,19,17,17,17,16, 9, 9, 9,
+	10,10,11,11,11,11,12,11,11,12,12,12,12,12,12,13,
+	12,12,13,13,12,13,12,13,13,13,13,13,13,13,13,13,
+	13,13,14,14,14,13,14,14,14,14,14,14,15,15,15,14,
+	16,15,16,15,15,15,16,16,16,16,16,16,16,17,16,17,
+	17,19,16,16,16,18,19,17,17,18,17,19,18,19, 9, 9,
+	 9,10,10,11,11,11,11,11,11,12,12,12,12,12,12,12,
+	12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,14,13,14,14,14,13,14,14,14,14,15,14,15,
+	15,15,16,16,16,16,16,15,16,16,17,16,16,17,19,16,
+	17,17,17,19,18,17,17,17,17,17,18,18,18,17,18,10,
+	10,10,11,11,11,11,12,12,12,12,12,12,12,13,12,13,
+	12,13,12,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,14,14,13,14,13,15,14,15,14,14,14,15,14,15,15,
+	16,15,16,15,17,16,16,17,16,16,16,16,18,16,17,16,
+	18,17,19,17,17,16,18,18,18,17,16,19,17,18,17,19,
+	10,10,10,11,11,11,11,12,12,12,12,12,12,12,12,12,
+	12,13,13,13,13,12,13,13,13,13,13,13,13,13,13,13,
+	13,14,14,14,14,14,14,14,13,14,14,14,14,15,15,15,
+	14,15,15,16,16,16,16,17,15,16,16,19,17,18,16,19,
+	18,16,18,18,17,17,19,16,19,17,19,18,17,18,19,17,
+	18,11,10,11,11,11,12,12,12,12,12,13,13,12,13,13,
+	12,13,13,13,13,13,13,13,13,14,13,14,13,13,13,13,
+	13,14,14,14,14,14,14,14,14,14,15,14,15,16,16,14,
+	16,15,19,15,16,15,16,17,17,17,17,16,18,17,17,19,
+	19,16,19,18,17,17,19,18,18,19,19,18,17,17,17,18,
+	19,19,10,11,11,11,12,12,12,12,12,12,12,12,12,13,
+	13,13,13,13,13,13,13,13,13,13,14,13,13,13,14,14,
+	14,14,14,14,14,14,14,15,14,15,14,15,14,15,15,15,
+	15,15,15,17,15,16,16,16,16,16,16,16,17,16,16,17,
+	18,18,17,17,17,19,17,18,18,18,17,17,17,18,17,19,
+	19,18,19,11,11,11,12,12,12,12,12,13,13,13,13,13,
+	13,13,13,13,13,14,14,13,13,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,15,14,14,15,14,15,14,
+	16,15,16,15,18,15,17,16,18,15,19,17,18,16,19,18,
+	19,17,18,18,17,19,19,18,19,17,19,19,17,19,18,19,
+	17,17,19,19,11,11,11,12,12,12,12,12,12,13,13,13,
+	13,13,13,13,13,13,13,13,14,14,13,14,13,14,14,14,
+	13,14,14,14,14,14,14,15,14,14,14,15,15,15,15,15,
+	16,16,16,19,15,16,16,16,16,17,16,17,16,19,19,16,
+	16,19,16,18,17,18,17,16,18,18,18,18,19,17,18,18,
+	19,18,19,18,19,12,12,11,12,12,13,13,13,13,13,13,
+	13,13,13,14,13,14,14,14,14,14,13,14,14,14,14,14,
+	15,14,14,14,14,14,14,14,14,15,15,15,15,15,16,15,
+	16,15,16,15,16,15,17,15,16,16,17,16,19,17,16,17,
+	19,17,17,17,17,17,19,19,18,19,19,19,18,18,18,19,
+	19,18,19,17,19,19,12,12,12,12,12,13,13,13,13,13,
+	13,13,13,13,14,14,13,14,14,14,14,14,13,14,14,14,
+	14,14,14,14,15,14,15,14,14,15,14,15,14,14,15,15,
+	15,18,14,17,15,16,15,17,15,18,17,16,17,17,16,16,
+	18,16,19,16,16,18,17,18,19,18,18,19,19,17,19,19,
+	18,18,19,17,19,19,19,12,12,12,13,13,13,13,13,14,
+	13,13,13,14,13,14,14,14,14,14,14,14,14,15,15,14,
+	14,14,15,15,15,14,14,14,14,14,15,15,15,15,17,15,
+	16,14,16,15,16,15,16,16,17,16,17,16,17,17,17,16,
+	18,17,19,19,18,18,18,18,17,18,17,19,19,18,19,18,
+	17,19,19,19,17,19,18,19,12,12,12,13,13,13,13,13,
+	13,13,13,14,14,14,14,13,14,14,14,14,14,14,15,14,
+	15,14,14,15,15,15,15,14,14,15,15,15,15,14,15,16,
+	15,16,16,16,15,16,15,17,15,19,15,17,15,17,15,17,
+	18,17,16,17,17,17,17,17,17,19,17,18,17,17,18,19,
+	19,18,19,18,18,19,19,19,17,12,12,12,13,13,13,14,
+	14,14,14,14,14,14,14,15,14,14,14,14,15,14,15,15,
+	14,14,15,15,15,14,14,15,15,15,16,15,15,15,16,15,
+	16,16,16,17,15,16,16,18,16,16,17,17,17,17,16,16,
+	19,17,19,17,19,17,19,18,19,17,17,19,18,18,17,18,
+	17,19,18,18,19,19,17,19,19,19,12,12,12,13,13,13,
+	13,13,13,14,14,14,14,14,14,15,14,14,14,15,14,14,
+	15,14,14,14,15,14,15,15,15,14,14,15,15,15,15,17,
+	16,16,16,16,16,17,15,17,16,16,15,16,16,19,16,18,
+	16,19,17,17,18,17,17,17,17,18,18,17,18,19,18,18,
+	19,18,19,19,18,19,19,18,19,19,19,13,13,13,13,13,
+	14,14,14,14,14,14,14,14,14,14,14,15,14,15,15,14,
+	14,15,15,15,15,15,15,15,14,15,15,16,16,14,15,15,
+	15,16,16,16,17,15,17,17,16,16,16,16,17,17,17,16,
+	19,17,18,17,17,18,17,18,18,18,18,17,19,18,19,19,
+	18,17,19,19,19,19,19,18,19,18,19,17,13,13,13,13,
+	13,13,13,14,14,14,14,14,14,15,15,15,14,15,14,15,
+	15,14,15,14,14,15,15,15,15,15,14,15,16,16,15,15,
+	16,16,15,15,16,16,17,16,16,17,17,17,18,19,16,17,
+	17,19,18,18,17,17,18,19,17,18,19,19,17,17,19,19,
+	19,18,17,19,19,19,19,19,17,19,19,19,19,13,13,13,
+	14,14,14,14,14,14,15,15,14,14,15,14,14,15,14,16,
+	14,15,14,14,15,15,15,15,15,15,15,15,15,16,16,15,
+	15,16,17,16,16,16,16,18,16,17,18,16,17,17,17,16,
+	17,18,17,17,19,17,18,17,17,16,18,19,19,17,19,19,
+	19,19,18,19,18,19,19,19,19,18,19,18,19,18,13,13,
+	13,14,14,14,14,14,15,15,15,15,15,15,15,14,14,14,
+	15,15,14,14,16,15,15,15,15,15,15,16,15,15,15,15,
+	15,16,15,16,16,17,16,16,16,18,15,16,17,19,17,19,
+	16,17,17,17,18,18,19,17,18,18,18,18,18,18,19,19,
+	19,18,18,19,19,19,19,19,19,19,19,19,19,19,18,14,
+	14,13,14,14,14,14,15,15,15,14,14,16,15,15,15,16,
+	16,15,15,15,15,16,15,16,15,15,15,15,15,15,15,15,
+	15,16,16,16,17,17,16,16,17,16,16,18,15,17,16,16,
+	16,16,19,17,19,17,17,19,18,18,19,19,18,18,19,17,
+	19,17,19,19,18,19,19,18,19,18,18,18,19,19,19,18,
+	14,14,13,14,13,14,15,14,15,14,14,14,14,14,14,15,
+	15,15,15,17,15,15,16,15,15,15,15,16,15,16,15,16,
+	16,17,15,16,16,17,16,16,16,16,16,17,18,18,18,17,
+	18,18,17,19,17,18,19,19,17,18,18,17,17,19,17,19,
+	19,18,19,19,19,19,17,19,18,19,18,19,19,19,18,19,
+	19,14,13,13,14,14,14,14,14,15,15,15,15,15,15,15,
+	15,16,15,15,15,16,15,15,15,16,15,16,17,15,16,16,
+	16,17,15,16,17,16,16,16,16,19,16,17,17,16,18,16,
+	18,17,18,17,17,17,17,18,17,17,18,19,19,19,19,18,
+	17,19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,
+	18,19,13,14,14,14,14,14,14,15,14,14,14,15,15,15,
+	15,15,15,16,16,16,16,16,16,15,16,15,15,16,16,16,
+	16,16,17,17,15,17,16,16,16,18,16,19,16,19,17,18,
+	18,18,17,16,19,17,17,18,18,17,16,18,18,19,19,19,
+	17,19,18,18,19,18,19,18,18,18,19,18,19,19,19,19,
+	18,18,19,14,14,14,14,14,16,14,15,15,15,15,14,15,
+	16,15,16,16,15,16,14,15,15,16,15,17,16,16,15,18,
+	15,16,16,16,16,15,17,16,17,18,18,17,17,18,18,19,
+	19,17,18,17,17,19,17,18,18,19,17,19,17,18,19,17,
+	18,19,19,17,18,19,19,19,19,19,19,19,17,19,18,19,
+	19,19,18,19,14,13,14,14,14,14,14,14,16,15,15,15,
+	15,15,15,15,16,15,16,15,16,16,15,16,16,15,16,16,
+	16,15,16,17,16,16,17,16,16,18,19,16,17,17,16,17,
+	18,19,16,17,18,19,18,19,18,19,17,19,18,19,18,19,
+	19,19,19,17,19,18,19,19,18,19,19,18,19,19,19,19,
+	19,19,19,19,19,14,14,14,14,15,16,15,16,15,15,16,
+	16,15,15,15,15,17,16,17,16,15,15,16,15,15,15,16,
+	16,17,16,16,16,16,17,17,17,15,18,17,16,17,19,16,
+	17,19,16,18,19,18,18,19,18,16,18,17,18,17,18,19,
+	19,19,18,18,19,17,19,18,19,19,19,18,19,19,18,19,
+	19,19,19,19,19,19,14,14,14,14,15,14,15,14,15,15,
+	15,16,15,14,15,17,16,16,16,16,16,17,15,16,16,16,
+	16,16,17,16,16,16,17,16,16,17,17,16,15,17,17,18,
+	17,19,18,16,18,19,17,19,17,18,17,19,19,19,17,19,
+	18,19,19,19,19,17,19,19,18,19,19,19,19,18,19,19,
+	19,19,19,19,18,19,19,14,14,14,15,15,15,15,15,15,
+	16,17,15,15,16,15,15,15,15,16,16,18,15,17,16,16,
+	16,16,17,18,19,17,18,16,17,16,17,16,18,17,18,17,
+	19,17,17,19,19,17,17,19,18,17,19,17,19,17,19,19,
+	19,19,19,18,17,19,19,19,19,19,19,19,19,19,19,19,
+	18,19,19,19,19,19,19,19,14,14,15,15,16,15,16,15,
+	15,16,16,16,15,16,16,15,17,16,16,17,16,17,15,17,
+	16,18,16,17,16,16,17,15,16,18,16,17,16,16,17,17,
+	16,18,16,18,16,19,16,18,18,17,18,18,19,17,19,19,
+	19,19,18,19,19,19,18,19,19,19,19,19,19,19,19,19,
+	18,19,19,19,19,19,19,19,19,15,14,14,15,16,16,16,
+	15,15,15,15,15,15,16,15,16,16,17,17,16,16,16,16,
+	16,18,16,16,16,16,18,16,17,16,16,17,18,17,18,19,
+	19,17,17,19,18,18,18,17,19,17,18,19,18,17,19,19,
+	18,18,19,19,19,18,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,18,18,19,19,19,15,14,14,15,15,15,
+	15,16,16,16,16,15,18,15,15,18,16,19,16,16,16,16,
+	17,16,17,17,16,16,16,17,16,18,16,17,16,18,17,18,
+	18,19,16,18,16,19,16,17,17,18,18,18,19,18,18,18,
+	18,19,19,18,18,19,19,19,19,18,19,19,19,19,19,19,
+	19,19,19,18,18,19,19,19,19,19,19,14,15,16,15,16,
+	15,15,16,16,15,16,17,16,16,17,16,17,17,18,17,17,
+	16,17,16,17,18,16,16,15,16,16,19,16,17,16,17,18,
+	18,17,17,17,18,16,18,17,19,17,17,17,18,19,19,19,
+	19,19,19,19,19,19,19,19,19,18,18,18,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,15,15,14,15,
+	15,15,15,16,15,15,17,16,16,16,18,17,17,16,16,18,
+	17,16,16,18,17,16,18,16,16,17,16,16,16,19,17,16,
+	18,17,17,19,17,18,18,18,17,19,17,18,18,19,19,19,
+	19,19,18,18,18,18,18,19,19,19,19,19,19,19,19,18,
+	19,19,18,19,19,19,18,19,19,19,19,19,19,15,15,15,
+	16,15,15,16,16,16,16,17,16,17,16,15,16,16,16,17,
+	16,17,17,16,17,16,16,18,16,18,18,17,17,16,17,16,
+	17,16,19,18,16,17,18,18,18,17,18,19,18,18,17,18,
+	18,19,19,19,19,19,19,19,19,19,19,19,18,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,16,15,
+	15,16,14,16,16,16,16,16,16,16,19,15,16,15,16,17,
+	16,16,16,17,16,17,16,17,18,17,17,18,16,19,17,17,
+	17,18,16,19,17,17,17,19,18,19,19,19,17,18,19,19,
+	18,19,19,19,19,19,19,18,19,19,18,19,17,19,19,19,
+	18,19,19,19,19,19,19,19,19,18,19,19,19,19,19,17,
+	15,15,16,16,16,17,15,17,16,16,17,17,17,17,15,16,
+	18,18,17,17,16,15,17,16,16,17,16,17,17,17,18,18,
+	17,18,19,19,19,18,19,19,19,19,18,18,19,18,19,19,
+	18,19,19,17,19,19,19,18,19,18,19,19,19,18,19,19,
+	19,19,18,19,19,19,19,19,19,19,19,19,18,19,19,19,
+	16,16,17,15,16,16,16,17,16,17,17,16,16,17,16,16,
+	16,18,18,17,16,17,17,18,18,17,18,18,17,17,18,19,
+	18,17,17,19,18,17,19,17,19,19,19,18,18,18,18,18,
+	19,19,19,19,18,19,18,18,19,19,19,19,19,18,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,16,15,16,15,15,16,18,17,16,17,17,17,16,19,17,
+	16,18,17,17,16,17,16,18,18,17,16,17,18,19,18,17,
+	18,17,17,19,19,18,18,18,19,18,19,18,19,17,18,18,
+	19,19,19,19,18,19,19,18,19,19,19,19,19,19,18,18,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,16,15,15,16,16,17,17,16,16,17,17,16,18,17,
+	18,18,16,16,17,19,17,18,17,16,17,18,18,16,16,17,
+	17,18,16,19,17,18,17,19,19,17,19,18,18,19,17,19,
+	18,18,18,19,19,19,19,19,19,18,18,17,17,19,19,19,
+	19,19,18,19,19,19,19,19,18,19,19,19,19,19,19,19,
+	19,19,19,19,16,15,17,15,16,15,16,16,17,17,16,17,
+	19,18,16,16,17,17,19,17,18,17,17,18,18,18,18,17,
+	19,18,18,17,19,17,18,17,17,18,19,18,18,19,19,18,
+	17,19,19,17,18,18,19,19,19,19,19,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,16,16,16,15,15,16,17,16,16,16,18,16,
+	17,16,17,19,17,16,19,18,19,16,17,18,18,17,19,16,
+	17,19,17,18,18,19,18,19,17,19,18,18,18,19,18,18,
+	18,17,18,19,18,18,19,19,19,19,18,19,17,19,19,19,
+	17,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,17,16,15,15,16,16,18,16,16,16,18,
+	17,16,17,17,19,17,17,17,16,17,18,19,19,18,17,17,
+	17,18,19,18,18,18,17,17,18,16,19,18,19,18,18,17,
+	19,18,19,18,18,17,19,18,17,19,19,19,19,18,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,18,19,19,19,
+	19,19,19,19,19,19,16,16,15,16,16,16,16,17,19,17,
+	17,17,17,19,16,17,17,17,18,17,19,18,19,17,17,19,
+	16,19,18,19,17,17,17,17,18,17,17,19,18,18,19,19,
+	18,17,18,18,18,19,18,18,17,19,19,19,19,19,19,19,
+	18,19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,17,15,16,16,19,17,17,19,18,
+	17,18,17,17,18,17,17,16,16,18,19,17,18,19,17,18,
+	17,18,17,18,18,18,19,17,17,17,18,17,18,18,19,19,
+	19,18,19,19,18,18,19,18,19,19,19,19,19,19,19,18,
+	19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,19,18,16,16,16,16,18,16,18,
+	17,17,17,16,19,16,18,17,17,16,18,18,19,18,18,17,
+	18,17,18,18,17,18,18,18,19,19,16,19,19,19,18,17,
+	19,18,19,19,19,19,19,18,19,18,19,19,19,19,17,19,
+	19,19,18,19,18,19,19,19,19,19,19,19,19,19,19,19,
+	19,18,19,19,19,19,19,19,19,19,18,16,16,16,17,19,
+	18,19,17,18,18,18,18,17,17,18,18,17,18,19,17,19,
+	17,19,18,18,19,19,19,18,19,19,19,18,19,18,19,18,
+	19,19,19,19,19,19,19,18,19,19,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,19,19,19,19,18,19,19,17,17,16,16,17,18,
+	19,17,18,18,17,19,17,18,18,18,17,17,17,17,18,19,
+	19,19,18,17,19,19,19,16,17,18,17,19,18,18,17,17,
+	17,18,18,18,19,17,18,19,18,19,18,19,19,19,19,19,
+	19,18,19,19,19,19,19,19,17,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,17,16,17,17,17,
+	17,19,18,17,17,18,18,19,18,18,19,18,19,19,18,18,
+	19,18,19,18,19,17,18,18,18,18,17,19,19,18,19,19,
+	19,19,17,17,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,18,18,19,19,19,19,19,18,19,19,18,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,18,16,17,16,
+	18,18,17,17,19,17,17,18,18,19,19,17,19,17,19,19,
+	19,18,18,19,17,19,17,18,19,17,18,18,19,17,19,18,
+	19,19,19,19,19,19,18,19,18,19,18,19,18,19,19,19,
+	18,19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,18,19,19,19,19,19,19,19,19,19,17,16,17,
+	18,18,17,19,17,18,17,16,19,19,17,18,17,19,18,17,
+	19,18,19,19,19,18,19,19,19,18,18,19,19,19,19,19,
+	19,17,18,19,18,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,17,19,19,19,19,18,19,18,19,19,19,18,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,18,17,
+	17,18,18,18,18,17,18,18,18,17,18,19,18,19,19,19,
+	19,17,17,17,19,18,18,19,19,19,19,19,18,19,18,19,
+	19,19,19,19,18,18,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,19,18,19,19,19,19,19,19,18,
+	17,17,18,19,18,18,17,18,18,17,18,19,16,18,19,19,
+	19,18,18,18,19,18,19,19,19,19,19,19,19,18,18,19,
+	19,18,17,19,19,19,19,19,19,19,19,18,19,19,19,19,
+	19,19,19,19,19,19,19,17,19,19,19,18,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	16,17,16,16,18,18,17,19,19,18,17,17,16,18,19,17,
+	17,19,18,18,19,19,19,19,18,19,18,19,19,18,19,19,
+	18,19,18,19,18,19,18,19,19,19,19,19,18,19,19,19,
+	19,19,19,19,18,19,18,19,19,19,19,19,19,19,19,18,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,18,19,19,
+	19,18,16,18,18,19,17,19,17,18,18,17,19,19,18,19,
+	19,19,19,18,18,19,17,18,19,19,19,18,19,19,19,19,
+	18,17,18,19,19,19,19,19,18,19,19,19,19,18,19,19,
+	19,19,19,18,19,18,19,19,19,19,19,18,19,19,19,18,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,18,17,18,17,19,18,18,19,16,18,18,19,19,17,
+	17,18,19,19,18,19,19,18,18,19,19,19,19,19,19,18,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,18,19,18,19,19,19,19,19,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,17,18,17,18,18,18,17,17,18,18,19,18,19,
+	17,18,19,19,17,17,19,19,17,19,17,18,19,19,18,19,
+	19,19,19,19,19,18,18,19,19,19,19,19,19,19,19,19,
+	19,18,19,18,19,19,19,19,19,19,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,19,17,18,16,16,18,18,17,18,17,19,17,19,
+	19,18,19,19,18,19,19,19,19,19,19,19,18,18,19,19,
+	19,18,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,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,19,
+	19,19,19,19,19,18,19,18,19,17,17,17,19,19,18,19,
+	17,19,18,19,19,19,19,19,19,19,19,19,18,19,19,19,
+	18,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,18,19,19,19,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,
+	19,19,19,19,19,19,19,16,19,19,19,17,19,17,19,17,
+	19,19,18,19,19,19,19,19,19,17,19,19,19,18,19,19,
+	19,19,19,19,18,19,18,19,19,19,19,19,19,19,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,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,18,18,19,19,18,18,18,19,17,
+	19,17,19,19,19,19,18,18,18,18,19,19,19,19,18,19,
+	19,19,18,19,19,19,19,18,19,19,19,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,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,18,19,19,17,19,18,17,
+	19,17,19,19,19,19,19,19,19,19,18,17,19,18,19,19,
+	17,19,19,19,18,19,19,19,18,19,19,19,18,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,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,19,19,19,19,19,18,18,18,18,19,18,
+	17,18,18,18,18,19,19,19,19,18,17,19,19,19,18,19,
+	19,19,18,19,19,19,19,19,19,19,19,18,19,18,19,19,
+	19,19,17,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,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,17,18,17,18,19,19,
+	19,19,19,18,19,18,19,19,19,19,18,19,18,19,18,19,
+	18,19,19,19,19,19,19,18,19,19,19,17,19,19,19,19,
+	19,19,19,18,19,19,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,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,17,19,18,
+	19,19,19,19,19,19,18,19,19,19,18,17,19,18,18,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,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,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,18,19,19,17,
+	19,18,18,19,19,19,18,19,18,19,18,19,18,19,19,19,
+	19,19,19,19,19,19,19,19,19,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,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,18,17,
+	19,19,19,19,18,18,19,19,18,19,19,19,19,18,19,19,
+	19,18,19,19,19,19,18,19,19,19,19,19,19,19,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,18,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,17,
+	17,19,19,19,19,19,18,19,19,19,19,19,19,19,19,19,
+	19,18,19,19,19,19,18,19,19,19,19,19,19,19,19,19,
+	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,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	18,18,18,19,18,19,19,19,19,19,19,18,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,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,19,19,19,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,19,19,18,18,19,19,18,18,19,19,19,19,18,19,19,
+	18,19,18,18,19,19,18,19,19,19,19,19,19,19,19,19,
+	19,19,18,19,19,19,19,19,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,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+	19,
 };
 
 static float _vq_quantthresh_res0_256_128_4[] = {

1.5       +383 -250  vorbis/lib/books/res0_256_128_5.vqh

Index: res0_256_128_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128_5.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_128_5.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_128_5.vqh	2001/02/18 09:53:03	1.5
@@ -6,7 +6,8 @@
  * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -18,424 +19,556 @@
 #include "codebook.h"
 
 static long _vq_quantlist_res0_256_128_5[] = {
+	200,
+	199,
+	201,
+	198,
+	202,
+	197,
+	203,
+	196,
+	204,
+	195,
+	205,
+	194,
+	206,
+	193,
+	207,
+	192,
+	208,
+	191,
+	209,
+	190,
+	210,
+	189,
+	211,
+	188,
+	212,
+	187,
+	213,
+	186,
+	214,
+	185,
+	215,
+	184,
+	216,
+	183,
+	217,
+	182,
+	218,
+	181,
+	219,
+	180,
+	220,
+	179,
+	221,
+	178,
+	222,
+	177,
+	223,
+	176,
+	224,
+	175,
+	225,
+	174,
+	226,
+	173,
+	227,
+	172,
+	228,
+	171,
+	229,
+	170,
+	230,
+	169,
+	231,
+	168,
+	232,
+	167,
+	233,
+	166,
+	234,
+	165,
+	235,
+	164,
+	236,
+	163,
+	237,
+	162,
+	238,
+	161,
+	239,
+	160,
+	240,
+	159,
+	241,
+	158,
+	242,
+	157,
+	243,
+	156,
+	244,
+	155,
+	245,
+	154,
+	246,
+	153,
+	247,
+	152,
+	248,
+	151,
+	249,
         150,
+	250,
         149,
-	151,
+	251,
         148,
-	152,
+	252,
         147,
-	153,
+	253,
         146,
-	154,
+	254,
         145,
-	155,
+	255,
         144,
-	156,
+	256,
         143,
-	157,
+	257,
         142,
-	158,
+	258,
         141,
-	159,
+	259,
         140,
-	160,
+	260,
         139,
-	161,
+	261,
         138,
-	162,
+	262,
         137,
-	163,
+	263,
         136,
-	164,
+	264,
         135,
-	165,
+	265,
         134,
-	166,
+	266,
         133,
-	167,
+	267,
         132,
-	168,
+	268,
         131,
-	169,
+	269,
         130,
-	170,
+	270,
         129,
-	171,
+	271,
         128,
-	172,
+	272,
         127,
-	173,
+	273,
         126,
-	174,
+	274,
         125,
-	175,
+	275,
         124,
-	176,
+	276,
         123,
-	177,
+	277,
         122,
-	178,
+	278,
         121,
-	179,
+	279,
         120,
-	180,
+	280,
         119,
-	181,
+	281,
         118,
-	182,
+	282,
         117,
-	183,
+	283,
         116,
-	184,
+	284,
         115,
-	185,
+	285,
         114,
-	186,
+	286,
         113,
-	187,
+	287,
         112,
-	188,
+	288,
         111,
-	189,
+	289,
         110,
-	190,
+	290,
         109,
-	191,
+	291,
         108,
-	192,
+	292,
         107,
-	193,
+	293,
         106,
-	194,
+	294,
         105,
-	195,
+	295,
         104,
-	196,
+	296,
         103,
-	197,
+	297,
         102,
-	198,
+	298,
         101,
-	199,
+	299,
         100,
-	200,
+	300,
         99,
-	201,
+	301,
         98,
-	202,
+	302,
         97,
-	203,
+	303,
         96,
-	204,
+	304,
         95,
-	205,
+	305,
         94,
-	206,
+	306,
         93,
-	207,
+	307,
         92,
-	208,
+	308,
         91,
-	209,
+	309,
         90,
-	210,
+	310,
         89,
-	211,
+	311,
         88,
-	212,
+	312,
         87,
-	213,
+	313,
         86,
-	214,
+	314,
         85,
-	215,
+	315,
         84,
-	216,
+	316,
         83,
-	217,
+	317,
         82,
-	218,
+	318,
         81,
-	219,
+	319,
         80,
-	220,
+	320,
         79,
-	221,
+	321,
         78,
-	222,
+	322,
         77,
-	223,
+	323,
         76,
-	224,
+	324,
         75,
-	225,
+	325,
         74,
-	226,
+	326,
         73,
-	227,
+	327,
         72,
-	228,
+	328,
         71,
-	229,
+	329,
         70,
-	230,
+	330,
         69,
-	231,
+	331,
         68,
-	232,
+	332,
         67,
-	233,
+	333,
         66,
-	234,
+	334,
         65,
-	235,
+	335,
         64,
-	236,
+	336,
         63,
-	237,
+	337,
         62,
-	238,
+	338,
         61,
-	239,
+	339,
         60,
-	240,
+	340,
         59,
-	241,
+	341,
         58,
-	242,
+	342,
         57,
-	243,
+	343,
         56,
-	244,
+	344,
         55,
-	245,
+	345,
         54,
-	246,
+	346,
         53,
-	247,
+	347,
         52,
-	248,
+	348,
         51,
-	249,
+	349,
         50,
-	250,
+	350,
         49,
-	251,
+	351,
         48,
-	252,
+	352,
         47,
-	253,
+	353,
         46,
-	254,
+	354,
         45,
-	255,
+	355,
         44,
-	256,
+	356,
         43,
-	257,
+	357,
         42,
-	258,
+	358,
         41,
-	259,
+	359,
         40,
-	260,
+	360,
         39,
-	261,
+	361,
         38,
-	262,
+	362,
         37,
-	263,
+	363,
         36,
-	264,
+	364,
         35,
-	265,
+	365,
         34,
-	266,
+	366,
         33,
-	267,
+	367,
         32,
-	268,
+	368,
         31,
-	269,
+	369,
         30,
-	270,
+	370,
         29,
-	271,
+	371,
         28,
-	272,
+	372,
         27,
-	273,
+	373,
         26,
-	274,
+	374,
         25,
-	275,
+	375,
         24,
-	276,
+	376,
         23,
-	277,
+	377,
         22,
-	278,
+	378,
         21,
-	279,
+	379,
         20,
-	280,
+	380,
         19,
-	281,
+	381,
         18,
-	282,
+	382,
         17,
-	283,
+	383,
         16,
-	284,
+	384,
         15,
-	285,
+	385,
         14,
-	286,
+	386,
         13,
-	287,
+	387,
         12,
-	288,
+	388,
         11,
-	289,
+	389,
         10,
-	290,
+	390,
         9,
-	291,
+	391,
         8,
-	292,
+	392,
         7,
-	293,
+	393,
         6,
-	294,
+	394,
         5,
-	295,
+	395,
         4,
-	296,
+	396,
         3,
-	297,
+	397,
         2,
-	298,
+	398,
         1,
-	299,
+	399,
         0,
-	300,
+	400,
 };
 
 static long _vq_lengthlist_res0_256_128_5[] = {
-	 3, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 7,
-	 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,10, 9,10, 9,10,10,10,10,10,10,10,
-	11,11,11,11,11,11,11,12,11,12,12,12,12,12,12,12,
-	13, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	 9, 9,10,10,10,10,10,10,10,10,11,11,11,11,11,10,
-	11,12,11,12,11,13,11,13,12,13,12,13,12,13,12,14,
-	12,13,12,13,13,12,13,14,14,15,12,15,14,13,12,15,
-	14,13,13,14,14,15,14,14,14,14,14,14,14,14,13,15,
-	14,14,14,15,15,15,14,15,15,14,14,14,15,15,15,14,
-	15,15,14,15,15,14,15,15,15,14,15,15,14,15,15,15,
-	15,15,15,15,15,15,15,15,14,15,15,15,15,15,14,15,
-	15,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,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,15,15,15,15,15,15,15,
-	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,
+	 4, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6,
+	 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8,
+	 8, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
+	10,10,10,10,10,10,10,11,12,12,11,11,11,11,11,12,
+	12,13,13,12,13,12,12,12,11,13,12,13,12,13,13,12,
+	13, 8, 9, 8,10, 9, 9, 9, 9, 9,10, 9,10, 9,10, 9,
+	11, 9,10,10,11,10,11,10,11,10,11,11,11,10,12,10,
+	11,10,12,11,12,11,11,11,12,11,12,12,12,11,12,11,
+	12,12,12,13,12,12,12,11,12,11,12,12,14,12,13,12,
+	13,11,13,13,12,12,14,12,14,13,13,12,13,13,13,12,
+	14,12,13,13,14,13,14,13,14,13,13,12,14,14,14,14,
+	13,13,14,13,13,13,13,14,14,12,13,13,14,14,13,13,
+	13,14,14,13,13,14,14,13,13,13,13,13,13,14,13,13,
+	13,14,13,13,13,14,13,14,14,14,14,13,14,13,13,13,
+	13,13,14,14,14,14,14,13,14,13,13,14,14,13,13,13,
+	14,14,14,13,14,14,14,14,14,14,14,14,14,13,14,14,
+	14,14,14,14,14,14,14,14,13,14,13,13,14,14,14,14,
+	14,13,13,14,14,13,14,14,14,14,14,13,14,14,14,14,
+	14,14,14,14,14,13,14,14,14,14,14,13,14,14,14,14,
+	14,13,14,14,14,14,14,14,14,14,14,13,14,14,14,14,
+	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,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,
 };
 
 static float _vq_quantthresh_res0_256_128_5[] = {
-	-149.5, -148.5, -147.5, -146.5, -145.5, -144.5, -143.5, -142.5, 
-	-141.5, -140.5, -139.5, -138.5, -137.5, -136.5, -135.5, -134.5, 
-	-133.5, -132.5, -131.5, -130.5, -129.5, -128.5, -127.5, -126.5, 
-	-125.5, -124.5, -123.5, -122.5, -121.5, -120.5, -119.5, -118.5, 
-	-117.5, -116.5, -115.5, -114.5, -113.5, -112.5, -111.5, -110.5, 
-	-109.5, -108.5, -107.5, -106.5, -105.5, -104.5, -103.5, -102.5, 
-	-101.5, -100.5, -99.5, -98.5, -97.5, -96.5, -95.5, -94.5, 
-	-93.5, -92.5, -91.5, -90.5, -89.5, -88.5, -87.5, -86.5, 
-	-85.5, -84.5, -83.5, -82.5, -81.5, -80.5, -79.5, -78.5, 
-	-77.5, -76.5, -75.5, -74.5, -73.5, -72.5, -71.5, -70.5, 
-	-69.5, -68.5, -67.5, -66.5, -65.5, -64.5, -63.5, -62.5, 
-	-61.5, -60.5, -59.5, -58.5, -57.5, -56.5, -55.5, -54.5, 
-	-53.5, -52.5, -51.5, -50.5, -49.5, -48.5, -47.5, -46.5, 
-	-45.5, -44.5, -43.5, -42.5, -41.5, -40.5, -39.5, -38.5, 
-	-37.5, -36.5, -35.5, -34.5, -33.5, -32.5, -31.5, -30.5, 
-	-29.5, -28.5, -27.5, -26.5, -25.5, -24.5, -23.5, -22.5, 
-	-21.5, -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5, 
-	-13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5, 
-	-5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 
-	2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 
-	10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5, 
-	18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5, 
-	26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5, 
-	34.5, 35.5, 36.5, 37.5, 38.5, 39.5, 40.5, 41.5, 
-	42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5, 
-	50.5, 51.5, 52.5, 53.5, 54.5, 55.5, 56.5, 57.5, 
-	58.5, 59.5, 60.5, 61.5, 62.5, 63.5, 64.5, 65.5, 
-	66.5, 67.5, 68.5, 69.5, 70.5, 71.5, 72.5, 73.5, 
-	74.5, 75.5, 76.5, 77.5, 78.5, 79.5, 80.5, 81.5, 
-	82.5, 83.5, 84.5, 85.5, 86.5, 87.5, 88.5, 89.5, 
-	90.5, 91.5, 92.5, 93.5, 94.5, 95.5, 96.5, 97.5, 
-	98.5, 99.5, 100.5, 101.5, 102.5, 103.5, 104.5, 105.5, 
-	106.5, 107.5, 108.5, 109.5, 110.5, 111.5, 112.5, 113.5, 
-	114.5, 115.5, 116.5, 117.5, 118.5, 119.5, 120.5, 121.5, 
-	122.5, 123.5, 124.5, 125.5, 126.5, 127.5, 128.5, 129.5, 
-	130.5, 131.5, 132.5, 133.5, 134.5, 135.5, 136.5, 137.5, 
-	138.5, 139.5, 140.5, 141.5, 142.5, 143.5, 144.5, 145.5, 
-	146.5, 147.5, 148.5, 149.5, 
+	-199.5, -198.5, -197.5, -196.5, -195.5, -194.5, -193.5, -192.5, 
+	-191.5, -190.5, -189.5, -188.5, -187.5, -186.5, -185.5, -184.5, 
+	-183.5, -182.5, -181.5, -180.5, -179.5, -178.5, -177.5, -176.5, 
+	-175.5, -174.5, -173.5, -172.5, -171.5, -170.5, -169.5, -168.5, 
+	-167.5, -166.5, -165.5, -164.5, -163.5, -162.5, -161.5, -160.5, 
+	-159.5, -158.5, -157.5, -156.5, -155.5, -154.5, -153.5, -152.5, 
+	-151.5, -150.5, -149.5, -148.5, -147.5, -146.5, -145.5, -144.5, 
+	-143.5, -142.5, -141.5, -140.5, -139.5, -138.5, -137.5, -136.5, 
+	-135.5, -134.5, -133.5, -132.5, -131.5, -130.5, -129.5, -128.5, 
+	-127.5, -126.5, -125.5, -124.5, -123.5, -122.5, -121.5, -120.5, 
+	-119.5, -118.5, -117.5, -116.5, -115.5, -114.5, -113.5, -112.5, 
+	-111.5, -110.5, -109.5, -108.5, -107.5, -106.5, -105.5, -104.5, 
+	-103.5, -102.5, -101.5, -100.5, -99.5, -98.5, -97.5, -96.5, 
+	-95.5, -94.5, -93.5, -92.5, -91.5, -90.5, -89.5, -88.5, 
+	-87.5, -86.5, -85.5, -84.5, -83.5, -82.5, -81.5, -80.5, 
+	-79.5, -78.5, -77.5, -76.5, -75.5, -74.5, -73.5, -72.5, 
+	-71.5, -70.5, -69.5, -68.5, -67.5, -66.5, -65.5, -64.5, 
+	-63.5, -62.5, -61.5, -60.5, -59.5, -58.5, -57.5, -56.5, 
+	-55.5, -54.5, -53.5, -52.5, -51.5, -50.5, -49.5, -48.5, 
+	-47.5, -46.5, -45.5, -44.5, -43.5, -42.5, -41.5, -40.5, 
+	-39.5, -38.5, -37.5, -36.5, -35.5, -34.5, -33.5, -32.5, 
+	-31.5, -30.5, -29.5, -28.5, -27.5, -26.5, -25.5, -24.5, 
+	-23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, 
+	-15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, 
+	-7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 
+	0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 
+	8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 
+	16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 
+	24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 
+	32.5, 33.5, 34.5, 35.5, 36.5, 37.5, 38.5, 39.5, 
+	40.5, 41.5, 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 
+	48.5, 49.5, 50.5, 51.5, 52.5, 53.5, 54.5, 55.5, 
+	56.5, 57.5, 58.5, 59.5, 60.5, 61.5, 62.5, 63.5, 
+	64.5, 65.5, 66.5, 67.5, 68.5, 69.5, 70.5, 71.5, 
+	72.5, 73.5, 74.5, 75.5, 76.5, 77.5, 78.5, 79.5, 
+	80.5, 81.5, 82.5, 83.5, 84.5, 85.5, 86.5, 87.5, 
+	88.5, 89.5, 90.5, 91.5, 92.5, 93.5, 94.5, 95.5, 
+	96.5, 97.5, 98.5, 99.5, 100.5, 101.5, 102.5, 103.5, 
+	104.5, 105.5, 106.5, 107.5, 108.5, 109.5, 110.5, 111.5, 
+	112.5, 113.5, 114.5, 115.5, 116.5, 117.5, 118.5, 119.5, 
+	120.5, 121.5, 122.5, 123.5, 124.5, 125.5, 126.5, 127.5, 
+	128.5, 129.5, 130.5, 131.5, 132.5, 133.5, 134.5, 135.5, 
+	136.5, 137.5, 138.5, 139.5, 140.5, 141.5, 142.5, 143.5, 
+	144.5, 145.5, 146.5, 147.5, 148.5, 149.5, 150.5, 151.5, 
+	152.5, 153.5, 154.5, 155.5, 156.5, 157.5, 158.5, 159.5, 
+	160.5, 161.5, 162.5, 163.5, 164.5, 165.5, 166.5, 167.5, 
+	168.5, 169.5, 170.5, 171.5, 172.5, 173.5, 174.5, 175.5, 
+	176.5, 177.5, 178.5, 179.5, 180.5, 181.5, 182.5, 183.5, 
+	184.5, 185.5, 186.5, 187.5, 188.5, 189.5, 190.5, 191.5, 
+	192.5, 193.5, 194.5, 195.5, 196.5, 197.5, 198.5, 199.5, 
 };
 
 static long _vq_quantmap_res0_256_128_5[] = {
-	  299,  297,  295,  293,  291,  289,  287,  285,
-	  283,  281,  279,  277,  275,  273,  271,  269,
-	  267,  265,  263,  261,  259,  257,  255,  253,
-	  251,  249,  247,  245,  243,  241,  239,  237,
-	  235,  233,  231,  229,  227,  225,  223,  221,
-	  219,  217,  215,  213,  211,  209,  207,  205,
-	  203,  201,  199,  197,  195,  193,  191,  189,
-	  187,  185,  183,  181,  179,  177,  175,  173,
-	  171,  169,  167,  165,  163,  161,  159,  157,
-	  155,  153,  151,  149,  147,  145,  143,  141,
-	  139,  137,  135,  133,  131,  129,  127,  125,
-	  123,  121,  119,  117,  115,  113,  111,  109,
-	  107,  105,  103,  101,   99,   97,   95,   93,
-	   91,   89,   87,   85,   83,   81,   79,   77,
-	   75,   73,   71,   69,   67,   65,   63,   61,
-	   59,   57,   55,   53,   51,   49,   47,   45,
-	   43,   41,   39,   37,   35,   33,   31,   29,
-	   27,   25,   23,   21,   19,   17,   15,   13,
-	   11,    9,    7,    5,    3,    1,    0,    2,
-	    4,    6,    8,   10,   12,   14,   16,   18,
-	   20,   22,   24,   26,   28,   30,   32,   34,
-	   36,   38,   40,   42,   44,   46,   48,   50,
-	   52,   54,   56,   58,   60,   62,   64,   66,
-	   68,   70,   72,   74,   76,   78,   80,   82,
-	   84,   86,   88,   90,   92,   94,   96,   98,
-	  100,  102,  104,  106,  108,  110,  112,  114,
-	  116,  118,  120,  122,  124,  126,  128,  130,
-	  132,  134,  136,  138,  140,  142,  144,  146,
-	  148,  150,  152,  154,  156,  158,  160,  162,
-	  164,  166,  168,  170,  172,  174,  176,  178,
-	  180,  182,  184,  186,  188,  190,  192,  194,
-	  196,  198,  200,  202,  204,  206,  208,  210,
-	  212,  214,  216,  218,  220,  222,  224,  226,
-	  228,  230,  232,  234,  236,  238,  240,  242,
-	  244,  246,  248,  250,  252,  254,  256,  258,
-	  260,  262,  264,  266,  268,  270,  272,  274,
-	  276,  278,  280,  282,  284,  286,  288,  290,
-	  292,  294,  296,  298,  300,
+	  399,  397,  395,  393,  391,  389,  387,  385,
+	  383,  381,  379,  377,  375,  373,  371,  369,
+	  367,  365,  363,  361,  359,  357,  355,  353,
+	  351,  349,  347,  345,  343,  341,  339,  337,
+	  335,  333,  331,  329,  327,  325,  323,  321,
+	  319,  317,  315,  313,  311,  309,  307,  305,
+	  303,  301,  299,  297,  295,  293,  291,  289,
+	  287,  285,  283,  281,  279,  277,  275,  273,
+	  271,  269,  267,  265,  263,  261,  259,  257,
+	  255,  253,  251,  249,  247,  245,  243,  241,
+	  239,  237,  235,  233,  231,  229,  227,  225,
+	  223,  221,  219,  217,  215,  213,  211,  209,
+	  207,  205,  203,  201,  199,  197,  195,  193,
+	  191,  189,  187,  185,  183,  181,  179,  177,
+	  175,  173,  171,  169,  167,  165,  163,  161,
+	  159,  157,  155,  153,  151,  149,  147,  145,
+	  143,  141,  139,  137,  135,  133,  131,  129,
+	  127,  125,  123,  121,  119,  117,  115,  113,
+	  111,  109,  107,  105,  103,  101,   99,   97,
+	   95,   93,   91,   89,   87,   85,   83,   81,
+	   79,   77,   75,   73,   71,   69,   67,   65,
+	   63,   61,   59,   57,   55,   53,   51,   49,
+	   47,   45,   43,   41,   39,   37,   35,   33,
+	   31,   29,   27,   25,   23,   21,   19,   17,
+	   15,   13,   11,    9,    7,    5,    3,    1,
+	    0,    2,    4,    6,    8,   10,   12,   14,
+	   16,   18,   20,   22,   24,   26,   28,   30,
+	   32,   34,   36,   38,   40,   42,   44,   46,
+	   48,   50,   52,   54,   56,   58,   60,   62,
+	   64,   66,   68,   70,   72,   74,   76,   78,
+	   80,   82,   84,   86,   88,   90,   92,   94,
+	   96,   98,  100,  102,  104,  106,  108,  110,
+	  112,  114,  116,  118,  120,  122,  124,  126,
+	  128,  130,  132,  134,  136,  138,  140,  142,
+	  144,  146,  148,  150,  152,  154,  156,  158,
+	  160,  162,  164,  166,  168,  170,  172,  174,
+	  176,  178,  180,  182,  184,  186,  188,  190,
+	  192,  194,  196,  198,  200,  202,  204,  206,
+	  208,  210,  212,  214,  216,  218,  220,  222,
+	  224,  226,  228,  230,  232,  234,  236,  238,
+	  240,  242,  244,  246,  248,  250,  252,  254,
+	  256,  258,  260,  262,  264,  266,  268,  270,
+	  272,  274,  276,  278,  280,  282,  284,  286,
+	  288,  290,  292,  294,  296,  298,  300,  302,
+	  304,  306,  308,  310,  312,  314,  316,  318,
+	  320,  322,  324,  326,  328,  330,  332,  334,
+	  336,  338,  340,  342,  344,  346,  348,  350,
+	  352,  354,  356,  358,  360,  362,  364,  366,
+	  368,  370,  372,  374,  376,  378,  380,  382,
+	  384,  386,  388,  390,  392,  394,  396,  398,
+	  400,
 };
 
 static encode_aux_threshmatch _vq_auxt_res0_256_128_5 = {
         _vq_quantthresh_res0_256_128_5,
         _vq_quantmap_res0_256_128_5,
-	301,
-	301
+	401,
+	401
 };
 
 static static_codebook _vq_book_res0_256_128_5 = {
-	1, 301,
+	1, 401,
         _vq_lengthlist_res0_256_128_5,
-	1, -520962048, 1611661312, 9, 0,
+	1, -520552448, 1611661312, 9, 0,
         _vq_quantlist_res0_256_128_5,
         NULL,
         &_vq_auxt_res0_256_128_5,

1.5       +10 -87    vorbis/lib/books/res0_256_128aux.vqh

Index: res0_256_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128aux.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_256_128aux.vqh	2001/02/02 03:52:08	1.4
+++ res0_256_128aux.vqh	2001/02/18 09:53:04	1.5
@@ -1,12 +1,13 @@
 /********************************************************************
  *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
  * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
+ * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
@@ -19,91 +20,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res0_256_128aux[] = {
-	10,17,17,17,17,16,12,15,16,16,16,16,14,16,16,16,
-	16,16,13,16,16,16,16,16,14,16,16,16,16,16,16,16,
-	16,16,16,16,10,15,16,16,16,16,11,13,16,16,16,16,
-	15,15,15,16,16,16,15,16,16,16,16,16,15,16,16,16,
-	16,16,16,16,16,16,16,16,12,16,16,16,16,16,13,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,12,16,16,16,
-	16,16,12,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	12,16,16,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,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16, 6,12,15,16,15,16, 9,12,
-	15,16,16,16,16,14,16,16,16,16,13,16,16,16,16,16,
-	13,16,16,16,16,16,16,16,16,16,16,16, 5,10,13,14,
-	16,16, 6, 6, 9,12,15,16,11, 9,10,13,16,16,13,13,
-	12,14,16,16,14,16,16,16,16,16,16,16,16,16,16,16,
-	 9,13,15,16,16,16, 8, 8, 9,13,15,16,11, 8, 8,11,
-	16,16,12,11,11,12,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,11,14,16,16,16,16,11,11,13,15,16,16,
-	13,10,11,13,16,16,12,13,12,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,12,16,16,16,16,16,15,15,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	 6,12,15,16,16,16, 9,11,15,16,16,16,15,15,14,16,
-	16,16,15,16,15,16,16,16,14,16,16,16,16,16,16,16,
-	16,16,16,16, 4, 9,12,13,16,16, 5, 5, 8,10,13,16,
-	11, 7, 8,10,14,16,13,11,10,12,16,16,15,16,16,16,
-	16,16,16,16,16,16,16,16, 8,11,16,15,16,16, 6, 6,
-	 7,10,16,16,10, 6, 6, 8,16,16,13, 9, 8,10,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,10,14,15,16,
-	16,16, 9, 9,10,12,16,16,11, 8, 8,11,16,16,12,11,
-	10,12,15,16,15,16,16,16,16,16,16,16,16,16,16,16,
-	13,16,16,16,16,16,16,15,16,16,16,16,16,15,16,16,
-	16,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,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16, 7,13,16,16,16,16,10,11,
-	16,15,16,16,15,14,16,16,16,16,16,15,15,14,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16, 6,10,13,14,
-	16,16, 7, 7,10,11,14,16,11, 9,10,13,16,16,13,12,
-	12,13,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	 8,12,16,15,16,16, 8, 7, 9,12,15,16,11, 8, 8,11,
-	16,16,14,11,10,12,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,11,15,15,16,16,16,10, 9,11,13,16,16,
-	12,10,10,13,16,16,14,12,12,13,16,16,15,16,16,16,
-	16,16,16,16,16,16,16,16,14,15,16,16,16,16,16,14,
-	16,16,16,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,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	10,13,16,16,16,16,12,13,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,15,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,12,14,16,16,16,16,12,11,15,13,16,16,
-	16,13,10,11,16,16,14,13,11,11,16,16,15,16,16,15,
-	16,16,16,16,16,16,16,16,13,16,16,15,15,16,13,10,
-	 8, 8,13,16,14, 7, 4, 5,11,16,12, 7, 5, 6,12,16,
-	15,12,12,13,14,16,16,16,16,16,16,16,14,15,16,13,
-	15,16,14,10, 7, 7,11,15,14, 6, 3, 4,10,16,12, 7,
-	 5, 5,11,16,15,11,11,11,16,16,16,16,16,16,16,16,
-	16,16,15,14,15,16,16,14,11,11,13,16,16,11, 8, 9,
-	12,16,15,11, 9,10,14,16,16,15,15,13,15,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,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,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,15,16,16,
-	16,16,16,16,16,15,16,16,16,16,13,14,16,16,15,15,
-	13,14,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	15,16,16,16,16,16,16,13,11,12,15,16,15,11, 8, 9,
-	15,16,15,11, 9,10,14,16,16,15,14,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,13,11,10,15,16,
-	15,11, 7, 8,13,16,15,11, 8, 9,14,16,15,15,14,13,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	15,14,15,16,16,15,12,12,14,16,16,15,13,13,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	 4, 8,11,11,11,16, 4, 4, 7, 8,10,15, 7, 5, 5, 4,
+	 7,15, 7, 4, 4, 3, 5,16, 9, 7, 5, 2, 4,13,16,12,
+	10, 7, 9,16,
 };
 
 static static_codebook _huff_book_res0_256_128aux = {
-	4, 1296,
+	2, 36,
         _huff_lengthlist_res0_256_128aux,
         0, 0, 0, 0, 0,
         NULL,

1.12      +67 -74    vorbis/lib/modes/mode_B.h

Index: mode_B.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_B.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mode_B.h	2001/02/15 19:06:02	1.11
+++ mode_B.h	2001/02/18 09:53:12	1.12
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: mode_B.h,v 1.11 2001/02/15 19:06:02 xiphmont Exp $
+ last mod: $Id: mode_B.h,v 1.12 2001/02/18 09:53:12 xiphmont Exp $
 
  ********************************************************************/
 
@@ -72,35 +72,35 @@
    {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/
    {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/
 
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
+   {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
+   {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
    {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
    {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
+   {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
+   {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
+   {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
+   {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
    {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
   },
 
   1,/* peakattp */
-  {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/
-   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/
-   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*175*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*250*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*350*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*500*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*700*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-28.f,-28.f,-28.f},/*1000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*1400*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*2000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*2400*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*4000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-28.f,-28.f,-28.f},/*5600*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-28.f,-28.f,-28.f},/*8000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-28.f,-28.f,-28.f},/*11500*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-28.f},/*16000*/
+  {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*63*/
+   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*88*/
+   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*175*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*250*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*350*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*500*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*700*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-24.f,-24.f,-24.f},/*1000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*1400*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2400*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*4000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-24.f,-24.f,-24.f},/*5600*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*8000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*11500*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f},/*16000*/
   },
 
   1,/*noisemaskp */
@@ -123,14 +123,14 @@
    .500f, 0.f,/*2800*/
    .600f, 0.f,/*4000*/
    .700f, 0.f,/*5600*/
-   .850f, 0.f,/*8000*/
-   .900f, 0.f,/*11500*/
-   .900f, 0.f,/*16000*/
+   .800f, 0.f,/*8000*/
+   .800f, 0.f,/*11500*/
+   .800f, 0.f,/*16000*/
   },
  
-  105.f,  /* even decade + 5 is important; saves an rint() later in a
+   95.f,  /* even decade + 5 is important; saves an rint() later in a
             tight loop) */
-  -28.,
+  -26.,
 
   -0., -.004   /* attack/decay control */
 };
@@ -153,15 +153,7 @@
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*175*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*250*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*350*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*500*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*700*/
-
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
+
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
@@ -175,34 +167,34 @@
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
 
-   {-30.f,-35.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
-   {-30.f,-35.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/
-   {-30.f,-34.f,-36.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/
+   {-35.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+   {-35.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/
+   {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/
 
   },
 
   1,/* peakattp */
-  {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/
-   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/
-   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*175*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*250*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*350*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*500*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*700*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-28.f,-28.f,-28.f},/*1000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*1400*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*2000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*2400*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*4000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-28.f,-28.f,-28.f},/*5600*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-28.f,-28.f,-28.f},/*8000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-28.f,-28.f,-28.f},/*11500*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-28.f},/*16000*/
+  {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*63*/
+   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*88*/
+   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*125*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*175*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*250*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*350*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*500*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*700*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-26.f,-26.f,-26.f},/*1000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*1400*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*2000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*2400*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*4000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-26.f,-26.f,-26.f},/*5600*/
+   {-10.f,-10.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-22.f,-24.f,-26.f},/*8000*/
+   {-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-14.f,-20.f,-22.f,-24.f,-26.f},/*11500*/
+   {-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-26.f},/*16000*/
   },
 
   1,/*noisemaskp */
-  -10.f,  /* suppress any noise curve over maxspec+n */
+  -28.f,  /* suppress any noise curve over maxspec+n */
   .5f,   /* low window */
   .5f,   /* high window */
   25,
@@ -214,21 +206,21 @@
    .000f, 0.f, /*250*/
    .000f, 0.f, /*350*/
    .000f, 0.f, /*500*/
-   .200f, -2.f, /*700*/
-   .300f, -2.f, /*1000*/
-   .400f, -2.f, /*1400*/
-   .400f, -2.f, /*2000*/
-   .400f, -2.f, /*2800*/
-   .700f, -2.f, /*4000*/
-   .850f, -3.f, /*5600*/
-   .900f, -3.f, /*8000*/
-   .900f, -3.f, /*11500*/
-   .900f, -3.f, /*16000*/
+   .000f, 0.f, /*700*/
+   .200f, 0.f, /*1000*/
+   .300f, 0.f, /*1400*/
+   .300f, 0.f, /*2000*/
+   .300f, 0.f, /*2800*/
+   .700f, 0.f, /*4000*/
+   .700f, 0.f, /*5600*/
+   .750f, 0.f, /*8000*/
+   .750f, 0.f, /*11500*/
+   .800f, 0.f, /*16000*/
   },
  
   105.f,  /* even decade + 5 is important; saves an rint() later in a
             tight loop) */
-  -32.,
+  -30.,
 
   -0.f, -.004f,   /* attack/decay control */
 
@@ -249,14 +241,14 @@
                                             {4,4,4,4,4},
                                             {99,99,99,99,99}};
 
-static vorbis_info_residue0 _residue_set1B={0,1024, 32,10,5,
+static vorbis_info_residue0 _residue_set1B={0, 960, 32,10,5,
                                             {0,1,1,1,1,1,1,1,1,1},
                                             {11,12,13,14,15,16,17,18,19},
                                            
-					    {0,8,9999,18,9999,
+					    {0,8,9999,16,9999,
                                              24,9999,9999,9999},
                                             {999.f,1.5f,1.5f,2.5f,2.5f,
-					     6.5f,6.5f,14.5f,30.f},
+					     6.5f,6.5f,12.5f,22.5f},
                                             {5,5,5,5,5,5,5,5,5},
                                             {99,99,99,99,99,99,99,99,99}};
 
@@ -310,9 +302,10 @@
   },
   /* psy */
   {&_psy_set_B0,&_psy_set_B},
+
   /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
   256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-
+  
   -10., 
 
   0,

1.11      +59 -66    vorbis/lib/modes/mode_C.h

Index: mode_C.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_C.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mode_C.h	2001/02/15 19:06:02	1.10
+++ mode_C.h	2001/02/18 09:53:12	1.11
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: mode_C.h,v 1.10 2001/02/15 19:06:02 xiphmont Exp $
+ last mod: $Id: mode_C.h,v 1.11 2001/02/18 09:53:12 xiphmont Exp $
 
  ********************************************************************/
 
@@ -49,7 +49,7 @@
 
 static vorbis_info_psy _psy_set_C0={
   1,/*athp*/
-  0,/*decayp*/
+  1,/*decayp*/
 
   -100.,
   -140.,
@@ -72,39 +72,39 @@
    {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/
    {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/
 
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
    {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
    {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
   },
 
   1,/* peakattp */
-  {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/
-   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/
-   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*175*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*250*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*350*/
-   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*500*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*700*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-28.f,-28.f,-28.f},/*1000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*1400*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*2000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*2400*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-28.f,-28.f,-28.f},/*4000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-28.f,-28.f,-28.f},/*5600*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-28.f,-28.f,-28.f},/*8000*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-28.f,-28.f,-28.f},/*11500*/
-   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-28.f},/*16000*/
+  {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*63*/
+   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*88*/
+   {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*175*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*250*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*350*/
+   {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*500*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*700*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-24.f,-24.f,-24.f},/*1000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*1400*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2400*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*4000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-24.f,-24.f,-24.f},/*5600*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*8000*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*11500*/
+   {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f},/*16000*/
   },
 
   1,/*noisemaskp */
-  -10.f,  /* suppress any noise curve over maxspec+n */
+  -20.f,  /* suppress any noise curve over maxspec+n */
   .5f,   /* low window */
   .5f,   /* high window */
   5,
@@ -116,28 +116,28 @@
    .000f, 0.f,/*250*/
    .000f, 0.f,/*350*/
    .000f, 0.f,/*500*/
-   .000f, 0.f,/*700*/
-   .200f, 0.f,/*1000*/
+   .200f, 0.f,/*700*/
+   .300f, 0.f,/*1000*/
    .300f, 0.f,/*1400*/
-   .400f, 0.f,/*2000*/
-   .600f, -2.f,/*2800*/
-   .600f, -2.f,/*4000*/
-   .700f, -2.f,/*5600*/
-   .850f, -2.f,/*8000*/
-   .850f, -1.f,/*11500*/
-   .850f,  0.f,/*16000*/
+   .300f, 0.f,/*2000*/
+   .300f, 0.f,/*2800*/
+   .500f, 0.f,/*4000*/
+   .600f, 0.f,/*5600*/
+   .700f, 0.f,/*8000*/
+   .700f, 0.f,/*11500*/
+   .700f, 1.f,/*16000*/
   },
-
+ 
   105.f,  /* even decade + 5 is important; saves an rint() later in a
             tight loop) */
-  -28.,
+  -26.,
 
   -0., -.004   /* attack/decay control */
 };
 
 static vorbis_info_psy _psy_set_C={
   1,/*athp*/
-  0,/*decayp*/
+  1,/*decayp*/
 
   -100.f,
   -140.f,
@@ -153,15 +153,7 @@
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*175*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*250*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*350*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*500*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*700*/
-
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
+
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
@@ -175,9 +167,9 @@
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
 
-   {-30.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
-   {-30.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/
-   {-30.f,-35.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/
+   {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+   {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/
+   {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/
 
   },
 
@@ -202,7 +194,7 @@
   },
 
   1,/*noisemaskp */
-  -15.f,  /* suppress any noise curve over maxspec+n */
+  -28.f,  /* suppress any noise curve over maxspec+n */
   .5f,   /* low window */
   .5f,   /* high window */
   25,
@@ -214,16 +206,16 @@
    .000f, 0.f, /*250*/
    .000f, 0.f, /*350*/
    .000f, 0.f, /*500*/
-   .200f, -6.f, /*700*/
-   .300f, -6.f, /*1000*/
-   .400f, -6.f, /*1400*/
-   .400f, -6.f, /*2000*/
-   .400f, -6.f, /*2800*/
-   .700f, -6.f, /*4000*/
-   .850f, -6.f, /*5600*/
-   .850f, -5.f, /*8000*/
-   .850f, -4.f, /*11500*/
-   .850f, -3.f, /*16000*/
+   .000f, 0.f, /*700*/
+   .200f, 0.f, /*1000*/
+   .300f, 0.f, /*1400*/
+   .300f, 0.f, /*2000*/
+   .300f, 0.f, /*2800*/
+   .300f, 0.f, /*4000*/
+   .400f, 0.f, /*5600*/
+   .600f, 0.f, /*8000*/
+   .600f, 0.f, /*11500*/
+   .650f, 0.f, /*16000*/
   },
  
   105.f,  /* even decade + 5 is important; saves an rint() later in a
@@ -249,11 +241,11 @@
                                             {4,4,4,4,4},
                                             {99,99,99,99,99}};
 
-static vorbis_info_residue0 _residue_set1C={0,1024, 32,10,5,
+static vorbis_info_residue0 _residue_set1C={0, 960, 32,10,5,
                                             {0,1,1,1,1,1,1,1,1,1},
                                             {11,12,13,14,15,16,17,18,19},
                                            
-					    {0,8,9999,18,9999,
+					    {0,8,9999,16,9999,
                                              24,9999,9999,9999},
                                             {999.f,1.5f,1.5f,2.5f,2.5f,
                                              6.5f,6.5f,14.5f,30.f},
@@ -310,10 +302,11 @@
   },
   /* psy */
   {&_psy_set_C0,&_psy_set_C},
+
   /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
   256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-
-  -15., 
+  
+  -10., 
 
   0,
 };

1.12      +54 -62    vorbis/lib/modes/mode_D.h

Index: mode_D.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_D.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mode_D.h	2001/02/15 19:06:02	1.11
+++ mode_D.h	2001/02/18 09:53:12	1.12
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: mode_D.h,v 1.11 2001/02/15 19:06:02 xiphmont Exp $
+ last mod: $Id: mode_D.h,v 1.12 2001/02/18 09:53:12 xiphmont Exp $
 
  ********************************************************************/
 
@@ -47,7 +47,7 @@
 
 static vorbis_info_psy _psy_set_D0={
   1,/*athp*/
-  0,/*decayp*/
+  1,/*decayp*/
 
   -100.,
   -140.,
@@ -70,40 +70,39 @@
    {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/
    {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/
 
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
    {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
    {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
-   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
+   {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
   },
 
   1,/* peakattp */
-  {{-20.f,-20.f,-20.f,-20.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-21.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*175*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*250*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*350*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*500*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*700*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*1000*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*1400*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*2000*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*2800*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f,-28.f,-28.f},/*4000*/
-
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-28.f,-28.f,-28.f},/*5600*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-28.f,-28.f,-28.f},/*8000*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-28.f,-28.f,-28.f},/*11500*/
-   {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-28.f},/*16000*/
+  {{-16.f,-20.f,-20.f,-22.f,-22.f,-22.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*63*/
+   {-16.f,-20.f,-20.f,-22.f,-22.f,-22.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*88*/
+   {-16.f,-20.f,-20.f,-22.f,-22.f,-22.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*125*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*175*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*250*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*350*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*500*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*700*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*1000*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-26.f,-26.f,-26.f,-26.f},/*2000*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-26.f,-26.f,-26.f,-26.f},/*2000*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-26.f,-26.f,-26.f,-26.f},/*2600*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-26.f,-26.f,-26.f,-26.f},/*4000*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f},/*5600*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f},/*8000*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f},/*11500*/
+   {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f},/*16000*/
   },
 
   1,/*noisemaskp */
-  -15.f,  /* suppress any noise curve over maxspec+n */
+  -20.f,  /* suppress any noise curve over maxspec+n */
   .5f,   /* low window */
   .5f,   /* high window */
   5,
@@ -115,28 +114,28 @@
    .000f, 0.f,/*250*/
    .000f, 0.f,/*350*/
    .000f, 0.f,/*500*/
-   .000f, 0.f,/*700*/
-   .000f,  0.f,/*1000*/
-   .000f,  0.f,/*1400*/
-   .000f,  0.f,/*2000*/
-   .600f, -6.f,/*2800*/
-   .600f, -6.f,/*4000*/
-   .700f, -6.f,/*5600*/
-   .850f, -6.f,/*8000*/
-   .850f, -5.f,/*11500*/
-   .850f, -4.f,/*16000*/
+   .100f, 0.f,/*700*/
+   .100f, 0.f,/*1000*/
+   .100f, 0.f,/*1400*/
+   .100f, 0.f,/*2000*/
+   .100f, 0.f,/*2800*/
+   .200f, 0.f,/*4000*/
+   .300f, 0.f,/*5600*/
+   .400f, 0.f,/*8000*/
+   .400f, 0.f,/*11500*/
+   .400f, 0.f,/*16000*/
   },
-
+ 
   105.f,  /* even decade + 5 is important; saves an rint() later in a
             tight loop) */
-  -30.,
+  -28.,
 
   -0., -.004   /* attack/decay control */
 };
 
 static vorbis_info_psy _psy_set_D={
   1,/*athp*/
-  0,/*decayp*/
+  1,/*decayp*/
 
   -100.f,
   -140.f,
@@ -152,15 +151,7 @@
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*175*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*250*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*350*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*500*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*700*/
-
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
+
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
@@ -174,9 +165,9 @@
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
    {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
 
-   {-30.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
-   {-30.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/
-   {-30.f,-35.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/
+   {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+   {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/
+   {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/
 
   },
 
@@ -201,7 +192,7 @@
   },
 
   1,/*noisemaskp */
-  -15.f,  /* suppress any noise curve over maxspec+n */
+  -28.f,  /* suppress any noise curve over maxspec+n */
   .5f,   /* low window */
   .5f,   /* high window */
   25,
@@ -218,11 +209,11 @@
    .000f, 0.f, /*1400*/
    .000f, 0.f, /*2000*/
    .000f, 0.f, /*2800*/
-   .000f, 0.f, /*4000*/
-   .500f, -12.f, /*5600*/
-   .500f, -12.f, /*8000*/
-   .500f, -10.f, /*11500*/
-   .500f, -10.f, /*16000*/
+   .050f, 0.f, /*4000*/
+   .100f, 0.f, /*5600*/
+   .100f, 0.f, /*8000*/
+   .120f, 0.f, /*11500*/
+   .150f, 0.f, /*16000*/
   },
  
   105.f,  /* even decade + 5 is important; saves an rint() later in a
@@ -307,10 +298,11 @@
   },
   /* psy */
   {&_psy_set_D0,&_psy_set_D},
-  /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
-  256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
 
-  -15., 
+  /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+  256, {26.f,26.f,26.f,30.f}, {-36.f,-36.f,-36.f,-36.f}, -90.f,
+  
+  -10., 
 
   0,
 };

1.10      +74 -114   vorbis/lib/modes/mode_E.h

Index: mode_E.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_E.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mode_E.h	2001/02/15 19:06:02	1.9
+++ mode_E.h	2001/02/18 09:53:12	1.10
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: mode_E.h,v 1.9 2001/02/15 19:06:02 xiphmont Exp $
+ last mod: $Id: mode_E.h,v 1.10 2001/02/18 09:53:12 xiphmont Exp $
 
  ********************************************************************/
 
@@ -47,7 +47,7 @@
 
 static vorbis_info_psy _psy_set_E0={
   1,/*athp*/
-  0,/*decayp*/
+  1,/*decayp*/
 
   -100.,
   -140.,
@@ -70,73 +70,55 @@
    {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/
    {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/
 
-   {-35.,-35.,-35.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*1000*/
-   {-35.,-35.,-35.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*1400*/
-   {-45.,-45.,-45.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*2000*/
-   {-45.,-45.,-45.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*2800*/
-   {-35.,-35.,-35.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*4000*/
-   {-35.,-35.,-35.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*5600*/
-   {-35.,-35.,-35.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*8000*/
-   {-35.,-35.,-35.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*11500*/
-   {-35.,-35.,-35.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*16000*/
+   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
+   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
+   {-40.,-45.,-45.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*2000*/
+   {-40.,-45.,-45.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*2800*/
+   {-40.,-45.,-45.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*4000*/
+   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
+   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
+   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
+   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
   },
 
   1,/* peakattp */
-  {{-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*175*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*250*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*350*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*500*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*700*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*1000*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*1400*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*2000*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*2800*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*4000*/
-
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*5600*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*8000*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*11500*/
-   {-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-28.f},/*16000*/
+  {{-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*63*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*88*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*125*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*175*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*250*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*350*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*500*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*700*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*1000*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*1400*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*2000*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*2600*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*4000*/
+   {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*5600*/
+   {-20.f,-22.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*8000*/
+   {-20.f,-22.f,-22.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*11500*/
+   {-16.f,-20.f,-22.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*16000*/
   },
 
-  1,/*noisemaskp */
-  -30.f,  /* suppress any noise curve over maxspec+n */
+  0,/*noisemaskp */
+  -20.f,  /* suppress any noise curve over maxspec+n */
   .5f,   /* low window */
   .5f,   /* high window */
   5,
   5,
-  {.000f, 0.f,/*63*/
-   .000f, 0.f,/*88*/
-   .000f, 0.f,/*125*/
-   .000f, 0.f,/*175*/
-   .000f, 0.f,/*250*/
-   .000f, 0.f,/*350*/
-   .000f, 0.f,/*500*/
-   .000f, 0.f,/*700*/
-   .000f,  0.f,/*1000*/
-   .000f,  0.f,/*1400*/
-   .000f,  0.f,/*2000*/
-   .000f,  0.f,/*2800*/
-   .000f,  0.f,/*4000*/
-   .500f, -6.f,/*5600*/
-   .500f, -6.f,/*8000*/
-   .500f, -5.f,/*11500*/
-   .500f, -4.f,/*16000*/
-  },
-
+  {0.f},
+ 
   105.f,  /* even decade + 5 is important; saves an rint() later in a
             tight loop) */
-  -32.,
+  -28.,
 
   -0., -.004   /* attack/decay control */
 };
 
 static vorbis_info_psy _psy_set_E={
   1,/*athp*/
-  0,/*decayp*/
+  1,/*decayp*/
 
   -100.f,
   -140.f,
@@ -152,76 +134,53 @@
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
    {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*175*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*250*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*350*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*500*/
-   //   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*700*/
-
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
-   //   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*175*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*250*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*350*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*500*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*700*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*1000*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*1400*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*2000*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*2800*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*4000*/
-   {-45.f,-45.f,-45.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*5600*/
-   {-35.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*8000*/
-   {-35.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*11500*/
-   {-35.f,-35.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*16000*/
 
+   {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*175*/
+   {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*250*/
+   {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*350*/
+   {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*500*/
+   {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*700*/
+
+   {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*1000*/
+   {-40.f,-45.f,-50.f,-50.f,-50.f,-60.f,-70.f,-80.f,-90.f,-99.f,-110.f}, /*1400*/
+   {-40.f,-45.f,-50.f,-50.f,-50.f,-60.f,-70.f,-80.f,-90.f,-99.f,-110.f}, /*2000*/
+   {-40.f,-45.f,-50.f,-50.f,-50.f,-60.f,-70.f,-80.f,-90.f,-99.f,-110.f}, /*2800*/
+   {-40.f,-45.f,-50.f,-50.f,-50.f,-60.f,-70.f,-80.f,-90.f,-99.f,-110.f}, /*4000*/
+   {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*5600*/
+
+   {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*8000*/
+   {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*11500*/
+   {-40.f,-40.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*16000*/
+
   },
 
   1,
-  {{-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*175*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*250*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*350*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*500*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*700*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*1000*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*1400*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*2800*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*2800*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*4000*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*5600*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*8000*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*11500*/
-   {-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*16000*/
+  {{-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/
+   {-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/
+   {-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/
+   {-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*175*/
+   {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*250*/
+   {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*350*/
+   {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*500*/
+   {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*700*/
+   {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*1000*/
+   {-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*1400*/
+   {-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*2000*/
+   {-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*2800*/
+   {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*4000*/
+   {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f},/*5600*/
+   {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f},/*8000*/
+   {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f},/*11500*/
+   {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f},/*16000*/
   },
 
   0,/*noisemaskp */
-  -15.f,  /* suppress any noise curve over maxspec+n */
+  -28.f,  /* suppress any noise curve over maxspec+n */
   .5f,   /* low window */
   .5f,   /* high window */
   25,
   25,
-  {.000f, 0.f, /*63*/
-   .000f, 0.f, /*88*/
-   .000f, 0.f, /*125*/
-   .000f, 0.f, /*175*/
-   .000f, 0.f, /*250*/
-   .000f, 0.f, /*350*/
-   .000f, 0.f, /*500*/
-   .000f, 0.f, /*700*/
-   .000f, 0.f, /*1000*/
-   .000f, 0.f, /*1400*/
-   .000f, 0.f, /*2000*/
-   .000f, 0.f, /*2800*/
-   .000f, 0.f, /*4000*/
-   .500f, -12.f, /*5600*/
-   .500f, -12.f, /*8000*/
-   .500f, -10.f, /*11500*/
-   .500f, -10.f, /*16000*/
-  },
+  {0.f},
  
   105.f,  /* even decade + 5 is important; saves an rint() later in a
             tight loop) */
@@ -305,10 +264,11 @@
   },
   /* psy */
   {&_psy_set_E0,&_psy_set_E},
-  /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
-  256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
 
-  -15., 
+  /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+  256, {26.f,26.f,26.f,30.f}, {-36.f,-36.f,-36.f,-36.f}, -90.f,
+  
+  -10., 
 
   0,
 };

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.



More information about the commits mailing list