[xiph-cvs] cvs commit: vorbis/vq 44c0.vqs 44c1.vqs 44c2.vqs 44c3.vqs 44c4.vqs 44c5.vqs 44c6.vqs 44c7.vqs 44c8.vqs 44c9.vqs 44u0.vqs 44u4.vqs 44u7.vqs 44c0_s4.vqs 44c1_s3.vqs 44c2_s2.vqs 44c3_s2.vqs 44c4_s1.vqs 44c5_s0.vqs 44c6_s0.vqs 44c7_s0.vqs 44c8_s0.vqs 44c9_s0.vqs

Monty xiphmont at xiph.org
Tue Dec 18 17:10:33 PST 2001



xiphmont    01/12/18 17:10:30

  Modified:    examples encoder_example.c
               lib      bitrate.c block.c codec_internal.h info.c
                        mapping0.c os.h psy.c psy.h res0.c vorbisenc.c
               lib/books/coupled _44c0_long.vqh _44c0_s0_p1_0.vqh
                        _44c0_s0_p2_0.vqh _44c0_s0_p3_0.vqh
                        _44c0_s0_p4_0.vqh _44c0_s0_p4_1.vqh
                        _44c0_s1_p5_0.vqh _44c0_s1_p6_0.vqh
                        _44c0_s2_p6_0.vqh _44c0_s2_p7_0.vqh _44c0_short.vqh
                        _44c1_long.vqh _44c1_s0_p1_0.vqh _44c1_s0_p2_0.vqh
                        _44c1_s0_p3_0.vqh _44c1_s0_p4_0.vqh
                        _44c1_s0_p4_1.vqh _44c1_s1_p5_0.vqh
                        _44c1_s2_p6_0.vqh _44c1_s3_p7_0.vqh
                        _44c1_s3_p7_1.vqh _44c1_s3_p7_2.vqh _44c1_short.vqh
                        _44c2_long.vqh _44c2_s0_p1_0.vqh _44c2_s0_p2_0.vqh
                        _44c2_s0_p3_0.vqh _44c2_s0_p4_0.vqh
                        _44c2_s0_p4_1.vqh _44c2_s1_p5_0.vqh
                        _44c2_s2_p6_0.vqh _44c2_s2_p7_0.vqh
                        _44c2_s2_p7_1.vqh _44c2_s2_p7_2.vqh _44c2_short.vqh
                        _44c3_long.vqh _44c3_s0_p1_0.vqh _44c3_s0_p2_0.vqh
                        _44c3_s0_p3_0.vqh _44c3_s0_p4_0.vqh
                        _44c3_s0_p4_1.vqh _44c3_s1_p5_0.vqh
                        _44c3_s2_p6_0.vqh _44c3_s2_p7_0.vqh
                        _44c3_s2_p7_1.vqh _44c3_s2_p7_2.vqh _44c3_short.vqh
                        _44c4_long.vqh _44c4_s0_p1_0.vqh _44c4_s0_p3_0.vqh
                        _44c4_s0_p5_0.vqh _44c4_s1_p2_0.vqh
                        _44c4_s1_p4_0.vqh _44c4_s1_p6_0.vqh
                        _44c4_s1_p7_0.vqh _44c4_s1_p7_1.vqh
                        _44c4_s1_p8_0.vqh _44c4_s1_p8_1.vqh
                        _44c4_s1_p9_0.vqh _44c4_s1_p9_1.vqh
                        _44c4_s1_p9_2.vqh _44c4_short.vqh _44c5_long.vqh
                        _44c5_s0_p1_0.vqh _44c5_s0_p2_0.vqh
                        _44c5_s0_p3_0.vqh _44c5_s0_p4_0.vqh
                        _44c5_s0_p5_0.vqh _44c5_s0_p6_0.vqh
                        _44c5_s0_p7_0.vqh _44c5_s0_p7_1.vqh
                        _44c5_s0_p8_0.vqh _44c5_s0_p8_1.vqh
                        _44c5_s0_p9_0.vqh _44c5_s0_p9_1.vqh
                        _44c5_s0_p9_2.vqh _44c5_short.vqh _44c6_long.vqh
                        _44c6_s0_p1_0.vqh _44c6_s0_p2_0.vqh
                        _44c6_s0_p3_0.vqh _44c6_s0_p4_0.vqh
                        _44c6_s0_p5_0.vqh _44c6_s0_p6_0.vqh
                        _44c6_s0_p7_0.vqh _44c6_s0_p7_1.vqh
                        _44c6_s0_p8_0.vqh _44c6_s0_p8_1.vqh
                        _44c6_s0_p9_0.vqh _44c6_s0_p9_1.vqh
                        _44c6_s0_p9_2.vqh _44c6_short.vqh _44c7_long.vqh
                        _44c7_s0_p1_0.vqh _44c7_s0_p1_1.vqh
                        _44c7_s0_p2_0.vqh _44c7_s0_p2_1.vqh
                        _44c7_s0_p3_0.vqh _44c7_s0_p4_0.vqh
                        _44c7_s0_p5_0.vqh _44c7_s0_p6_0.vqh
                        _44c7_s0_p6_1.vqh _44c7_s0_p7_0.vqh
                        _44c7_s0_p7_1.vqh _44c7_s0_p8_0.vqh
                        _44c7_s0_p8_1.vqh _44c7_s0_p9_0.vqh
                        _44c7_s0_p9_1.vqh _44c7_s0_p9_2.vqh _44c7_short.vqh
                        _44c8_long.vqh _44c8_s0_p1_0.vqh _44c8_s0_p1_1.vqh
                        _44c8_s0_p2_0.vqh _44c8_s0_p2_1.vqh
                        _44c8_s0_p3_0.vqh _44c8_s0_p4_0.vqh
                        _44c8_s0_p5_0.vqh _44c8_s0_p6_0.vqh
                        _44c8_s0_p6_1.vqh _44c8_s0_p7_0.vqh
                        _44c8_s0_p7_1.vqh _44c8_s0_p8_0.vqh
                        _44c8_s0_p8_1.vqh _44c8_s0_p9_0.vqh
                        _44c8_s0_p9_1.vqh _44c8_s0_p9_2.vqh _44c8_short.vqh
                        _44c9_long.vqh _44c9_s0_p1_0.vqh _44c9_s0_p1_1.vqh
                        _44c9_s0_p2_0.vqh _44c9_s0_p2_1.vqh
                        _44c9_s0_p3_0.vqh _44c9_s0_p4_0.vqh
                        _44c9_s0_p5_0.vqh _44c9_s0_p6_0.vqh
                        _44c9_s0_p6_1.vqh _44c9_s0_p7_0.vqh
                        _44c9_s0_p7_1.vqh _44c9_s0_p8_0.vqh
                        _44c9_s0_p8_1.vqh _44c9_s0_p9_0.vqh
                        _44c9_s0_p9_1.vqh _44c9_s0_p9_2.vqh _44c9_short.vqh
               lib/books/floor line_1024x31_0sub0.vqh
                        line_1024x31_0sub1.vqh line_1024x31_1sub0.vqh
                        line_1024x31_1sub1.vqh line_1024x31_2sub1.vqh
                        line_1024x31_2sub2.vqh line_1024x31_2sub3.vqh
                        line_1024x31_3sub1.vqh line_1024x31_3sub2.vqh
                        line_1024x31_3sub3.vqh line_1024x31_class0.vqh
                        line_1024x31_class1.vqh line_1024x31_class2.vqh
                        line_1024x31_class3.vqh line_128x19_0sub0.vqh
                        line_128x19_1sub1.vqh line_128x19_1sub2.vqh
                        line_128x19_1sub3.vqh line_128x19_2sub1.vqh
                        line_128x19_2sub2.vqh line_128x19_2sub3.vqh
                        line_128x19_class1.vqh line_128x19_class2.vqh
                        line_128x7_0sub0.vqh line_128x7_1sub2.vqh
                        line_128x7_1sub3.vqh line_128x7_2sub3.vqh
                        line_128x7_class1.vqh line_128x7_class2.vqh
                        line_128x9_0sub0.vqh line_128x9_1sub1.vqh
                        line_128x9_1sub2.vqh line_128x9_1sub3.vqh
                        line_128x9_2sub2.vqh line_128x9_2sub3.vqh
                        line_128x9_class1.vqh line_128x9_class2.vqh
               lib/books/uncoupled _44u0_p0_r0.vqh _44u0_p0_r1.vqh
                        _44u0_p1_0.vqh _44u0_p1_r0.vqh _44u0_p1_r1.vqh
                        _44u0_p2_0.vqh _44u0_p3_0.vqh _44u0_p4_0.vqh
                        _44u0_p4_1.vqh _44u0_p5_0.vqh _44u0_p6_0.vqh
                        _44u0_p7_0.vqh _44u0_p7_1.vqh _44u0_p7_2.vqh
                        _44u4_p0_r0.vqh _44u4_p0_r1.vqh _44u4_p1_0.vqh
                        _44u4_p1_r0.vqh _44u4_p1_r1.vqh _44u4_p2_0.vqh
                        _44u4_p3_0.vqh _44u4_p4_0.vqh _44u4_p5_0.vqh
                        _44u4_p6_0.vqh _44u4_p7_0.vqh _44u4_p7_1.vqh
                        _44u4_p8_0.vqh _44u4_p8_1.vqh _44u4_p9_0.vqh
                        _44u4_p9_1.vqh _44u4_p9_2.vqh _44u7_p0_r0.vqh
                        _44u7_p0_r1.vqh _44u7_p1_0.vqh _44u7_p1_r0.vqh
                        _44u7_p1_r1.vqh _44u7_p2_0.vqh _44u7_p2_1.vqh
                        _44u7_p3_0.vqh _44u7_p4_0.vqh _44u7_p5_0.vqh
                        _44u7_p6_0.vqh _44u7_p7_0.vqh _44u7_p7_1.vqh
                        _44u7_p8_0.vqh _44u7_p8_1.vqh _44u7_p9_0.vqh
                        _44u7_p9_1.vqh _44u7_p9_2.vqh
               lib/modes psych_44.h residue_44.h
               vq       44u0.vqs 44u4.vqs 44u7.vqs
  Added:       lib/books/coupled _44c0_s0_p0_r0.vqh _44c0_s0_p0_r1.vqh
                        _44c0_s0_p5_0.vqh _44c0_s0_p6_0.vqh
                        _44c0_s0_p7_0.vqh _44c0_s0_p7_1.vqh
                        _44c0_s0_p7_2.vqh _44c0_s0_pN_r0.vqh
                        _44c0_s0_pN_r1.vqh _44c0_s1_p5_s0.vqh
                        _44c0_s1_p6_s0.vqh _44c0_s1_p7_0.vqh
                        _44c0_s1_p7_1.vqh _44c0_s1_p7_2.vqh
                        _44c0_s1_p7_s0.vqh _44c0_s1_pS_r0.vqh
                        _44c0_s1_pS_r1.vqh _44c0_s2_p6_s0.vqh
                        _44c0_s2_p7_1.vqh _44c0_s2_p7_2.vqh
                        _44c0_s2_p7_s0.vqh _44c0_s3_p7_0.vqh
                        _44c0_s3_p7_1.vqh _44c0_s3_p7_2.vqh
                        _44c0_s3_p7_s0.vqh _44c1_s0_p5_0.vqh
                        _44c1_s0_p6_0.vqh _44c1_s0_p7_0.vqh
                        _44c1_s0_p7_1.vqh _44c1_s0_p7_2.vqh
                        _44c1_s1_p6_0.vqh _44c1_s1_p7_0.vqh
                        _44c1_s1_p7_1.vqh _44c1_s1_p7_2.vqh
                        _44c1_s2_p7_0.vqh _44c1_s2_p7_1.vqh
                        _44c1_s2_p7_2.vqh _44c2_s0_p5_0.vqh
                        _44c2_s0_p6_0.vqh _44c2_s0_p7_0.vqh
                        _44c2_s0_p7_1.vqh _44c2_s0_p7_2.vqh
                        _44c2_s1_p6_0.vqh _44c2_s1_p7_0.vqh
                        _44c2_s1_p7_1.vqh _44c2_s1_p7_2.vqh
                        _44c2_s3_p7_0.vqh _44c2_s3_p7_1.vqh
                        _44c2_s3_p7_2.vqh _44c3_s0_p5_0.vqh
                        _44c3_s0_p6_0.vqh _44c3_s0_p7_0.vqh
                        _44c3_s0_p7_1.vqh _44c3_s0_p7_2.vqh
                        _44c3_s1_p6_0.vqh _44c3_s1_p7_0.vqh
                        _44c3_s1_p7_1.vqh _44c3_s1_p7_2.vqh
                        _44c3_s3_p7_0.vqh _44c3_s3_p7_1.vqh
                        _44c3_s3_p7_2.vqh _44c4_s0_p0_r0.vqh
                        _44c4_s0_p0_r1.vqh _44c4_s0_p2_0.vqh
                        _44c4_s0_p4_0.vqh _44c4_s0_p6_0.vqh
                        _44c4_s0_p7_0.vqh _44c4_s0_p7_1.vqh
                        _44c4_s0_p8_0.vqh _44c4_s0_p8_1.vqh
                        _44c4_s0_p9_0.vqh _44c4_s0_p9_1.vqh
                        _44c4_s0_p9_2.vqh _44c4_s0_pN_r0.vqh
                        _44c4_s0_pN_r1.vqh _44c4_s1_p2_s0.vqh
                        _44c4_s1_p4_s0.vqh _44c4_s1_p6_s0.vqh
                        _44c4_s1_p7_s0.vqh _44c4_s1_p8_s0.vqh
                        _44c4_s1_p9_s0.vqh _44c4_s1_pS_r0.vqh
                        _44c4_s1_pS_r1.vqh _44c4_s2_p6_0.vqh
                        _44c4_s2_p6_s0.vqh _44c4_s2_p7_0.vqh
                        _44c4_s2_p7_1.vqh _44c4_s2_p7_s0.vqh
                        _44c4_s2_p8_0.vqh _44c4_s2_p8_1.vqh
                        _44c4_s2_p8_s0.vqh _44c4_s2_p9_0.vqh
                        _44c4_s2_p9_1.vqh _44c4_s2_p9_2.vqh
                        _44c4_s2_p9_s0.vqh _44c4_s3_p7_0.vqh
                        _44c4_s3_p7_1.vqh _44c4_s3_p8_0.vqh
                        _44c4_s3_p8_1.vqh _44c4_s3_p9_0.vqh
                        _44c4_s3_p9_1.vqh _44c4_s3_p9_2.vqh
                        _44c4_s3_p9_s0.vqh _44c5_s1_p2_0.vqh
                        _44c5_s1_p4_0.vqh _44c5_s1_p6_0.vqh
                        _44c5_s1_p7_0.vqh _44c5_s1_p7_1.vqh
                        _44c5_s1_p8_0.vqh _44c5_s1_p8_1.vqh
                        _44c5_s1_p9_0.vqh _44c5_s1_p9_1.vqh
                        _44c5_s1_p9_2.vqh _44c5_s2_p6_0.vqh
                        _44c5_s2_p7_0.vqh _44c5_s2_p7_1.vqh
                        _44c5_s2_p8_0.vqh _44c5_s2_p8_1.vqh
                        _44c5_s2_p9_0.vqh _44c5_s2_p9_1.vqh
                        _44c5_s2_p9_2.vqh _44c5_s3_p7_0.vqh
                        _44c5_s3_p7_1.vqh _44c5_s3_p8_0.vqh
                        _44c5_s3_p8_1.vqh _44c5_s3_p9_0.vqh
                        _44c5_s3_p9_1.vqh _44c5_s3_p9_2.vqh
                        _44c6_s1_p2_0.vqh _44c6_s1_p4_0.vqh
                        _44c6_s1_p6_0.vqh _44c6_s1_p7_0.vqh
                        _44c6_s1_p7_1.vqh _44c6_s1_p8_0.vqh
                        _44c6_s1_p8_1.vqh _44c6_s1_p9_0.vqh
                        _44c6_s1_p9_1.vqh _44c6_s1_p9_2.vqh
                        _44c6_s2_p6_0.vqh _44c6_s2_p7_0.vqh
                        _44c6_s2_p7_1.vqh _44c6_s2_p8_0.vqh
                        _44c6_s2_p8_1.vqh _44c6_s2_p9_0.vqh
                        _44c6_s2_p9_1.vqh _44c6_s2_p9_2.vqh
                        _44c6_s3_p7_0.vqh _44c6_s3_p7_1.vqh
                        _44c6_s3_p8_0.vqh _44c6_s3_p8_1.vqh
                        _44c6_s3_p9_0.vqh _44c6_s3_p9_1.vqh
                        _44c6_s3_p9_2.vqh _44c7_s0_p0_r0.vqh
                        _44c7_s0_p0_r1.vqh _44c7_s0_pN_r0.vqh
                        _44c7_s0_pN_r1.vqh
               vq       44c0.vqs 44c1.vqs 44c2.vqs 44c3.vqs 44c4.vqs
                        44c5.vqs 44c6.vqs 44c7.vqs 44c8.vqs 44c9.vqs
  Removed:     vq       44c0_s4.vqs 44c1_s3.vqs 44c2_s2.vqs 44c3_s2.vqs
                        44c4_s1.vqs 44c5_s0.vqs 44c6_s0.vqs 44c7_s0.vqs
                        44c8_s0.vqs 44c9_s0.vqs
  Log:
  Merge infrastructure work; full books

Revision  Changes    Path
1.30      +1 -1      vorbis/examples/encoder_example.c

Index: encoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/encoder_example.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- encoder_example.c	2001/12/19 00:48:41	1.29
+++ encoder_example.c	2001/12/19 01:08:13	1.30
@@ -7,11 +7,11 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
-
+ *                                                                  *
  ********************************************************************
 
  function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.29 2001/12/19 00:48:41 xiphmont Exp $
+ last mod: $Id: encoder_example.c,v 1.30 2001/12/19 01:08:13 xiphmont Exp $
 
  ********************************************************************/
 

1.4       +7 -7      vorbis/lib/bitrate.c

Index: bitrate.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/bitrate.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bitrate.c	2001/12/14 07:21:16	1.3
+++ bitrate.c	2001/12/19 01:08:13	1.4
@@ -11,13 +11,12 @@
  ********************************************************************
 
  function: bitrate tracking and management
- last mod: $Id: bitrate.c,v 1.3 2001/12/14 07:21:16 xiphmont Exp $
+ last mod: $Id: bitrate.c,v 1.4 2001/12/19 01:08:13 xiphmont Exp $
 
  ********************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 #include <math.h>
 #include <ogg/ogg.h>
@@ -265,7 +264,7 @@
      in use) are taken into account by the min/max limiter (if min/max
      is in use) */
   if(bm->avg_binacc){
-    long desired_center=bm->avg_centerdesired;
+    unsigned long desired_center=bm->avg_centerdesired;
     if(eofflag)desired_center=0;
 
     /* update the avg head */
@@ -336,13 +335,13 @@
       if(bm->noisetrigger_postpone<=0){
         if(bm->noisetrigger_request<0.){
           bm->avgnoise-=1.f;
-	  if(bm->noisetrigger_request<bm->avg_sampleacc/2)
+	  if(bm->noisetrigger_request<(signed long)(bm->avg_sampleacc)/2)
             bm->avgnoise-=1.f;
           bm->noisetrigger_postpone=bm->avg_sampleacc/2;
         }
         if(bm->noisetrigger_request>0.){
           bm->avgnoise+=1.f;
-	  if(bm->noisetrigger_request>bm->avg_sampleacc/2)
+	  if(bm->noisetrigger_request>(signed long)(bm->avg_sampleacc)/2)
             bm->avgnoise+=1.f;
           bm->noisetrigger_postpone=bm->avg_sampleacc/2;
         }
@@ -374,10 +373,11 @@
   
   /* update the min/max queues and enforce limits */
   if(bm->minmax_binstack){
-    long sampledesired=eofflag?0:bm->minmax_sampledesired;
+    unsigned long sampledesired=eofflag?0:bm->minmax_sampledesired;
 
     /* add to stack recent */
     while(minmax_head!=new_minmax_head){
+      unsigned int i;
       int samples=ci->blocksizes[bm->queue_actual[minmax_head]&
                                 0x80000000UL?1:0]>>1;
 
@@ -401,7 +401,7 @@
     -bin+1  minmax[0]       <-> floater limited to 1
             limited to zero (val= -bin) is implicit
         */
-      for(i=0;i<bins;i++){
+      for(i=0;i<(unsigned int)bins;i++){
         bm->minmax_binstack[bm->minmax_stackptr*bins*2+bins+i]+=
           LACING_ADJUST(
           BINBITS(minmax_head,

1.52      +1 -14     vorbis/lib/block.c

Index: block.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/block.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- block.c	2001/12/12 09:45:24	1.51
+++ block.c	2001/12/19 01:08:13	1.52
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.51 2001/12/12 09:45:24 xiphmont Exp $
+ last mod: $Id: block.c,v 1.52 2001/12/19 01:08:13 xiphmont Exp $
 
  Handle windowing, overlap-add, etc of the PCM vectors.  This is made
  more amusing by Vorbis' current two allowed block sizes.
@@ -379,7 +379,6 @@
   return(v->pcmret);
 }
 
-static int seq=0;
 static void _preextrapolate_helper(vorbis_dsp_state *v){
   int i;
   int order=32;
@@ -394,12 +393,8 @@
       for(j=0;j<v->pcm_current;j++)
         work[j]=v->pcm[i][v->pcm_current-j-1];
       
-      _analysis_output("preextrap",seq,v->pcm[i],v->pcm_current,0,0);
-      _analysis_output("workextrap",seq,work,v->pcm_current,0,0);
-
       /* prime as above */
       vorbis_lpc_from_data(work,lpc,v->pcm_current-v->centerW,order);
-      _analysis_output("lpc",seq,lpc,order,0,0);
       
       /* run the predictor filter */
       vorbis_lpc_predict(lpc,work+v->pcm_current-v->centerW-order,
@@ -407,13 +402,9 @@
                          work+v->pcm_current-v->centerW,
                          v->centerW);
 
-      _analysis_output("extrap",seq,work,v->pcm_current,0,0);
-
-
       for(j=0;j<v->pcm_current;j++)
         v->pcm[i][v->pcm_current-j-1]=work[j];
 
-      _analysis_output("postextrap",seq++,v->pcm[i],v->pcm_current,0,0);
     }
   }
 }
@@ -735,7 +726,6 @@
     }
 
     for(j=0;j<vi->channels;j++){
-      static int seq=0;
       float *pcm=v->pcm[j]+beginW;
       float *p=vb->pcm[j];
 
@@ -746,9 +736,6 @@
       for(;i<sizeW;i++)
         pcm[i]=p[i];
 
-      //_analysis_output("lapped",seq,pcm,sizeW,0,0);
-      //_analysis_output("buffered",seq++,v->pcm[j],sizeW+beginW,0,0);
-    
     }
 
     /* deal with initial packet state; we do this using the explicit

1.11      +45 -2     vorbis/lib/codec_internal.h

Index: codec_internal.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/codec_internal.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- codec_internal.h	2001/12/12 09:45:24	1.10
+++ codec_internal.h	2001/12/19 01:08:13	1.11
@@ -10,7 +10,7 @@
  ********************************************************************
 
  function: libvorbis codec headers
- last mod: $Id: codec_internal.h,v 1.10 2001/12/12 09:45:24 xiphmont Exp $
+ last mod: $Id: codec_internal.h,v 1.11 2001/12/19 01:08:13 xiphmont Exp $
 
  ********************************************************************/
 
@@ -79,7 +79,48 @@
 
 } backend_lookup_state;
 
-/* vorbis_info contains all the setup information specific to the
+/* high level configuration information for setting things up
+   step-by-step with the detaile vorbis_encode_ctl interface */
+
+typedef struct highlevel_block {
+  double tone_mask_quality;
+  double tone_peaklimit_quality;
+
+  double noise_bias_quality;
+  double noise_compand_quality;
+
+  double ath_quality;
+
+} highlevel_block;
+
+typedef struct highlevel_encode_setup {
+  double base_quality;       /* these have to be tracked by the ctl */
+  double base_quality_short; /* interface so that the right books get */
+  double base_quality_long;  /* chosen... */
+
+  int short_block_p;
+  int long_block_p;
+  int impulse_block_p;
+
+  int stereo_couple_p;
+  int stereo_backfill_p;
+  int residue_backfill_p;
+
+  int    stereo_point_dB;
+  double stereo_point_kHz[2];
+  double lowpass_kHz[2];
+
+  double ath_floating_dB;
+  double ath_absolute_dB;
+
+  double amplitude_track_dBpersec;
+  double trigger_quality;
+
+  highlevel_block blocktype[4]; /* impulse, padding, trans, long */
+  
+} highlevel_encode_setup;
+
+/* codec_setup_info contains all the setup information specific to the
    specific compression/decompression mode in progress (eg,
    psychoacoustic settings, channel setup, options, codebook
    etc).  
@@ -118,7 +159,9 @@
 
   vorbis_info_psy        *psy_param[64]; /* encode only */
   vorbis_info_psy_global psy_g_param;
+
   bitrate_manager_info   bi;
+  highlevel_encode_setup hi;
 
   int    passlimit[32];     /* iteration limit per couple/quant pass */
   int    coupling_passes;

1.50      +2 -2      vorbis/lib/info.c

Index: info.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/info.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- info.c	2001/12/12 09:45:25	1.49
+++ info.c	2001/12/19 01:08:13	1.50
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.49 2001/12/12 09:45:25 xiphmont Exp $
+ last mod: $Id: info.c,v 1.50 2001/12/19 01:08:13 xiphmont Exp $
 
  ********************************************************************/
 
@@ -416,7 +416,7 @@
 }
 
 static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){
-  char temp[]="Xiphophorus libVorbis I 20011212";
+  char temp[]="Xiphophorus libVorbis I 20011217";
   int bytes = strlen(temp);
 
   /* preamble */  

1.42      +5 -26     vorbis/lib/mapping0.c

Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mapping0.c	2001/12/18 17:42:28	1.41
+++ mapping0.c	2001/12/19 01:08:14	1.42
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.41 2001/12/18 17:42:28 jack Exp $
+ last mod: $Id: mapping0.c,v 1.42 2001/12/19 01:08:14 xiphmont Exp $
 
  ********************************************************************/
 
@@ -380,14 +380,11 @@
 
     /* perform psychoacoustics; do masking */
     _vp_compute_mask(look->psy_look[blocktype],
-		     b->psy_g_look,
-		     i,
                      logfft, /* -> logmax */
                      logmdct,
                      logmask,
                      global_ampmax,
                      local_ampmax[i],
-		     ci->blocksizes[vb->lW]/2,
                      bm->avgnoise);
 
     _analysis_output("mask",seq+i,logmask,n/2,1,0);
@@ -403,12 +400,9 @@
 
 
     _vp_remove_floor(look->psy_look[blocktype],
-		     b->psy_g_look,
-		     logmdct,
                      mdct,
                      codedflr,
-		     res,
-		     local_ampmax[i]);
+		     res);
 
     /*for(j=0;j<n/2;j++)
       if(fabs(res[j])>1200){
@@ -416,7 +410,6 @@
         fprintf(stderr,"%ld ",seq+i);
         }*/
 
-    //_analysis_output("res",seq+i,res,n/2,1,0);
     _analysis_output("codedflr",seq+i,codedflr,n/2,1,1);
       
   }
@@ -495,8 +488,8 @@
                           0);
     }
 
-    //for(i=0;i<vi->channels;i++)
-    //_analysis_output("quant",seq+i,quantized[i],n/2,1,0);
+    for(i=0;i<vi->channels;i++)
+      _analysis_output("quant",seq+i,quantized[i],n/2,1,0);
 
   
     /* classify, by submap */
@@ -557,8 +550,7 @@
               lqua[j]=lpcm[j]-lsof[j];
           }
         }else{
-	  char buf[80];
-	  
+
           _vp_quantize_couple(look->psy_look[blocktype],
                               info,
                               pcm,
@@ -566,11 +558,6 @@
                               quantized,
                               nonzero,
                               i);
-	  
-	  //sprintf(buf,"quant%d",i);
-	  //for(j=0;j<vi->channels;j++)
-	  //_analysis_output(buf,seq+j,quantized[j],n/2,1,0);
-	  
         }
       }
     }
@@ -682,8 +669,6 @@
   /* only MDCT right now.... */
   for(i=0;i<vi->channels;i++){
     float *pcm=vb->pcm[i];
-    //_analysis_output("out",seq+i,pcm,n/2,1,1);
-    //_analysis_output("lout",seq+i,pcm,n/2,0,0);
     mdct_backward(b->transform[vb->W][0],pcm,pcm);
   }
 
@@ -697,14 +682,8 @@
       for(j=0;j<n;j++)
         pcm[j]=0.f;
 
-    //_analysis_output("final",seq,pcm,n,0,0);
   }
             
-  /* now apply the decoded post-window time information */
-  /* NOT IMPLEMENTED */
-
-  /*fprintf(stderr,"seq %d\r",seq);*/
-    
   /* all done! */
   return(0);
 }

1.28      +2 -2      vorbis/lib/os.h

Index: os.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/os.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- os.h	2001/08/13 01:36:57	1.27
+++ os.h	2001/12/19 01:08:14	1.28
@@ -13,7 +13,7 @@
  ********************************************************************
 
  function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os.h,v 1.27 2001/08/13 01:36:57 xiphmont Exp $
+ last mod: $Id: os.h,v 1.28 2001/12/19 01:08:14 xiphmont Exp $
 
  ********************************************************************/
 
@@ -24,7 +24,7 @@
 #  define _V_IFDEFJAIL_H_
 
 #  ifdef __GNUC__
-#    define STIN static inline
+#    define STIN static __inline__
 #  elif _WIN32
 #    define STIN static __inline
 #else

1.60      +7 -15     vorbis/lib/psy.c

Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- psy.c	2001/12/18 02:57:30	1.59
+++ psy.c	2001/12/19 01:08:14	1.60
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.59 2001/12/18 02:57:30 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.60 2001/12/19 01:08:14 xiphmont Exp $
 
  ********************************************************************/
 
@@ -650,8 +650,6 @@
 
 /* bleaugh, this is more complicated than it needs to be */
 static void max_seeds(vorbis_look_psy *p,
-		      vorbis_look_psy_global *g,
-		      int channel,
                       float *seed,
                       float *flr){
   long   n=p->total_octave_lines;
@@ -789,12 +787,9 @@
 
    
 void _vp_remove_floor(vorbis_look_psy *p,
-		      vorbis_look_psy_global *g,
-		      float *logmdct, 
                       float *mdct,
                       float *codedflr,
-		      float *residue,
-		      float local_specmax){ 
+		      float *residue){ 
   int i,n=p->n;
   
   for(i=0;i<n;i++)
@@ -806,14 +801,11 @@
   
 
 void _vp_compute_mask(vorbis_look_psy *p,
-		      vorbis_look_psy_global *g,
-		      int channel,
                       float *logfft, 
                       float *logmdct, 
                       float *logmask, 
                       float global_specmax,
                       float local_specmax,
-		      int lastsize,
                       float bitrate_noise_offset){
   int i,n=p->n;
   static int seq=0;
@@ -869,7 +861,7 @@
 
   /* tone masking */
   seed_loop(p,(const float ***)p->tonecurves,logfft,logmask,seed,global_specmax);
-  max_seeds(p,g,channel,seed,logmask);
+  max_seeds(p,seed,logmask);
 
   /* doing this here is clean, but we need to find a faster way to do
      it than to just tack it on */
@@ -1006,13 +998,13 @@
              we opt not to fill in additional resolution (in order to
              simplify the iterative codebook design and
              efficiency). */
+
+	  qM[j]=mag-sofarM[j];
+	  qA[j]=ang-sofarA[j];
          
-	  if(ang<-rqlimit || ang>rqlimit){
+	  if(qA[j]<-rqlimit || qA[j]>rqlimit){
             qM[j]=0.f;
             qA[j]=0.f;
-	  }else{ 
-	    qM[j]=mag-sofarM[j];
-	    qA[j]=ang-sofarA[j];
           }
         }
       }

1.26      +3 -9      vorbis/lib/psy.h

Index: psy.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- psy.h	2001/12/12 09:45:25	1.25
+++ psy.h	2001/12/19 01:08:15	1.26
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.25 2001/12/12 09:45:25 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.26 2001/12/19 01:08:15 xiphmont Exp $
 
  ********************************************************************/
 
@@ -116,7 +116,7 @@
 
   float *ath;
   long  *octave;             /* in n.ocshift format */
-  unsigned long *bark;
+  long  *bark;
 
   long  firstoc;
   long  shiftoc;
@@ -134,22 +134,16 @@
 extern vorbis_info_psy *_vi_psy_copy(vorbis_info_psy *i);
 
 extern void _vp_remove_floor(vorbis_look_psy *p,
-			     vorbis_look_psy_global *g,
-			     float *logmdct, 
                              float *mdct,
                              float *codedflr,
-			     float *residue,
-			     float local_specmax);
+			     float *residue);
 
 extern void   _vp_compute_mask(vorbis_look_psy *p,
-			       vorbis_look_psy_global *g,
-			       int channel,
                                float *fft, 
                                float *mdct, 
                                float *mask, 
                                float global_specmax,
                                float local_specmax,
-			       int lastsize,
                                float bitrate_noise_offset);
 
 extern void _vp_quantize_couple(vorbis_look_psy *p,

1.40      +23 -10    vorbis/lib/res0.c

Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- res0.c	2001/12/16 04:15:47	1.39
+++ res0.c	2001/12/19 01:08:15	1.40
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.39 2001/12/16 04:15:47 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.40 2001/12/19 01:08:15 xiphmont Exp $
 
  ********************************************************************/
 
@@ -56,9 +56,11 @@
 
 #ifdef TRAIN_RES
   long      *training_data[8][64];
+  float      training_max[8][64];
+  float      training_min[8][64];
   int       longp;
-  double    tmin;
-  double    tmax;
+  float     tmin;
+  float     tmax;
 #endif
 
 } vorbis_look_residue0;
@@ -88,6 +90,7 @@
     {
       int j,k,l;
       for(j=0;j<look->parts;j++){
+	fprintf(stderr,"partition %d: ",j);
         for(k=0;k<8;k++)
           if(look->training_data[k][j]){
             char buffer[80];
@@ -103,8 +106,11 @@
             
             fclose(of);
             
+	    fprintf(stderr,"%d(%.2f|%.2f) ",k,look->training_min[k][j],look->training_max[k][j]);
+
             _ogg_free(look->training_data[k][j]);
           }
+	fprintf(stderr,"\n");
       }
     }
     fprintf(stderr,"min/max residue: %g::%g\n",look->tmin,look->tmax);
@@ -368,8 +374,7 @@
 }
 
 static int _interleaved_encodepart(oggpack_buffer *opb,float *vec, int n,
-				   codebook *book,vorbis_look_residue0 *look,
-				   long *acc){
+				   codebook *book,long *acc){
   int i,bits=0;
   int dim=book->dim;
   int step=n/dim;
@@ -388,8 +393,7 @@
 }
  
 static int _encodepart(oggpack_buffer *opb,float *vec, int n,
-		       codebook *book,vorbis_look_residue0 *look,
-		       long *acc){
+		       codebook *book,long *acc){
   int i,bits=0;
   int dim=book->dim;
   int step=n/dim;
@@ -523,7 +527,7 @@
                       float **in,int ch,
                       int pass,long **partword,
                       int (*encode)(oggpack_buffer *,float *,int,
-				    codebook *,vorbis_look_residue0 *,long *),
+				    codebook *,long *),
                       ogg_uint32_t *stats){
   long i,j,k,s;
   vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
@@ -602,16 +606,25 @@
           if(info->secondstages[partword[j][i]]&(1<<s)){
             codebook *statebook=look->partbooks[partword[j][i]][s];
             if(statebook){
-	      int fn=-1;
               int ret;
               long *accumulator=NULL;
 
 #ifdef TRAIN_RES
               accumulator=look->training_data[s][partword[j][i]];
+	      {
+		int l;
+		float *samples=in[j]+offset;
+		for(l=0;l<samples_per_partition;l++){
+		  if(samples[l]<look->training_min[s][partword[j][i]])
+		    look->training_min[s][partword[j][i]]=samples[l];
+		  if(samples[l]>look->training_max[s][partword[j][i]])
+		    look->training_max[s][partword[j][i]]=samples[l];
+		}
+	      }
 #endif
               
               ret=encode(&vb->opb,in[j]+offset,samples_per_partition,
-			 statebook,look,accumulator);
+			 statebook,accumulator);
 
               look->postbits+=ret;
               resbits[partword[j][i]]+=ret;

1.24      +326 -225  vorbis/lib/vorbisenc.c

Index: vorbisenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisenc.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vorbisenc.c	2001/12/16 04:15:47	1.23
+++ vorbisenc.c	2001/12/19 01:08:15	1.24
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.23 2001/12/16 04:15:47 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.24 2001/12/19 01:08:15 xiphmont Exp $
 
  ********************************************************************/
 
@@ -64,7 +64,7 @@
 static vorbis_info_mapping0 _mapping_set_long={
   1, {0,0}, {0}, {1}, {1}, {2,3}, 0,{0},{0}};
 
-static int vorbis_encode_toplevel_init(vorbis_info *vi,int small,int large,int ch,long rate){
+static int vorbis_encode_toplevel_setup(vorbis_info *vi,int small,int large,int ch,long rate){
   if(vi && vi->codec_setup){
     codec_setup_info *ci=vi->codec_setup;
 
@@ -104,7 +104,7 @@
   return(OV_EINVAL);
 }
 
-static int vorbis_encode_floor_init(vorbis_info *vi,double q,int block,
+static int vorbis_encode_floor_setup(vorbis_info *vi,double q,int block,
                                     static_codebook    ***books, 
                                     vorbis_info_floor1 *in, 
                                     ...){
@@ -150,7 +150,7 @@
   return(0);
 }
 
-static int vorbis_encode_global_psych_init(vorbis_info *vi,double q,
+static int vorbis_encode_global_psych_setup(vorbis_info *vi,double q,
                                            vorbis_info_psy_global *in, ...){
   int i,iq=q*10;
   double x[11],dq;
@@ -185,24 +185,14 @@
     g->preecho_thresh[i]=in[iq].preecho_thresh[i]*(1.-dq)+in[iq+1].preecho_thresh[i]*dq;
     g->postecho_thresh[i]=in[iq].postecho_thresh[i]*(1.-dq)+in[iq+1].postecho_thresh[i]*dq;
   }
-  g->ampmax_att_per_sec=in[iq].ampmax_att_per_sec*(1.-dq)+in[iq+1].ampmax_att_per_sec*dq;
+  g->ampmax_att_per_sec=ci->hi.amplitude_track_dBpersec;
   return(0);
 }
 
-static int vorbis_encode_psyset_init(vorbis_info *vi,double q,int block,
-					   vorbis_info_psy *in){
-  int iq=q*10;
-  double dq;
+static int vorbis_encode_psyset_setup(vorbis_info *vi,int block){
   codec_setup_info *ci=vi->codec_setup;
   vorbis_info_psy *p=ci->psy_param[block];
 
-  if(iq==10){
-    iq=9;
-    dq=1.;
-  }else{
-    dq=q*10.-iq;
-  }
-
   if(block>=ci->psys)
     ci->psys=block+1;
   if(!p){
@@ -210,22 +200,51 @@
     ci->psy_param[block]=p;
   }
 
-  memcpy(p,in+(int)(q*10.),sizeof(*p));
-  
-  p->ath_adjatt=in[iq].ath_adjatt*(1.-dq)+in[iq+1].ath_adjatt*dq;
-  p->ath_maxatt=in[iq].ath_maxatt*(1.-dq)+in[iq+1].ath_maxatt*dq;
+  memcpy(p,&_psy_info_template,sizeof(*p));
+
+  return 0;
+}
 
-  p->tone_masteratt=in[iq].tone_masteratt*(1.-dq)+in[iq+1].tone_masteratt*dq;
-  p->tone_guard=in[iq].tone_guard*(1.-dq)+in[iq+1].tone_guard*dq;
-  p->tone_abs_limit=in[iq].tone_abs_limit*(1.-dq)+in[iq+1].tone_abs_limit*dq;
+static int vorbis_encode_tonemask_setup(vorbis_info *vi,double q,int block,
+				       double *att,
+				       double *max,
+				       int *peaklimit_bands,
+				       vp_adjblock *in){
+  int i,j,iq;
+  double dq;
+  codec_setup_info *ci=vi->codec_setup;
+  vorbis_info_psy *p=ci->psy_param[block];
+
+  iq=q*10;
+  if(iq==10){
+    iq=9;
+    dq=1.;
+  }else{
+    dq=q*10.-iq;
+  }
 
-  p->noisemaxsupp=in[iq].noisemaxsupp*(1.-dq)+in[iq+1].noisemaxsupp*dq;
+  p->tone_masteratt=att[iq]*(1.-dq)+att[iq+1]*dq;
+  p->max_curve_dB=max[iq];
+  p->curvelimitp=peaklimit_bands[iq];
 
+  iq=q*5.;
+  if(iq==5){
+    iq=5;
+    dq=1.;
+  }else{
+    dq=q*5.-iq;
+  }
+  
+  for(i=0;i<P_BANDS;i++)
+    for(j=0;j<P_LEVELS;j++)
+      p->toneatt.block[i][j]=(j<4?4:j)*-10.+
+	in[iq].block[i][j]*(1.-dq)+in[iq+1].block[i][j]*dq;
   return(0);
 }
 
-static int vorbis_encode_compand_init(vorbis_info *vi,double q,int block,
-					   float in[][NOISE_COMPAND_LEVELS], ...){
+
+static int vorbis_encode_compand_setup(vorbis_info *vi,double q,int block,
+				      float in[][NOISE_COMPAND_LEVELS], ...){
   int i,iq=q*10;
   double x[11],dq;
   codec_setup_info *ci=vi->codec_setup;
@@ -258,34 +277,28 @@
   return(0);
 }
 
-static int vorbis_encode_tonemask_init(vorbis_info *vi,double q,int block,
-				       vp_adjblock *in){
-  int i,j,iq=q*5.;
+static int vorbis_encode_peak_setup(vorbis_info *vi,double q,int block,
+				    double *guard,
+				    double *suppress,
+				    vp_adjblock *in){
+  int i,j,iq;
   double dq;
   codec_setup_info *ci=vi->codec_setup;
   vorbis_info_psy *p=ci->psy_param[block];
 
-  if(iq==5){
-    iq=5;
+  iq=q*10;
+  if(iq==10){
+    iq=9;
     dq=1.;
   }else{
-    dq=q*5.-iq;
+    dq=q*10.-iq;
   }
-
-  for(i=0;i<P_BANDS;i++)
-    for(j=0;j<P_LEVELS;j++)
-      p->toneatt.block[i][j]=(j<4?4:j)*-10.+
-	in[iq].block[i][j]*(1.-dq)+in[iq+1].block[i][j]*dq;
-  return(0);
-}
 
-static int vorbis_encode_peak_init(vorbis_info *vi,double q,int block,
-				   vp_adjblock *in){
-  int i,j,iq=q*5.;
-  double dq;
-  codec_setup_info *ci=vi->codec_setup;
-  vorbis_info_psy *p=ci->psy_param[block];
+  p->peakattp=1;
+  p->tone_guard=guard[iq]*(1.-dq)+guard[iq+1]*dq;
+  p->tone_abs_limit=suppress[iq]*(1.-dq)+suppress[iq+1]*dq;
 
+  iq=q*5.;
   if(iq==5){
     iq=5;
     dq=1.;
@@ -300,8 +313,9 @@
   return(0);
 }
 
-static int vorbis_encode_noisebias_init(vorbis_info *vi,double q,int block,
-					int in[][17],int guard[33]){
+static int vorbis_encode_noisebias_setup(vorbis_info *vi,double q,int block,
+					 double *suppress,
+					 int in[][17],int guard[33]){
   int i,iq=q*10;
   double dq;
   codec_setup_info *ci=vi->codec_setup;
@@ -314,17 +328,18 @@
     dq=q*10.-iq;
   }
 
+  p->noisemaxsupp=suppress[iq]*(1.-dq)+suppress[iq+1]*dq;
   p->noisewindowlomin=guard[iq*3];
   p->noisewindowhimin=guard[iq*3+1];
   p->noisewindowfixed=guard[iq*3+2];
-
+  
   for(i=0;i<P_BANDS;i++)
     p->noiseoff[i]=in[iq][i]*(1.-dq)+in[iq+1][i]*dq;
   return(0);
 }
 
-static int vorbis_encode_ath_init(vorbis_info *vi,double q,int block,
-				  float in[][27], ...){
+static int vorbis_encode_ath_setup(vorbis_info *vi,double q,int block,
+				   float in[][27], ...){
   int i,iq=q*10;
   double x[11],dq;
   codec_setup_info *ci=vi->codec_setup;
@@ -336,6 +351,9 @@
     x[i]=va_arg(ap,double);
   va_end(ap);
 
+  p->ath_adjatt=ci->hi.ath_floating_dB;
+  p->ath_maxatt=ci->hi.ath_absolute_dB;
+
   if(iq==10){
     iq=9;
     dq=1.;
@@ -365,15 +383,15 @@
   return(ci->books++);
 }
 
-static int vorbis_encode_residue_init(vorbis_info *vi,double q,int block,
-				      int coupled_p,
-				      int stereo_backfill_p,
-				      int residue_backfill_p,
-				      vorbis_residue_template *in, ...){
+static int vorbis_encode_residue_setup(vorbis_info *vi,double q,int block,
+				       int coupled_p,
+				       int stereo_backfill_p,
+				       int residue_backfill_p,
+				       vorbis_residue_template *in,
+				       int point_dB,
+				       double point_kHz){
 
   int i,iq=q*10;
-  int a[11];
-  double c[11];
   int n,k;
   int partition_position;
   int res_position;
@@ -383,15 +401,7 @@
   codec_setup_info *ci=vi->codec_setup;
   vorbis_info_residue0 *r;
   vorbis_info_psy *psy=ci->psy_param[block*2];
-  va_list ap;
   
-  va_start(ap,in);
-  for(i=0;i<11;i++)
-    a[i]=va_arg(ap,int);
-  for(i=0;i<11;i++)
-    c[i]=va_arg(ap,double);
-  va_end(ap);
-  
   /* may be re-called due to ctl */
   if(ci->residue_param[block])
     /* free preexisting instance */
@@ -417,12 +427,12 @@
   switch(ci->residue_type[block]){
   case 1:
     n=r->end=ci->blocksizes[block?1:0]>>1; /* to be adjusted by lowpass later */
-    partition_position=rint((double)c[iq]*1000/(vi->rate/2)*n/r->grouping);
+    partition_position=rint(point_kHz*1000./(vi->rate/2)*n/r->grouping);
     res_position=partition_position*r->grouping;
     break;
   case 2:
     n=r->end=(ci->blocksizes[block?1:0]>>1)*vi->channels; /* to be adjusted by lowpass later */
-    partition_position=rint((double)c[iq]*1000/(vi->rate/2)*n/r->grouping);
+    partition_position=rint(point_kHz*1000./(vi->rate/2)*n/r->grouping);
     res_position=partition_position*r->grouping/vi->channels;
     break;
   }
@@ -432,12 +442,11 @@
 
   for(i=0;i<r->partitions;i++)
     for(k=0;k<3;k++)
-      if(in[iq].books_base[a[iq]][i][k])
+      if(in[iq].books_base[point_dB][i][k])
         r->secondstages[i]|=(1<<k);
   
   ci->passlimit[0]=3;
     
-  
   if(coupled_p){
     vorbis_info_mapping0 *map=ci->map_param[block];
 
@@ -455,36 +464,41 @@
     psy->couple_pass[0].couple_pass[1].limit=9999;
     psy->couple_pass[0].couple_pass[1].outofphase_redundant_flip_p=1;
     psy->couple_pass[0].couple_pass[1].outofphase_requant_limit=9e10;
-    psy->couple_pass[0].couple_pass[1].amppost_point=stereo_threshholds[a[iq]];
-    amplitude_select=a[iq];
+    psy->couple_pass[0].couple_pass[1].amppost_point=
+      stereo_threshholds[point_dB];
+    amplitude_select=point_dB;
 
-    if(stereo_backfill_p && a[iq]){
+    if(stereo_backfill_p && amplitude_select){
       memcpy(psy->couple_pass+iterations,psy->couple_pass+iterations-1,
              sizeof(*psy->couple_pass));
-      amplitude_select=a[iq]-1;
-      psy->couple_pass[1].couple_pass[1].amppost_point=stereo_threshholds[a[iq]-1];
+      psy->couple_pass[1].couple_pass[1].amppost_point=stereo_threshholds[amplitude_select-1];
       ci->passlimit[1]=4;
       for(i=0;i<r->partitions;i++)
-	if(in[iq].books_stereo_backfill[a[iq]-1][i])
+	if(in[iq].books_stereo_backfill[amplitude_select][i])
           r->secondstages[i]|=8;
+      amplitude_select=amplitude_select-1;
       iterations++;
     }
-
+    
     if(residue_backfill_p){
       memcpy(psy->couple_pass+iterations,psy->couple_pass+iterations-1,
              sizeof(*psy->couple_pass));
       psy->couple_pass[iterations].granulem=.333333333;
       psy->couple_pass[iterations].igranulem=3.;
+      psy->couple_pass[iterations].couple_pass[0].outofphase_requant_limit=1.;
+      psy->couple_pass[iterations].couple_pass[1].outofphase_requant_limit=1.;
       for(i=0;i<r->partitions;i++)
         if(in[iq].books_residue_backfill[amplitude_select][i][0])
           r->secondstages[i]|=(1<<(iterations+2));
       ci->passlimit[iterations]=ci->passlimit[iterations-1]+1;
       iterations++;
-
+      
       memcpy(psy->couple_pass+iterations,psy->couple_pass+iterations-1,
              sizeof(*psy->couple_pass));
       psy->couple_pass[iterations].granulem=.1111111111;
       psy->couple_pass[iterations].igranulem=9.;
+      psy->couple_pass[iterations].couple_pass[0].outofphase_requant_limit=.3;
+      psy->couple_pass[iterations].couple_pass[1].outofphase_requant_limit=.3;
       for(i=0;i<r->partitions;i++)
         if(in[iq].books_residue_backfill[amplitude_select][i][1])
           r->secondstages[i]|=(1<<(iterations+2));
@@ -508,10 +522,10 @@
     }else
       ci->coupling_passes=1;
   }
-
+  
   memcpy(&ci->psy_param[block*2+1]->couple_pass,
          &ci->psy_param[block*2]->couple_pass,
-	 sizeof(psy->couple_pass[0]));
+	 sizeof(psy->couple_pass));
   
   /* fill in all the books */
   {
@@ -520,17 +534,17 @@
     ci->book_param[ci->books++]=in[iq].book_aux[block];
     for(i=0;i<r->partitions;i++){
       for(k=0;k<3;k++){
-	if(in[iq].books_base[a[iq]][i][k]){
-	  int bookid=book_dup_or_new(ci,in[iq].books_base[a[iq]][i][k]);
+	if(in[iq].books_base[point_dB][i][k]){
+	  int bookid=book_dup_or_new(ci,in[iq].books_base[point_dB][i][k]);
           r->booklist[booklist++]=bookid;
-	  ci->book_param[bookid]=in[iq].books_base[a[iq]][i][k];
+	  ci->book_param[bookid]=in[iq].books_base[point_dB][i][k];
         }
       }
-      if(coupled_p && stereo_backfill_p && a[iq] &&
-	 in[iq].books_stereo_backfill[a[iq]][i]){
-	int bookid=book_dup_or_new(ci,in[iq].books_stereo_backfill[a[iq]][i]);
+      if(coupled_p && stereo_backfill_p && point_dB &&
+	 in[iq].books_stereo_backfill[point_dB][i]){
+	int bookid=book_dup_or_new(ci,in[iq].books_stereo_backfill[point_dB][i]);
         r->booklist[booklist++]=bookid;
-	ci->book_param[bookid]=in[iq].books_stereo_backfill[a[iq]][i];
+	ci->book_param[bookid]=in[iq].books_stereo_backfill[point_dB][i];
       }
       if(residue_backfill_p){
         for(k=0;k<2;k++){
@@ -547,21 +561,15 @@
   return(0);
 }      
 
-static int vorbis_encode_lowpass_init(vorbis_info *vi,double q,int block,...){
-  int i,iq=q*10;
-  double x[11],dq;
+static int vorbis_encode_lowpass_setup(vorbis_info *vi,double q,int block){
+  int iq=q*10;
+  double dq;
   double freq;
   codec_setup_info *ci=vi->codec_setup;
   vorbis_info_floor1 *f=ci->floor_param[block];
   vorbis_info_residue0 *r=ci->residue_param[block];
   int blocksize=ci->blocksizes[block]>>1;
   double nyq=vi->rate/2.;
-  va_list ap;
-  
-  va_start(ap,block);
-  for(i=0;i<11;i++)
-    x[i]=va_arg(ap,double);
-  va_end(ap);
 
   if(iq==10){
     iq=9;
@@ -570,7 +578,7 @@
     dq=q*10.-iq;
   }
   
-  freq=(x[iq]*(1.-dq)+x[iq+1]*dq)*1000.;
+  freq=ci->hi.lowpass_kHz[block]*1000.;
   if(freq>vi->rate/2)freq=vi->rate/2;
   /* lowpass needs to be set in the floor and the residue. */
 
@@ -584,10 +592,10 @@
      here to next boundary, or the vorbis spec will round it *down* to
      previous boundary in encode/decode */
   if(ci->residue_type[block]==2)
-    r->end=((freq/nyq*blocksize*2)/r->grouping+.9)* /* round up only if we're well past */
+    r->end=(int)((freq/nyq*blocksize*2)/r->grouping+.9)* /* round up only if we're well past */
       r->grouping;
   else
-    r->end=((freq/nyq*blocksize)/r->grouping+.9)* /* round up only if we're well past */
+    r->end=(int)((freq/nyq*blocksize)/r->grouping+.9)* /* round up only if we're well past */
       r->grouping;
   return(0);
 }
@@ -595,6 +603,213 @@
 /* encoders will need to use vorbis_info_init beforehand and call
    vorbis_info clear when all done */
 
+/* two interfaces; this, more detailed one, and later a convenience
+   layer on top */
+
+/* the final setup call */
+int vorbis_encode_setup_init(vorbis_info *vi){
+  int ret=0;
+  long rate=vi->rate;
+  long channels=vi->channels;
+  codec_setup_info *ci=vi->codec_setup;
+  highlevel_encode_setup *hi=&ci->hi;
+
+  ret|=vorbis_encode_floor_setup(vi,hi->base_quality_short,0,
+				_floor_44_128_books,_floor_44_128,
+				0,1,1,2,2,2,2,2,2,2,2);
+  ret|=vorbis_encode_floor_setup(vi,hi->base_quality_long,1,
+				_floor_44_1024_books,_floor_44_1024,
+				0,0,0,0,0,0,0,0,0,0,0);
+  
+  ret|=vorbis_encode_global_psych_setup(vi,hi->trigger_quality,_psy_global_44,
+				       0., 1., 1.5, 2., 2., 2., 2., 2., 2., 2., 2.);
+
+  ret|=vorbis_encode_psyset_setup(vi,0);
+  ret|=vorbis_encode_psyset_setup(vi,1);
+  ret|=vorbis_encode_psyset_setup(vi,2);
+  ret|=vorbis_encode_psyset_setup(vi,3);
+  
+  ret|=vorbis_encode_tonemask_setup(vi,hi->blocktype[0].tone_mask_quality,0,
+				    _psy_tone_masteratt,_psy_tone_0dB,_psy_ehmer_bandlimit,
+				    _vp_tonemask_adj_otherblock);
+  ret|=vorbis_encode_tonemask_setup(vi,hi->blocktype[1].tone_mask_quality,1,
+				    _psy_tone_masteratt,_psy_tone_0dB,_psy_ehmer_bandlimit,
+				    _vp_tonemask_adj_otherblock);
+  ret|=vorbis_encode_tonemask_setup(vi,hi->blocktype[2].tone_mask_quality,2,
+				    _psy_tone_masteratt,_psy_tone_0dB,_psy_ehmer_bandlimit,
+				    _vp_tonemask_adj_otherblock);
+  ret|=vorbis_encode_tonemask_setup(vi,hi->blocktype[3].tone_mask_quality,3,
+				    _psy_tone_masteratt,_psy_tone_0dB,_psy_ehmer_bandlimit,
+				    _vp_tonemask_adj_longblock);
+  
+  ret|=vorbis_encode_compand_setup(vi,hi->blocktype[0].noise_compand_quality,
+				  0,_psy_compand_44_short,
+				  1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.);
+  ret|=vorbis_encode_compand_setup(vi,hi->blocktype[1].noise_compand_quality,
+				  1,_psy_compand_44_short,
+				  1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.);
+  ret|=vorbis_encode_compand_setup(vi,hi->blocktype[2].noise_compand_quality,
+				  2,_psy_compand_44,
+				  1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.);
+  ret|=vorbis_encode_compand_setup(vi,hi->blocktype[3].noise_compand_quality,
+				  3,_psy_compand_44,
+				  1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.);
+  ret|=vorbis_encode_peak_setup(vi,hi->blocktype[0].tone_peaklimit_quality,
+				0,_psy_tone_masterguard,_psy_tone_suppress,
+				_vp_peakguard);
+  ret|=vorbis_encode_peak_setup(vi,hi->blocktype[1].tone_peaklimit_quality,
+				1,_psy_tone_masterguard,_psy_tone_suppress,
+				_vp_peakguard);
+  ret|=vorbis_encode_peak_setup(vi,hi->blocktype[2].tone_peaklimit_quality,
+				2,_psy_tone_masterguard,_psy_tone_suppress,
+				_vp_peakguard);
+  ret|=vorbis_encode_peak_setup(vi,hi->blocktype[3].tone_peaklimit_quality,
+				3,_psy_tone_masterguard,_psy_tone_suppress,
+				_vp_peakguard);
+
+  ret|=vorbis_encode_noisebias_setup(vi,hi->blocktype[0].noise_bias_quality,
+				    0,_psy_noise_suppress,_psy_noisebias_impulse,
+				    _psy_noiseguards_short);
+  ret|=vorbis_encode_noisebias_setup(vi,hi->blocktype[1].noise_bias_quality,
+				    1,_psy_noise_suppress,_psy_noisebias_other,
+				      _psy_noiseguards_short);
+  ret|=vorbis_encode_noisebias_setup(vi,hi->blocktype[2].noise_bias_quality,
+				      2,_psy_noise_suppress,_psy_noisebias_other,
+				    _psy_noiseguards_long);
+  ret|=vorbis_encode_noisebias_setup(vi,hi->blocktype[3].noise_bias_quality,
+				    3,_psy_noise_suppress,_psy_noisebias_long,
+				    _psy_noiseguards_long);
+
+  ret|=vorbis_encode_ath_setup(vi,hi->blocktype[0].ath_quality,0,ATH_Bark_dB,
+			      0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
+  ret|=vorbis_encode_ath_setup(vi,hi->blocktype[1].ath_quality,1,ATH_Bark_dB,
+			      0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
+  ret|=vorbis_encode_ath_setup(vi,hi->blocktype[2].ath_quality,2,ATH_Bark_dB,
+			      0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
+  ret|=vorbis_encode_ath_setup(vi,hi->blocktype[3].ath_quality,3,ATH_Bark_dB,
+			      0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
+
+  if(ret){
+    vorbis_info_clear(vi);
+    return ret; 
+  }
+
+  if(channels==2 && hi->stereo_couple_p){
+    /* setup specific to stereo coupling */
+    
+    ret|=vorbis_encode_residue_setup(vi,hi->base_quality_short,0,
+				    1, /* coupled */
+				    hi->stereo_backfill_p,
+				    hi->residue_backfill_p, 
+				    _residue_template_44_stereo,
+				    hi->stereo_point_dB,
+				    hi->stereo_point_kHz[0]);
+      
+    ret|=vorbis_encode_residue_setup(vi,hi->base_quality_long,1,
+				    1, /* coupled */
+				    hi->stereo_backfill_p,
+				    hi->residue_backfill_p, 
+				    _residue_template_44_stereo,
+				    hi->stereo_point_dB,
+				    hi->stereo_point_kHz[1]);
+
+  }else{
+    /* setup specific to non-stereo (mono or uncoupled polyphonic)
+       coupling */
+    ret|=vorbis_encode_residue_setup(vi,hi->base_quality_short,0,
+				    0, /* uncoupled */
+				    0,
+				    hi->residue_backfill_p, 
+				    _residue_template_44_uncoupled,
+				    0,
+				    hi->stereo_point_kHz[0]); /* just
+				    used as an encoding partitioning
+				    point */
+      
+    ret|=vorbis_encode_residue_setup(vi,hi->base_quality_long,1,
+				    0, /* uncoupled */
+				    0,
+				    hi->residue_backfill_p, 
+				    _residue_template_44_uncoupled,
+				    0,
+				    hi->stereo_point_kHz[1]); /* just
+				    used as an encoding partitioning
+				    point */
+  }
+  ret|=vorbis_encode_lowpass_setup(vi,hi->lowpass_kHz[0],0);
+  ret|=vorbis_encode_lowpass_setup(vi,hi->lowpass_kHz[1],1);
+    
+  if(ret)
+    vorbis_info_clear(vi);
+  return(ret);
+
+}
+
+/* only populates the high-level settings so that we can tweak with ctl before final setup */
+int vorbis_encode_setup_vbr(vorbis_info *vi,
+			    long channels,
+			    long rate,
+			    
+			    float base_quality){
+  int ret=0,i,iq;
+  double dq;
+  codec_setup_info *ci=vi->codec_setup;
+  highlevel_encode_setup *hi=&ci->hi;
+  
+  base_quality+=.0001;
+  if(base_quality<0.)base_quality=0.;
+  if(base_quality>.999)base_quality=.999;
+
+  iq=base_quality*10;
+  if(iq==10){
+    iq=9;
+    dq=1.;
+  }else{
+    dq=base_quality*10.-iq;
+  }
+
+  ret|=vorbis_encode_toplevel_setup(vi,256,2048,channels,rate);
+  hi->base_quality=base_quality;
+  hi->base_quality_short=base_quality;
+  hi->base_quality_long=base_quality;
+  hi->trigger_quality=base_quality;
+
+  for(i=0;i<4;i++){
+    hi->blocktype[i].tone_mask_quality=base_quality;
+    hi->blocktype[i].tone_peaklimit_quality=base_quality;
+    hi->blocktype[i].noise_bias_quality=base_quality;
+    hi->blocktype[i].noise_compand_quality=base_quality;
+    hi->blocktype[i].ath_quality=base_quality;
+  }
+
+  hi->short_block_p=1;
+  hi->long_block_p=1;
+  hi->impulse_block_p=1;
+  hi->amplitude_track_dBpersec=-6.;
+
+  hi->stereo_couple_p=1; /* only relevant if a two channel input */
+  hi->stereo_backfill_p=0;
+  hi->residue_backfill_p=0;
+
+  /* set the ATH floaters */
+  hi->ath_floating_dB=_psy_ath_floater[iq]*(1.-dq)+_psy_ath_floater[iq+1]*dq;
+  hi->ath_absolute_dB=_psy_ath_abs[iq]*(1.-dq)+_psy_ath_abs[iq+1]*dq;
+
+  /* set stereo dB and Hz */
+  hi->stereo_point_dB=_psy_stereo_point_dB_44[iq];
+  hi->stereo_point_kHz[0]=_psy_stereo_point_kHz_44[0][iq]*(1.-dq)+
+    _psy_stereo_point_kHz_44[0][iq+1]*dq;
+  hi->stereo_point_kHz[1]=_psy_stereo_point_kHz_44[1][iq]*(1.-dq)+
+    _psy_stereo_point_kHz_44[1][iq+1]*dq;
+  
+  /* set lowpass */
+  hi->lowpass_kHz[0]=
+    hi->lowpass_kHz[1]=
+    _psy_lowpass_44[iq]*(1.-dq)+_psy_lowpass_44[iq+1]*dq;
+
+  return(ret);
+}
+
 int vorbis_encode_init_vbr(vorbis_info *vi,
                            long channels,
                            long rate,
@@ -603,138 +818,24 @@
                            ){
   int ret=0;
 
-  base_quality+=.001;
-  if(base_quality<0.)base_quality=0.;
-  if(base_quality>.999)base_quality=.999;
-
-  if(rate>40000){
-    ret|=vorbis_encode_toplevel_init(vi,256,2048,channels,rate);
-    ret|=vorbis_encode_floor_init(vi,base_quality,0,_floor_44_128_books,_floor_44_128,
-				  0,1,1,2,2,2,2,2,2,2,2);
-    ret|=vorbis_encode_floor_init(vi,base_quality,1,_floor_44_1024_books,_floor_44_1024,
-				  0,0,0,0,0,0,0,0,0,0,0);
-    
-    ret|=vorbis_encode_global_psych_init(vi,base_quality,_psy_global_44,
-					 0., 1., 1.5, 2., 2., 2., 2., 2., 2., 2., 2.);
-    
-    ret|=vorbis_encode_psyset_init(vi,base_quality,0,_psy_settings);
-    ret|=vorbis_encode_psyset_init(vi,base_quality,1,_psy_settings);
-    ret|=vorbis_encode_psyset_init(vi,base_quality,2,_psy_settings);
-    ret|=vorbis_encode_psyset_init(vi,base_quality,3,_psy_settings);
-
-    ret|=vorbis_encode_tonemask_init(vi,base_quality,0,_vp_tonemask_adj_otherblock);
-    ret|=vorbis_encode_tonemask_init(vi,base_quality,1,_vp_tonemask_adj_otherblock);
-    ret|=vorbis_encode_tonemask_init(vi,base_quality,2,_vp_tonemask_adj_otherblock);
-    ret|=vorbis_encode_tonemask_init(vi,base_quality,3,_vp_tonemask_adj_longblock);
-
-    ret|=vorbis_encode_compand_init(vi,base_quality,0,_psy_compand_44_short,
-				    1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.);
-    ret|=vorbis_encode_compand_init(vi,base_quality,1,_psy_compand_44_short,
-				    1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.);
-    ret|=vorbis_encode_compand_init(vi,base_quality,2,_psy_compand_44,
-				    1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.);
-    ret|=vorbis_encode_compand_init(vi,base_quality,3,_psy_compand_44,
-				    1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.);
-    
-    ret|=vorbis_encode_peak_init(vi,base_quality,0,_vp_peakguard);
-    ret|=vorbis_encode_peak_init(vi,base_quality,1,_vp_peakguard);
-    ret|=vorbis_encode_peak_init(vi,base_quality,2,_vp_peakguard);
-    ret|=vorbis_encode_peak_init(vi,base_quality,3,_vp_peakguard);
-    
-    ret|=vorbis_encode_noisebias_init(vi,base_quality,0,_psy_noisebias_impulse,
-				      _psy_noiseguards_short);
-    ret|=vorbis_encode_noisebias_init(vi,base_quality,1,_psy_noisebias_other,
-				      _psy_noiseguards_short);
-    ret|=vorbis_encode_noisebias_init(vi,base_quality,2,_psy_noisebias_other,
-				      _psy_noiseguards_long);
-    ret|=vorbis_encode_noisebias_init(vi,base_quality,3,_psy_noisebias_long,
-				      _psy_noiseguards_long);
-
-    ret|=vorbis_encode_ath_init(vi,base_quality,0,ATH_Bark_dB,
-				0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
-    ret|=vorbis_encode_ath_init(vi,base_quality,1,ATH_Bark_dB,
-				0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
-    ret|=vorbis_encode_ath_init(vi,base_quality,2,ATH_Bark_dB,
-				0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
-    ret|=vorbis_encode_ath_init(vi,base_quality,3,ATH_Bark_dB,
-				0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
-
-    if(ret){
-      vorbis_info_clear(vi);
-      return ret; 
-    }
-
-    switch(channels){
-    case 2:
-      /* setup specific to stereo coupling */
-
-      /* unmanaged, one iteration residue setup */
-      ret|=vorbis_encode_residue_init(vi,base_quality,0,
-				      1, /* coupled */
-				      0, /* no mid stereo backfill */
-				      0, /* no residue backfill */
-				      _residue_template_44_stereo,
-				      4,  3,  2,  2,   1,  0,  0,  0,  0,  0,  0,
-				      4., 6., 6., 6., 10., 6., 6., 4., 4., 4., 4.);
-      
-      ret|=vorbis_encode_residue_init(vi,base_quality,1,
-				      1, /* coupled */
-				      0, /* no mid stereo backfill */
-				      0, /* no residue backfill */
-				      _residue_template_44_stereo,
-				      4,  3,  2,   2,   1,  0,  0,  0,  0,  0,  0,
-				      6., 6., 6., 10., 10., 6., 6., 4., 4., 4., 4.);      
-
-      ret|=vorbis_encode_lowpass_init(vi,base_quality,0,
-				      15.1,15.8,16.5,17.9,20.5,
-				      999.,999.,999.,999.,999.,999.);
-      ret|=vorbis_encode_lowpass_init(vi,base_quality,1,
-				      15.1,15.8,16.5,17.9,20.5,
-				      999.,999.,999.,999.,999.,999.);
-      
-      return(ret);
-
-      break;
-    default:
-      /* setup specific to non-stereo (mono or uncoupled polyphonic)
-         coupling */
-      
-      /* unmanaged, one iteration residue setup */
-      ret|=vorbis_encode_residue_init(vi,base_quality,0,
-				      0, /* uncoupled */
-				      0, /* no mid stereo backfill */
-				      0, /* residue backfill */
-				      _residue_template_44_uncoupled,
-				      0,0,0,0,0,0,0,0,0,0,0,
-				      4.,4.,4.,6.,6.,6.,6.,4.,4.,4.,4.);
-      
-      ret|=vorbis_encode_residue_init(vi,base_quality,1,
-				      0, /* uncoupled */
-				      0, /* no mid stereo backfill */
-				      0, /* residue backfill */
-				      _residue_template_44_uncoupled,
-				      0,0,0,0,0,0,0,0,0,0,0,
-				      4.,4.,4.,6.,6.,6.,6.,4.,4.,4.,4.);      
-
-      ret|=vorbis_encode_lowpass_init(vi,base_quality,0,
-				      15.1,15.8,16.5,17.9,20.5,
-				      999.,999.,999.,999.,999.,999.);
-      ret|=vorbis_encode_lowpass_init(vi,base_quality,1,
-				      15.1,15.8,16.5,17.9,20.5,
-				      999.,999.,999.,999.,999.,999.);
-      
-      return(ret);
-      break;
-    }
-    return(0);
-  }else
-    return(OV_EIMPL);
+  ret=vorbis_encode_setup_vbr(vi,channels,rate,1.);
+  
+  {
+    codec_setup_info *ci=vi->codec_setup;
+    highlevel_encode_setup *hi=&ci->hi;
+    hi->stereo_couple_p=0;
+    hi->residue_backfill_p=1;
+  }
 
+  if(ret){
+    vorbis_info_clear(vi);
+    return ret; 
+  }
+  ret=vorbis_encode_setup_init(vi);
   if(ret)
     vorbis_info_clear(vi);
   return(ret);
 }
-
 
 int vorbis_encode_init(vorbis_info *vi,
                        long channels,

1.5       +4 -4      vorbis/lib/books/coupled/_44c0_long.vqh

Index: _44c0_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_long.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c0_long.vqh	2001/12/17 00:16:43	1.4
+++ _44c0_long.vqh	2001/12/19 01:08:18	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c0_long[] = {
-	 3, 8, 9, 9, 9, 4, 8,12, 7, 3, 5, 7, 9, 5, 8,13,
-	 8, 5, 5, 7, 9, 8,10,16, 8, 6, 6, 6, 8,11,12,16,
-	 8, 8, 7, 6, 4,13,15,12, 4,19,19,19,19, 2, 6,13,
-	 7,19,19,19,19, 6, 8,13,11,14,15,12, 9,12,14,16,
+	 3, 8, 9,10,11, 4, 8,12, 7, 3, 5, 8,10, 5, 8,14,
+	 8, 4, 6, 7,10, 8,10,15, 8, 6, 6, 6, 8,11,12,15,
+	 9, 8, 7, 6, 4,13,15,13, 4,18,18,18,18, 2, 6,13,
+	 8,17,17,17,17, 6, 8,13,12,16,14,12,10,13,14,15,
 };
 
 static static_codebook _huff_book__44c0_long = {

1.5       +5 -4      vorbis/lib/books/coupled/_44c0_s0_p1_0.vqh

Index: _44c0_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p1_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c0_s0_p1_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c0_s0_p1_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,8 +27,8 @@
 };
 
 static long _vq_lengthlist__44c0_s0_p1_0[] = {
-	 1, 5, 6, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
-	 8, 9, 0, 0, 0, 0, 0, 0, 0, 5, 8, 7, 0, 0, 0, 9,
+	 1, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
+	 8, 9, 0, 0, 0, 0, 0, 0, 0, 6, 8, 7, 0, 0, 0, 9,
          9, 0, 0, 0, 9, 9, 0, 0, 0,12,12, 0, 0, 0, 0, 0,
          0, 0, 5, 7, 8, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0,
          0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -44,14 +45,14 @@
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
-	 0, 0, 0,10,11, 0, 0, 0, 0, 0, 0, 0, 5, 9, 9, 0,
+	 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 5, 9, 9, 0,
          0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,11,10, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 9,12,12, 0, 0, 0,11,11, 0, 0, 0,10,11, 0, 0, 0,
+	 9,12,12, 0, 0, 0,10,11, 0, 0, 0,10,11, 0, 0, 0,
         12,12, 0, 0, 0, 0, 0, 0, 0, 9,12,12, 0, 0, 0,11,
         11, 0, 0, 0,11,10, 0, 0, 0,12,12, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +3 -2      vorbis/lib/books/coupled/_44c0_s0_p2_0.vqh

Index: _44c0_s0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p2_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c0_s0_p2_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c0_s0_p2_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,8 +31,8 @@
 };
 
 static long _vq_lengthlist__44c0_s0_p2_0[] = {
-	 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0,
-	 0, 0, 0, 4, 4, 7, 7, 0, 0, 0, 0, 0, 6, 7, 8, 8,
+	 1, 4, 4, 7, 6, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0,
+	 0, 0, 0, 4, 4, 7, 7, 0, 0, 0, 0, 0, 6, 6, 8, 8,
          0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
          8, 9, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
          0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +4 -3      vorbis/lib/books/coupled/_44c0_s0_p3_0.vqh

Index: _44c0_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p3_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c0_s0_p3_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c0_s0_p3_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -40,7 +41,7 @@
 static long _vq_lengthlist__44c0_s0_p3_0[] = {
          1, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 5, 5, 7, 7, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 5, 5, 7, 7, 8, 7, 9, 9, 0, 0, 0, 0, 0,
+	 0, 0, 0, 5, 5, 7, 7, 7, 8, 9, 9, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 6, 6, 7, 7, 8, 8,10,10, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,10,10, 0, 0,
@@ -50,8 +51,8 @@
         11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,
         11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
         10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	11,11,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0,11,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	11,11,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +15 -14    vorbis/lib/books/coupled/_44c0_s0_p4_0.vqh

Index: _44c0_s0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p4_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c0_s0_p4_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c0_s0_p4_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,20 +37,20 @@
 };
 
 static long _vq_lengthlist__44c0_s0_p4_0[] = {
-	 1, 3, 3, 6, 6, 9, 9,13,13,20,20,20,20,20,20, 5,
-	 5, 5, 8, 8,10,11,14,14,20,20,20,20,20,20, 7, 5,
-	 5, 8, 8,11,10,14,14,20,20,20,20,20,20,20, 8, 8,
-	 9, 9,12,12,15,15,20,20,20,20,20,20,20, 8, 8, 9,
-	 9,12,12,15,15,20,20,20,20,20,20,20,12,13,10,10,
-	13,13,16,16,20,20,20,20,20,20,20,13,13,11,10,13,
-	14,18,16,20,20,20,20,20,20,20,20,20,11,13,12,14,
-	16,16,20,20,20,20,20,20,20,20,20,13,12,14,13,17,
-	18,20,20,20,20,20,20,20,20,20,16,17,11,15,16,18,
-	20,20,20,20,20,20,20,20,20,18,16,15,12,17,17,20,
-	20,20,20,20,20,20,20,20,20,20,15,17,14,17,20,20,
-	20,20,20,20,20,20,20,20,20,18,15,17,17,20,20,20,
-	20,20,20,20,20,20,20,20,18,19,16,18,20,20,20,20,
-	20,20,20,20,20,20,20,20,20,20,16,20,20,20,20,20,
+	 1, 3, 3, 6, 6,10,10,13,14,19,19,19,19,19,19, 5,
+	 5, 5, 8, 8,11,11,14,14,19,19,19,19,19,19, 6, 5,
+	 5, 8, 8,11,11,14,15,19,19,19,19,19,19,19, 8, 8,
+	10,10,12,13,15,15,19,19,19,19,19,19,19, 8, 8,10,
+	10,13,13,14,15,19,19,19,19,19,19,19,11,12,10,11,
+	13,14,16,16,19,19,19,19,19,19,19,13,12,11,10,13,
+	14,16,16,19,19,19,19,19,19,19,19,19,13,13,14,14,
+	18,17,19,19,19,19,19,19,19,19,19,13,13,14,14,18,
+	18,19,19,19,19,19,19,19,19,19,16,18,13,15,16,17,
+	19,19,19,19,19,19,19,19,19,19,17,14,12,17,15,19,
+	19,19,19,19,19,19,19,19,19,19,13,16,16,17,19,19,
+	19,19,19,19,19,19,19,19,19,17,12,17,15,19,19,19,
+	19,19,19,19,19,19,19,19,15,19,13,18,19,19,19,19,
+	19,19,19,19,19,19,19,19,16,19,15,19,19,19,19,19,
         19,
 };
 

1.4       +1 -0      vorbis/lib/books/coupled/_44c0_s0_p4_1.vqh

Index: _44c0_s0_p4_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p4_1.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- _44c0_s0_p4_1.vqh	2001/12/17 00:16:43	1.3
+++ _44c0_s0_p4_1.vqh	2001/12/19 01:08:18	1.4
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.5       +1 -0      vorbis/lib/books/coupled/_44c0_s1_p5_0.vqh

Index: _44c0_s1_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s1_p5_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c0_s1_p5_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c0_s1_p5_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.4       +41 -46    vorbis/lib/books/coupled/_44c0_s1_p6_0.vqh

Index: _44c0_s1_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s1_p6_0.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- _44c0_s1_p6_0.vqh	2001/12/17 00:16:43	1.3
+++ _44c0_s1_p6_0.vqh	2001/12/19 01:08:18	1.4
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -18,75 +19,69 @@
 #include "codebook.h"
 
 static long _vq_quantlist__44c0_s1_p6_0[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
         2,
+	14,
         1,
-	3,
+	15,
         0,
-	4,
+	16,
 };
 
 static long _vq_lengthlist__44c0_s1_p6_0[] = {
-	 1, 4, 4, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 4, 8, 8, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 4, 5, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8,11,11,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 8, 8,11,11, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 1, 3, 2, 4, 5, 8, 9,11,11, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 9, 9,11,11, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 9, 9,11,11, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,10,10,12,12, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,12,12, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,12,13, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,12,12, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,13,13,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,13,
+	12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,11,
+	13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
+	12,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	13,13,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,15,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };
 
 static float _vq_quantthresh__44c0_s1_p6_0[] = {
-	-1.5, -0.5, 0.5, 1.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, 
 };
 
 static long _vq_quantmap__44c0_s1_p6_0[] = {
-	    3,    1,    0,    2,    4,
+	   15,   13,   11,    9,    7,    5,    3,    1,
+	    0,    2,    4,    6,    8,   10,   12,   14,
+	   16,
 };
 
 static encode_aux_threshmatch _vq_auxt__44c0_s1_p6_0 = {
         _vq_quantthresh__44c0_s1_p6_0,
         _vq_quantmap__44c0_s1_p6_0,
-	5,
-	5
+	17,
+	17
 };
 
 static static_codebook _44c0_s1_p6_0 = {
-	4, 625,
+	2, 289,
         _vq_lengthlist__44c0_s1_p6_0,
-	1, -533725184, 1611661312, 3, 0,
+	1, -529530880, 1611661312, 5, 0,
         _vq_quantlist__44c0_s1_p6_0,
         NULL,
         &_vq_auxt__44c0_s1_p6_0,

1.5       +2 -1      vorbis/lib/books/coupled/_44c0_s2_p6_0.vqh

Index: _44c0_s2_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s2_p6_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c0_s2_p6_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c0_s2_p6_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,7 +31,7 @@
 };
 
 static long _vq_lengthlist__44c0_s2_p6_0[] = {
-	 1, 2, 3, 5, 4, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 1, 3, 2, 4, 5, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.4       +14 -18    vorbis/lib/books/coupled/_44c0_s2_p7_0.vqh

Index: _44c0_s2_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s2_p7_0.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- _44c0_s2_p7_0.vqh	2001/12/17 00:16:43	1.3
+++ _44c0_s2_p7_0.vqh	2001/12/19 01:08:18	1.4
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -18,46 +19,41 @@
 #include "codebook.h"
 
 static long _vq_quantlist__44c0_s2_p7_0[] = {
-	4,
         3,
-	5,
         2,
-	6,
+	4,
         1,
-	7,
+	5,
         0,
-	8,
+	6,
 };
 
 static long _vq_lengthlist__44c0_s2_p7_0[] = {
-	 1, 3, 2, 5, 5, 5, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
+	 1, 3, 3,11,11,11,11, 3, 6, 7,11,11,11,11, 4, 8,
+	 7,11,11,11,11,11,11, 9,10,11,11,11,11,11,11,11,
+	11,11,11,11,11,10,10,10,10,10,10,10,10,10,10,10,
+	10,
 };
 
 static float _vq_quantthresh__44c0_s2_p7_0[] = {
-	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
+	-167.5, -100.5, -33.5, 33.5, 100.5, 167.5, 
 };
 
 static long _vq_quantmap__44c0_s2_p7_0[] = {
-	    7,    5,    3,    1,    0,    2,    4,    6,
-	    8,
+	    5,    3,    1,    0,    2,    4,    6,
 };
 
 static encode_aux_threshmatch _vq_auxt__44c0_s2_p7_0 = {
         _vq_quantthresh__44c0_s2_p7_0,
         _vq_quantmap__44c0_s2_p7_0,
-	9,
-	9
+	7,
+	7
 };
 
 static static_codebook _44c0_s2_p7_0 = {
-	2, 81,
+	2, 49,
         _vq_lengthlist__44c0_s2_p7_0,
-	1, -531628032, 1611661312, 4, 0,
+	1, -520544256, 1624293376, 3, 0,
         _vq_quantlist__44c0_s2_p7_0,
         NULL,
         &_vq_auxt__44c0_s2_p7_0,

1.5       +4 -4      vorbis/lib/books/coupled/_44c0_short.vqh

Index: _44c0_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_short.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c0_short.vqh	2001/12/17 00:16:43	1.4
+++ _44c0_short.vqh	2001/12/19 01:08:18	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c0_short[] = {
-	 4,17,17,17,17, 6, 8,11,12,17,16,17,17, 5, 5, 9,
-	10,16,17,17,17, 5, 5,10, 9,17,17,17,17, 6, 6,10,
-	 9, 5, 4, 4, 5, 8, 9,11, 3,17,17,16,16, 2, 4,10,
-	 7,16,16,16,16, 4, 5,10,11, 9, 8, 8, 9, 9, 9,10,
+	 6,16,16,16,16, 5, 8,12,12,15,14,15,15, 5, 4, 9,
+	10,14,15,15,15, 4, 5,10, 8,15,15,15,15, 6, 6,10,
+	 9, 5, 4, 4, 5, 8, 9,11, 5,15,15,15,15, 2, 4,11,
+	 7,15,15,15,15, 3, 5,10,12, 9, 8, 8, 9, 9,10,11,
 };
 
 static static_codebook _huff_book__44c0_short = {

1.5       +4 -4      vorbis/lib/books/coupled/_44c1_long.vqh

Index: _44c1_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_long.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_long.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_long.vqh	2001/12/19 01:08:18	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c1_long[] = {
-	 3, 8, 9, 9, 9, 5, 7,10, 8, 4, 5, 7, 8, 6, 7,11,
-	 9, 5, 4, 6, 8, 7, 8,14, 9, 6, 5, 6, 7, 9,10,14,
-	 8, 7, 6, 6, 5,12,12, 8, 5,18,18,18,18, 2, 5,11,
-	 7,18,18,18,18, 4, 6,11,10,14,15,12, 7,10,11,10,
+	 3, 9,10,10,10, 5, 8,11, 9, 4, 5, 7, 9, 6, 7,12,
+	10, 5, 4, 6, 9, 7, 8,14, 9, 6, 5, 6, 8, 9,10,13,
+	 8, 7, 7, 6, 5,12,13, 9, 5,18,18,18,18, 2, 4,11,
+	 7,18,18,18,18, 4, 6,12,10,13,15,12, 7,11,11,11,
 };
 
 static static_codebook _huff_book__44c1_long = {

1.5       +7 -6      vorbis/lib/books/coupled/_44c1_s0_p1_0.vqh

Index: _44c1_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_s0_p1_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_s0_p1_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_s0_p1_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,16 +27,16 @@
 };
 
 static long _vq_lengthlist__44c1_s0_p1_0[] = {
-	 1, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 6, 5, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 5, 8, 7, 0, 0, 0, 9,
-	 8, 0, 0, 0, 9, 8, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
-	 0, 0, 5, 7, 7, 0, 0, 0, 8, 9, 0, 0, 0, 9, 9, 0,
+	 1, 5, 5, 0, 0, 0, 6, 5, 0, 0, 0, 6, 6, 0, 0, 0,
+	 8, 8, 0, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 9,
+	 8, 0, 0, 0, 8, 8, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
+	 0, 0, 5, 7, 7, 0, 0, 0, 8, 9, 0, 0, 0, 8, 8, 0,
          0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 8, 0, 0,
+	 0, 0, 0, 0, 0, 0, 5, 8, 8, 0, 0, 0, 8, 7, 0, 0,
          0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5,
          8, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
         10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -43,7 +44,7 @@
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 6, 9, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
+	 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
          0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 6, 8, 9, 0,
          0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,10, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +2 -1      vorbis/lib/books/coupled/_44c1_s0_p2_0.vqh

Index: _44c1_s0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_s0_p2_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_s0_p2_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_s0_p2_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -33,7 +34,7 @@
          1, 4, 4, 7, 7, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0,
          0, 0, 0, 4, 4, 7, 7, 0, 0, 0, 0, 0, 6, 6, 7, 7,
          0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
-	 9, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
+	 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 9, 0, 0, 0, 0, 0,
          0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.5       +4 -3      vorbis/lib/books/coupled/_44c1_s0_p3_0.vqh

Index: _44c1_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_s0_p3_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_s0_p3_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_s0_p3_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -39,8 +40,8 @@
 
 static long _vq_lengthlist__44c1_s0_p3_0[] = {
          1, 4, 4, 7, 7, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 5, 4, 7, 7, 8, 8, 9,10, 0, 0, 0, 0, 0,
+	 0, 0, 5, 4, 7, 7, 8, 8, 9, 9, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 5, 5, 7, 7, 8, 8,10, 9, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 6, 6, 7, 7, 8, 8,10,10, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,10,10, 0, 0,
@@ -51,7 +52,7 @@
         11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
         10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         11,11,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0,11,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +16 -15    vorbis/lib/books/coupled/_44c1_s0_p4_0.vqh

Index: _44c1_s0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_s0_p4_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_s0_p4_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_s0_p4_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,21 +37,21 @@
 };
 
 static long _vq_lengthlist__44c1_s0_p4_0[] = {
-	 1, 3, 3, 6, 6, 9, 9,12,12,21,21,21,21,21,21, 6,
-	 5, 5, 7, 7,10,10,13,13,21,21,21,21,21,21, 7, 5,
-	 5, 8, 7,10,10,13,13,21,21,21,21,21,21,21, 8, 8,
-	 9, 9,11,11,14,14,21,21,21,21,21,21,21, 8, 8, 9,
-	 9,11,11,14,13,21,21,21,21,21,21,21,13,13,10,10,
-	12,12,15,15,21,21,21,21,21,21,21,14,13,10,10,12,
-	12,15,15,21,21,21,21,21,21,21,21,21,11,12,12,13,
-	15,15,21,21,21,21,21,21,21,21,21,13,12,13,13,16,
-	16,21,21,21,21,21,21,21,21,21,16,16,11,14,16,16,
-	21,21,21,21,21,21,21,21,21,17,17,14,12,16,16,21,
-	21,21,21,21,21,21,21,21,21,21,15,15,15,17,21,21,
-	21,21,21,21,21,21,21,21,21,15,15,17,16,21,21,21,
-	21,21,21,21,21,21,21,21,18,20,17,17,21,20,20,20,
-	20,20,20,20,20,20,20,19,19,17,17,20,20,20,20,20,
-	20,
+	 1, 3, 3, 6, 6, 8, 8,11,11,20,20,20,20,19,19, 6,
+	 5, 5, 7, 8, 9,10,12,12,19,19,19,19,19,19, 7, 5,
+	 5, 8, 8,10,10,12,12,19,19,19,19,19,19,19, 8, 8,
+	 9, 9,11,11,14,13,19,19,19,19,19,19,19, 8, 8, 9,
+	 9,11,11,13,13,19,19,19,19,19,19,19,12,12,10,10,
+	12,12,14,14,19,19,19,19,19,19,19,13,13,10,10,12,
+	12,15,15,19,19,19,19,19,19,19,19,19,11,12,11,12,
+	15,14,19,19,19,19,19,19,19,19,19,12,12,12,12,15,
+	16,19,19,19,19,19,19,19,19,19,15,15,11,13,14,15,
+	19,19,19,19,19,19,19,19,19,16,16,13,12,15,15,19,
+	19,19,19,19,19,19,19,19,19,19,14,14,14,16,19,19,
+	19,19,19,19,19,19,19,19,19,14,14,15,15,19,19,19,
+	19,19,19,19,19,19,19,19,17,16,16,17,19,19,19,19,
+	19,19,19,19,19,19,19,18,18,16,15,19,19,19,19,19,
+	19,
 };
 
 static float _vq_quantthresh__44c1_s0_p4_0[] = {

1.5       +1 -0      vorbis/lib/books/coupled/_44c1_s0_p4_1.vqh

Index: _44c1_s0_p4_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_s0_p4_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_s0_p4_1.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_s0_p4_1.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.5       +3 -2      vorbis/lib/books/coupled/_44c1_s1_p5_0.vqh

Index: _44c1_s1_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_s1_p5_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_s1_p5_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_s1_p5_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,8 +25,8 @@
 };
 
 static long _vq_lengthlist__44c1_s1_p5_0[] = {
-	 1, 3, 3, 0, 0, 0, 0, 0, 0, 3, 6, 6, 0, 0, 0, 0,
-	 0, 0, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0,
+	 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +2 -1      vorbis/lib/books/coupled/_44c1_s2_p6_0.vqh

Index: _44c1_s2_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_s2_p6_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_s2_p6_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_s2_p6_0.vqh	2001/12/19 01:08:18	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,7 +31,7 @@
 };
 
 static long _vq_lengthlist__44c1_s2_p6_0[] = {
-	 1, 3, 2, 5, 4, 7, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 1, 3, 2, 4, 5, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +5 -4      vorbis/lib/books/coupled/_44c1_s3_p7_0.vqh

Index: _44c1_s3_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_s3_p7_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_s3_p7_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_s3_p7_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -28,10 +29,10 @@
 };
 
 static long _vq_lengthlist__44c1_s3_p7_0[] = {
-	 1, 2, 3,12,12,13,13, 5, 6, 7,13,13,13,13, 5, 7,
-	 6,13,13,13,13,13, 8,12,13,12,12,12,12,12, 8,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,
+	 1, 3, 3, 8, 8,15,15, 5, 5, 5,10, 9,14,14, 5, 5,
+	 5,10,10,14,14,14, 7, 9,11,10,14,14,14, 8, 5,13,
+	10,14,14,14,11,13,14,14,14,14,14,13,12,14,13,14,
+	14,
 };
 
 static float _vq_quantthresh__44c1_s3_p7_0[] = {

1.5       +34 -33    vorbis/lib/books/coupled/_44c1_s3_p7_1.vqh

Index: _44c1_s3_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_s3_p7_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_s3_p7_1.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_s3_p7_1.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -44,39 +45,39 @@
 };
 
 static long _vq_lengthlist__44c1_s3_p7_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9,10,10,10,
-	10, 9, 9, 9, 9,10,10, 7, 6, 6, 7, 7, 8, 8, 9, 9,
-	10,10,10,10,11,11,11,11,10,10,10,10,11,11,16, 6,
-	 6, 7, 7, 8, 8, 9, 9,10,10,10,10,10,11,11,11,10,
-	10,10,10,11,11,17, 8, 8, 8, 8, 9, 9,10,10,10,10,
-	11,11,11,12,12,12,11,11,11,10,11,11,16, 9, 8, 8,
-	 8, 9, 9,10, 9,10,10,11,11,11,11,11,12,11,11,10,
-	11,11,11,17,11,12, 9, 9,10, 9,10,10,11,11,11,11,
-	11,12,12,12,11,11,11,11,11,12,17,17,17, 9, 9, 9,
-	 9,10,10,10,11,11,11,12,11,12,12,11,11,11,11,12,
-	12,18,18,18,10,10,10,10,10,10,11,11,11,11,12,12,
-	12,12,11,11,11,11,12,12,18,17,18,11,10,10,10,11,
-	10,11,11,11,11,12,12,12,12,11,11,11,11,12,12,18,
-	18,18,13,14,11,11,11,11,11,11,12,12,12,12,13,12,
-	12,11,12,12,13,12,17,17,18,17,16,11,11,11,11,11,
-	11,12,12,12,12,12,12,12,12,12,11,12,12,18,18,17,
-	17,17,12,12,11,11,12,12,12,12,13,13,13,13,12,12,
-	12,12,13,13,18,18,17,18,16,13,12,11,11,12,12,12,
-	12,12,13,13,13,12,12,12,12,13,13,18,16,18,17,18,
-	13,15,11,12,12,12,12,13,13,13,13,13,12,12,13,12,
-	13,13,18,16,18,17,17,18,15,12,12,12,13,13,12,13,
-	13,13,13,12,13,12,12,13,13,17,16,17,18,17,15,16,
-	13,12,13,13,12,13,13,13,13,13,14,12,13,13,14,13,
-	18,18,18,18,17,18,16,13,13,13,13,13,13,13,13,13,
-	13,12,12,12,13,13,13,17,17,18,18,17,16,17,14,15,
-	13,13,13,14,14,13,13,14,13,12,13,13,13,14,16,18,
-	17,17,18,18,18,16,16,13,13,14,14,13,13,14,14,12,
-	12,13,13,13,13,16,17,18,17,17,17,16,16,17,14,14,
-	14,14,13,13,13,15,13,13,13,13,14,13,18,18,16,16,
-	18,17,18,17,16,14,14,14,14,14,14,13,15,13,13,13,
-	13,14,14,18,18,16,17,17,18,18,16,16,15,16,14,14,
-	14,13,14,14,14,14,13,14,15,14,16,18,17,18,17,18,
-	16,16,17,16,16,15,14,14,14,15,15,13,13,13,14,14,
+	 2, 3, 4, 5, 5, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9,10,
+	 9, 9, 9, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 9, 9,
+	 9, 9, 9,10,10,10,10,10,10,10,10, 9,10,10,13, 6,
+	 5, 7, 7, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,
+	10, 9, 9,10,10,14, 8, 8, 8, 8, 9, 9, 9, 9,10,10,
+	10,10,11,11,11,11,10,10,10,10,11,11,13, 8, 8, 8,
+	 8, 8, 8, 9, 9,10,10,10,10,10,10,11,11,10,10,10,
+	10,11,11,14,10,11, 8, 8, 9, 9,10,10,10,10,11,11,
+	11,11,11,11,11,11,11,11,11,11,13,14,13, 8, 8, 9,
+	 9,10,10,10,10,10,10,11,11,11,11,10,11,11,11,11,
+	11,13,14,14,10,10,10, 9,10,10,10,10,11,11,11,11,
+	11,11,11,11,11,11,12,12,14,13,13,10,10, 9, 9,10,
+	10,10,10,11,11,11,11,12,12,11,11,11,11,12,12,14,
+	14,13,12,12,10,10,10,10,11,11,11,11,11,11,12,11,
+	12,11,11,11,12,12,15,14,14,15,13,10,10,10,10,11,
+	11,11,12,12,12,12,11,11,11,11,11,12,12,14,15,13,
+	14,13,11,11,11,11,11,11,11,12,12,11,12,12,11,11,
+	12,11,12,12,14,14,14,13,13,11,11,11,11,11,11,12,
+	11,12,12,12,12,11,11,11,11,12,12,14,14,14,14,14,
+	12,12,11,11,11,11,12,12,12,12,12,12,12,12,11,11,
+	12,12,14,14,14,13,13,13,13,11,11,11,11,12,12,12,
+	12,12,12,11,12,11,12,12,12,14,14,14,14,13,14,13,
+	12,11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	13,14,14,13,14,13,14,12,12,12,11,12,12,12,12,12,
+	12,11,12,11,12,12,12,14,14,14,14,13,14,14,13,13,
+	12,12,12,12,12,12,13,13,12,12,12,12,12,12,13,13,
+	14,14,14,14,14,13,13,13,12,13,13,12,12,12,12,12,
+	12,12,12,12,13,14,13,13,14,13,13,13,14,13,12,13,
+	12,12,13,12,12,12,12,12,12,12,13,12,14,13,13,14,
+	14,14,14,14,14,14,13,12,12,12,12,13,12,12,12,12,
+	12,12,13,14,15,14,15,14,15,14,14,14,14,14,12,12,
+	13,12,13,13,13,13,12,12,14,13,14,15,15,14,14,15,
+	14,15,14,14,14,13,12,13,13,13,13,12,12,12,13,13,
         14,
 };
 

1.5       +6 -5      vorbis/lib/books/coupled/_44c1_s3_p7_2.vqh

Index: _44c1_s3_p7_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_s3_p7_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_s3_p7_2.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_s3_p7_2.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
 };
 
 static long _vq_lengthlist__44c1_s3_p7_2[] = {
-	 2, 5, 5, 7, 6, 6, 7, 6, 6, 5, 5, 6, 7, 7, 7, 7,
-	 7, 7, 5, 6, 5, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,
-	 8, 8, 8, 8, 7, 7, 7, 8, 7, 7, 8, 7, 7, 7, 7, 7,
-	 8, 7, 7, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 7, 6,
-	 7, 7, 8, 7, 7, 8, 7, 7, 6, 7, 7, 8, 7, 7, 8, 7,
+	 3, 5, 5, 7, 6, 6, 7, 6, 6, 5, 5, 5, 7, 7, 7, 7,
+	 6, 7, 5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6,
+	 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7,
          7,
 };
 

1.5       +4 -4      vorbis/lib/books/coupled/_44c1_short.vqh

Index: _44c1_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c1_short.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c1_short.vqh	2001/12/17 00:16:43	1.4
+++ _44c1_short.vqh	2001/12/19 01:08:19	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c1_short[] = {
-	 5,14,17,17,17, 7, 9,12,15, 7, 7, 9,10,17,17,17,
-	14, 5, 5, 6, 9,17,17,17,16, 7, 6, 7, 9,17,17,17,
-	14, 8, 5, 5, 7,16,16,16, 4,16,16,16,16, 2, 4,10,
-	 7,16,16,16,16, 3, 3, 9,12, 9, 4, 5, 7, 8, 7,10,
+	 5,17,17,17,17, 7,10,14,17, 7, 7, 9,11,17,17,17,
+	15, 5, 5, 6, 9,17,17,17,17, 7, 6, 7, 9,17,17,17,
+	15, 8, 5, 5, 8,17,17,17, 5,17,17,16,16, 2, 4,10,
+	 7,16,16,16,16, 3, 3, 9,13, 9, 4, 4, 6, 9, 7,10,
 };
 
 static static_codebook _huff_book__44c1_short = {

1.5       +4 -4      vorbis/lib/books/coupled/_44c2_long.vqh

Index: _44c2_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_long.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_long.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_long.vqh	2001/12/19 01:08:19	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c2_long[] = {
-	 3, 9,12,11, 9, 6, 8,10, 9, 6, 6, 7, 8, 7, 7,10,
-	11, 6, 4, 6, 7, 7, 7,11,11, 7, 5, 5, 7, 9, 8,11,
-	 9, 7, 6, 5, 5,10,10, 8, 5,18,18,18,18, 2, 4, 9,
-	 8,18,18,18,18, 4, 4, 9,10,15,14,13, 7, 9, 9, 9,
+	 3,10,12,12,10, 6, 8,10,10, 6, 6, 7, 8, 7, 7,10,
+	12, 5, 4, 6, 7, 7, 7,11,12, 7, 5, 5, 7, 9, 8,11,
+	 9, 7, 6, 5, 5,11,10, 8, 6,17,17,17,17, 2, 4, 9,
+	 8,17,17,17,17, 4, 4, 9,10,14,13,12, 7, 8, 8, 9,
 };
 
 static static_codebook _huff_book__44c2_long = {

1.5       +1 -0      vorbis/lib/books/coupled/_44c2_s0_p1_0.vqh

Index: _44c2_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_s0_p1_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_s0_p1_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_s0_p1_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.5       +6 -5      vorbis/lib/books/coupled/_44c2_s0_p2_0.vqh

Index: _44c2_s0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_s0_p2_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_s0_p2_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_s0_p2_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,11 +31,11 @@
 };
 
 static long _vq_lengthlist__44c2_s0_p2_0[] = {
-	 1, 4, 4, 7, 7, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0,
-	 0, 0, 0, 4, 4, 7, 7, 0, 0, 0, 0, 0, 6, 6, 7, 7,
-	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 9, 8, 0, 0, 0, 0, 0,
-	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
+	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
+	 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 0,
+	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };
 

1.5       +18 -17    vorbis/lib/books/coupled/_44c2_s0_p3_0.vqh

Index: _44c2_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_s0_p3_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_s0_p3_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_s0_p3_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,23 +39,23 @@
 };
 
 static long _vq_lengthlist__44c2_s0_p3_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 4, 7, 7, 8, 8,10,10, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 5, 4, 7, 7, 8, 8,10,10, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 8, 8, 9, 9,10,10, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 8,10,10, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,10,11, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,10,11, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,10,10,11,11,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,11,
-	11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,
-	11,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
-	10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	11,11,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,
+	 2, 4, 4, 6, 6, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 5, 5, 6, 7, 8, 7, 9, 9, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 8, 9, 9, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9,10,10,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 9,10,
+	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,
+	11,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+	 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	10,10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.5       +16 -15    vorbis/lib/books/coupled/_44c2_s0_p4_0.vqh

Index: _44c2_s0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_s0_p4_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_s0_p4_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_s0_p4_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,21 +37,21 @@
 };
 
 static long _vq_lengthlist__44c2_s0_p4_0[] = {
-	 1, 3, 3, 6, 6, 9, 9,11,12,21,21,21,21,21,21, 6,
-	 5, 5, 7, 7, 9,10,12,13,21,21,21,21,21,21, 7, 5,
-	 5, 8, 8,10,10,12,13,21,21,21,21,21,21,21, 8, 8,
-	 9, 9,10,11,13,13,21,21,21,21,21,21,21, 8, 8, 9,
-	 9,11,11,13,14,21,21,21,21,21,21,21,12,12,10,10,
-	11,11,14,14,21,21,21,21,21,21,21,13,13,10,10,12,
-	12,14,15,21,21,21,21,21,21,21,21,21,11,12,12,12,
-	15,15,21,21,21,21,21,21,21,21,21,12,12,12,11,15,
-	15,21,21,21,21,21,21,21,21,21,16,16,11,13,15,16,
-	21,20,20,20,20,20,20,20,20,17,16,13,12,16,15,20,
-	20,20,20,20,20,20,20,20,20,20,15,15,16,16,20,20,
-	20,20,20,20,20,20,20,20,20,15,15,16,16,20,20,20,
-	20,20,20,20,20,20,20,20,18,18,17,17,20,20,20,20,
-	20,20,20,20,20,20,20,19,19,17,17,20,20,20,20,20,
-	20,
+	 1, 3, 3, 6, 6, 9, 9,11,12,20,20,20,20,20,20, 6,
+	 5, 5, 7, 7,10,10,12,13,20,20,20,20,20,20, 7, 5,
+	 5, 8, 8,10,10,13,13,20,20,20,20,20,20,20, 8, 8,
+	 8, 9,11,11,13,14,20,20,20,20,20,19,19, 8, 8, 9,
+	 9,11,11,13,13,19,19,19,19,19,19,19,12,12,10,10,
+	12,12,14,15,19,19,19,19,19,19,19,13,13,10,10,11,
+	11,14,14,19,19,19,19,19,19,19,19,19,11,12,12,12,
+	15,15,19,19,19,19,19,19,19,19,19,12,12,12,12,15,
+	15,19,19,19,19,19,19,19,19,19,15,16,12,13,15,16,
+	19,19,19,19,19,19,19,19,19,17,16,13,13,16,15,19,
+	19,19,19,19,19,19,19,19,19,19,14,15,15,16,19,19,
+	19,19,19,19,19,19,19,19,19,14,15,16,16,19,19,19,
+	19,19,19,19,19,19,19,19,18,17,17,16,19,19,19,19,
+	19,19,19,19,19,19,19,18,18,17,16,19,19,19,19,19,
+	19,
 };
 
 static float _vq_quantthresh__44c2_s0_p4_0[] = {

1.5       +3 -2      vorbis/lib/books/coupled/_44c2_s0_p4_1.vqh

Index: _44c2_s0_p4_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_s0_p4_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_s0_p4_1.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_s0_p4_1.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -28,8 +29,8 @@
 };
 
 static long _vq_lengthlist__44c2_s0_p4_1[] = {
-	 2, 4, 4, 5, 5, 6, 6, 8, 5, 5, 6, 6, 6, 6, 8, 4,
-	 5, 6, 6, 6, 6, 8, 6, 6, 6, 6, 7, 7, 8, 8, 8, 6,
+	 2, 4, 4, 6, 6, 6, 6, 8, 5, 5, 6, 6, 6, 6, 8, 4,
+	 4, 6, 6, 6, 6, 8, 6, 6, 6, 6, 7, 7, 8, 8, 8, 6,
          6, 7, 7, 8, 8, 8, 7, 7, 7, 7, 8, 8, 8, 6, 6, 7,
          7,
 };

1.5       +1 -0      vorbis/lib/books/coupled/_44c2_s1_p5_0.vqh

Index: _44c2_s1_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_s1_p5_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_s1_p5_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_s1_p5_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.5       +2 -1      vorbis/lib/books/coupled/_44c2_s2_p6_0.vqh

Index: _44c2_s2_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_s2_p6_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_s2_p6_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_s2_p6_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,7 +31,7 @@
 };
 
 static long _vq_lengthlist__44c2_s2_p6_0[] = {
-	 1, 3, 2, 5, 4, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 1, 3, 2, 5, 4, 7, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +4 -3      vorbis/lib/books/coupled/_44c2_s2_p7_0.vqh

Index: _44c2_s2_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_s2_p7_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_s2_p7_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_s2_p7_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -28,9 +29,9 @@
 };
 
 static long _vq_lengthlist__44c2_s2_p7_0[] = {
-	 1, 2, 3,10,10,15,13, 5, 6, 7,13,12,15,14, 5, 6,
-	 6,12,12,14,14,14,10,13,14,14,14,14,14,13, 9,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	 1, 3, 3, 7, 7,14,14, 5, 5, 5, 8, 9,15,14, 5, 5,
+	 5, 9, 8,15,15,15, 8, 9,10,10,15,15,15, 8, 6,10,
+	 9,15,14,14,10,12,12,12,14,14,14,13,10,12,10,14,
         14,
 };
 

1.5       +35 -34    vorbis/lib/books/coupled/_44c2_s2_p7_1.vqh

Index: _44c2_s2_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_s2_p7_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_s2_p7_1.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_s2_p7_1.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -44,40 +45,40 @@
 };
 
 static long _vq_lengthlist__44c2_s2_p7_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9,10,10,10,
-	10,10, 9, 9, 9,10,10, 7, 6, 6, 7, 7, 8, 8, 9, 9,
-	10, 9,10,10,11,11,11,11,10,10,10,10,11,11,16, 6,
-	 6, 7, 7, 8, 8, 9, 9,10,10,10,10,11,11,11,11,10,
-	10,10,10,11,11,16, 9, 9, 8, 8, 9, 9,10,10,10,10,
-	11,11,11,11,11,11,11,11,11,11,12,11,17, 9, 9, 8,
-	 8, 9, 9, 9,10,10,10,11,11,11,11,11,11,11,11,11,
-	11,11,11,16,11,12, 8, 9, 9, 9,10,10,11,11,11,11,
-	11,11,12,12,11,11,11,11,12,12,16,17,16, 9, 9, 9,
-	 9,10,10,11,11,11,11,11,11,12,11,11,11,11,11,12,
-	12,16,18,16,10,10,10,10,10,10,11,11,11,11,12,12,
-	12,12,11,11,11,11,12,12,17,16,16,11,10,10,10,10,
-	10,11,11,11,11,12,12,12,12,11,12,11,11,12,12,16,
-	17,16,13,13,11,11,11,11,11,11,12,12,12,12,12,12,
-	11,12,12,12,12,13,16,17,19,16,17,10,10,11,11,11,
-	12,12,12,12,12,12,12,12,12,12,12,13,12,17,18,17,
-	18,16,12,12,11,11,12,12,12,12,12,12,13,13,12,12,
-	12,12,13,13,17,18,17,18,17,12,12,11,11,12,12,12,
-	12,12,12,13,13,12,12,12,12,13,13,17,19,16,18,19,
-	15,14,12,12,12,12,12,13,13,13,13,13,12,12,12,12,
-	13,13,17,17,17,17,18,18,17,11,12,12,12,12,12,13,
-	13,13,13,12,12,12,12,12,13,17,16,16,17,16,17,17,
-	13,13,13,13,13,13,13,13,13,13,12,12,13,12,13,13,
-	16,18,16,18,18,18,16,13,14,13,12,13,13,13,13,13,
-	13,13,12,13,12,13,13,16,16,17,18,16,17,16,15,15,
-	13,13,13,13,13,13,13,13,13,13,12,13,13,13,17,17,
-	17,17,17,17,17,16,16,13,13,13,14,13,13,13,13,12,
-	13,12,13,13,14,17,16,18,17,16,18,17,16,16,14,13,
-	13,13,13,13,13,14,13,13,12,13,13,13,17,17,17,17,
-	17,18,17,15,16,14,14,13,13,13,13,13,13,13,13,12,
-	13,13,13,17,17,19,18,18,18,17,17,16,17,16,14,13,
-	14,14,14,14,13,14,13,13,14,14,18,16,17,17,17,18,
-	18,17,16,16,16,14,13,14,14,14,14,13,13,13,13,14,
-	14,
+	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9,10,10,
+	10,10,10,10,10,10,10, 7, 6, 6, 7, 7, 8, 8, 9, 9,
+	10,10,10,10,10,11,11,11,10,10,10,10,11,11,14, 6,
+	 6, 7, 7, 8, 8, 9, 9,10,10,10,10,10,10,11,10,10,
+	10,10,10,11,11,14, 8, 9, 8, 8, 9, 9,10,10,10,10,
+	11,11,11,11,11,11,11,11,11,11,11,11,14, 9, 9, 8,
+	 8, 9, 9,10,10,10,11,11,11,11,11,11,11,11,11,11,
+	11,11,12,14,11,11, 9, 9,10,10,10,10,11,11,11,11,
+	11,11,12,12,11,11,11,11,12,12,14,15,14, 9, 9, 9,
+	10,10,10,11,11,11,11,11,11,12,11,11,11,11,11,12,
+	12,14,15,14,10,10,10,10,11,11,11,11,11,11,12,12,
+	12,12,11,12,11,11,12,12,15,15,14,10,10,10,10,11,
+	11,11,11,12,11,12,12,12,12,12,12,11,12,12,12,14,
+	14,14,13,13,11,10,11,11,12,11,12,12,12,12,12,12,
+	12,12,12,12,12,12,14,14,15,15,16,10,10,11,11,11,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,14,15,14,
+	15,14,12,12,11,11,12,12,12,12,12,12,12,12,12,12,
+	12,12,13,13,14,15,14,14,14,12,11,11,11,12,12,12,
+	12,12,12,12,12,12,12,12,12,13,13,14,15,14,15,15,
+	14,13,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	13,13,15,15,15,14,14,14,14,11,12,12,12,12,12,13,
+	13,12,12,12,12,12,12,13,13,14,15,14,14,16,14,14,
+	13,12,12,12,13,12,13,12,12,12,12,12,12,12,13,13,
+	16,15,14,15,15,15,15,13,13,12,12,12,12,13,12,13,
+	13,13,12,12,13,13,13,14,15,15,15,14,15,15,14,14,
+	13,12,13,13,13,13,13,13,13,13,12,13,13,13,15,14,
+	15,14,15,15,15,14,14,12,13,13,13,13,12,13,12,12,
+	13,12,12,13,14,14,14,14,15,14,15,15,14,15,14,14,
+	13,13,13,13,13,13,12,13,12,13,13,13,15,14,15,15,
+	14,14,15,14,15,13,13,13,12,13,12,13,13,12,13,12,
+	12,13,13,15,15,15,15,15,15,16,14,16,15,14,13,12,
+	13,13,14,13,13,13,13,13,14,14,15,15,15,15,15,15,
+	15,15,15,16,15,13,12,13,13,13,13,13,13,13,13,14,
+	13,
 };
 
 static float _vq_quantthresh__44c2_s2_p7_1[] = {

1.5       +5 -4      vorbis/lib/books/coupled/_44c2_s2_p7_2.vqh

Index: _44c2_s2_p7_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_s2_p7_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_s2_p7_2.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_s2_p7_2.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
 };
 
 static long _vq_lengthlist__44c2_s2_p7_2[] = {
-	 2, 4, 4, 7, 7, 7, 7, 7, 7, 5, 5, 5, 7, 7, 7, 7,
+	 2, 5, 5, 7, 7, 7, 7, 7, 7, 5, 5, 5, 7, 7, 7, 7,
          7, 7, 5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8,
-	 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 7, 8, 7, 7, 7,
-	 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 7,
-	 7, 7, 8, 8, 8, 8, 7, 8, 7, 7, 7, 8, 8, 8, 8, 7,
+	 8, 8, 8, 8, 7, 7, 7, 8, 7, 7, 8, 7, 7, 7, 7, 7,
+	 8, 7, 7, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
          7,
 };
 

1.5       +4 -4      vorbis/lib/books/coupled/_44c2_short.vqh

Index: _44c2_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c2_short.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c2_short.vqh	2001/12/17 00:16:43	1.4
+++ _44c2_short.vqh	2001/12/19 01:08:19	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c2_short[] = {
-	 8,15,18,18,18, 8, 9,12,17, 9, 8, 9,12,18,18,17,
-	16, 6, 5, 5, 8,18,17,17,17, 7, 5, 5, 7,17,17,17,
-	17, 9, 6, 5, 6,17,17,15, 6,17,17,17,17, 3, 4, 9,
-	 8,17,17,17,17, 3, 2, 7,12,10, 5, 4, 5, 8, 5, 8,
+	 8,17,17,17,17, 8,10,14,16,10, 9,10,11,17,17,17,
+	17, 7, 5, 6, 8,17,17,17,17, 8, 5, 5, 8,17,17,17,
+	17, 9, 6, 5, 7,16,16,16, 6,16,16,16,16, 3, 3,10,
+	 9,16,16,16,16, 3, 2, 7,13,10, 5, 4, 5, 8, 6, 8,
 };
 
 static static_codebook _huff_book__44c2_short = {

1.5       +4 -4      vorbis/lib/books/coupled/_44c3_long.vqh

Index: _44c3_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_long.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_long.vqh	2001/12/17 00:16:43	1.4
+++ _44c3_long.vqh	2001/12/19 01:08:19	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c3_long[] = {
-	 3, 9,11,12,10, 7,10,11, 9, 4, 5, 7, 7, 6, 7,11,
-	11, 5, 4, 6, 7, 8, 8,12,11, 6, 5, 6, 6,10, 9,12,
-	 9, 7, 6, 5, 4,13,11, 7, 5,16,16,16,16, 2, 5,11,
-	10,16,16,16,16, 5, 5,11,11,12,12,11, 7,11,10, 8,
+	 3, 9,12,12,10, 7, 9,11, 9, 4, 5, 7, 8, 6, 8,12,
+	11, 4, 4, 6, 7, 8, 8,13,11, 6, 5, 6, 6,11,10,13,
+	 9, 7, 6, 5, 4,13,12, 8, 5,18,18,18,18, 2, 5,11,
+	 9,18,18,18,18, 5, 6,12,11,15,14,12, 7,11,11, 9,
 };
 
 static static_codebook _huff_book__44c3_long = {

1.5       +5 -4      vorbis/lib/books/coupled/_44c3_s0_p1_0.vqh

Index: _44c3_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_s0_p1_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_s0_p1_0.vqh	2001/12/17 00:16:43	1.4
+++ _44c3_s0_p1_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -27,17 +28,17 @@
 
 static long _vq_lengthlist__44c3_s0_p1_0[] = {
          2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
-	 7, 7, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 8,
          7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
-	 0, 0, 5, 6, 6, 0, 0, 0, 7, 8, 0, 0, 0, 7, 7, 0,
+	 0, 0, 5, 6, 7, 0, 0, 0, 7, 8, 0, 0, 0, 7, 7, 0,
          0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 7, 7, 0, 0,
-	 0, 7, 7, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5,
-	 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9,
+	 0, 7, 7, 0, 0, 0, 9, 8, 0, 0, 0, 0, 0, 0, 0, 5,
+	 7, 7, 0, 0, 0, 6, 7, 0, 0, 0, 7, 7, 0, 0, 0, 8,
          9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +2 -1      vorbis/lib/books/coupled/_44c3_s0_p2_0.vqh

Index: _44c3_s0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_s0_p2_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_s0_p2_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c3_s0_p2_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -33,7 +34,7 @@
          1, 4, 4, 7, 7, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0,
          0, 0, 0, 4, 4, 7, 7, 0, 0, 0, 0, 0, 6, 6, 7, 7,
          0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
-	 9, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
+	 8, 9, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
          0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.5       +13 -12    vorbis/lib/books/coupled/_44c3_s0_p3_0.vqh

Index: _44c3_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_s0_p3_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_s0_p3_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c3_s0_p3_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,23 +39,23 @@
 };
 
 static long _vq_lengthlist__44c3_s0_p3_0[] = {
-	 2, 4, 3, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
+	 2, 4, 4, 6, 6, 7, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 5, 7, 7, 8, 8,10, 9, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8,10,10, 0,
+	 0, 0, 0, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 6, 6, 8, 8, 9, 9, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9,10,10,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,10,
-	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,
-	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
-	10,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	11,11,11,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8,10,
+	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,
+	10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+	 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	10,10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.5       +16 -15    vorbis/lib/books/coupled/_44c3_s0_p4_0.vqh

Index: _44c3_s0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_s0_p4_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_s0_p4_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c3_s0_p4_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,21 +37,21 @@
 };
 
 static long _vq_lengthlist__44c3_s0_p4_0[] = {
-	 1, 3, 3, 7, 7, 9, 9,12,12,22,22,22,22,21,21, 5,
-	 5, 5, 8, 8,10,10,13,13,21,21,21,21,21,21, 6, 5,
-	 5, 8, 8,10,10,13,13,21,21,21,21,21,21,21, 8, 8,
-	 9, 9,10,10,13,13,21,21,21,21,21,21,21, 8, 8, 9,
-	 9,10,11,13,13,21,21,21,21,21,21,21,12,12,10,10,
-	11,11,14,14,21,21,21,21,21,21,21,13,13,10,10,11,
-	11,14,14,21,21,21,21,21,21,21,21,21,11,12,12,12,
-	14,15,21,21,21,21,21,21,21,21,21,12,11,12,12,15,
-	15,21,21,21,21,21,21,21,21,21,12,15,12,13,15,15,
-	21,21,21,21,21,21,21,21,21,17,16,13,13,15,15,21,
-	21,21,21,21,21,21,21,21,21,21,15,15,16,16,21,21,
-	21,21,21,21,21,21,21,21,21,15,15,16,16,21,21,21,
-	21,21,21,21,21,21,21,21,18,18,17,17,21,21,21,21,
-	21,21,21,21,21,21,21,20,20,17,17,21,21,21,21,21,
-	21,
+	 1, 3, 3, 7, 7, 9, 9,12,11,20,20,20,20,20,20, 5,
+	 5, 5, 8, 8,10,10,12,13,20,20,20,20,20,20, 6, 5,
+	 5, 8, 8,10,10,13,13,20,20,20,20,20,20,20, 8, 8,
+	 9, 9,10,10,13,13,20,20,20,20,20,20,20, 8, 8, 9,
+	 9,10,11,13,13,20,20,20,20,20,20,20,12,12,10,10,
+	11,11,14,14,20,20,20,20,20,20,20,13,13,10,10,11,
+	11,14,15,20,20,20,20,20,20,20,20,20,12,12,12,12,
+	14,15,20,20,20,20,20,20,20,20,20,12,11,12,12,15,
+	14,20,20,20,20,20,20,20,20,20,15,16,12,13,14,16,
+	20,20,20,20,20,20,20,20,20,18,16,13,13,15,15,20,
+	20,20,20,20,20,20,20,20,20,20,15,15,15,16,20,20,
+	20,20,20,20,20,20,20,20,20,15,15,16,16,20,20,20,
+	20,20,20,20,20,20,20,20,18,18,16,17,20,20,20,20,
+	20,20,20,20,20,20,20,18,20,17,16,20,20,20,20,20,
+	19,
 };
 
 static float _vq_quantthresh__44c3_s0_p4_0[] = {

1.5       +3 -2      vorbis/lib/books/coupled/_44c3_s0_p4_1.vqh

Index: _44c3_s0_p4_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_s0_p4_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_s0_p4_1.vqh	2001/12/17 00:16:44	1.4
+++ _44c3_s0_p4_1.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -28,9 +29,9 @@
 };
 
 static long _vq_lengthlist__44c3_s0_p4_1[] = {
-	 2, 4, 4, 6, 6, 7, 7, 8, 4, 4, 6, 6, 7, 7, 8, 4,
+	 2, 4, 4, 6, 6, 6, 6, 8, 5, 4, 6, 6, 7, 7, 8, 4,
          4, 6, 6, 7, 7, 8, 6, 6, 6, 6, 7, 7, 8, 8, 8, 6,
-	 6, 7, 7, 8, 8, 8, 7, 7, 7, 7, 8, 8, 8, 7, 7, 7,
+	 6, 7, 7, 8, 8, 8, 7, 7, 7, 7, 8, 8, 8, 6, 6, 7,
          7,
 };
 

1.4       +1 -0      vorbis/lib/books/coupled/_44c3_s1_p5_0.vqh

Index: _44c3_s1_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_s1_p5_0.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- _44c3_s1_p5_0.vqh	2001/12/17 00:16:44	1.3
+++ _44c3_s1_p5_0.vqh	2001/12/19 01:08:19	1.4
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.5       +2 -1      vorbis/lib/books/coupled/_44c3_s2_p6_0.vqh

Index: _44c3_s2_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_s2_p6_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_s2_p6_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c3_s2_p6_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,7 +31,7 @@
 };
 
 static long _vq_lengthlist__44c3_s2_p6_0[] = {
-	 1, 3, 2, 5, 4, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 1, 2, 3, 4, 5, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +12 -11    vorbis/lib/books/coupled/_44c3_s2_p7_0.vqh

Index: _44c3_s2_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_s2_p7_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_s2_p7_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c3_s2_p7_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c3_s2_p7_0[] = {
-	 1, 2, 3, 9, 9,11,12,14,13,16,15,16,16, 6, 6, 6,
-	10,11,14,13,16,16,16,16,16,16, 5, 6, 6,11,11,15,
-	14,15,15,16,16,16,16,16, 9,11,13,14,15,16,16,16,
-	16,16,16,16,16,11,11,12,12,13,13,16,16,16,16,16,
-	16,16,14,16,13,15,16,16,16,16,16,16,16,16,16,16,
-	13,16,10,16,16,16,15,15,15,16,16,16,16,16,12,16,
-	16,16,16,16,16,16,16,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,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,
+	 1, 3, 3, 7, 7,12,12,15,14,15,15,15,15, 5, 5, 5,
+	 9, 9,14,13,15,15,15,15,15,15, 5, 5, 5, 9, 9,13,
+	12,15,15,15,15,15,15,15, 8, 9,10,10,13,13,15,15,
+	15,15,15,15,15, 9, 6,10, 9,13,13,15,15,15,15,15,
+	15,15,10,13,10,11,13,15,15,15,15,15,15,15,15,12,
+	10,12,10,13,15,15,15,15,15,15,15,15,15,15,15,13,
+	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	15,15,15,15,15,15,15,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,
 };
 
 static float _vq_quantthresh__44c3_s2_p7_0[] = {

1.5       +34 -33    vorbis/lib/books/coupled/_44c3_s2_p7_1.vqh

Index: _44c3_s2_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_s2_p7_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_s2_p7_1.vqh	2001/12/17 00:16:44	1.4
+++ _44c3_s2_p7_1.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -44,39 +45,39 @@
 };
 
 static long _vq_lengthlist__44c3_s2_p7_1[] = {
-	 1, 4, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9,10,10,10,
-	10,10,10,10,10,10,10, 7, 6, 6, 7, 7, 8, 8, 9, 9,
-	10, 9,10,10,11,11,11,11,10,10,10,10,11,11,15, 6,
-	 6, 7, 7, 8, 8, 9, 9, 9,10,10,10,11,11,11,11,10,
-	10,11,10,11,11,14, 8, 8, 8, 8, 9, 9, 9, 9,10,10,
-	10,11,11,11,11,11,11,11,11,11,11,11,15, 9, 8, 8,
-	 8, 9, 9, 9, 9,10,10,10,10,11,11,11,11,11,11,11,
-	11,11,12,15,11,11, 9, 9, 9, 9,10,10,10,10,11,11,
-	11,11,11,11,11,11,11,11,12,12,15,15,15, 9, 9, 9,
-	 9,10,10,10,10,11,11,11,11,11,11,11,11,11,11,12,
-	12,16,15,15,10,10,10,10,10,10,11,11,11,11,11,11,
-	12,12,11,11,11,11,12,12,15,15,15,10,11,10, 9,10,
-	10,11,11,11,11,11,11,12,12,11,11,11,11,12,12,16,
-	15,16,13,13,10,10,11,11,11,11,11,11,12,12,12,12,
-	11,11,11,11,12,12,16,15,16,15,15,10,10,10,10,11,
-	11,11,11,12,12,12,12,11,11,11,11,12,12,15,16,16,
-	16,16,12,11,11,11,11,11,12,12,12,12,12,12,12,11,
-	11,11,12,12,15,16,15,15,15,12,12,11,11,11,11,12,
-	12,12,12,12,12,12,11,11,11,12,12,16,15,15,15,15,
-	14,14,12,11,12,12,12,12,12,12,12,12,12,12,11,11,
-	12,12,15,16,15,16,16,15,16,11,11,12,11,12,12,12,
-	12,12,12,12,12,12,12,12,12,15,15,16,16,16,16,15,
-	13,13,12,12,12,12,12,13,12,12,12,12,12,12,13,12,
-	16,16,16,15,15,15,15,13,12,12,12,12,12,12,13,13,
-	12,12,12,12,12,12,13,16,16,16,15,15,16,15,15,14,
-	12,12,13,13,12,12,12,13,12,12,12,12,13,13,15,16,
-	16,16,15,15,16,15,15,12,12,12,12,13,12,13,12,12,
-	12,12,12,13,12,16,15,16,15,15,15,15,15,14,13,13,
-	13,13,12,13,12,12,12,12,12,12,12,12,16,15,17,16,
-	15,15,16,15,15,14,14,12,13,13,13,13,13,12,12,12,
-	12,13,13,17,16,16,16,16,16,16,16,16,15,15,13,13,
-	13,13,13,13,12,13,12,13,13,14,16,16,16,17,17,17,
-	17,15,15,15,16,13,13,13,13,13,13,13,13,13,13,13,
+	 2, 4, 4, 5, 5, 6, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 6, 5, 6, 7, 7, 8, 8, 8, 8,
+	 9, 9, 9, 9,10,10,10,10, 9, 9, 9, 9,10,10,13, 6,
+	 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10, 9,
+	 9, 9, 9,10,10,13, 8, 8, 7, 7, 8, 8, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,10,11,11,13, 8, 8, 7,
+	 7, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,
+	10,11,11,13,11,11, 8, 8, 9, 9, 9, 9,10,10,10,10,
+	11,10,11,11,10,10,10,10,11,11,13,13,13, 8, 8, 9,
+	 8, 9,10,10,10,10,10,10,10,11,11,10,11,10,10,11,
+	11,14,14,14,10,10, 9, 9,10,10,10,10,10,10,11,11,
+	11,11,11,11,11,11,11,11,14,13,13,10,10, 9, 9,10,
+	10,10,10,10,11,11,10,11,11,11,11,11,11,11,11,14,
+	15,14,12,12,10,10,10,10,10,11,11,11,11,11,11,11,
+	11,11,11,11,11,12,14,14,14,14,13,10, 9,10,10,10,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,14,14,14,
+	14,14,11,11,10,10,11,11,11,11,11,11,11,12,11,11,
+	11,11,11,12,15,14,14,13,13,11,11,10,10,11,11,11,
+	11,11,11,12,11,11,11,11,11,11,12,13,14,14,13,14,
+	13,12,11,11,11,11,11,11,12,12,11,11,11,11,11,11,
+	12,12,14,14,13,14,13,14,13,10,11,11,11,11,11,12,
+	12,12,11,11,11,11,11,12,12,14,14,13,14,13,13,13,
+	12,12,11,11,12,12,12,12,11,11,11,11,12,11,12,12,
+	13,14,15,14,13,14,14,12,12,11,11,11,11,12,12,11,
+	12,11,11,11,11,12,12,14,14,14,14,14,14,14,14,13,
+	12,12,12,12,11,11,12,11,12,11,11,11,12,12,14,13,
+	13,13,13,13,14,13,14,12,12,11,12,12,11,12,12,11,
+	11,11,12,12,12,13,14,13,13,13,14,13,14,13,12,12,
+	12,12,12,11,12,12,11,12,11,12,12,12,13,13,13,14,
+	13,13,13,14,13,12,13,11,11,12,11,12,12,11,11,11,
+	11,12,12,14,14,15,14,14,15,14,15,14,14,13,12,13,
+	12,12,12,12,12,12,12,13,13,13,14,15,14,13,14,14,
+	14,14,15,14,14,12,12,12,12,12,12,12,12,12,12,13,
         13,
 };
 

1.5       +4 -3      vorbis/lib/books/coupled/_44c3_s2_p7_2.vqh

Index: _44c3_s2_p7_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_s2_p7_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_s2_p7_2.vqh	2001/12/17 00:16:44	1.4
+++ _44c3_s2_p7_2.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
 };
 
 static long _vq_lengthlist__44c3_s2_p7_2[] = {
-	 3, 5, 5, 7, 6, 6, 7, 6, 6, 5, 6, 5, 7, 7, 7, 7,
+	 3, 5, 5, 7, 6, 6, 7, 6, 6, 5, 5, 5, 7, 7, 7, 7,
          7, 7, 5, 5, 5, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7,
-	 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7,
          7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6,
-	 6, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7,
          7,
 };
 

1.5       +4 -4      vorbis/lib/books/coupled/_44c3_short.vqh

Index: _44c3_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c3_short.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c3_short.vqh	2001/12/17 00:16:44	1.4
+++ _44c3_short.vqh	2001/12/19 01:08:19	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c3_short[] = {
-	 4,15,18,18,18, 9,11,14,17,10, 9,11,13,18,18,18,
-	18, 7, 5, 7, 9,18,18,18,18, 8, 5, 5, 8,18,18,18,
-	15,10, 7, 6, 6,18,18,18, 4,18,18,18,17, 3, 4, 9,
-	 7,17,17,17,17, 3, 2, 7,13,11, 6, 4, 5, 9, 6, 9,
+	 8,17,17,17,17, 9,10,14,15, 8, 7, 9,12,16,16,16,
+	16, 6, 4, 6, 9,16,16,16,15, 7, 5, 5, 8,16,16,16,
+	16, 9, 6, 6, 7,16,16,16, 6,16,16,16,16, 3, 4, 9,
+	 7,16,16,16,16, 3, 2, 7,12, 9, 4, 4, 5, 8, 7, 9,
 };
 
 static static_codebook _huff_book__44c3_short = {

1.5       +7 -7      vorbis/lib/books/coupled/_44c4_long.vqh

Index: _44c4_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_long.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_long.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_long.vqh	2001/12/19 01:08:19	1.5
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c4_long[] = {
-	 2, 9, 7,12,11,12,11,10,12,14, 9, 5, 7, 5, 8, 7,
-	10, 8,11,14, 6,21, 3,21, 5,21, 8,11,18,21,11, 5,
-	 8, 4, 7, 6, 9, 7,10,14,10,20, 5,20, 5,20, 7,12,
-	19,20,12, 7,10, 5, 9, 5,10, 6,10,15,11,20, 7,20,
-	 7,20, 8,12,20,20,10, 8,10, 7,10, 5,10, 4, 8,12,
-	10,10,17,10,19, 9,19, 6, 7,10,12,12,20,11,20,10,
-	20, 8, 8, 8,
+	 2, 9, 7,12,10,13,11,10,12,15, 9, 4, 6, 5, 8, 7,
+	10, 8,11,17, 5,19, 3,19, 5,19, 8,11,18,19,12, 5,
+	 8, 4, 8, 5,10, 7,11,18,10,19, 5,19, 6,19, 8,12,
+	19,19,12, 7,11, 5,10, 6,11, 6,11,15,11,19, 8,19,
+	 8,19, 9,13,19,19,10, 7,10, 6,11, 5,11, 5, 8,13,
+	11,10,17,10,19, 9,18, 6, 7,11,11,13,19,13,19,11,
+	19, 7, 7,10,
 };
 
 static static_codebook _huff_book__44c4_long = {

1.5       +4 -3      vorbis/lib/books/coupled/_44c4_s0_p1_0.vqh

Index: _44c4_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s0_p1_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s0_p1_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s0_p1_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,14 +37,14 @@
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 7, 7, 0, 0,
-	 0, 7, 7, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5,
+	 0, 7, 7, 0, 0, 0, 9, 8, 0, 0, 0, 0, 0, 0, 0, 5,
          7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9,
          9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 5, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7,
+	 0, 0, 0, 5, 8, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7,
          0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5, 7, 8, 0,
          0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9, 9, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -51,7 +52,7 @@
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 7,10,10, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0,
+	 7,10,10, 0, 0, 0, 9, 9, 0, 0, 0, 8, 9, 0, 0, 0,
         10,10, 0, 0, 0, 0, 0, 0, 0, 7,10,10, 0, 0, 0, 9,
          9, 0, 0, 0, 9, 9, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +2 -1      vorbis/lib/books/coupled/_44c4_s0_p3_0.vqh

Index: _44c4_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s0_p3_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s0_p3_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s0_p3_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -33,7 +34,7 @@
          2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
          0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
          0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
-	 7, 8, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 0,
          0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.5       +10 -9     vorbis/lib/books/coupled/_44c4_s0_p5_0.vqh

Index: _44c4_s0_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s0_p5_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s0_p5_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s0_p5_0.vqh	2001/12/19 01:08:19	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,23 +39,23 @@
 };
 
 static long _vq_lengthlist__44c4_s0_p5_0[] = {
-	 2, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
+	 2, 4, 4, 5, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 5, 5, 6, 6, 8, 8,10,10, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0,
+	 0, 0, 0, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 7, 6, 8, 8, 9, 9, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 9, 9, 9,10,10,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9,10,10,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,10,
-	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,
-	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
-	10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	11,11,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,
+	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+	 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	11,10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.4       +1 -0      vorbis/lib/books/coupled/_44c4_s1_p2_0.vqh

Index: _44c4_s1_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s1_p2_0.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- _44c4_s1_p2_0.vqh	2001/12/17 00:16:44	1.3
+++ _44c4_s1_p2_0.vqh	2001/12/19 01:08:20	1.4
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.5       +6 -5      vorbis/lib/books/coupled/_44c4_s1_p4_0.vqh

Index: _44c4_s1_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s1_p4_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s1_p4_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s1_p4_0.vqh	2001/12/19 01:08:20	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,13 +27,13 @@
 };
 
 static long _vq_lengthlist__44c4_s1_p4_0[] = {
-	 2, 3, 3, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 8, 8, 0, 0,
+	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 7, 7, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 3, 4, 4, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8,10,10,
+	 0, 0, 4, 4, 4, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 8, 8,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.5       +12 -11    vorbis/lib/books/coupled/_44c4_s1_p6_0.vqh

Index: _44c4_s1_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s1_p6_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s1_p6_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s1_p6_0.vqh	2001/12/19 01:08:20	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,22 +39,22 @@
 };
 
 static long _vq_lengthlist__44c4_s1_p6_0[] = {
-	 1, 3, 2, 5, 5, 8, 8,11,11, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 8, 8,10,11, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 8, 8,10,10, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,11,11, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8,11,11, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,12,11, 0, 0,
+	 1, 2, 3, 5, 5, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 8, 8,10,10, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 8, 8,11,10, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 8, 9,11,11, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 8,11,11, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,11,11, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,11,11, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,12,12,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,11,
-	11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,10,
+	12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
         12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
-	10,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	11,12,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	10,13,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	12,12,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,14,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,14,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,

1.5       +8 -7      vorbis/lib/books/coupled/_44c4_s1_p7_0.vqh

Index: _44c4_s1_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s1_p7_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s1_p7_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s1_p7_0.vqh	2001/12/19 01:08:20	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c4_s1_p7_0[] = {
-	 1, 3, 4, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 5, 5, 5,
+	 1, 3, 4, 6, 6, 8, 9, 0, 0, 0, 0, 0, 0, 5, 5, 5,
          7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5, 7, 7, 9,
-	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8, 9,10, 0, 0,
-	 0, 0, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, 0, 0,
-	 0, 0,11,11, 9, 9,10,10, 0, 0, 0, 0, 0, 0, 0,12,
+	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0,
+	 0, 0, 0, 0, 0, 8, 7, 8, 8,10,10, 0, 0, 0, 0, 0,
+	 0, 0,11,12, 9, 9,11,10, 0, 0, 0, 0, 0, 0, 0,13,
         12, 9, 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
         11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,14,14,12,12, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,14,15,12,12, 0, 0, 0, 0,
          0, 0, 0, 0, 0,15,15,12,12, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,14,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,14,14, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,14,15, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c4_s1_p7_0[] = {

1.4       +2 -1      vorbis/lib/books/coupled/_44c4_s1_p7_1.vqh

Index: _44c4_s1_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s1_p7_1.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- _44c4_s1_p7_1.vqh	2001/12/17 00:16:44	1.3
+++ _44c4_s1_p7_1.vqh	2001/12/19 01:08:20	1.4
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -27,7 +28,7 @@
 
 static long _vq_lengthlist__44c4_s1_p7_1[] = {
          2, 4, 4, 5, 5, 7, 4, 4, 6, 6, 7, 4, 4, 5, 5, 7,
-	 6, 5, 5, 5, 7, 7, 7, 5, 5,
+	 5, 5, 5, 6, 7, 7, 7, 5, 5,
 };
 
 static float _vq_quantthresh__44c4_s1_p7_1[] = {

1.5       +10 -9     vorbis/lib/books/coupled/_44c4_s1_p8_0.vqh

Index: _44c4_s1_p8_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s1_p8_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s1_p8_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s1_p8_0.vqh	2001/12/19 01:08:20	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c4_s1_p8_0[] = {
-	 1, 4, 3, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 6, 5, 5,
-	 6, 6, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5, 6, 7, 9,
-	 9, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 8,10,10, 0, 0,
-	 0, 0, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, 0, 0,
+	 1, 4, 3, 6, 5, 7, 7, 0, 0, 0, 0, 0, 0, 6, 5, 5,
+	 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5, 7, 7, 9,
+	 9, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 9, 9, 0, 0,
+	 0, 0, 0, 0, 0, 8, 8, 8, 8, 9,10, 0, 0, 0, 0, 0,
          0, 0,12,12, 9, 9,10,11, 0, 0, 0, 0, 0, 0, 0,12,
         12, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
-	11,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,12, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,15,15,12,12, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,16,16,13,13, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,15,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,15,15, 0, 0, 0, 0, 0, 0,
+	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,14,15,12,12, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,15,14,12,12, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,14,13, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c4_s1_p8_0[] = {

1.5       +12 -11    vorbis/lib/books/coupled/_44c4_s1_p8_1.vqh

Index: _44c4_s1_p8_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s1_p8_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s1_p8_1.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s1_p8_1.vqh	2001/12/19 01:08:20	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c4_s1_p8_1[] = {
-	 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10, 5, 5,
-	 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10, 5, 5, 7, 7, 7,
-	 7, 8, 8, 8, 8, 8, 8,10, 7, 7, 7, 7, 8, 8, 8, 8,
-	 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8, 8,
-	 8,10,10,10, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10,10,
-	10, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 8, 8,
-	 8, 8, 9, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
-	 8, 8, 8, 8, 8,10,10,10,10,10, 9, 9, 9, 9, 8, 8,
-	 9, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8, 9, 9,10,
-	10,10,10,10, 9, 9, 8, 8, 8, 8, 9, 9,10,10,10,10,
-	10,10,10, 8, 8, 9, 8, 9, 9,
+	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 9, 5, 5,
+	 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 5, 5, 6, 6, 7,
+	 7, 8, 7, 8, 8, 8, 8, 9, 7, 7, 7, 7, 7, 7, 8, 8,
+	 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 8,
+	 8, 9, 9,10, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 9,
+	 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 9,10, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
+	 8, 8, 8, 8, 8, 9, 9,10, 9, 9, 8, 8, 8, 8, 8, 8,
+	 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8,10,
+	 9,10, 9,10, 9, 9, 8, 8, 8, 8, 8, 8,10,10, 9,10,
+	10, 9, 9, 8, 8, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44c4_s1_p8_1[] = {

1.5       +12 -11    vorbis/lib/books/coupled/_44c4_s1_p9_0.vqh

Index: _44c4_s1_p9_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s1_p9_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s1_p9_0.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s1_p9_0.vqh	2001/12/19 01:08:20	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c4_s1_p9_0[] = {
-	 1, 3, 2,10, 9,13,12,15,14,15,15,15,15, 6, 7, 7,
-	10,11,14,13,14,15,15,15,15,15, 6, 7, 5,12,11,14,
-	14,15,15,15,15,15,15,15, 7,11,13,15,14,15,15,15,
-	15,15,15,15,15,11, 6,13,12,15,15,15,15,15,15,15,
-	15,15,14,13,11,14,14,15,15,15,15,15,15,15,15,13,
-	14,13,13,15,14,15,15,15,15,15,15,15,15,15,14,14,
-	15,15,15,15,15,15,15,15,15,15,15,15,11,15,14,15,
-	15,15,15,15,15,15,15,15,11,15,13,15,15,15,15,15,
-	15,15,15,15,15,15,10,15,10,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,
+	 1, 3, 3, 9, 8,13,14,14,14,14,14,14,14, 5, 5, 6,
+	 9,10,14,14,14,14,14,14,14,14, 5, 6, 4,11,10,13,
+	13,14,14,14,14,14,14,14, 6,10,13,13,14,14,14,14,
+	14,14,14,14,14,11, 6,13,12,14,14,14,14,14,14,14,
+	14,14,12,13, 9,14,13,14,14,14,14,14,14,14,14,14,
+	12,14,12,14,14,14,14,14,14,14,14,14,14,14,13,13,
+	14,14,14,14,14,14,14,14,14,14,14,14, 9,14,13,14,
+	14,14,14,14,14,14,14,14,10,14,12,14,14,14,14,14,
+	14,14,14,14,14,14, 9,14, 9,14,14,14,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,13,13,13,13,
 };
 
 static float _vq_quantthresh__44c4_s1_p9_0[] = {

1.5       +12 -11    vorbis/lib/books/coupled/_44c4_s1_p9_1.vqh

Index: _44c4_s1_p9_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s1_p9_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s1_p9_1.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s1_p9_1.vqh	2001/12/19 01:08:20	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c4_s1_p9_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 6, 5, 5,
-	 7, 7, 8, 8, 8, 9, 9, 9,10,10, 7, 6, 5, 7, 7, 8,
-	 8, 9, 9, 9, 9,10,10,13, 8, 8, 8, 8, 9, 9, 9, 9,
-	10,10,10,10,13, 8, 8, 8, 8, 9, 9,10,10,10,10,11,
-	11,12,10,11, 9, 9,10,10,10,10,11,11,11,11,14,12,
-	10, 9, 9,10,10,10,10,11,11,11,11,13,13,13,11,11,
-	11,11,11,11,11,11,11,11,14,15,13,11,11,11,11,11,
-	11,11,11,12,12,14,13,13,12,13,11,11,11,11,11,11,
-	12,11,14,15,14,14,13,11,11,10,11,12,12,12,12,14,
-	14,14,12,14,11,11,11,11,12,12,12,12,14,14,14,13,
-	13,10,11,11,11,12,12,13,12,
+	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 6, 5, 6,
+	 7, 7, 8, 8, 8, 9, 9,10,10,10, 7, 6, 5, 7, 7, 8,
+	 8, 9, 9, 9, 9,10,10,12, 8, 8, 8, 8, 9, 9, 9, 9,
+	10,10,10,10,13, 8, 7, 8, 8, 9, 9, 9, 9,10,10,10,
+	10,13,11,12, 9, 9,10,10,10,10,10,11,10,11,13,11,
+	11, 9, 9,10,10,10,10,10,10,11,11,13,13,13,11,11,
+	10,11,10,10,11,11,11,11,13,12,12,11,10,10,11,11,
+	11,11,11,11,11,13,13,13,12,12,11,11,11,11,11,11,
+	12,11,13,13,13,13,12,11,11,10,10,11,11,11,12,14,
+	13,13,12,13,11,11,10,10,11,11,11,12,14,14,14,12,
+	13,10,11,10,10,11,11,12,12,
 };
 
 static float _vq_quantthresh__44c4_s1_p9_1[] = {

1.5       +8 -7      vorbis/lib/books/coupled/_44c4_s1_p9_2.vqh

Index: _44c4_s1_p9_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_s1_p9_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_s1_p9_2.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_s1_p9_2.vqh	2001/12/19 01:08:20	1.5
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,16 +35,16 @@
 };
 
 static long _vq_lengthlist__44c4_s1_p9_2[] = {
-	 3, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6,
-	 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 9, 6, 6, 6, 6, 7,
-	 7, 7, 7, 7, 7, 8, 8, 9, 7, 7, 7, 7, 7, 8, 8, 8,
-	 8, 8, 8, 8, 9, 9, 9, 7, 7, 8, 7, 8, 8, 8, 8, 8,
-	 8, 9, 9, 9, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
-	 9, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
+	 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6,
+	 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 6, 7,
+	 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 8, 7, 8, 9, 9, 9, 7, 7, 7, 7, 7, 7, 8, 8, 8,
+	 8, 9, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
+	 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
          8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
          8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,
          8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9,
-	 9, 9, 9, 9, 8, 9, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
          9, 9, 9, 8, 8, 8, 8, 8, 8,
 };
 

1.5       +7 -7      vorbis/lib/books/coupled/_44c4_short.vqh

Index: _44c4_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c4_short.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _44c4_short.vqh	2001/12/17 00:16:44	1.4
+++ _44c4_short.vqh	2001/12/19 01:08:21	1.5
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c4_short[] = {
-	 3,15, 9,18,12,17,14,13,18,18,15,10, 9, 8, 7, 9,
-	 8,11,18,18, 4,18, 4,18, 6,18, 7,10,18,18,16, 7,
-	 7, 5, 5, 6, 6, 8,18,18, 8,17, 4,17, 5,17, 6,10,
-	17,17,14, 8, 7, 5, 6, 4, 5, 5,13,17, 9,17, 6,17,
-	 5,17, 6,10,17,17,12,10, 9, 7, 8, 5, 7, 5,13,17,
-	15,14,17, 8,16, 5,17, 5,10,16,17,14,16, 7,17, 5,
-	17, 5, 9,15,
+	 4,18, 9,18,12,16,13,14,17,17,16, 7, 7, 7, 6, 9,
+	 9,11,17,17, 4,17, 3,17, 6,17, 7,10,17,17,14, 6,
+	 6, 4, 5, 5, 6, 8,17,17, 8,17, 4,17, 5,17, 6,10,
+	17,17,13, 7, 7, 5, 5, 4, 6, 6,15,17, 9,17, 6,17,
+	 6,17, 7,11,17,17,12,10, 9, 7, 8, 6, 9, 7,15,17,
+	17,12,16, 7,17, 5,17, 6,12,16,17,12,17, 6,17, 5,
+	17, 5, 9,17,
 };
 
 static static_codebook _huff_book__44c4_short = {

1.3       +7 -7      vorbis/lib/books/coupled/_44c5_long.vqh

Index: _44c5_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_long.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_long.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_long.vqh	2001/12/19 01:08:21	1.3
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c5_long[] = {
-	 2,10, 7,13,11,14,11,10,12,13,10, 9,11,10,12,10,
-	12,10,11,12, 6,21, 3,21, 5,20, 7, 9,14,15,13,10,
-	12, 9, 9, 7, 9, 8,11,13,10,20, 5,20, 4,20, 5, 8,
-	13,17,14,11,12, 7, 9, 5, 7, 6, 9,13,11,20, 7,20,
-	 4,20, 4, 7,13,16,10,10, 9, 8, 7, 5, 6, 4, 7,12,
-	11,11,12,10,11, 8,11, 6, 7, 9,11,12,14,11,15,10,
-	15, 7, 7, 7,
+	 2,11, 7,14,10,16,11,11,13,14,11, 8, 9, 8, 9, 9,
+	11, 9,11,14, 6,20, 3,20, 4,20, 7, 8,14,18,14, 7,
+	 9, 6, 7, 6, 9, 7,10,13,10,20, 4,20, 3,20, 6, 8,
+	14,18,15, 8,10, 6, 9, 6, 9, 6,10,14,11,19, 6,19,
+	 6,19, 6, 8,14,18,10, 9, 8, 7, 8, 6, 7, 5, 7,11,
+	11,11,12, 9,12, 8,12, 6, 7, 9,11,13,15,12,16,11,
+	17, 8, 7, 8,
 };
 
 static static_codebook _huff_book__44c5_long = {

1.3       +16 -15    vorbis/lib/books/coupled/_44c5_s0_p1_0.vqh

Index: _44c5_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p1_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p1_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p1_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,34 +27,34 @@
 };
 
 static long _vq_lengthlist__44c5_s0_p1_0[] = {
-	 1, 6, 6, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 7, 7, 0, 0, 0, 9,
-	 9, 0, 0, 0, 9, 9, 0, 0, 0,12,11, 0, 0, 0, 0, 0,
-	 0, 0, 5, 7, 7, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0,
-	 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 8,
+	 7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
+	 0, 0, 5, 6, 6, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0,
+	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 8, 0, 0,
-	 0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5,
-	 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
-	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 7, 7, 0, 0,
+	 0, 7, 7, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5,
+	 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9,
+	 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 7,
-	 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5, 9, 9, 0,
-	 0, 0, 8, 8, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0,
+	 0, 0, 0, 5, 8, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7,
+	 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0,
+	 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9, 9, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 8,11,12, 0, 0, 0,10,10, 0, 0, 0,10,11, 0, 0, 0,
-	11,11, 0, 0, 0, 0, 0, 0, 0, 8,12,12, 0, 0, 0,10,
-	10, 0, 0, 0,10,10, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
+	 8,10,10, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0,
+	10,10, 0, 0, 0, 0, 0, 0, 0, 7,10,10, 0, 0, 0, 9,
+	 9, 0, 0, 0, 9, 9, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.3       +5 -4      vorbis/lib/books/coupled/_44c5_s0_p2_0.vqh

Index: _44c5_s0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p2_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p2_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p2_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -27,9 +28,9 @@
 
 static long _vq_lengthlist__44c5_s0_p2_0[] = {
          1, 6, 6, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0, 0, 0, 9,
-	 8, 0, 0, 0, 8, 8, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
-	 0, 0, 6, 8, 8, 0, 0, 0, 8, 9, 0, 0, 0, 8, 9, 0,
+	 8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 8, 7, 0, 0, 0, 9,
+	 8, 0, 0, 0, 9, 8, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
+	 0, 0, 6, 7, 8, 0, 0, 0, 8, 9, 0, 0, 0, 8, 8, 0,
          0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -37,7 +38,7 @@
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 5, 8, 8, 0, 0, 0, 8, 7, 0, 0,
          0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5,
-	 8, 8, 0, 0, 0, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0,10,
+	 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
         10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.3       +4 -3      vorbis/lib/books/coupled/_44c5_s0_p3_0.vqh

Index: _44c5_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p3_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p3_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p3_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,10 +31,10 @@
 };
 
 static long _vq_lengthlist__44c5_s0_p3_0[] = {
-	 2, 3, 3, 5, 5, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
-	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 6, 6, 6, 6,
+	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
+	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
          0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
-	 8, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 0,
          0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.3       +6 -5      vorbis/lib/books/coupled/_44c5_s0_p4_0.vqh

Index: _44c5_s0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p4_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p4_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p4_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,11 +31,11 @@
 };
 
 static long _vq_lengthlist__44c5_s0_p4_0[] = {
-	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
-	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
-	 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
-	 8, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
-	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 2, 3, 3, 7, 7, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
+	 0, 0, 0, 3, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 7, 7,
+	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
+	 9, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
+	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };
 

1.3       +13 -12    vorbis/lib/books/coupled/_44c5_s0_p5_0.vqh

Index: _44c5_s0_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p5_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p5_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p5_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,20 +39,20 @@
 };
 
 static long _vq_lengthlist__44c5_s0_p5_0[] = {
-	 3, 4, 4, 5, 5, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 4, 5, 5, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 4, 4, 5, 5, 7, 7, 9, 9, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 5, 5, 6, 6, 8, 7, 9, 9, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0,
+	 2, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 5, 5, 6, 6, 8, 8,10,10, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8,10,10,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8,10,
-	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,
-	10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
-	 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	11,11,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 9, 9, 9,10,10,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,10,
+	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,
+	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
+	10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	11,11,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,11,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,

1.3       +12 -11    vorbis/lib/books/coupled/_44c5_s0_p6_0.vqh

Index: _44c5_s0_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p6_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p6_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p6_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,21 +39,21 @@
 };
 
 static long _vq_lengthlist__44c5_s0_p6_0[] = {
-	 2, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
+	 2, 4, 4, 6, 6, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 5, 5, 6, 6, 8, 8,10,10, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0,
+	 0, 0, 0, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7,10, 9, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,11,11,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,10,
-	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,
-	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
-	10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	11,11,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,10,10,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 8,10,
+	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,
+	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+	 9,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	10,10,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.3       +10 -9     vorbis/lib/books/coupled/_44c5_s0_p7_0.vqh

Index: _44c5_s0_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p7_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p7_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c5_s0_p7_0[] = {
-	 1, 3, 3, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 5, 5, 5,
-	 8, 8,10,10, 0, 0, 0, 0, 0, 0, 6, 5, 5, 8, 8,10,
-	10, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,11,10, 0, 0,
-	 0, 0, 0, 0, 0, 8, 8, 8, 8,11,11, 0, 0, 0, 0, 0,
-	 0, 0,12,12,10,10,11,11, 0, 0, 0, 0, 0, 0, 0,13,
-	13,10,10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,
+	 1, 3, 3, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5,
+	 7, 7,10,10, 0, 0, 0, 0, 0, 0, 6, 5, 5, 8, 8,10,
+	10, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0,
+	 0, 0, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, 0, 0,
+	 0, 0,12,12,10, 9,11,11, 0, 0, 0, 0, 0, 0, 0,13,
+	13,10, 9,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,12,
         12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,15,15,13,13, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,15,15,12,12, 0, 0, 0, 0,
          0, 0, 0, 0, 0,16,16,13,13, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,15,15, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,15,14, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c5_s0_p7_0[] = {

1.3       +3 -2      vorbis/lib/books/coupled/_44c5_s0_p7_1.vqh

Index: _44c5_s0_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p7_1.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p7_1.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,8 +27,8 @@
 };
 
 static long _vq_lengthlist__44c5_s0_p7_1[] = {
-	 2, 4, 4, 5, 5, 7, 4, 4, 6, 5, 7, 4, 4, 5, 5, 7,
-	 6, 6, 5, 5, 7, 7, 7, 5, 5,
+	 2, 4, 4, 5, 5, 7, 4, 4, 6, 6, 7, 4, 4, 5, 5, 7,
+	 5, 5, 6, 5, 7, 7, 7, 5, 5,
 };
 
 static float _vq_quantthresh__44c5_s0_p7_1[] = {

1.3       +10 -9     vorbis/lib/books/coupled/_44c5_s0_p8_0.vqh

Index: _44c5_s0_p8_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p8_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p8_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p8_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c5_s0_p8_0[] = {
-	 1, 4, 3, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 6, 5, 5,
+	 1, 3, 4, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 6, 5, 5,
          6, 6, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5, 7, 7, 9,
-	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0,
-	 0, 0, 0, 0, 0, 8, 7, 8, 8,10,10, 0, 0, 0, 0, 0,
-	 0, 0,12,12, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0,12,
-	12, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
+	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0, 0,
+	 0, 0, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, 0, 0,
+	 0, 0,12,12, 9, 9,10,11, 0, 0, 0, 0, 0, 0, 0,12,
+	12, 9, 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
         11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,15,15,12,13, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,15,16,13,12, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,16,14, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,15,15,12,12, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,15,15,12,12, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,13,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,14,13, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c5_s0_p8_0[] = {

1.3       +10 -9     vorbis/lib/books/coupled/_44c5_s0_p8_1.vqh

Index: _44c5_s0_p8_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p8_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p8_1.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p8_1.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,15 +37,15 @@
 static long _vq_lengthlist__44c5_s0_p8_1[] = {
          3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 5, 5,
          6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 5, 5, 6, 6, 7,
-	 7, 8, 8, 8, 8, 8, 8, 9, 6, 6, 7, 7, 8, 8, 8, 8,
-	 8, 8, 8, 8,10, 9,10, 7, 7, 7, 7, 8, 8, 8, 8, 8,
-	 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10,10,
-	10, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9,10,10, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8,10,10, 9,10, 9, 8, 8, 8,
-	 8, 8, 8, 8, 8,10,10,10, 9,10, 8, 8, 8, 8, 8, 8,
-	 8, 8,10,10,10,10, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9,
-	10, 9,10, 9, 9, 9, 8, 8, 8, 8, 8, 8, 9,10, 9, 9,
-	 9, 9, 9, 8, 8, 8, 8, 8, 8,
+	 7, 8, 8, 8, 8, 8, 8, 9, 6, 7, 7, 7, 8, 7, 8, 8,
+	 8, 8, 8, 8, 9, 9, 9, 7, 7, 8, 7, 8, 8, 8, 8, 8,
+	 8, 9,10,10, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10, 9,
+	 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,10, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8,10,10, 9,10,10, 8, 8, 8,
+	 8, 8, 8, 8, 8, 9,10, 9, 9, 9, 8, 8, 8, 8, 8, 8,
+	 8, 8,10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8,10,
+	10,10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,10, 9, 9,10,
+	10, 9, 9, 8, 8, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44c5_s0_p8_1[] = {

1.3       +33 -32    vorbis/lib/books/coupled/_44c5_s0_p9_0.vqh

Index: _44c5_s0_p9_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p9_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p9_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p9_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -18,44 +19,44 @@
 #include "codebook.h"
 
 static long _vq_quantlist__44c5_s0_p9_0[] = {
-	1208,
-	1023,
-	1392,
-	839,
-	1577,
-	654,
-	1761,
-	470,
-	1946,
-	369,
-	2047,
-	184,
-	2231,
+	7,
+	6,
+	8,
+	5,
+	9,
+	4,
+	10,
+	3,
+	11,
+	2,
+	12,
+	1,
+	13,
         0,
-	2416,
+	14,
 };
 
 static long _vq_lengthlist__44c5_s0_p9_0[] = {
-	 1, 3, 2,10, 9,14,12,15,15,16,16,16,16,16,16, 6,
-	 6, 7,10,11,13,12,16,16,16,16,16,16,16,16, 6, 7,
-	 5,12,11,16,14,16,16,16,16,16,16,16,16,16, 7,11,
-	12,16,15,16,16,15,16,16,16,16,16,16,16,11, 7,15,
-	13,16,16,15,15,16,16,16,16,16,16,16,12,13,10,14,
-	15,16,16,16,16,16,16,16,16,16,16,15,13,12,12,16,
-	15,16,16,16,16,16,16,16,16,16,16,16,15,15,15,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,14,16,16,15,
-	15,15,15,15,15,15,15,15,15,15,13,15,13,14,15,15,
-	15,15,15,15,15,15,15,15,15,15,12,15,12,15,15,15,
-	15,15,15,15,15,15,15,15,15,15,10,15,15,15,15,15,
-	15,15,15,15,15,15,15,15,15,15,13,15,14,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,
+	 1, 3, 3,11,10,14,14,14,14,14,14,14,14,14,14, 5,
+	 5, 5,11,14,14,14,14,14,14,14,14,14,14,14, 5, 6,
+	 4,12,12,14,14,14,14,14,14,14,14,14,14,14, 7,10,
+	13,13,14,14,14,14,14,14,14,14,14,14,14,12, 7,14,
+	14,14,14,14,14,14,14,14,14,14,13,13,10,13, 8,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,12,13,11,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,11,13,13,13,
+	13,13,13,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,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,
 };
 
 static float _vq_quantthresh__44c5_s0_p9_0[] = {
-	-1336.8, -1115.7, -944.43, -773.71, -552.68, -331.64, -110.61, 110.43, 
-	331.46, 552.5, 773.53, 944.85, 1115.6, 1336.6, 
+	-1436.5, -1215.5, -994.5, -773.5, -552.5, -331.5, -110.5, 110.5, 
+	331.5, 552.5, 773.5, 994.5, 1215.5, 1436.5, 
 };
 
 static long _vq_quantmap__44c5_s0_p9_0[] = {
@@ -73,7 +74,7 @@
 static static_codebook _44c5_s0_p9_0 = {
         2, 225,
         _vq_lengthlist__44c5_s0_p9_0,
-	1, -514417664, 1611868951, 12, 0,
+	1, -514315264, 1627103232, 4, 0,
         _vq_quantlist__44c5_s0_p9_0,
         NULL,
         &_vq_auxt__44c5_s0_p9_0,

1.3       +18 -17    vorbis/lib/books/coupled/_44c5_s0_p9_1.vqh

Index: _44c5_s0_p9_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p9_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p9_1.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p9_1.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,24 +39,24 @@
 };
 
 static long _vq_lengthlist__44c5_s0_p9_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
-	10, 7, 5, 5, 7, 7, 8, 8, 9, 9,10,10,10,10,11,11,
-	11,11, 7, 6, 5, 7, 7, 8, 8, 9, 9,10,10,10,10,11,
-	11,11,11,13, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11,
+	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10,10,
+	10, 7, 6, 6, 7, 7, 8, 8, 9, 9, 9,10,10,10,11,11,
+	11,11, 7, 5, 5, 7, 7, 8, 8, 9, 9,10,10,10,10,11,
+	11,11,11,15, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11,
         11,11,11,11,14, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11,11,11,12,12,15,10,11, 9, 9, 9, 9,10,10,10,11,
-	11,11,12,12,12,12,14,12,11, 9, 9,10,10,10,10,11,
-	11,11,11,12,12,12,12,14,14,15,11,11,10,10,10,11,
-	11,11,11,12,12,12,12,12,15,16,15,11,11,10,10,11,
-	11,11,11,12,12,12,12,12,12,15,15,14,13,14,11,11,
-	11,11,12,12,12,12,12,12,12,13,15,16,15,14,14,11,
-	11,11,11,12,12,12,12,12,13,13,13,16,16,15,16,15,
-	12,12,11,12,12,12,12,12,12,13,12,13,16,16,16,15,
-	15,13,13,12,12,11,12,12,13,13,13,13,13,16,16,16,
-	15,15,14,13,12,12,13,12,13,12,13,13,13,13,16,17,
-	16,16,15,15,13,12,12,11,12,13,13,13,13,13,13,17,
-	16,16,15,16,15,14,13,12,12,12,13,13,13,13,14,13,
-	16,16,16,16,15,14,14,12,13,12,12,13,13,13,13,13,
+	11,11,11,12,12,15,12,12, 9, 9,10,10,10,10,10,11,
+	11,11,11,11,11,12,14,12,11, 9, 9,10,10,10,10,11,
+	11,11,11,11,11,12,12,14,14,14,11,11,10,10,10,10,
+	11,11,11,11,11,12,12,12,14,14,14,11,11,10,10,11,
+	11,11,11,11,12,12,12,12,12,15,15,14,13,13,11,11,
+	11,11,12,12,12,12,12,12,12,12,14,14,14,14,14,11,
+	11,11,11,12,12,12,12,12,12,12,12,15,14,15,14,14,
+	12,12,11,12,12,12,12,12,12,12,12,12,14,15,15,14,
+	16,12,12,11,11,12,12,13,12,12,12,12,13,15,14,16,
+	14,15,14,14,12,12,12,12,13,12,12,12,13,13,15,15,
+	15,15,15,14,13,12,12,12,12,12,12,13,13,13,13,14,
+	14,15,14,15,14,15,13,12,12,12,12,12,13,13,13,13,
+	15,15,15,15,14,15,14,12,13,12,12,12,12,13,12,13,
         13,
 };
 

1.3       +6 -5      vorbis/lib/books/coupled/_44c5_s0_p9_2.vqh

Index: _44c5_s0_p9_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_s0_p9_2.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_s0_p9_2.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_s0_p9_2.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,11 +35,11 @@
 };
 
 static long _vq_lengthlist__44c5_s0_p9_2[] = {
-	 3, 5, 5, 6, 6, 7, 6, 7, 7, 7, 7, 7, 7, 9, 6, 6,
-	 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 6, 6, 6, 6, 7,
-	 7, 7, 7, 7, 7, 7, 8, 9, 7, 7, 7, 7, 7, 7, 8, 8,
-	 8, 8, 8, 8, 9, 8, 9, 7, 7, 7, 7, 8, 7, 8, 8, 8,
-	 8, 9, 9, 9, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
+	 3, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6,
+	 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 6, 6, 6, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7, 7, 8, 8,
+	 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 8,
+	 8, 9, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
          9, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
          8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
          8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,

1.3       +7 -7      vorbis/lib/books/coupled/_44c5_short.vqh

Index: _44c5_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c5_short.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c5_short.vqh	2001/12/17 00:16:44	1.2
+++ _44c5_short.vqh	2001/12/19 01:08:21	1.3
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c5_short[] = {
-	 3,18, 9,18,12,18,13,14,18,18,18,14,18,18,18,18,
-	18,17,18,18, 4,18, 5,18, 7,18, 8, 9,15,16,18,16,
-	18,11,18, 8,18,10,17,18, 7,18, 5,18, 5,18, 5, 7,
-	15,17,18,13,18, 8,18, 5,18, 7,15,18, 9,18, 5,18,
-	 4,18, 3, 5,13,18,11,13, 8, 9, 6, 6, 4, 3,10,17,
-	15,15,14,12,13, 8,12, 6, 8,15,18,15,18, 9,16, 5,
-	18, 4, 7,10,
+	 3,18, 9,18,12,17,14,16,17,17,16,15,17,12,17,12,
+	17,14,17,17, 4,17, 4,17, 5,17, 7, 9,17,17,17, 9,
+	17, 7,17, 8,17,10,17,17, 8,17, 4,17, 3,17, 5, 8,
+	16,17,17, 9,17, 6,17, 6,17, 8,16,17, 9,17, 5,17,
+	 4,17, 4, 6,14,17,12,11, 9, 8, 7, 5, 5, 5,12,17,
+	17,17,15, 9,16, 7,14, 5, 9,16,17,15,17, 8,17, 5,
+	17, 4, 8,11,
 };
 
 static static_codebook _huff_book__44c5_short = {

1.3       +7 -7      vorbis/lib/books/coupled/_44c6_long.vqh

Index: _44c6_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_long.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_long.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_long.vqh	2001/12/19 01:08:21	1.3
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c6_long[] = {
-	 2,10, 7,13,11,13,11,10,12,13,10, 9,11,10,13,11,
-	13,10,11,13, 6,21, 4,21, 6,20, 8, 9,14,15,13,10,
-	13,10,12,10,12, 9,11,13,10,20, 6,20, 4,20, 5, 7,
-	13,17,14,11,13,10,12, 8, 9, 6, 9,12,11,20, 7,20,
-	 5,20, 3, 5,12,16,10,10, 8, 9, 7, 6, 5, 3, 6,10,
-	11,11,12,10,12, 9,10, 5, 6, 8,11,12,14,11,14,10,
-	14, 7, 7, 7,
+	 2,11, 7,14,11,16,11,11,13,13,10, 9,11,11,13,11,
+	13,10,11,14, 6,20, 4,20, 5,20, 7, 9,14,16,14,11,
+	12, 9,10, 7, 9, 8,11,13,10,20, 5,19, 4,19, 4, 8,
+	13,19,14,11,12, 7, 8, 5, 7, 5, 9,13,11,19, 7,19,
+	 4,19, 4, 6,13,16,10,10, 8, 8, 7, 5, 6, 4, 7,12,
+	11,11,12,10,11, 8,10, 6, 6, 9,11,12,14,12,15,10,
+	15, 7, 7, 7,
 };
 
 static static_codebook _huff_book__44c6_long = {

1.3       +12 -11    vorbis/lib/books/coupled/_44c6_s0_p1_0.vqh

Index: _44c6_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p1_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p1_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p1_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -28,32 +29,32 @@
 static long _vq_lengthlist__44c6_s0_p1_0[] = {
          1, 6, 6, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
          8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 7, 7, 0, 0, 0, 9,
-	 9, 0, 0, 0, 9, 9, 0, 0, 0,12,11, 0, 0, 0, 0, 0,
-	 0, 0, 5, 7, 7, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0,
-	 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 8, 0, 0, 0, 8, 9, 0, 0, 0,12,12, 0, 0, 0, 0, 0,
+	 0, 0, 5, 7, 7, 0, 0, 0, 8, 9, 0, 0, 0, 9, 9, 0,
+	 0, 0,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 8, 0, 0,
+	 0, 0, 0, 0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 7, 0, 0,
          0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5,
-	 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
-	11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 9, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
+	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 7, 8,
+	 0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
          0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5, 9, 9, 0,
-	 0, 0, 8, 8, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0,
+	 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,11,10, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 8,11,12, 0, 0, 0,10,10, 0, 0, 0,10,10, 0, 0, 0,
-	11,11, 0, 0, 0, 0, 0, 0, 0, 8,12,12, 0, 0, 0,10,
-	10, 0, 0, 0,10,10, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
+	 8,12,11, 0, 0, 0,10,10, 0, 0, 0,10,10, 0, 0, 0,
+	11,11, 0, 0, 0, 0, 0, 0, 0, 8,11,11, 0, 0, 0,10,
+	10, 0, 0, 0,11,10, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.3       +7 -6      vorbis/lib/books/coupled/_44c6_s0_p2_0.vqh

Index: _44c6_s0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p2_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p2_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p2_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -27,25 +28,25 @@
 
 static long _vq_lengthlist__44c6_s0_p2_0[] = {
          1, 6, 6, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0, 0, 0, 9,
+	 8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 8, 7, 0, 0, 0, 9,
          8, 0, 0, 0, 9, 8, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
-	 0, 0, 6, 8, 8, 0, 0, 0, 8, 9, 0, 0, 0, 9, 9, 0,
+	 0, 0, 6, 7, 8, 0, 0, 0, 8, 9, 0, 0, 0, 8, 9, 0,
          0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 7, 0, 0,
+	 0, 0, 0, 0, 0, 0, 5, 8, 8, 0, 0, 0, 8, 7, 0, 0,
          0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5,
-	 8, 9, 0, 0, 0, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0,10,
+	 8, 9, 0, 0, 0, 7, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
         10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 8, 0, 0, 0, 7, 7,
+	 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 7,
          0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5, 8, 9, 0,
-	 0, 0, 8, 8, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0,
+	 0, 0, 8, 8, 0, 0, 0, 7, 8, 0, 0, 0,10,10, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.3       +5 -4      vorbis/lib/books/coupled/_44c6_s0_p3_0.vqh

Index: _44c6_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p3_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p3_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p3_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,10 +31,10 @@
 };
 
 static long _vq_lengthlist__44c6_s0_p3_0[] = {
-	 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 5, 7, 7, 0, 0,
-	 0, 0, 0, 4, 4, 7, 6, 0, 0, 0, 0, 0, 6, 6, 7, 7,
-	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 7, 0, 0, 0, 0, 0,
+	 2, 3, 3, 5, 5, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
+	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 6, 6, 6, 6,
+	 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
+	 8, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
          0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.3       +2 -1      vorbis/lib/books/coupled/_44c6_s0_p4_0.vqh

Index: _44c6_s0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p4_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p4_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p4_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -33,7 +34,7 @@
          2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
          0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
          0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
-	 8, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 0,
          0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.3       +15 -14    vorbis/lib/books/coupled/_44c6_s0_p5_0.vqh

Index: _44c6_s0_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p5_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p5_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p5_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,23 +39,23 @@
 };
 
 static long _vq_lengthlist__44c6_s0_p5_0[] = {
-	 3, 4, 4, 5, 5, 6, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 4, 6, 6, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 4, 4, 6, 5, 7, 7, 8, 8, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 6, 6, 7, 7, 8, 8, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 8, 8, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 9, 9,
+	 3, 4, 4, 5, 5, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 4, 4, 5, 5, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 4, 4, 6, 5, 7, 7, 9, 9, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 5, 5, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8,10,10,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9,
          9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,
-	10, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
-	 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	10,10,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+	 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	10,10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.3       +9 -8      vorbis/lib/books/coupled/_44c6_s0_p6_0.vqh

Index: _44c6_s0_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p6_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p6_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p6_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -40,20 +41,20 @@
 static long _vq_lengthlist__44c6_s0_p6_0[] = {
          3, 4, 4, 5, 5, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 4, 4, 5, 5, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 4, 4, 5, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 5, 5, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 7, 9,10, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 7,10, 9, 0,
+	 0, 0, 0, 4, 4, 5, 5, 7, 7, 9, 9, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 5, 5, 6, 6, 7, 7,10,10, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7,10,10, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8,10,10,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8,10,
         10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,
-	10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
-	 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+	 9,11,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         10,10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,

1.3       +9 -8      vorbis/lib/books/coupled/_44c6_s0_p7_0.vqh

Index: _44c6_s0_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p7_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p7_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -35,16 +36,16 @@
 
 static long _vq_lengthlist__44c6_s0_p7_0[] = {
          1, 3, 3, 7, 7,10,10, 0, 0, 0, 0, 0, 0, 5, 5, 5,
-	 8, 8,10,10, 0, 0, 0, 0, 0, 0, 6, 5, 5, 8, 8,11,
-	11, 0, 0, 0, 0, 0, 0, 0, 7, 7, 9, 9,11,11, 0, 0,
-	 0, 0, 0, 0, 0, 8, 8, 9, 9,11,11, 0, 0, 0, 0, 0,
-	 0, 0,12,13,10,10,12,11, 0, 0, 0, 0, 0, 0, 0,13,
+	 8, 8,10,10, 0, 0, 0, 0, 0, 0, 6, 5, 5, 8, 8,10,
+	10, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 9,10,11, 0, 0,
+	 0, 0, 0, 0, 0, 8, 8, 8, 8,11,11, 0, 0, 0, 0, 0,
+	 0, 0,12,12,10,10,11,11, 0, 0, 0, 0, 0, 0, 0,13,
         13,10,10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,
         12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,16,16,13,13, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,17,17,13,13, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,15,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,16,16, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,15,15,13,13, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,16,16,13,13, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,15,15, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c6_s0_p7_0[] = {

1.3       +1 -0      vorbis/lib/books/coupled/_44c6_s0_p7_1.vqh

Index: _44c6_s0_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p7_1.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p7_1.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +10 -9     vorbis/lib/books/coupled/_44c6_s0_p8_0.vqh

Index: _44c6_s0_p8_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p8_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p8_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p8_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c6_s0_p8_0[] = {
-	 1, 4, 3, 6, 6, 9, 9, 0, 0, 0, 0, 0, 0, 5, 5, 5,
+	 1, 4, 3, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 6, 5, 5,
          7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5, 7, 7, 9,
-	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0,
-	 0, 0, 0, 0, 0, 8, 7, 7, 8,10,10, 0, 0, 0, 0, 0,
-	 0, 0,12,12, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0,12,
-	12, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
+	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10, 9, 0, 0,
+	 0, 0, 0, 0, 0, 7, 7, 7, 7,10, 9, 0, 0, 0, 0, 0,
+	 0, 0,12,11, 9, 9,10,11, 0, 0, 0, 0, 0, 0, 0,12,
+	12, 9, 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
         11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,15,15,12,13, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,16,16,12,13, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,15,14, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,15,16,12,12, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,15,16,12,12, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,15,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,15,15, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c6_s0_p8_0[] = {

1.3       +12 -11    vorbis/lib/books/coupled/_44c6_s0_p8_1.vqh

Index: _44c6_s0_p8_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p8_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p8_1.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p8_1.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c6_s0_p8_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 5, 5,
-	 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10, 5, 5, 6, 6, 7,
-	 7, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 7, 7, 8, 8,
-	 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8, 8,
-	 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10,10,
-	10, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10, 9, 8, 8, 8,
-	 8, 8, 8, 8, 8,10,10,10,10, 9, 8, 8, 8, 8, 8, 8,
-	 8, 8,10,10,10,10, 9, 8, 8, 8, 8, 8, 8, 8, 8,10,
-	10,10,10,10, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,
-	10, 9, 9, 8, 8, 8, 8, 8, 8,
+	 3, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 8, 8, 9, 5, 5,
+	 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 5, 5, 6, 6, 7,
+	 7, 8, 8, 8, 8, 8, 8, 9, 6, 6, 7, 7, 8, 8, 8, 8,
+	 8, 8, 8, 8, 9, 9, 9, 7, 7, 8, 7, 8, 8, 8, 8, 8,
+	 8,10, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9,10,
+	 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9,10, 9, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8,10,10, 9,10, 9, 8, 8, 8,
+	 8, 8, 8, 8, 8,10, 9, 9,10, 9, 8, 8, 8, 8, 8, 8,
+	 8, 8,10,10,10,10, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9,
+	10,10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,10, 9,10, 9,
+	 9, 9, 9, 8, 8, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44c6_s0_p8_1[] = {

1.3       +7 -6      vorbis/lib/books/coupled/_44c6_s0_p9_0.vqh

Index: _44c6_s0_p9_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p9_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p9_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p9_0.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,12 +31,12 @@
 };
 
 static long _vq_lengthlist__44c6_s0_p9_0[] = {
-	 1, 5, 3,14,13,13,14,13,13, 5, 7,10,13,12,13,13,
-	13,13, 2, 9, 5,12,13,13,13,13,13,13, 7,12,13,13,
-	13,13,13,13,13,13, 8,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,
+	 1, 4, 4,12,12,12,12,12,12, 4, 6, 8,12,12,12,12,
+	12,12, 2,10, 7,12,12,12,12,12,12,12, 7,12,12,12,
+	12,12,12,12,12,12, 7,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,11,11,11,11,11,
+	11,
 };
 
 static float _vq_quantthresh__44c6_s0_p9_0[] = {

1.3       +12 -11    vorbis/lib/books/coupled/_44c6_s0_p9_1.vqh

Index: _44c6_s0_p9_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p9_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p9_1.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p9_1.vqh	2001/12/19 01:08:21	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c6_s0_p9_1[] = {
-	 1, 3, 3, 6, 6, 8, 8,10,10,11,11,11,11, 6, 5, 5,
-	 8, 8,10,10,11,11,12,11,11,10, 6, 5, 5, 8, 8,10,
-	10,12,11,12,12,12,12,18, 9, 9, 9,10,10,11,12,13,
-	12,13,12,11,16, 9, 9,10,10,11,11,13,13,13,13,13,
-	14,19,13,14,11,11,12,13,13,14,13,12,14,12,18,14,
-	13,11,11,13,13,13,14,13,14,13,15,18,18,18,13,13,
-	13,13,14,14,14,10,15,14,19,18,18,13,13,13,13,14,
-	15,12,15,15,15,19,17,18,16,16,13,12,14,12,15,13,
-	15,15,19,19,18,15,16,13,13,14,14,14,15,16,16,19,
-	17,19,19,18,14,14,14,14,15,16,16,16,19,18,17,19,
-	17,15,14,15,14,15,16,16,16,
+	 1, 3, 3, 6, 6, 8, 8,10,10,11,11,12,12, 6, 5, 5,
+	 8, 8, 9, 9,11,11,12,12,12,12, 6, 6, 5, 8, 8,10,
+	10,11,11,12,12,12,12,19, 8, 9, 9, 9,10,11,11,12,
+	12,13,13,12,15, 9, 8, 9, 9,11,11,12,12,12,13,12,
+	13,17,12,13,10,10,12,12,12,13,12,12,13,12,17,13,
+	12,10,10,12,12,13,12,12,13,13,14,19,15,16,13,12,
+	12,12,13,14,13,10,14,13,18,18,18,12,12,12,11,13,
+	13,13,13,15,14,17,16,18,14,14,13,12,14,12,14,12,
+	13,14,18,18,18,14,15,13,11,13,11,14,14,15,15,18,
+	16,17,16,18,14,14,14,12,14,12,14,14,18,18,18,18,
+	17,14,13,14,11,15,12,14,14,
 };
 
 static float _vq_quantthresh__44c6_s0_p9_1[] = {

1.3       +3 -2      vorbis/lib/books/coupled/_44c6_s0_p9_2.vqh

Index: _44c6_s0_p9_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_s0_p9_2.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_s0_p9_2.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_s0_p9_2.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -70,8 +71,8 @@
 };
 
 static long _vq_lengthlist__44c6_s0_p9_2[] = {
-	 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7,
+	 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7,
          7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
          7,
 };

1.3       +7 -7      vorbis/lib/books/coupled/_44c6_short.vqh

Index: _44c6_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c6_short.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c6_short.vqh	2001/12/17 00:16:44	1.2
+++ _44c6_short.vqh	2001/12/19 01:08:22	1.3
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c6_short[] = {
-	 3,18, 9,18,13,18,14,14,18,18,18,14,18,18,18,18,
-	18,18,18,18, 4,18, 5,18, 9,18,10,10,15,17,18,16,
-	18,16,18,15,18,16,18,18, 7,18, 5,18, 6,18, 6, 7,
-	15,16,18,16,18,14,18,12,18,10,15,18, 9,18, 5,18,
-	 4,18, 4, 5,13,17,11,14, 7,11, 5, 7, 4, 2, 7,13,
-	17,16,14,13,13,10,11, 5, 7,12,15,15,17,15,17,11,
-	16, 4, 5, 9,
+	 3,18, 9,18,13,17,14,17,17,17,17,16,17,17,17,16,
+	17,16,17,17, 4,17, 5,17, 7,17, 8,10,15,17,17,17,
+	17,12,17, 9,17,10,15,17, 7,17, 5,17, 5,17, 5, 8,
+	15,17,17,13,17, 8,17, 5,17, 7,14,17, 9,17, 5,17,
+	 4,17, 3, 5,14,17,12,14, 8, 9, 6, 6, 4, 3, 9,15,
+	16,17,15,12,14, 8,13, 6, 8,16,17,16,17,10,17, 5,
+	17, 4, 6,10,
 };
 
 static static_codebook _huff_book__44c6_short = {

1.3       +7 -7      vorbis/lib/books/coupled/_44c7_long.vqh

Index: _44c7_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_long.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_long.vqh	2001/12/17 00:16:44	1.2
+++ _44c7_long.vqh	2001/12/19 01:08:22	1.3
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c7_long[] = {
-	 2,10,11, 7,11,11,11,12,13,13,11, 5, 6,21,21,21,
-	21,21,11,12,11, 6, 4,21,21,21,20,20, 8, 9, 6,20,
-	20, 4, 7, 8, 9,10,12,15,10,20,20, 6, 5, 6, 7,10,
-	12,16,11,20,20, 7, 5, 3, 5, 8,10,14,12,20,20, 9,
-	 7, 4, 4, 6, 9,15,12,20,20,10, 9, 7, 6, 6, 8,15,
-	11,10, 7,11,11, 9, 8, 8, 9,10,12, 8, 7,14,14,14,
-	14,14, 9, 8,
+	 2,11,13, 7,11,12,12,13,14,14,11, 5, 6,19,19,19,
+	19,19,12,12,13, 5, 4,19,19,19,19,19, 9,10, 6,19,
+	19, 4, 6, 8, 9,11,13,16,10,19,19, 6, 5, 5, 7,10,
+	12,17,11,19,19, 7, 5, 3, 5, 8,10,15,12,19,19, 9,
+	 7, 4, 4, 7, 9,15,12,19,19,11,10, 8, 6, 7, 9,15,
+	11,10, 8,11,11, 9, 9, 9, 9,11,12, 9, 7,14,15,15,
+	15,14, 9, 8,
 };
 
 static static_codebook _huff_book__44c7_long = {

1.3       +7 -6      vorbis/lib/books/coupled/_44c7_s0_p1_0.vqh

Index: _44c7_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p1_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p1_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c7_s0_p1_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -32,14 +33,14 @@
 };
 
 static long _vq_lengthlist__44c7_s0_p1_0[] = {
-	 1, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 5, 5, 4, 7, 7,
-	 0, 0, 0, 0, 0, 0, 0, 5, 5, 7, 7, 0, 0, 0, 0, 0,
-	 0, 0, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 8, 8, 7,
+	 2, 3, 3, 5, 5, 0, 0, 0, 0, 0, 0, 5, 4, 4, 6, 6,
+	 0, 0, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0,
+	 0, 0, 7, 7, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7,
          7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	10, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0,12,11, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,13,13, 0, 0, 0, 0, 0, 0,
+	 9, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,11,11, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c7_s0_p1_0[] = {

1.3       +1 -0      vorbis/lib/books/coupled/_44c7_s0_p1_1.vqh

Index: _44c7_s0_p1_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p1_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p1_1.vqh	2001/12/17 00:16:44	1.2
+++ _44c7_s0_p1_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +6 -5      vorbis/lib/books/coupled/_44c7_s0_p2_0.vqh

Index: _44c7_s0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p2_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p2_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c7_s0_p2_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c7_s0_p2_0[] = {
-	 1, 3, 3, 7, 7,10, 9, 0, 0, 0, 0, 0, 0, 5, 5, 5,
+	 1, 3, 3, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 5, 5, 5,
          8, 8,10,10, 0, 0, 0, 0, 0, 0, 6, 5, 5, 8, 8,10,
-	10, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 8,11,11, 0, 0,
+	10, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,10,11, 0, 0,
          0, 0, 0, 0, 0, 8, 8, 8, 8,11,11, 0, 0, 0, 0, 0,
-	 0, 0,12,12,10,10,12,12, 0, 0, 0, 0, 0, 0, 0,13,
+	 0, 0,12,12,10,10,11,11, 0, 0, 0, 0, 0, 0, 0,13,
         12,10,10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,
         12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12, 0,
          0, 0, 0, 0, 0, 0, 0, 0,16,16,13,13, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,16,16,13,13, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,17,17,13,13, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,16,16, 0, 0, 0, 0, 0, 0,
+	 0,15,16, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c7_s0_p2_0[] = {

1.3       +8 -7      vorbis/lib/books/coupled/_44c7_s0_p2_1.vqh

Index: _44c7_s0_p2_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p2_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p2_1.vqh	2001/12/17 00:16:44	1.2
+++ _44c7_s0_p2_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c7_s0_p2_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7,10, 6, 6,
-	 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,10, 6, 5, 6, 6, 7,
-	 7, 7, 7, 8, 8, 8, 8,10, 6, 6, 7, 7, 7, 7, 8, 8,
+	 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7,10, 5, 5,
+	 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 5, 5, 6, 6, 7,
+	 7, 7, 7, 8, 8, 8, 8,10, 6, 6, 7, 7, 7, 7, 8, 7,
          8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8, 8,
          8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,10,
         10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 9, 9, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
          8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8, 8, 8, 8,
-	 8, 8,10,10,10,10, 9, 8, 8, 8, 8, 8, 8, 8, 8,10,
-	10,10,10,10, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 9,
-	10, 9, 9, 8, 8, 8, 8, 8, 8,
+	 8, 8,10,10,10,10,10, 8, 8, 8, 8, 8, 8, 8, 8,10,
+	10,10,10,10, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,
+	10, 9,10, 8, 8, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44c7_s0_p2_1[] = {

1.3       +11 -10    vorbis/lib/books/coupled/_44c7_s0_p3_0.vqh

Index: _44c7_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p3_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p3_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c7_s0_p3_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -27,32 +28,32 @@
 
 static long _vq_lengthlist__44c7_s0_p3_0[] = {
          1, 6, 6, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0, 0, 0, 9,
-	 8, 0, 0, 0, 9, 8, 0, 0, 0,12,12, 0, 0, 0, 0, 0,
-	 0, 0, 6, 8, 8, 0, 0, 0, 8, 9, 0, 0, 0, 9, 9, 0,
-	 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 8, 7, 0, 0, 0, 9,
+	 8, 0, 0, 0, 9, 8, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
+	 0, 0, 6, 7, 8, 0, 0, 0, 8, 9, 0, 0, 0, 8, 9, 0,
+	 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 5, 9, 8, 0, 0, 0, 7, 7, 0, 0,
+	 0, 0, 0, 0, 0, 0, 5, 8, 8, 0, 0, 0, 8, 7, 0, 0,
          0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5,
-	 9, 9, 0, 0, 0, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0,10,
+	 8, 9, 0, 0, 0, 7, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
         10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 8, 0, 0, 0, 7, 7,
+	 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 7,
          0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5, 8, 9, 0,
-	 0, 0, 8, 8, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0,
+	 0, 0, 8, 8, 0, 0, 0, 7, 8, 0, 0, 0,10,10, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 8,12,12, 0, 0, 0,10,10, 0, 0, 0,10,10, 0, 0, 0,
-	11,11, 0, 0, 0, 0, 0, 0, 0, 8,12,12, 0, 0, 0,10,
+	 8,11,12, 0, 0, 0,10,10, 0, 0, 0,10,10, 0, 0, 0,
+	11,10, 0, 0, 0, 0, 0, 0, 0, 8,12,11, 0, 0, 0,10,
         10, 0, 0, 0,10,10, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.3       +2 -1      vorbis/lib/books/coupled/_44c7_s0_p4_0.vqh

Index: _44c7_s0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p4_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p4_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c7_s0_p4_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -33,7 +34,7 @@
          2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
          0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
          0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
-	 7, 8, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 8, 7, 0, 0, 0, 0, 0,
          0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.3       +7 -6      vorbis/lib/books/coupled/_44c7_s0_p5_0.vqh

Index: _44c7_s0_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p5_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p5_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c7_s0_p5_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,22 +39,22 @@
 };
 
 static long _vq_lengthlist__44c7_s0_p5_0[] = {
-	 3, 4, 4, 5, 5, 7, 7, 9, 8, 0, 0, 0, 0, 0, 0, 0,
+	 3, 4, 4, 5, 5, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 4, 4, 5, 5, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 5, 5, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 7, 9, 9, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 9, 9,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9,
          9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,
         10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
          9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	10,10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,11,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	10,10,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,10,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,

1.3       +4 -3      vorbis/lib/books/coupled/_44c7_s0_p6_0.vqh

Index: _44c7_s0_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p6_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p6_0.vqh	2001/12/17 00:16:44	1.2
+++ _44c7_s0_p6_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -32,10 +33,10 @@
 };
 
 static long _vq_lengthlist__44c7_s0_p6_0[] = {
-	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6,
+	 2, 3, 3, 6, 5, 0, 0, 0, 0, 0, 0, 5, 4, 4, 6, 6,
          0, 0, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0,
-	 0, 0, 6, 6, 7, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7,
-	 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 6, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7,
+	 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         10, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0,
          0, 0, 0, 0, 0, 0,12,11, 0, 0, 0, 0, 0, 0, 0, 0,

1.3       +1 -0      vorbis/lib/books/coupled/_44c7_s0_p6_1.vqh

Index: _44c7_s0_p6_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p6_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p6_1.vqh	2001/12/17 00:16:44	1.2
+++ _44c7_s0_p6_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +10 -9     vorbis/lib/books/coupled/_44c7_s0_p7_0.vqh

Index: _44c7_s0_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p7_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c7_s0_p7_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -35,16 +36,16 @@
 
 static long _vq_lengthlist__44c7_s0_p7_0[] = {
          1, 3, 4, 6, 6, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5,
-	 7, 7, 9,10, 0, 0, 0, 0, 0, 0, 6, 5, 5, 7, 7, 9,
-	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7,10,10, 0, 0,
-	 0, 0, 0, 0, 0, 7, 7, 7, 7,10,10, 0, 0, 0, 0, 0,
-	 0, 0,12,12, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0,12,
-	13, 9, 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
+	 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5, 7, 7, 9,
+	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 8,10,10, 0, 0,
+	 0, 0, 0, 0, 0, 8, 8, 7, 7,10,10, 0, 0, 0, 0, 0,
+	 0, 0,11,11, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0,12,
+	12, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,
         11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,15,15,13,12, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,16,16,12,12, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,15,15, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,14,14,12,12, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,15,15,12,12, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,13,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,14,14, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c7_s0_p7_0[] = {

1.3       +1 -0      vorbis/lib/books/coupled/_44c7_s0_p7_1.vqh

Index: _44c7_s0_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p7_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c7_s0_p7_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +13 -12    vorbis/lib/books/coupled/_44c7_s0_p8_0.vqh

Index: _44c7_s0_p8_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p8_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p8_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c7_s0_p8_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,20 +37,20 @@
 };
 
 static long _vq_lengthlist__44c7_s0_p8_0[] = {
-	 1, 3, 4, 7, 7, 8, 7,10,10, 0, 0, 0, 0, 0, 0, 5,
-	 5, 5, 7, 7, 8, 8,11,11, 0, 0, 0, 0, 0, 0, 6, 5,
+	 1, 3, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 6,
+	 5, 5, 7, 7, 8, 8,10,11, 0, 0, 0, 0, 0, 0, 6, 5,
          5, 7, 7, 8, 8,11,11, 0, 0, 0, 0, 0, 0, 0, 8, 8,
-	 8, 8, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8,
-	 8, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0,12,12,10, 9,
-	 9, 9,12,12, 0, 0, 0, 0, 0, 0, 0,13,13,10,10,10,
+	 9, 8, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9,
+	 8, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0,12,13,10,10,
+	10,10,12,12, 0, 0, 0, 0, 0, 0, 0,13,13,10,10,10,
         10,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,10,10,
-	13,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,10,10,12,
-	13, 0, 0, 0, 0, 0, 0, 0, 0, 0,17,16,11,11,13,13,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17,11,11,13,13, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,13,14,14, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,15,14, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,16,18,16,15, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0,17,18,15,16, 0, 0, 0, 0, 0,
+	12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,10,10,12,
+	12, 0, 0, 0, 0, 0, 0, 0, 0, 0,15,15,11,11,13,13,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,17,17,11,11,13,13, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,13,13,14, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,14,13, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,15,16,15,15, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0,16,16,13,15, 0, 0, 0, 0, 0,
          0,
 };
 

1.3       +7 -6      vorbis/lib/books/coupled/_44c7_s0_p8_1.vqh

Index: _44c7_s0_p8_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p8_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p8_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c7_s0_p8_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,16 +37,16 @@
 };
 
 static long _vq_lengthlist__44c7_s0_p8_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10,
+	 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,
          5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9,10, 5,
-	 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9,10, 6, 6,
-	 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10, 7,
+	 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 7,
+	 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10, 7,
          7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10, 7, 7,
          8, 8, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10, 7, 7, 8,
-	 8, 8, 8, 9, 8, 9, 9, 9, 9,10,10,10, 8, 8, 8, 8,
+	 8, 8, 8, 9, 8, 9, 8, 9, 9,10,10,10, 8, 8, 8, 8,
          8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 8, 8, 8,
-	 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10,10,10,10,10, 8, 9, 9, 9, 8,
+	 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 8, 9, 8, 9,
+	 9, 9, 9, 9, 9, 9,10,10,10,10,10, 8, 8, 9, 9, 9,
          9, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9, 9, 9, 9,
          9, 9, 9, 9,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,
          9, 9, 9,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,

1.3       +6 -5      vorbis/lib/books/coupled/_44c7_s0_p9_0.vqh

Index: _44c7_s0_p9_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p9_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p9_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c7_s0_p9_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,11 +31,11 @@
 };
 
 static long _vq_lengthlist__44c7_s0_p9_0[] = {
-	 1, 5, 3,12,11,13,13,13,13, 5, 7, 9,13,12,13,13,
-	13,13, 2, 8, 5,13,12,13,13,13,13,13, 8,11,13,13,
-	13,13,13,13,13,13, 8,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	 1, 4, 4,13,13,11,12,12,12, 4, 6, 9,12,12,12,12,
+	12,12, 2,11, 7,12,12,12,12,12,12,12, 6,12,12,12,
+	12,12,12,12,12,12, 8,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
         12,
 };
 

1.3       +12 -11    vorbis/lib/books/coupled/_44c7_s0_p9_1.vqh

Index: _44c7_s0_p9_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p9_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p9_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c7_s0_p9_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c7_s0_p9_1[] = {
-	 1, 3, 3, 6, 6, 8, 8, 9, 9,11,10,10,10, 6, 5, 6,
-	 7, 7, 9, 9,11,10,11,10,10,10, 6, 6, 5, 7, 8, 9,
-	 9,11,11,12,12,11,12,17, 9, 9, 9, 9,10,11,11,12,
-	11,12,11,11,15, 9, 9, 9, 9,11,11,12,12,13,13,12,
-	13,17,12,13,10,10,12,12,12,13,13,11,13,12,19,13,
-	12,10,11,12,12,13,13,12,14,13,15,19,16,18,12,12,
-	12,13,14,14,14, 9,14,13,17,18,17,12,13,12,13,13,
-	14,12,14,14,14,17,17,17,15,14,13,12,14,12,15,13,
-	15,14,18,18,18,14,15,13,12,13,13,14,14,15,14,18,
-	16,17,16,17,14,14,13,13,15,15,15,15,18,18,18,17,
-	17,14,14,14,13,14,14,16,15,
+	 1, 3, 3, 6, 6, 8, 8, 9, 9,11,10,11,11, 6, 6, 6,
+	 7, 7, 9, 9,10,10,11,12,12,12, 6, 6, 5, 7, 7, 9,
+	 9,10,11,11,11,12,12,17, 8, 8, 9, 9,10,10,11,12,
+	12,12,13,11,14, 9, 8, 9, 9,10,10,12,11,12,12,12,
+	13,18,12,12,10,10,11,11,11,12,12,11,13,11,16,12,
+	12,10,10,12,11,12,12,12,13,13,13,17,16,16,12,12,
+	12,12,13,13,13,10,14,12,18,17,16,11,12,11,10,13,
+	13,13,12,14,14,16,17,17,14,15,12,11,13,12,14,12,
+	13,13,17,17,17,14,15,12,11,13,11,14,14,14,15,16,
+	17,16,17,16,13,14,13,12,14,12,15,13,17,17,17,17,
+	17,14,13,13,11,14,12,14,14,
 };
 
 static float _vq_quantthresh__44c7_s0_p9_1[] = {

1.3       +3 -2      vorbis/lib/books/coupled/_44c7_s0_p9_2.vqh

Index: _44c7_s0_p9_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_s0_p9_2.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_s0_p9_2.vqh	2001/12/17 00:16:45	1.2
+++ _44c7_s0_p9_2.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -70,8 +71,8 @@
 };
 
 static long _vq_lengthlist__44c7_s0_p9_2[] = {
-	 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7,
+	 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7,
          7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
          7,
 };

1.3       +7 -7      vorbis/lib/books/coupled/_44c7_short.vqh

Index: _44c7_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c7_short.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c7_short.vqh	2001/12/17 00:16:45	1.2
+++ _44c7_short.vqh	2001/12/19 01:08:22	1.3
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c7_short[] = {
-	 3,18,18,10,13,14,15,14,18,18,18,15,18,13,12, 9,
-	 6, 7,11,18,18,14, 7,15,12, 8, 5, 4, 5,11, 4,18,
-	18, 5, 9,10,10,13,15,17, 7,18,18, 5, 7, 8, 8,10,
-	14,16, 9,18,18, 6, 6, 5, 5, 8,13,17,11,18,18, 7,
-	 5, 4, 3, 6,10,17,13,18,18,10, 9, 6, 5, 5, 9,16,
-	15,12, 5,14,13,10, 8, 7, 8,10,15, 9, 4,15,16,16,
-	14,12, 7, 7,
+	 3,17,17,10,13,14,17,17,17,17,17,17,17,14,11, 8,
+	 5, 7,11,17,17, 9, 6,15,11, 9, 5, 5, 7,14, 4,17,
+	17, 5, 9,10,11,13,15,17, 7,17,17, 5, 7, 6, 8,12,
+	15,17, 9,17,17, 5, 4, 4, 5, 9,13,17,11,17,17, 7,
+	 6, 4, 3, 7,12,17,14,17,17,11, 9, 7, 5, 6,10,17,
+	17, 9, 6,14,14,12, 9, 8,10,14,17, 6, 4,17,16,17,
+	15,14, 9,10,
 };
 
 static static_codebook _huff_book__44c7_short = {

1.3       +7 -7      vorbis/lib/books/coupled/_44c8_long.vqh

Index: _44c8_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_long.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_long.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_long.vqh	2001/12/19 01:08:22	1.3
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c8_long[] = {
-	 2,11,13, 8,12,13,13,13,13,14,11, 6, 8,21,21,21,
-	21,21,11,10,12, 7, 4,21,21,21,20,20, 7, 7, 6,20,
-	20, 5, 7, 9,11,11,12,16,11,20,20, 6, 6, 7, 9,10,
-	11,15,12,20,20, 8, 6, 4, 5, 8,10,14,13,20,20,10,
-	 8, 5, 4, 5, 8,12,14,20,20,11,10, 8, 5, 4, 6,11,
-	12,11, 6,11,11, 9, 8, 5, 4, 7,11, 9, 6,13,13,12,
-	11,10, 7, 6,
+	 2,11,13, 8,11,12,12,13,14,14,11, 5, 6,20,20,20,
+	20,20,12,12,13, 6, 4,20,20,20,19,19, 9, 9, 6,19,
+	19, 4, 7, 8, 9,10,12,16,11,19,19, 6, 6, 6, 7,10,
+	12,16,12,19,19, 7, 5, 4, 4, 8,10,15,12,19,19, 9,
+	 7, 4, 3, 6, 9,15,12,19,19,10,10, 8, 6, 6, 8,14,
+	11,10, 7,11,11, 9, 8, 8, 9,10,12, 9, 7,13,15,15,
+	14,14, 9, 8,
 };
 
 static static_codebook _huff_book__44c8_long = {

1.3       +4 -3      vorbis/lib/books/coupled/_44c8_s0_p1_0.vqh

Index: _44c8_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p1_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p1_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p1_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -32,13 +33,13 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p1_0[] = {
-	 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 5, 4, 4, 7, 7,
+	 1, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 5, 5, 5, 7, 6,
          0, 0, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0,
-	 0, 0, 7, 7, 7, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7,
+	 0, 0, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7,
          7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         10, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0,12,11, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,11,12, 0, 0, 0, 0, 0, 0, 0, 0,
          0,13,13, 0, 0, 0, 0, 0, 0,
 };
 

1.3       +1 -0      vorbis/lib/books/coupled/_44c8_s0_p1_1.vqh

Index: _44c8_s0_p1_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p1_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p1_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p1_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +12 -11    vorbis/lib/books/coupled/_44c8_s0_p2_0.vqh

Index: _44c8_s0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p2_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p2_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p2_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p2_0[] = {
-	 1, 4, 3, 6, 6, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5,
-	 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5, 7, 7, 9,
-	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7,10,10, 0, 0,
-	 0, 0, 0, 0, 0, 7, 7, 8, 7,10, 9, 0, 0, 0, 0, 0,
-	 0, 0,11,11, 9, 9,10,10, 0, 0, 0, 0, 0, 0, 0,12,
-	12, 9, 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
-	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,14,14,12,12, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,15,15,12,12, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,13,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,14,14, 0, 0, 0, 0, 0, 0,
+	 1, 3, 3, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 5, 5, 5,
+	 8, 8,10,10, 0, 0, 0, 0, 0, 0, 6, 5, 5, 8, 8,10,
+	10, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,11,11, 0, 0,
+	 0, 0, 0, 0, 0, 8, 8, 8, 8,11,11, 0, 0, 0, 0, 0,
+	 0, 0,12,12,10,10,11,12, 0, 0, 0, 0, 0, 0, 0,13,
+	13,10, 9,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,
+	12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,13, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,16,17,13,13, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,16,17,13,13, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,16,15, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c8_s0_p2_0[] = {

1.3       +7 -6      vorbis/lib/books/coupled/_44c8_s0_p2_1.vqh

Index: _44c8_s0_p2_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p2_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p2_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p2_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,15 +35,15 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p2_1[] = {
-	 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7, 7, 7, 7,
+	 4, 5, 5, 6, 6, 7, 6, 7, 7, 7, 7, 7, 7, 9, 6, 6,
+	 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 5, 6, 6, 6, 7,
+	 7, 7, 7, 7, 8, 8, 8, 9, 6, 6, 7, 7, 7, 7, 7, 7,
          8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 7, 7, 8, 8, 8,
-	 8, 9, 9, 9, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 9, 9,
-	 9, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 8, 8,
+	 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9,
+	 9, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
          8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
          8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,
-	 8, 8, 9, 9, 9, 9, 9, 8, 8, 7, 8, 8, 8, 8, 8, 9,
+	 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9,
          9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
          9, 9, 9, 8, 8, 8, 8, 8, 8,
 };

1.3       +9 -8      vorbis/lib/books/coupled/_44c8_s0_p3_0.vqh

Index: _44c8_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p3_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p3_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p3_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -27,18 +28,18 @@
 
 static long _vq_lengthlist__44c8_s0_p3_0[] = {
          1, 6, 6, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0, 0, 0, 9,
-	 8, 0, 0, 0, 9, 9, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
+	 8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 8, 7, 0, 0, 0, 9,
+	 8, 0, 0, 0, 9, 8, 0, 0, 0,12,11, 0, 0, 0, 0, 0,
          0, 0, 6, 8, 8, 0, 0, 0, 8, 9, 0, 0, 0, 8, 9, 0,
-	 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 5, 9, 9, 0, 0, 0, 7, 7, 0, 0,
+	 0, 0, 0, 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 7, 0, 0,
          0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5,
-	 9, 9, 0, 0, 0, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0,10,
-	10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 8, 9, 0, 0, 0, 7, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
+	11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -51,8 +52,8 @@
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 8,11,11, 0, 0, 0,10,10, 0, 0, 0,10,10, 0, 0, 0,
-	11,11, 0, 0, 0, 0, 0, 0, 0, 8,11,11, 0, 0, 0,10,
+	 8,11,12, 0, 0, 0,10,10, 0, 0, 0,10,10, 0, 0, 0,
+	11,11, 0, 0, 0, 0, 0, 0, 0, 8,12,12, 0, 0, 0,10,
         10, 0, 0, 0,10,10, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1.3       +4 -3      vorbis/lib/books/coupled/_44c8_s0_p4_0.vqh

Index: _44c8_s0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p4_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p4_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p4_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,10 +31,10 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p4_0[] = {
-	 2, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
-	 0, 0, 0, 3, 3, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
+	 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
+	 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
          0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
-	 8, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 8, 7, 0, 0, 0, 0, 0,
          0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.3       +5 -4      vorbis/lib/books/coupled/_44c8_s0_p5_0.vqh

Index: _44c8_s0_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p5_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p5_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p5_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -39,12 +40,12 @@
 
 static long _vq_lengthlist__44c8_s0_p5_0[] = {
          3, 4, 4, 5, 5, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0,
+	 0, 0, 4, 4, 6, 5, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 4, 4, 6, 6, 7, 7, 8, 8, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 5, 5, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 7, 6, 7, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 8, 9, 9,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9,
          9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,

1.3       +3 -2      vorbis/lib/books/coupled/_44c8_s0_p6_0.vqh

Index: _44c8_s0_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p6_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p6_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p6_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -37,8 +38,8 @@
          0, 0, 6, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 6,
          6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 9, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0,10,11, 0, 0, 0, 0, 0, 0, 0, 0,
+	 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,11,10, 0, 0, 0, 0, 0, 0, 0, 0,
          0,12,12, 0, 0, 0, 0, 0, 0,
 };
 

1.3       +1 -0      vorbis/lib/books/coupled/_44c8_s0_p6_1.vqh

Index: _44c8_s0_p6_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p6_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p6_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p6_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +9 -8      vorbis/lib/books/coupled/_44c8_s0_p7_0.vqh

Index: _44c8_s0_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p7_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p7_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,16 +35,16 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p7_0[] = {
-	 2, 3, 3, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 6, 4, 4,
+	 2, 3, 3, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 5, 4, 4,
          6, 6, 9, 9, 0, 0, 0, 0, 0, 0, 6, 4, 4, 6, 6, 9,
-	 9, 0, 0, 0, 0, 0, 0, 0, 7, 6, 7, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 0, 0,
-	 0, 0,11,11, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0,11,
+	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7,10,10, 0, 0,
+	 0, 0, 0, 0, 0, 7, 7, 7, 7,10,10, 0, 0, 0, 0, 0,
+	 0, 0,11,11, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0,12,
         12, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,
-	10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,10,10, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,14,14,11,11, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,15,15,12,11, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,13,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,14,14,12,12, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,14,14,12,12, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,14,14, 0, 0, 0, 0, 0, 0,
 };
 

1.3       +3 -2      vorbis/lib/books/coupled/_44c8_s0_p7_1.vqh

Index: _44c8_s0_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p7_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p7_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,8 +27,8 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p7_1[] = {
-	 4, 4, 4, 4, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
-	 5, 5, 5, 5, 5, 5, 5, 5, 5,
+	 3, 4, 4, 5, 5, 6, 4, 4, 5, 5, 6, 4, 4, 5, 5, 6,
+	 5, 5, 5, 5, 6, 5, 5, 5, 5,
 };
 
 static float _vq_quantthresh__44c8_s0_p7_1[] = {

1.3       +15 -14    vorbis/lib/books/coupled/_44c8_s0_p8_0.vqh

Index: _44c8_s0_p8_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p8_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p8_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p8_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,20 +37,20 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p8_0[] = {
-	 1, 3, 3, 7, 7, 9, 9,12,12, 0, 0, 0, 0, 0, 0, 6,
-	 5, 5, 8, 8, 9, 9,12,12, 0, 0, 0, 0, 0, 0, 6, 5,
-	 5, 8, 8,10, 9,12,12, 0, 0, 0, 0, 0, 0, 0, 8, 8,
-	 8, 8,10,10,13,13, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8,
-	 8,10,10,13,13, 0, 0, 0, 0, 0, 0, 0,12,12,10,10,
-	10,10,13,13, 0, 0, 0, 0, 0, 0, 0,12,12,10,10,10,
-	10,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,11,11,
-	14,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,11,11,13,
-	13, 0, 0, 0, 0, 0, 0, 0, 0, 0,16,16,12,12,14,14,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,16,16,12,12,14,14, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,14,15, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,15,15, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,17,17,16,16, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0,17,17,16,16, 0, 0, 0, 0, 0,
+	 1, 4, 3, 6, 6, 7, 7,10,10, 0, 0, 0, 0, 0, 0, 6,
+	 5, 5, 7, 7, 8, 8,11,11, 0, 0, 0, 0, 0, 0, 6, 5,
+	 5, 7, 7, 8, 8,11,11, 0, 0, 0, 0, 0, 0, 0, 8, 8,
+	 9, 8, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8,
+	 8, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0,12,12,10,10,
+	10,10,12,12, 0, 0, 0, 0, 0, 0, 0,13,12, 9,10,10,
+	10,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,10,10,
+	13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,10,10,13,
+	13, 0, 0, 0, 0, 0, 0, 0, 0, 0,16,16,11,11,13,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,16,16,11,11,13,13, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,13,14,14, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,14,14, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0,16,17,16,14, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0,16,17,14,14, 0, 0, 0, 0, 0,
          0,
 };
 

1.3       +14 -13    vorbis/lib/books/coupled/_44c8_s0_p8_1.vqh

Index: _44c8_s0_p8_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p8_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p8_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p8_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,20 +37,20 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p8_1[] = {
-	 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 9,
-	 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 9, 6,
+	 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,
+	 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 6,
          6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 7, 7,
-	 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 7,
-	 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 7, 7,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 7, 7, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8,
-	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,
-	 8, 8, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8,
+	 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10,10, 9, 7,
+	 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 7, 7,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 9,10, 7, 7, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 9, 9, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8,10, 9,10, 9, 9, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8,10,10,10, 9, 9, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8,10,10,10,10,10, 9, 9, 9, 9, 8, 8,
+	 8, 8, 8, 8,10,10,10, 9, 9,10, 9, 9, 9, 8, 8, 8,
+	 8, 9, 8,10,10,10, 9, 9,10, 9, 9, 9, 8, 8, 8, 8,
+	 8, 8,10,10,10, 9,10,10,10, 8, 8, 8, 8, 8, 8, 8,
          8,
 };
 

1.3       +9 -8      vorbis/lib/books/coupled/_44c8_s0_p9_0.vqh

Index: _44c8_s0_p9_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p9_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p9_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p9_0.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -32,14 +33,14 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p9_0[] = {
-	 1, 3, 2,12,10,15,13,14,14,15,15, 6, 6, 7,11,12,
-	15,14,15,15,15,15, 6, 8, 5,13,12,15,13,15,15,15,
-	15,15, 7,12,11,15,15,15,15,15,15,15,15,11, 6,15,
-	13,15,15,15,15,15,15,15,15,14,13,13,15,15,15,15,
-	15,15,15,14,15,13, 9,15,15,15,15,15,15,15,15,15,
-	11,14,15,15,15,15,15,15,15,15,15,15, 9,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,14,
+	 1, 4, 4,11,12,12,12,12,12,12,12, 5, 6, 8,12,12,
+	12,12,12,12,12,12, 2,10, 7,12,12,12,12,12,12,12,
+	12,12, 6,12,12,12,12,12,12,12,12,12,12,12, 6,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,
 };
 
 static float _vq_quantthresh__44c8_s0_p9_0[] = {

1.3       +12 -11    vorbis/lib/books/coupled/_44c8_s0_p9_1.vqh

Index: _44c8_s0_p9_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p9_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p9_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p9_1.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p9_1[] = {
-	 1, 4, 3, 6, 6, 8, 8, 9, 9,10,10,11,11, 6, 5, 5,
-	 7, 7, 9, 9,10,10,11,11,11,12, 6, 5, 5, 7, 7, 9,
-	 9,10,11,11,11,12,12,13, 8, 8, 8, 8,10,10,11,11,
-	12,12,12,12,16, 8, 7, 8, 8,10,10,11,11,12,12,13,
-	12,14,12,12, 9, 9,11,11,12,12,12,12,13,13,16,12,
-	12, 9, 9,11,11,11,12,13,13,13,13,15,14,15,11,12,
-	12,12,13,12,13,13,13,13,17,17,15,12,12,11,12,11,
-	13,13,13,13,14,15,15,16,14,15,12,12,13,13,13,13,
-	14,13,17,16,16,14,14,12,13,13,13,14,14,14,14,16,
-	15,16,15,16,14,13,13,13,14,14,14,14,17,16,16,15,
-	15,13,13,13,13,14,14,14,14,
+	 1, 3, 3, 6, 6, 8, 8,10,10,11,11,11,11, 6, 6, 6,
+	 7, 7, 9, 9,11,11,12,12,12,12, 6, 5, 5, 8, 8, 9,
+	10,11,11,12,12,12,12,17, 8, 8, 9, 9,10,10,11,12,
+	12,12,13,12,15, 8, 8, 9, 9,11,10,12,12,13,13,13,
+	13,17,12,12,10,10,11,11,12,12,13,11,14,12,18,13,
+	12,10,10,11,11,12,12,12,13,13,14,17,15,16,12,12,
+	12,12,13,13,13,11,14,13,17,18,17,12,12,12,10,13,
+	13,13,13,14,14,18,16,18,15,14,13,12,13,12,14,12,
+	14,14,18,18,18,14,14,13,11,13,11,14,14,14,15,17,
+	18,17,17,18,13,15,13,12,14,13,15,14,18,18,18,17,
+	17,14,13,14,11,15,12,14,14,
 };
 
 static float _vq_quantthresh__44c8_s0_p9_1[] = {

1.3       +3 -2      vorbis/lib/books/coupled/_44c8_s0_p9_2.vqh

Index: _44c8_s0_p9_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_s0_p9_2.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_s0_p9_2.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_s0_p9_2.vqh	2001/12/19 01:08:22	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -70,9 +71,9 @@
 };
 
 static long _vq_lengthlist__44c8_s0_p9_2[] = {
-	 3, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6,
+	 3, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6,
          6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
          7,
 };
 

1.3       +7 -7      vorbis/lib/books/coupled/_44c8_short.vqh

Index: _44c8_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c8_short.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c8_short.vqh	2001/12/17 00:16:45	1.2
+++ _44c8_short.vqh	2001/12/19 01:08:22	1.3
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c8_short[] = {
-	 3,18,18, 9,13,16,18,18,18,18,18,18,18,14,13,11,
-	10,10,12,18,18,15,15,15,12,10, 7, 5, 5, 9, 5,18,
-	18, 6,10,11,12,14,14,18, 6,18,18, 5, 8, 9,10,12,
-	13,16, 8,18,18, 6, 7, 6, 6, 8,11,15,11,18,18, 7,
-	 6, 4, 4, 5, 8,14,12,18,18, 9, 7, 6, 4, 4, 6,13,
-	15,17,16,11,11, 8, 6, 4, 4, 8,16,10, 5,15,15,13,
-	11, 8, 5, 4,
+	 3,17,17,10,13,14,17,17,17,17,17,17,17,14,11, 9,
+	 6, 7,11,17,17,13, 7,14,11, 8, 5, 4, 5,11, 4,17,
+	17, 5, 9,10,11,13,15,17, 7,17,17, 5, 7, 8, 8,11,
+	14,16, 9,17,17, 6, 6, 5, 5, 8,12,16,11,17,17, 7,
+	 5, 4, 3, 6,11,17,13,17,17,10, 8, 6, 5, 5, 8,17,
+	17,13, 6,13,13,10, 8, 6, 7, 9,17, 9, 4,16,16,16,
+	14,12, 7, 7,
 };
 
 static static_codebook _huff_book__44c8_short = {

1.3       +7 -7      vorbis/lib/books/coupled/_44c9_long.vqh

Index: _44c9_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_long.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_long.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_long.vqh	2001/12/19 01:08:23	1.3
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c9_long[] = {
-	 3,11,14, 8,13,13,14,13,12,14,11, 7, 8,20,20,20,
-	20,20,12,10,15, 8, 6,20,20,20,19,19, 8, 7, 6,19,
-	19, 4, 8,10,11,12,12,14,10,19,19, 6, 6, 7, 9,11,
-	11,14,11,19,19, 8, 6, 4, 5, 9,10,13,13,19,19,10,
-	 8, 5, 4, 6, 8,11,13,19,19,12,11, 8, 5, 5, 6,10,
-	13,12, 8,12,12,10, 7, 5, 3, 5,11, 9, 6,12,12,12,
-	11, 9, 5, 3,
+	 2,12,16, 8,12,13,13,14,13,14,12, 7, 8,21,21,21,
+	21,21,12,10,14, 8, 5,21,21,21,20,20, 7, 7, 6,20,
+	20, 5, 7,10,11,12,12,15,10,20,20, 6, 6, 7, 9,10,
+	11,14,11,20,20, 8, 6, 4, 5, 8,10,13,13,20,20,10,
+	 8, 5, 4, 6, 8,12,14,20,20,11,10, 8, 5, 4, 6,10,
+	13,11, 7,11,11, 9, 7, 5, 4, 6,11, 9, 6,12,13,12,
+	11, 9, 6, 4,
 };
 
 static static_codebook _huff_book__44c9_long = {

1.3       +5 -4      vorbis/lib/books/coupled/_44c9_s0_p1_0.vqh

Index: _44c9_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p1_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p1_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p1_0.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -32,14 +33,14 @@
 };
 
 static long _vq_lengthlist__44c9_s0_p1_0[] = {
-	 1, 4, 4, 6, 7, 0, 0, 0, 0, 0, 0, 5, 5, 4, 7, 7,
-	 0, 0, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0, 0, 0, 0,
+	 1, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 5, 5, 5, 7, 6,
+	 0, 0, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0,
          0, 0, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7,
          7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          9,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0,12,11, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,13,13, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,12,12, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__44c9_s0_p1_0[] = {

1.3       +1 -0      vorbis/lib/books/coupled/_44c9_s0_p1_1.vqh

Index: _44c9_s0_p1_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p1_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p1_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p1_1.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +6 -5      vorbis/lib/books/coupled/_44c9_s0_p2_0.vqh

Index: _44c9_s0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p2_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p2_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p2_0.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,14 +37,14 @@
 static long _vq_lengthlist__44c9_s0_p2_0[] = {
          1, 4, 3, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 6, 5, 5,
          7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 6, 5, 5, 7, 7, 9,
-	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 0, 8, 8, 8, 7, 9, 9, 0, 0, 0, 0, 0,
-	 0, 0,12,12, 9, 9,10,10, 0, 0, 0, 0, 0, 0, 0,12,
+	 9, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 9,10, 0, 0,
+	 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, 0, 0,
+	 0, 0,11,11, 9, 9,10,10, 0, 0, 0, 0, 0, 0, 0,12,
         12, 9, 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
-	10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,10, 0,
+	11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11, 0,
          0, 0, 0, 0, 0, 0, 0, 0,14,14,12,12, 0, 0, 0, 0,
          0, 0, 0, 0, 0,15,15,12,12, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,13,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,14,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,14,14, 0, 0, 0, 0, 0, 0,
 };
 

1.3       +9 -8      vorbis/lib/books/coupled/_44c9_s0_p2_1.vqh

Index: _44c9_s0_p2_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p2_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p2_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p2_1.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44c9_s0_p2_1[] = {
-	 4, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 8, 6, 6,
+	 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6,
          7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7, 7,
          7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7, 7, 7, 7,
-	 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 7, 7, 8, 8, 8,
-	 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9,
-	 9, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 9, 9, 9, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 8, 8,
+	 7, 9, 8, 9, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 9,
+	 9, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 8, 8,
          8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
-	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,
-	 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 7, 8, 8, 8, 8, 9,
-	 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 8, 8, 8, 8, 8, 8,
+	 8, 7, 7, 7, 8, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 9, 9, 9, 9, 9, 8, 8, 7, 7, 7, 7, 7, 8, 9,
+	 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, 8, 9, 9, 9, 9,
+	 9, 8, 8, 8, 8, 8, 7, 8, 7,
 };
 
 static float _vq_quantthresh__44c9_s0_p2_1[] = {

1.3       +1 -0      vorbis/lib/books/coupled/_44c9_s0_p3_0.vqh

Index: _44c9_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p3_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p3_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p3_0.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +2 -1      vorbis/lib/books/coupled/_44c9_s0_p4_0.vqh

Index: _44c9_s0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p4_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p4_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p4_0.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -33,7 +34,7 @@
          2, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0,
          0, 0, 0, 3, 3, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6,
          0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0,
-	 8, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
+	 7, 8, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
          0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,
 };

1.3       +12 -11    vorbis/lib/books/coupled/_44c9_s0_p5_0.vqh

Index: _44c9_s0_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p5_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p5_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p5_0.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,20 +39,20 @@
 };
 
 static long _vq_lengthlist__44c9_s0_p5_0[] = {
-	 3, 4, 4, 6, 5, 7, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0,
+	 3, 4, 4, 5, 5, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 4, 4, 6, 6, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 4, 4, 6, 6, 7, 7, 8, 8, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 5, 5, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8, 9, 9,
+	 0, 0, 0, 0, 0, 0, 0, 0, 7, 6, 7, 7, 9, 9, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 7, 7, 9, 9, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 8, 9, 9,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9,
-	 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 8,
-	 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
-	 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	10,10,11,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,
+	10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+	 9,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	10,10,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0,11,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0,

1.3       +2 -1      vorbis/lib/books/coupled/_44c9_s0_p6_0.vqh

Index: _44c9_s0_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p6_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p6_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p6_0.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -37,7 +38,7 @@
          0, 0, 6, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 6,
          6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0,
+	 9, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0,
          0, 0, 0, 0, 0, 0,10,11, 0, 0, 0, 0, 0, 0, 0, 0,
          0,12,12, 0, 0, 0, 0, 0, 0,
 };

1.3       +1 -0      vorbis/lib/books/coupled/_44c9_s0_p6_1.vqh

Index: _44c9_s0_p6_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p6_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p6_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p6_1.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +4 -3      vorbis/lib/books/coupled/_44c9_s0_p7_0.vqh

Index: _44c9_s0_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p7_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p7_0.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -35,15 +36,15 @@
 
 static long _vq_lengthlist__44c9_s0_p7_0[] = {
          2, 3, 3, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 6, 4, 4,
-	 6, 6, 9, 9, 0, 0, 0, 0, 0, 0, 6, 4, 4, 6, 6, 9,
-	 9, 0, 0, 0, 0, 0, 0, 0, 7, 6, 7, 7, 9, 9, 0, 0,
+	 6, 6, 9, 9, 0, 0, 0, 0, 0, 0, 7, 4, 4, 6, 6, 9,
+	 9, 0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0,
          0, 0, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 0, 0,
          0, 0,11,11, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0,12,
         12, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,
         10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,10,10, 0,
          0, 0, 0, 0, 0, 0, 0, 0,14,14,11,11, 0, 0, 0, 0,
          0, 0, 0, 0, 0,15,15,11,11, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,14,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,13,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0,14,14, 0, 0, 0, 0, 0, 0,
 };
 

1.3       +2 -1      vorbis/lib/books/coupled/_44c9_s0_p7_1.vqh

Index: _44c9_s0_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p7_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p7_1.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,7 +27,7 @@
 };
 
 static long _vq_lengthlist__44c9_s0_p7_1[] = {
-	 4, 4, 4, 4, 4, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5,
+	 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 4, 4, 5, 5, 5,
          5, 5, 5, 5, 5, 5, 5, 5, 5,
 };
 

1.3       +8 -7      vorbis/lib/books/coupled/_44c9_s0_p8_0.vqh

Index: _44c9_s0_p8_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p8_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p8_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p8_0.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -37,19 +38,19 @@
 
 static long _vq_lengthlist__44c9_s0_p8_0[] = {
          2, 3, 3, 6, 6, 8, 8,11,11, 0, 0, 0, 0, 0, 0, 5,
-	 4, 4, 6, 6, 9, 9,12,12, 0, 0, 0, 0, 0, 0, 6, 4,
-	 4, 7, 7, 9, 9,12,12, 0, 0, 0, 0, 0, 0, 0, 7, 7,
+	 4, 4, 7, 7, 9, 9,12,12, 0, 0, 0, 0, 0, 0, 6, 4,
+	 4, 7, 7, 9, 9,12,12, 0, 0, 0, 0, 0, 0, 0, 6, 6,
          7, 7, 9, 9,12,12, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7,
          7, 9, 9,12,12, 0, 0, 0, 0, 0, 0, 0,11,11, 8, 8,
-	10,10,12,12, 0, 0, 0, 0, 0, 0, 0,11,11, 8, 8, 9,
-	 9,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,10,10,
+	 9, 9,12,12, 0, 0, 0, 0, 0, 0, 0,11,11, 8, 8,10,
+	10,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,10,10,
         13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,10,10,13,
-	13, 0, 0, 0, 0, 0, 0, 0, 0, 0,14,14,11,11,13,14,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,15,15,11,11,13,13, 0,
+	13, 0, 0, 0, 0, 0, 0, 0, 0, 0,14,14,11,11,13,13,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,15,14,11,11,13,13, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,14,14, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,14,14, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0,17,17,15,15, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0,17,17,16,16, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0,17,17,15,15, 0, 0, 0, 0, 0,
          0,
 };
 

1.3       +8 -7      vorbis/lib/books/coupled/_44c9_s0_p8_1.vqh

Index: _44c9_s0_p8_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p8_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p8_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p8_1.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,14 +37,14 @@
 };
 
 static long _vq_lengthlist__44c9_s0_p8_1[] = {
-	 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 7, 7,
-	 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 7,
+	 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9,
+	 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 7, 7,
+	 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 7,
          7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 7, 7,
-	 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 7, 7, 7,
-	 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
+	 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 7, 7, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 9, 8, 8, 8,
          8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8,
          8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8,
          8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,

1.3       +35 -34    vorbis/lib/books/coupled/_44c9_s0_p9_0.vqh

Index: _44c9_s0_p9_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p9_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p9_0.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p9_0.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -44,40 +45,40 @@
 };
 
 static long _vq_lengthlist__44c9_s0_p9_0[] = {
-	 1, 3, 3, 6, 5,11, 6,14, 9,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16, 6, 5, 6, 8, 8,12, 7,15, 9,
-	16,15,16,16,16,16,16,16,16,16,16,16,16,16, 6, 6,
-	 6,10, 9,11,11,14,12,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16, 8, 9,12,13,16,14,16,12,16,13,
-	16,16,16,16,16,16,16,16,16,16,16,16,16, 9, 8,12,
-	11,16,14,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,11,12,10,11,16,15,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,13,12,12, 9,16,
-	14,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16, 9,12,14,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,14, 6,16, 9,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,12,16,11,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,10,16, 8,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,11,16,14,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16, 9,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,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,14,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,16,16,16,16,
-	16,16,16,16,16,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,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,
+	 1, 3, 3, 7, 7,11,10,15,13,15,15,15,15,15,15,15,
+	15,15,15,15,15,15,15, 5, 5, 6, 9, 9,11,11,13,13,
+	15,15,15,15,15,15,15,15,15,15,15,15,15,15, 5, 6,
+	 5, 9,10,11,11,12,13,15,15,15,15,15,15,15,15,15,
+	15,15,15,15,15,15, 8, 9,11,14,14,15,15,14,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,15, 9, 8,12,
+	11,14,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	15,15,15,15,12,14,10,11,15,15,15,15,15,15,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,13,13, 8,15,
+	15,15,15,15,15,15,15,15,14,14,14,14,14,14,14,14,
+	14,14,14,14,10,12,13,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14, 6,14, 9,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,12,14,12,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,11,14, 9,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,13,14,13,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,12,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,13,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,
 };
 
 static float _vq_quantthresh__44c9_s0_p9_0[] = {

1.3       +33 -32    vorbis/lib/books/coupled/_44c9_s0_p9_1.vqh

Index: _44c9_s0_p9_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p9_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p9_1.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p9_1.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -45,39 +46,39 @@
 
 static long _vq_lengthlist__44c9_s0_p9_1[] = {
          1, 3, 3, 7, 7, 9, 9,10,10,11,11,12,12,13,13,14,
-	14,14,14,14,14,15,15, 6, 5, 5, 8, 8,10,10,11,11,
-	12,12,12,13,13,13,14,14,15,14,15,15,15,15, 6, 5,
+	14,14,14,15,15,15,15, 6, 5, 5, 8, 8,10,10,11,11,
+	12,12,13,13,14,14,15,15,15,15,15,15,15,15, 6, 5,
          5, 8, 8,10,10,11,11,12,12,13,13,14,14,14,14,15,
-	14,15,15,15,15,17, 8, 8, 9, 9,11,11,12,12,13,13,
-	13,13,14,14,14,15,15,15,15,15,15,15,17, 8, 8, 9,
-	 9,11,11,12,12,13,13,13,13,14,14,15,14,15,15,15,
-	15,15,15,17,13,13,10,10,11,11,12,12,13,13,14,14,
-	14,14,15,15,15,15,15,15,15,15,17,13,13,10,10,11,
-	11,13,12,13,13,14,14,14,15,15,15,15,15,15,15,16,
-	15,17,17,17,12,12,12,12,13,13,14,14,14,14,15,15,
-	15,15,15,15,15,16,16,16,17,17,17,12,12,12,12,13,
-	13,14,14,15,15,15,15,15,15,15,15,16,16,16,16,18,
-	17,18,15,16,13,13,14,14,15,15,15,15,15,15,15,16,
-	15,16,15,16,16,16,18,17,17,16,15,13,13,14,14,15,
-	15,15,15,15,15,15,16,16,16,16,16,16,16,18,18,18,
-	17,18,14,14,14,14,15,15,16,15,16,16,16,16,15,16,
-	16,16,16,15,18,18,18,18,18,14,14,14,14,15,15,16,
-	16,16,16,16,16,16,16,16,15,16,16,18,18,18,18,17,
-	17,17,14,15,15,15,16,15,16,16,16,16,16,16,16,16,
-	16,16,18,18,18,18,18,17,17,14,14,15,15,16,16,16,
-	16,16,16,16,16,16,16,16,16,17,18,18,19,18,18,17,
-	16,15,15,15,16,16,16,16,16,16,16,16,17,16,16,16,
-	17,18,17,18,17,18,18,15,15,15,15,16,16,16,16,17,
-	16,16,16,16,16,16,16,18,18,18,18,18,18,18,17,17,
-	16,15,16,16,16,16,16,16,16,16,17,16,16,16,18,18,
-	17,18,17,18,17,16,17,13,15,16,15,16,16,16,16,16,
-	17,16,16,16,16,18,19,18,18,18,18,17,18,18,17,16,
-	16,16,16,16,16,16,16,16,16,17,16,16,19,18,18,19,
-	19,18,18,17,18,14,16,16,15,16,16,16,17,16,16,16,
-	17,17,17,19,19,18,18,18,17,18,17,18,17,17,16,14,
-	16,15,16,16,16,17,17,17,17,17,18,19,18,18,18,18,
-	18,18,18,18,16,16,13,16,16,16,16,16,16,17,16,17,
-	16,
+	15,15,15,15,15,17, 8, 8, 9, 9,10,11,12,12,13,13,
+	13,14,14,14,15,15,15,15,16,16,16,16,18, 8, 8, 9,
+	 9,11,11,12,12,13,13,14,14,14,14,15,15,15,15,16,
+	16,16,16,17,13,13,10,10,11,11,12,12,13,13,14,14,
+	15,15,15,15,15,15,16,16,16,16,18,13,13,10,10,11,
+	11,12,12,13,13,14,14,15,15,15,15,15,16,16,16,16,
+	16,18,18,18,12,12,12,12,13,13,14,14,14,15,15,15,
+	15,16,15,16,16,16,16,16,18,18,18,12,12,12,12,13,
+	13,14,14,15,14,15,15,15,15,16,16,16,16,16,16,18,
+	19,19,16,16,13,13,13,13,14,14,15,15,15,15,16,16,
+	16,16,16,16,16,16,18,18,18,16,16,12,13,13,13,14,
+	14,15,15,15,15,16,16,16,16,16,16,16,16,18,19,18,
+	18,19,14,14,14,14,14,14,15,15,16,16,16,16,16,16,
+	16,16,16,16,18,19,18,18,18,14,14,14,13,14,14,15,
+	15,16,16,16,16,16,16,16,16,16,16,19,18,19,18,18,
+	17,16,14,14,15,15,15,16,16,16,16,16,16,16,16,16,
+	16,16,18,18,19,18,18,17,18,14,14,14,14,15,15,16,
+	16,16,16,17,16,16,16,16,16,18,18,18,19,20,18,18,
+	15,15,15,15,16,16,16,16,16,16,17,16,16,16,16,16,
+	19,18,19,19,19,18,18,16,15,14,15,15,15,16,16,16,
+	16,16,16,16,16,16,16,18,19,19,18,18,20,18,18,18,
+	15,15,16,16,16,16,16,16,16,16,16,16,17,16,19,18,
+	19,19,19,19,18,17,17,14,15,16,15,16,16,16,16,16,
+	17,16,17,17,16,20,18,19,18,19,19,19,19,18,16,16,
+	16,15,16,16,16,16,16,16,17,17,17,17,19,18,20,18,
+	19,18,19,19,18,16,15,16,14,16,15,16,16,16,16,16,
+	17,17,17,18,20,19,18,20,18,18,18,18,17,17,16,15,
+	16,15,16,16,16,16,17,16,16,17,19,19,19,19,19,18,
+	18,18,18,18,17,16,14,16,15,16,16,16,17,17,16,17,
+	17,
 };
 
 static float _vq_quantthresh__44c9_s0_p9_1[] = {

1.3       +2 -1      vorbis/lib/books/coupled/_44c9_s0_p9_2.vqh

Index: _44c9_s0_p9_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_s0_p9_2.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_s0_p9_2.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_s0_p9_2.vqh	2001/12/19 01:08:23	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -102,7 +103,7 @@
 };
 
 static long _vq_lengthlist__44c9_s0_p9_2[] = {
-	 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6,
          6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
          6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
          7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,

1.3       +7 -7      vorbis/lib/books/coupled/_44c9_short.vqh

Index: _44c9_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c9_short.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44c9_short.vqh	2001/12/17 00:16:45	1.2
+++ _44c9_short.vqh	2001/12/19 01:08:23	1.3
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c9_short[] = {
-	 3,18,18,10,12,15,18,18,18,18,17,17,18,14,13,12,
-	11,11,14,17,18,18,16,16,13,11, 8, 7, 7,10, 5,18,
-	18, 6, 9,11,13,15,16,18, 7,18,18, 5, 8,10,11,13,
-	14,16, 8,18,18, 6, 7, 7, 7, 9,11,15,10,18,18, 8,
-	 7, 5, 5, 6, 9,13,12,18,18,10, 8, 6, 5, 5, 6,11,
-	14,18,16,12,10, 8, 6, 5, 3, 7,18,10, 6,15,14,12,
-	10, 8, 4, 2,
+	 3,18,18, 9,13,14,18,18,18,18,17,18,18,16,13,12,
+	10,11,13,17,18,15,15,14,13,11, 8, 6, 5, 9, 5,18,
+	18, 6,10,11,13,14,16,18, 7,18,18, 5, 8,10,11,13,
+	14,17, 8,18,18, 6, 7, 7, 7, 9,12,16,11,18,18, 8,
+	 7, 5, 4, 6, 9,14,13,18,18,10, 8, 6, 4, 4, 6,13,
+	15,18,16,12,10, 8, 6, 5, 3, 7,18,10, 6,16,15,13,
+	10, 8, 4, 3,
 };
 
 static static_codebook _huff_book__44c9_short = {

1.2       +61 -0     vorbis/lib/books/coupled/_44c0_s0_p0_r0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c0_s0_p0_r1.vqh

1.2       +99 -0     vorbis/lib/books/coupled/_44c0_s0_p5_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c0_s0_p6_0.vqh

1.2       +65 -0     vorbis/lib/books/coupled/_44c0_s0_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c0_s0_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c0_s0_p7_2.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c0_s0_pN_r0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c0_s0_pN_r1.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c0_s1_p5_s0.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c0_s1_p6_s0.vqh

1.2       +65 -0     vorbis/lib/books/coupled/_44c0_s1_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c0_s1_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c0_s1_p7_2.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c0_s1_p7_s0.vqh

1.2       +58 -0     vorbis/lib/books/coupled/_44c0_s1_pS_r0.vqh

1.2       +58 -0     vorbis/lib/books/coupled/_44c0_s1_pS_r1.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c0_s2_p6_s0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c0_s2_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c0_s2_p7_2.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c0_s2_p7_s0.vqh

1.2       +65 -0     vorbis/lib/books/coupled/_44c0_s3_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c0_s3_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c0_s3_p7_2.vqh

1.2       +163 -0    vorbis/lib/books/coupled/_44c0_s3_p7_s0.vqh

1.2       +99 -0     vorbis/lib/books/coupled/_44c1_s0_p5_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c1_s0_p6_0.vqh

1.2       +65 -0     vorbis/lib/books/coupled/_44c1_s0_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c1_s0_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c1_s0_p7_2.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c1_s1_p6_0.vqh

1.2       +65 -0     vorbis/lib/books/coupled/_44c1_s1_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c1_s1_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c1_s1_p7_2.vqh

1.2       +65 -0     vorbis/lib/books/coupled/_44c1_s2_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c1_s2_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c1_s2_p7_2.vqh

1.2       +99 -0     vorbis/lib/books/coupled/_44c2_s0_p5_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c2_s0_p6_0.vqh

1.2       +65 -0     vorbis/lib/books/coupled/_44c2_s0_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c2_s0_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c2_s0_p7_2.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c2_s1_p6_0.vqh

1.2       +65 -0     vorbis/lib/books/coupled/_44c2_s1_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c2_s1_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c2_s1_p7_2.vqh

1.2       +65 -0     vorbis/lib/books/coupled/_44c2_s3_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c2_s3_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c2_s3_p7_2.vqh

1.2       +99 -0     vorbis/lib/books/coupled/_44c3_s0_p5_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c3_s0_p6_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c3_s0_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c3_s0_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c3_s0_p7_2.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c3_s1_p6_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c3_s1_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c3_s1_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c3_s1_p7_2.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c3_s3_p7_0.vqh

1.2       +115 -0    vorbis/lib/books/coupled/_44c3_s3_p7_1.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c3_s3_p7_2.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c4_s0_p0_r0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c4_s0_p0_r1.vqh

1.2       +99 -0     vorbis/lib/books/coupled/_44c4_s0_p2_0.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c4_s0_p4_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c4_s0_p6_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s0_p7_0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c4_s0_p7_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s0_p8_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s0_p8_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s0_p9_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s0_p9_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s0_p9_2.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c4_s0_pN_r0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c4_s0_pN_r1.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c4_s1_p2_s0.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c4_s1_p4_s0.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c4_s1_p6_s0.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c4_s1_p7_s0.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c4_s1_p8_s0.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c4_s1_p9_s0.vqh

1.2       +58 -0     vorbis/lib/books/coupled/_44c4_s1_pS_r0.vqh

1.2       +58 -0     vorbis/lib/books/coupled/_44c4_s1_pS_r1.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c4_s2_p6_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c4_s2_p6_s0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s2_p7_0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c4_s2_p7_1.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c4_s2_p7_s0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s2_p8_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s2_p8_1.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c4_s2_p8_s0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s2_p9_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s2_p9_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s2_p9_2.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c4_s2_p9_s0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s3_p7_0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c4_s3_p7_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s3_p8_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s3_p8_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s3_p9_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s3_p9_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c4_s3_p9_2.vqh

1.2       +163 -0    vorbis/lib/books/coupled/_44c4_s3_p9_s0.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c5_s1_p2_0.vqh

1.2       +99 -0     vorbis/lib/books/coupled/_44c5_s1_p4_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c5_s1_p6_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s1_p7_0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c5_s1_p7_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s1_p8_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s1_p8_1.vqh

1.2       +86 -0     vorbis/lib/books/coupled/_44c5_s1_p9_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c5_s1_p9_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s1_p9_2.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c5_s2_p6_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s2_p7_0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c5_s2_p7_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s2_p8_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s2_p8_1.vqh

1.2       +86 -0     vorbis/lib/books/coupled/_44c5_s2_p9_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c5_s2_p9_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s2_p9_2.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s3_p7_0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c5_s3_p7_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s3_p8_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s3_p8_1.vqh

1.2       +86 -0     vorbis/lib/books/coupled/_44c5_s3_p9_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c5_s3_p9_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c5_s3_p9_2.vqh

1.2       +63 -0     vorbis/lib/books/coupled/_44c6_s1_p2_0.vqh

1.2       +99 -0     vorbis/lib/books/coupled/_44c6_s1_p4_0.vqh

1.2       +93 -0     vorbis/lib/books/coupled/_44c6_s1_p6_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s1_p7_0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c6_s1_p7_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s1_p8_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s1_p8_1.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c6_s1_p9_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s1_p9_1.vqh

1.2       +118 -0    vorbis/lib/books/coupled/_44c6_s1_p9_2.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c6_s2_p6_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s2_p7_0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c6_s2_p7_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s2_p8_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s2_p8_1.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c6_s2_p9_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s2_p9_1.vqh

1.2       +118 -0    vorbis/lib/books/coupled/_44c6_s2_p9_2.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s3_p7_0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c6_s3_p7_1.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s3_p8_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s3_p8_1.vqh

1.2       +70 -0     vorbis/lib/books/coupled/_44c6_s3_p9_0.vqh

1.2       +80 -0     vorbis/lib/books/coupled/_44c6_s3_p9_1.vqh

1.2       +118 -0    vorbis/lib/books/coupled/_44c6_s3_p9_2.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c7_s0_p0_r0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c7_s0_p0_r1.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c7_s0_pN_r0.vqh

1.2       +61 -0     vorbis/lib/books/coupled/_44c7_s0_pN_r1.vqh

1.5       +2 -2      vorbis/lib/books/floor/line_1024x31_0sub0.vqh

Index: line_1024x31_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_0sub0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_0sub0.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_0sub0.vqh	2001/12/19 01:10:12	1.5
@@ -19,8 +19,8 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_0sub0[] = {
-	 4, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-	 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6,
+	 4, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5,
+	 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5,
 };
 
 static static_codebook _huff_book_line_1024x31_0sub0 = {

1.5       +6 -6      vorbis/lib/books/floor/line_1024x31_0sub1.vqh

Index: line_1024x31_0sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_0sub1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_0sub1.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_0sub1.vqh	2001/12/19 01:10:12	1.5
@@ -21,12 +21,12 @@
 static long _huff_lengthlist_line_1024x31_0sub1[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 4, 4, 4, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-	 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6, 7, 6, 7, 6,
-	 7, 6, 7, 7, 7, 7, 8, 7, 8, 7, 8, 8, 8, 8, 8, 9,
-	 8,10, 9,10, 9,11, 9,13,10,12,10,11,10, 9, 9,10,
-	11,12,11,13,12,13,13,12,12,13,13,13,12,13,13,15,
-	13,16,14,13,13,12,12,13,16,16,16,16,16,15,15,13,
+	 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5,
+	 6, 5, 6, 6, 6, 6, 7, 6, 7, 6, 7, 7, 7, 7, 8, 7,
+	 8, 7, 8, 8, 8, 8, 8, 8, 9, 8, 9, 8, 9, 8, 9, 9,
+	 9, 9,10,10,10,10,10,10,11,10,10,10,11, 9, 9,10,
+	11,11,11,11,11,11,11,11,11,12,13,12,13,14,15,12,
+	13,17,14,13,13,12,12,12,17,17,15,17,17,17,16,13,
 };
 
 static static_codebook _huff_book_line_1024x31_0sub1 = {

1.5       +1 -1      vorbis/lib/books/floor/line_1024x31_1sub0.vqh

Index: line_1024x31_1sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_1sub0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_1sub0.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_1sub0.vqh	2001/12/19 01:10:12	1.5
@@ -20,7 +20,7 @@
 
 static long _huff_lengthlist_line_1024x31_1sub0[] = {
          2, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-	 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8,
+	 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7,
 };
 
 static static_codebook _huff_book_line_1024x31_1sub0 = {

1.5       +6 -6      vorbis/lib/books/floor/line_1024x31_1sub1.vqh

Index: line_1024x31_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_1sub1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_1sub1.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_1sub1.vqh	2001/12/19 01:10:12	1.5
@@ -21,12 +21,12 @@
 static long _huff_lengthlist_line_1024x31_1sub1[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 3, 4, 4, 4, 4, 4, 5, 4, 5, 5, 5, 5, 6, 5, 6, 6,
-	 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 7, 7, 7, 8, 7,
-	 8, 7, 8, 7, 8, 7, 8, 7, 8, 8, 8, 8, 8, 8, 8, 9,
-	 8, 9, 9,10, 9,10, 9,10,10, 9,10, 9,11,11,12,11,
-	12,12,11,12,11,13,11,14,13,11,11,11,11,11,11,12,
-	12,14,14,13,13,14,13,13,14,14,14,14,14,14,14,14,
+	 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 5, 5, 6, 5,
+	 6, 5, 7, 6, 7, 6, 7, 6, 8, 6, 8, 6, 8, 7, 9, 7,
+	 9, 7, 9, 8, 9, 8,10, 8,10, 9,10, 9,11,10,11,10,
+	10, 9,10,10,10,10,10,10,10, 9,10,10,11,12,12,11,
+	12,11,11,12,11,12,11,12,11,12,13,12,11,12,12,12,
+	13,14,14,15,12,13,14,14,15,15,15,15,15,15,15,13,
 };
 
 static static_codebook _huff_book_line_1024x31_1sub1 = {

1.5       +1 -1      vorbis/lib/books/floor/line_1024x31_2sub1.vqh

Index: line_1024x31_2sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_2sub1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_2sub1.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_2sub1.vqh	2001/12/19 01:10:12	1.5
@@ -19,7 +19,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_2sub1[] = {
-	 0, 4, 4, 4, 4, 4, 4, 3, 4, 4, 4, 4, 4, 4, 5, 5,
+	 0, 4, 4, 4, 4, 3, 5, 3, 5, 3, 5, 4, 5, 4, 5, 5,
          5, 5,
 };
 

1.5       +3 -3      vorbis/lib/books/floor/line_1024x31_2sub2.vqh

Index: line_1024x31_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_2sub2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_2sub2.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_2sub2.vqh	2001/12/19 01:10:12	1.5
@@ -20,9 +20,9 @@
 
 static long _huff_lengthlist_line_1024x31_2sub2[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 3, 3, 4, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6,
-	 6, 6, 6, 7, 6, 8, 6, 9, 6, 9, 7, 9, 7,10, 8,11,
-	 7,11,
+	 0, 0, 3, 3, 3, 4, 4, 4, 4, 5, 4, 5, 4, 6, 5, 7,
+	 5, 8, 6, 8, 6,10, 6,10, 6,11, 7,11, 7,11, 7,12,
+	 8,12,
 };
 
 static static_codebook _huff_book_line_1024x31_2sub2 = {

1.5       +5 -5      vorbis/lib/books/floor/line_1024x31_2sub3.vqh

Index: line_1024x31_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_2sub3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_2sub3.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_2sub3.vqh	2001/12/19 01:10:12	1.5
@@ -22,11 +22,11 @@
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 3, 8, 4, 8, 3, 9, 3, 9, 3, 9, 4, 9, 4, 8,
-	 4, 9, 4,11, 5,11, 6, 9, 7,11,10,11, 8, 9, 9, 7,
-	 8,10, 8,11, 6,11, 7, 7, 7, 7, 8,11,10,11,11,11,
-	11,11, 9,11,10,10,10, 9, 9,11,11,11, 9,10, 8,11,
-	10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	 0, 0, 2, 6, 3, 7, 3, 7, 4, 9, 3, 9, 5, 8, 5, 8,
+	 6, 9, 6, 9, 6, 9, 7, 9, 7, 9, 7,10, 8, 8, 9, 7,
+	 7, 9, 9, 9, 8, 8, 8, 6, 7, 6, 8, 9, 9,11, 9,11,
+	 9,11, 8, 9, 9, 8, 9,11, 9,11, 8,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
 };
 
 static static_codebook _huff_book_line_1024x31_2sub3 = {

1.5       +1 -1      vorbis/lib/books/floor/line_1024x31_3sub1.vqh

Index: line_1024x31_3sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_3sub1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_3sub1.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_3sub1.vqh	2001/12/19 01:10:12	1.5
@@ -19,7 +19,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_3sub1[] = {
-	 0, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5,
+	 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
          5, 5,
 };
 

1.5       +3 -3      vorbis/lib/books/floor/line_1024x31_3sub2.vqh

Index: line_1024x31_3sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_3sub2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_3sub2.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_3sub2.vqh	2001/12/19 01:10:12	1.5
@@ -20,9 +20,9 @@
 
 static long _huff_lengthlist_line_1024x31_3sub2[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6,
-	 6, 6, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 9, 9, 9,
-	 9, 9,
+	 0, 0, 3, 3, 4, 4, 4, 4, 5, 4, 6, 4, 7, 4, 7, 5,
+	 8, 5, 8, 5, 9, 5, 9, 5,10, 6,10, 6,10, 6,11, 6,
+	11, 6,
 };
 
 static static_codebook _huff_book_line_1024x31_3sub2 = {

1.5       +5 -5      vorbis/lib/books/floor/line_1024x31_3sub3.vqh

Index: line_1024x31_3sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_3sub3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_3sub3.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_3sub3.vqh	2001/12/19 01:10:12	1.5
@@ -22,11 +22,11 @@
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 4, 4, 4, 5, 4, 5, 4, 6, 4, 6, 4, 6, 4,
-	 6, 4, 6, 5, 7, 6, 7, 6, 6, 6, 7, 7, 7, 7, 6,10,
-	 7,10, 7, 9,10, 9, 8,10, 9,10, 8, 9, 9,10, 9,10,
-	 8,10,10,10,10,10,10,10,10,10,10,10,10, 9,10, 9,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	 0, 0, 8, 3, 7, 3, 8, 3, 8, 4, 8, 4, 8, 4, 8, 4,
+	 9, 4, 8, 4, 9, 4, 9, 5, 9, 5,10, 6, 9, 6,10, 6,
+	10, 7,10, 8,12, 8,11, 9,12, 9,12,10,14,10,11,10,
+	11,11,14,10,14,11,14,13,14,11,14,13,14,13,12,14,
+	14,13,14,14,14,14,14,14,14,14,14,14,14,14,14,13,
 };
 
 static static_codebook _huff_book_line_1024x31_3sub3 = {

1.5       +1 -1      vorbis/lib/books/floor/line_1024x31_class0.vqh

Index: line_1024x31_class0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_class0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_class0.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_class0.vqh	2001/12/19 01:10:12	1.5
@@ -19,7 +19,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class0[] = {
-	 1, 3, 4, 4, 3, 5, 4, 5,
+	 1, 3, 4, 4, 3, 4, 5, 5,
 };
 
 static static_codebook _huff_book_line_1024x31_class0 = {

1.5       +1 -1      vorbis/lib/books/floor/line_1024x31_class1.vqh

Index: line_1024x31_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_class1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_class1.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_class1.vqh	2001/12/19 01:10:12	1.5
@@ -19,7 +19,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class1[] = {
-	 1, 3, 5, 6, 3, 7, 5,11, 3, 7, 8, 9, 6,10, 7,11,
+	 1, 3, 5, 8, 5,10, 9,13, 2, 5, 6, 8, 8,12,11,13,
 };
 
 static static_codebook _huff_book_line_1024x31_class1 = {

1.5       +4 -4      vorbis/lib/books/floor/line_1024x31_class2.vqh

Index: line_1024x31_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_class2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_class2.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_class2.vqh	2001/12/19 01:10:12	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class2[] = {
-	 1, 3, 5,10, 7, 4, 7,12, 9, 6, 9,14,18,20,20,15,
-	 7, 3, 6,11, 8, 5, 6,11,10, 6, 9,10,20,20,20,20,
-	11, 8, 8,11,11, 7, 8,10,14, 9,10,16,20,20,20,20,
-	18,17,17,17,19,19,17,17,19,19,18,19,19,19,19,19,
+	 1, 3, 5,12, 8, 4, 6,12,10, 7, 8,14,17,20,20,14,
+	 6, 3, 6,12, 8, 5, 6,10,11, 7, 9,12,20,19,20,17,
+	12, 7, 8,14,12, 7, 7,13,14,10,11,18,20,20,20,20,
+	18,18,15,17,20,18,16,17,20,19,17,19,19,19,19,19,
 };
 
 static static_codebook _huff_book_line_1024x31_class2 = {

1.5       +4 -4      vorbis/lib/books/floor/line_1024x31_class3.vqh

Index: line_1024x31_class3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_1024x31_class3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_1024x31_class3.vqh	2001/12/17 00:17:24	1.4
+++ line_1024x31_class3.vqh	2001/12/19 01:10:12	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class3[] = {
-	 1, 3, 6,11, 7, 3, 6,12,10, 7, 8,13,18,15,14,17,
-	 8, 4, 6,11, 8, 4, 6,11,11, 7, 9,13,19,19,18,18,
-	11, 8, 9,12,11, 7, 8,13,14, 9,11,15,18,18,18,18,
-	18,16,15,13,18,17,14,14,18,18,15,15,18,18,18,18,
+	 1, 4, 5,11, 7, 4, 6,12,11, 8, 9,13,18,14,14,16,
+	 7, 3, 5,11, 8, 4, 6,12,11, 8,10,14,20,20,20,20,
+	11, 6, 6, 8,11, 7, 7,10,13, 9,12,15,20,20,19,20,
+	17,14,12, 8,18,14,12,10,20,16,15,14,20,20,19,19,
 };
 
 static static_codebook _huff_book_line_1024x31_class3 = {

1.5       +7 -7      vorbis/lib/books/floor/line_128x19_0sub0.vqh

Index: line_128x19_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x19_0sub0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x19_0sub0.vqh	2001/12/17 00:17:24	1.4
+++ line_128x19_0sub0.vqh	2001/12/19 01:10:12	1.5
@@ -19,13 +19,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_0sub0[] = {
-	 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5,
-	 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 6, 6, 6,
-	 6, 6, 7, 6, 7, 6, 7, 6, 7, 7, 7, 7, 7, 7, 8, 7,
-	 8, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9,10,
-	 9,10,10,11,10,11,10,12,11,12,11,13,11,14,11,15,
-	12,14,12,15,13,15,13,15,14,16,15,16,14,18,15,18,
-	17,18,16,17,17,18,18,18,18,18,18,18,18,18,18,18,
+	 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5,
+	 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 7, 5, 7, 6,
+	 7, 6, 7, 6, 8, 6, 8, 6, 8, 6, 8, 6, 8, 7, 8, 7,
+	 9, 7, 9, 8, 9, 8, 9, 8, 9, 9,10, 9,10, 9,10,10,
+	10,10,10,11,11,11,11,12,11,12,12,12,12,13,12,13,
+	13,14,13,14,14,16,14,17,15,19,16,17,16,19,18,18,
+	16,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,
 };
 

1.5       +2 -2      vorbis/lib/books/floor/line_128x19_1sub1.vqh

Index: line_128x19_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x19_1sub1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x19_1sub1.vqh	2001/12/17 00:17:24	1.4
+++ line_128x19_1sub1.vqh	2001/12/19 01:10:12	1.5
@@ -19,8 +19,8 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_1sub1[] = {
-	 0, 4, 4, 4, 5, 4, 5, 4, 5, 3, 5, 4, 5, 4, 5, 4,
-	 5, 5, 5, 6, 6, 6, 6, 6, 6,
+	 0, 4, 5, 4, 5, 4, 5, 4, 5, 4, 5, 3, 5, 4, 5, 4,
+	 6, 4, 6, 5, 6, 5, 6, 6, 6,
 };
 
 static static_codebook _huff_book_line_128x19_1sub1 = {

1.5       +3 -3      vorbis/lib/books/floor/line_128x19_1sub2.vqh

Index: line_128x19_1sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x19_1sub2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x19_1sub2.vqh	2001/12/17 00:17:24	1.4
+++ line_128x19_1sub2.vqh	2001/12/19 01:10:12	1.5
@@ -20,9 +20,9 @@
 
 static long _huff_lengthlist_line_128x19_1sub2[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0,13,13,13,13,13,13,12, 3, 3, 3, 3, 4, 4, 4,
-	 4, 5, 5, 5, 5, 5, 6, 6, 6, 7, 7, 7, 7, 8, 8, 9,
-	 8,10,
+	 0, 0,15,15,15,15,15,15,14, 3, 2, 4, 3, 4, 3, 5,
+	 4, 6, 5, 6, 5, 7, 6, 7, 7, 8, 7, 9, 8, 9, 9,11,
+	10,12,
 };
 
 static static_codebook _huff_book_line_128x19_1sub2 = {

1.5       +5 -5      vorbis/lib/books/floor/line_128x19_1sub3.vqh

Index: line_128x19_1sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x19_1sub3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x19_1sub3.vqh	2001/12/17 00:17:24	1.4
+++ line_128x19_1sub3.vqh	2001/12/19 01:10:12	1.5
@@ -22,11 +22,11 @@
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 3, 5, 3, 8, 3, 6, 4, 7, 5, 8, 5, 8, 6, 8,
-	 6, 8, 6, 8, 6, 8, 5, 8, 7, 8, 7, 8, 7, 8, 6, 8,
-	 7, 8, 6, 8, 6, 8, 6, 6, 5, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 0, 0, 3, 7, 3, 8, 4, 7, 4, 8, 5, 6, 5, 8, 5, 8,
+	 6, 8, 7, 8, 6, 8, 6, 8, 6, 8, 6, 8, 8, 8, 8, 8,
+	 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 };
 
 static static_codebook _huff_book_line_128x19_1sub3 = {

1.5       +1 -1      vorbis/lib/books/floor/line_128x19_2sub1.vqh

Index: line_128x19_2sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x19_2sub1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x19_2sub1.vqh	2001/12/17 00:17:24	1.4
+++ line_128x19_2sub1.vqh	2001/12/19 01:10:12	1.5
@@ -19,7 +19,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_2sub1[] = {
-	 0, 3, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 4, 4, 4, 4,
+	 0, 4, 4, 4, 4, 4, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4,
          5, 4,
 };
 

1.5       +3 -3      vorbis/lib/books/floor/line_128x19_2sub2.vqh

Index: line_128x19_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x19_2sub2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x19_2sub2.vqh	2001/12/17 00:17:24	1.4
+++ line_128x19_2sub2.vqh	2001/12/19 01:10:12	1.5
@@ -20,9 +20,9 @@
 
 static long _huff_lengthlist_line_128x19_2sub2[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 3, 4, 3, 5, 4, 5, 4, 6, 4, 6, 4, 6, 4,
-	 6, 5, 7, 5, 7, 5, 8, 6, 9, 6, 9, 6, 9, 7,10, 7,
-	10, 8,
+	 0, 0, 4, 3, 4, 3, 5, 4, 6, 4, 6, 4, 7, 4, 7, 4,
+	 8, 5, 8, 5, 9, 5, 9, 5,10, 5,10, 6,10, 6,11, 6,
+	11, 6,
 };
 
 static static_codebook _huff_book_line_128x19_2sub2 = {

1.5       +5 -5      vorbis/lib/books/floor/line_128x19_2sub3.vqh

Index: line_128x19_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x19_2sub3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x19_2sub3.vqh	2001/12/17 00:17:24	1.4
+++ line_128x19_2sub3.vqh	2001/12/19 01:10:12	1.5
@@ -22,11 +22,11 @@
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 2, 4, 3, 5, 4, 5, 4, 6, 4, 6, 5, 7, 6,
-	 8, 7, 8, 7, 8, 8, 9, 8, 8, 9, 8, 9, 9, 8, 8, 9,
-	 9, 9, 8, 9, 9, 9, 9, 9, 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, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8,
+	 0, 0, 9, 3,10, 3,10, 3,11, 3,11, 4,12, 4,12, 4,
+	14, 4,13, 4,14, 5,14, 5,13, 5,14, 5,14, 6,13, 6,
+	14, 7,13, 7,13, 9,13, 9,13,11,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
 };
 
 static static_codebook _huff_book_line_128x19_2sub3 = {

1.5       +4 -4      vorbis/lib/books/floor/line_128x19_class1.vqh

Index: line_128x19_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x19_class1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x19_class1.vqh	2001/12/17 00:17:24	1.4
+++ line_128x19_class1.vqh	2001/12/19 01:10:12	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_class1[] = {
-	 1, 2, 6,11, 8, 4, 7,14,15,11,12,17,17,17,17,17,
-	 8, 3, 7,11,10, 6, 9,14,15,13,14,17,17,17,17,17,
-	14, 9,12,17,17,13,13,15,17,17,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+	 1, 2, 7,14, 8, 3, 6,17,14,11,13,19,19,19,19,19,
+	 8, 4, 8,13,10, 6,10,18,15,11,15,19,19,19,19,19,
+	13, 8,13,18,13, 8,14,19,19,16,19,19,19,19,19,19,
+	19,19,19,19,19,16,19,19,19,18,18,18,18,18,18,18,
 };
 
 static static_codebook _huff_book_line_128x19_class1 = {

1.5       +4 -4      vorbis/lib/books/floor/line_128x19_class2.vqh

Index: line_128x19_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x19_class2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x19_class2.vqh	2001/12/17 00:17:24	1.4
+++ line_128x19_class2.vqh	2001/12/19 01:10:12	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_class2[] = {
-	 2, 3, 3,10, 7, 4, 4,10,10, 6, 7,13,17,17,16,16,
-	 7, 3, 4,11, 8, 4, 5,11,10, 6, 7,12,17,16,16,16,
-	11, 8,10,14,11, 7, 8,13,13, 9, 9,15,17,17,16,17,
-	17,17,17,17,17,17,17,16,17,17,17,17,17,17,17,16,
+	 2, 3, 4,11, 7, 4, 5,12,10, 7, 8,15,18,16,14,17,
+	 7, 3, 4,11, 8, 4, 5,12,10, 7, 8,15,18,16,16,16,
+	10, 5, 5, 6,11, 6, 6, 8,13, 9, 9,12,17,17,17,17,
+	17,16,10, 6,17,14,11, 8,17,17,12,11,17,17,17,17,
 };
 
 static static_codebook _huff_book_line_128x19_class2 = {

1.5       +4 -4      vorbis/lib/books/floor/line_128x7_0sub0.vqh

Index: line_128x7_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x7_0sub0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x7_0sub0.vqh	2001/12/17 00:17:24	1.4
+++ line_128x7_0sub0.vqh	2001/12/19 01:10:12	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x7_0sub0[] = {
-	 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-	 5, 5, 6, 5, 6, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 9,
-	 8,10, 8,13, 9,15, 9,14, 9,15, 9,13,10,15,10,13,
-	10,13,11,12,13,13,14,15,15,15,15,15,15,15,15,15,
+	 4, 4, 4, 4, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+	 5, 5, 5, 5, 6, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 9,
+	 7,11, 7,13, 8,15, 9,15, 9,15, 9,13,10,15,11,14,
+	12,14,12,13,13,14,13,14,14,14,14,14,14,14,14,14,
 };
 
 static static_codebook _huff_book_line_128x7_0sub0 = {

1.5       +1 -1      vorbis/lib/books/floor/line_128x7_1sub2.vqh

Index: line_128x7_1sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x7_1sub2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x7_1sub2.vqh	2001/12/17 00:17:24	1.4
+++ line_128x7_1sub2.vqh	2001/12/19 01:10:12	1.5
@@ -20,7 +20,7 @@
 
 static long _huff_lengthlist_line_128x7_1sub2[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 4, 3, 5,
-	 4, 6, 5, 7, 6, 9, 6, 9, 8,
+	 4, 7, 5, 7, 5, 9, 7, 9, 8,
 };
 
 static static_codebook _huff_book_line_128x7_1sub2 = {

1.5       +2 -2      vorbis/lib/books/floor/line_128x7_1sub3.vqh

Index: line_128x7_1sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x7_1sub3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x7_1sub3.vqh	2001/12/17 00:17:24	1.4
+++ line_128x7_1sub3.vqh	2001/12/19 01:10:12	1.5
@@ -20,8 +20,8 @@
 
 static long _huff_lengthlist_line_128x7_1sub3[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 2, 7, 3, 7, 4, 7,
-	 5, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 5, 4, 6, 4, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
          6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 };
 

1.5       +3 -3      vorbis/lib/books/floor/line_128x7_2sub3.vqh

Index: line_128x7_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x7_2sub3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x7_2sub3.vqh	2001/12/17 00:17:24	1.4
+++ line_128x7_2sub3.vqh	2001/12/19 01:10:12	1.5
@@ -20,9 +20,9 @@
 
 static long _huff_lengthlist_line_128x7_2sub3[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 4, 4, 4,
-	 4, 5, 5, 5, 6, 6, 6, 8, 7, 9, 7, 8, 8, 9, 8, 9,
-	 8,11,10,12,12,12,10,12,11,11,12,12,12,12,12,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 4, 4, 4,
+	 4, 4, 4, 5, 6, 6, 6, 9, 7, 9, 7, 9, 7,11, 8,11,
+	 9,11,11,11,10,11,11,11,11,11,10,10,10,10,10,10,
 };
 
 static static_codebook _huff_book_line_128x7_2sub3 = {

1.5       +4 -4      vorbis/lib/books/floor/line_128x7_class1.vqh

Index: line_128x7_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x7_class1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x7_class1.vqh	2001/12/17 00:17:24	1.4
+++ line_128x7_class1.vqh	2001/12/19 01:10:12	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x7_class1[] = {
-	 2, 3, 4,14,12, 8, 8,15,12, 9, 9,15,15,15,15,15,
-	 5, 2, 4,13,11, 8, 9,15,12,10,12,15,15,15,15,15,
-	 5, 3, 5,13,11, 8, 8,15,14,11,12,15,15,15,15,15,
-	14,11,12,15,14,14,14,15,15,15,15,15,15,15,15,15,
+	 2, 3, 4,14,11, 8, 9,15,12, 9,10,15,15,15,15,15,
+	 5, 2, 4,14,11, 8,10,15,13,11,12,15,15,15,15,15,
+	 5, 3, 5,13,11, 7, 8,15,14,11,12,15,15,15,15,15,
+	14,11,12,14,14,13,13,14,14,14,14,14,14,14,14,14,
 };
 
 static static_codebook _huff_book_line_128x7_class1 = {

1.5       +4 -4      vorbis/lib/books/floor/line_128x7_class2.vqh

Index: line_128x7_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x7_class2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x7_class2.vqh	2001/12/17 00:17:24	1.4
+++ line_128x7_class2.vqh	2001/12/19 01:10:12	1.5
@@ -19,10 +19,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x7_class2[] = {
-	 9, 7, 7,11, 8, 5, 5, 9, 9, 6, 6, 8,13,10, 9,12,
-	 8, 5, 5, 9, 5, 3, 3, 7, 7, 4, 4, 6,10, 7, 7, 9,
-	 9, 6, 6,10, 6, 4, 4, 7, 7, 4, 4, 7,13, 9, 7, 8,
-	15,13,13,15,12, 9, 9,12,11, 9, 9,10,14,13,11,10,
+	 9, 7, 7,11, 7, 5, 5, 9, 9, 6, 6, 8,13,11, 9,14,
+	 7, 5, 5, 9, 5, 3, 3, 7, 6, 4, 4, 6,10, 8, 7, 9,
+	 9, 6, 6,10, 7, 4, 4, 7, 7, 4, 4, 7,13, 9, 7, 9,
+	13,12,12,14,11, 9,10,14,11, 9, 9,11,14,13,12,10,
 };
 
 static static_codebook _huff_book_line_128x7_class2 = {

1.5       +3 -3      vorbis/lib/books/floor/line_128x9_0sub0.vqh

Index: line_128x9_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x9_0sub0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x9_0sub0.vqh	2001/12/17 00:17:24	1.4
+++ line_128x9_0sub0.vqh	2001/12/19 01:10:12	1.5
@@ -20,9 +20,9 @@
 
 static long _huff_lengthlist_line_128x9_0sub0[] = {
          4, 4, 4, 5, 4, 5, 4, 5, 4, 5, 4, 6, 4, 6, 4, 6,
-	 5, 7, 5, 7, 5, 7, 5, 7, 6, 7, 6, 8, 6, 9, 7, 9,
-	 7,11, 8,14, 8,15, 8,14, 8,13, 8,10, 9,11, 9,11,
-	 9,10,10,11,11,14,16,16,16,16,16,16,16,16,16,16,
+	 5, 7, 5, 7, 5, 7, 5, 8, 6, 8, 6, 8, 6, 9, 6,10,
+	 7,11, 7,13, 8,14, 8,13, 9,12, 9,11, 9,11, 9,11,
+	 9,10, 9,11,11,13,15,15,15,15,15,15,15,15,15,15,
 };
 
 static static_codebook _huff_book_line_128x9_0sub0 = {

1.5       +1 -1      vorbis/lib/books/floor/line_128x9_1sub1.vqh

Index: line_128x9_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x9_1sub1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x9_1sub1.vqh	2001/12/17 00:17:24	1.4
+++ line_128x9_1sub1.vqh	2001/12/19 01:10:12	1.5
@@ -19,7 +19,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x9_1sub1[] = {
-	 0, 3, 3, 4, 3, 5, 2, 5, 2,
+	 0, 4, 3, 4, 3, 4, 2, 4, 2,
 };
 
 static static_codebook _huff_book_line_128x9_1sub1 = {

1.5       +2 -2      vorbis/lib/books/floor/line_128x9_1sub2.vqh

Index: line_128x9_1sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x9_1sub2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x9_1sub2.vqh	2001/12/17 00:17:24	1.4
+++ line_128x9_1sub2.vqh	2001/12/19 01:10:12	1.5
@@ -19,8 +19,8 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x9_1sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 5, 2, 6, 3, 8,
-	 3, 9, 4,10, 5,11, 5,11, 7,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 5, 2, 7, 3, 8,
+	 3, 9, 4,10, 5,11, 5,11, 6,
 };
 
 static static_codebook _huff_book_line_128x9_1sub2 = {

1.5       +3 -3      vorbis/lib/books/floor/line_128x9_1sub3.vqh

Index: line_128x9_1sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x9_1sub3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x9_1sub3.vqh	2001/12/17 00:17:24	1.4
+++ line_128x9_1sub3.vqh	2001/12/19 01:10:12	1.5
@@ -20,9 +20,9 @@
 
 static long _huff_lengthlist_line_128x9_1sub3[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 2, 7, 2, 7, 3, 7,
-	 4, 7, 6, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 1, 7, 3, 7, 4, 7,
+	 5, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 };
 
 static static_codebook _huff_book_line_128x9_1sub3 = {

1.5       +2 -2      vorbis/lib/books/floor/line_128x9_2sub2.vqh

Index: line_128x9_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x9_2sub2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x9_2sub2.vqh	2001/12/17 00:17:24	1.4
+++ line_128x9_2sub2.vqh	2001/12/19 01:10:12	1.5
@@ -19,8 +19,8 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x9_2sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 5, 3,
-	 6, 4, 7, 4, 8, 4, 9, 5, 9,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 4, 3, 5, 3,
+	 6, 4, 7, 4, 8, 5, 9, 5, 9,
 };
 
 static static_codebook _huff_book_line_128x9_2sub2 = {

1.5       +3 -3      vorbis/lib/books/floor/line_128x9_2sub3.vqh

Index: line_128x9_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x9_2sub3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x9_2sub3.vqh	2001/12/17 00:17:24	1.4
+++ line_128x9_2sub3.vqh	2001/12/19 01:10:12	1.5
@@ -20,9 +20,9 @@
 
 static long _huff_lengthlist_line_128x9_2sub3[] = {
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 6, 2, 8, 3, 8, 3,
-	 7, 3, 7, 5, 8, 5, 9, 7,11, 8,10,12,13,13,11,13,
-	13,13,13,13,13,12,12,12,12,12,12,12,12,12,12,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 7, 2, 8, 3, 9, 3,
+	 9, 4, 8, 4, 9, 4,12, 6,12, 6,11, 8,13, 9,11,12,
+	12,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
 };
 
 static static_codebook _huff_book_line_128x9_2sub3 = {

1.5       +9 -9      vorbis/lib/books/floor/line_128x9_class1.vqh

Index: line_128x9_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x9_class1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x9_class1.vqh	2001/12/17 00:17:24	1.4
+++ line_128x9_class1.vqh	2001/12/19 01:10:12	1.5
@@ -19,16 +19,16 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x9_class1[] = {
-	 2, 3, 3,13,14,12, 9,16,15, 9,12,16,16,16,16,16,
-	 5, 2, 3,11,13,10, 8,13,15,11,11,13,16,16,16,16,
-	 7, 5, 5,10,12,10, 8,11,16,14,13,15,16,16,16,16,
-	15,16,16,16,13,14,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,
+	 3, 3, 3,11,14,12,10,16,16, 9,12,16,16,16,16,16,
+	 5, 2, 2,10,13,11, 8,13,15,11,11,14,16,16,16,16,
+	 7, 5, 5,10,12,10, 8,14,16,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,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,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	16,16,15,16,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,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,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,

1.5       +16 -16    vorbis/lib/books/floor/line_128x9_class2.vqh

Index: line_128x9_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/line_128x9_class2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- line_128x9_class2.vqh	2001/12/17 00:17:25	1.4
+++ line_128x9_class2.vqh	2001/12/19 01:10:12	1.5
@@ -19,22 +19,22 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x9_class2[] = {
-	 7, 6, 8,11, 8, 5, 6, 9,10, 8, 8,10,16,15,14,16,
-	 8, 5, 6, 9, 7, 4, 5, 9, 9, 6, 6,10,16,13,12,16,
-	11, 8, 7, 9, 9, 7, 7,10,11, 8, 8,11,16,13,12,16,
-	16,16,16,16,16,16,13,16,16,15,14,16,16,16,16,16,
-	10, 7, 8,10, 7, 5, 5, 7,10, 6, 7, 8,14,12,12,13,
-	 9, 6, 7,10, 6, 4, 4, 7, 8, 5, 5, 7,13,10,10,10,
-	11, 9, 9,11, 9, 6, 6, 9, 9, 6, 6,10,14,10, 9,11,
-	16,16,15,16,16,13,13,16,15,12,13,16,16,16,16,16,
-	12, 9,10,11,10, 7, 7, 8,11, 8, 7, 7,15,14,11,10,
-	11, 8, 9,11, 9, 6, 6, 8, 9, 6, 5, 6,12,10, 8, 8,
-	12,10,10,13,10, 7, 8,10, 9, 7, 6, 8,12,10, 7, 9,
-	16,16,16,16,16,15,15,16,16,12,13,13,16,15,15,14,
-	16,14,14,16,15,12,13,15,16,13,12,15,16,16,15,16,
-	16,15,16,16,16,12,13,12,14,13,11,14,16,16,15,16,
-	16,16,16,15,16,13,14,11,16,13,12,12,16,16,14,16,
-	16,16,16,15,16,16,15,12,16,15,15,13,15,15,15,15,
+	 7, 6, 8,10, 8, 5, 6, 8,11, 8, 8,10,17,17,14,16,
+	 8, 5, 6, 9, 7, 4, 5, 8, 9, 6, 7, 9,14,12,13,16,
+	11, 8, 7,10, 9, 6, 7,10,11, 8, 8,11,16,13,12,16,
+	16,16,14,16,15,14,12,15,16,16,14,16,16,16,16,16,
+	10, 7, 9,10, 7, 5, 6, 7,10, 7, 7, 8,15,12,12,13,
+	 9, 6, 7, 9, 6, 3, 4, 6, 8, 5, 5, 7,14,10,10,12,
+	11, 9, 9,12, 9, 6, 6, 9, 9, 7, 6,10,14,11, 9,12,
+	16,15,15,16,14,13,13,16,14,13,13,15,16,16,16,16,
+	13, 9,10,11,10, 7, 7, 8,11, 8, 8, 7,14,13,13,12,
+	11, 8, 9,10, 9, 6, 6, 8, 9, 6, 6, 6,12,11, 9, 9,
+	12,10,11,13,10, 7, 8,10,10, 7, 7, 8,14,11, 8, 9,
+	16,15,16,16,14,14,14,16,16,15,14,12,16,16,16,16,
+	16,14,16,16,16,14,14,15,16,14,15,13,16,16,16,16,
+	16,15,14,16,16,12,12,14,14,12,12,14,16,16,16,16,
+	16,16,16,16,16,13,16,14,16,14,14,13,15,16,14,16,
+	16,16,16,16,16,16,16,15,16,16,16,14,16,16,16,16,
 };
 
 static static_codebook _huff_book_line_128x9_class2 = {

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u0_p0_r0.vqh

Index: _44u0_p0_r0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p0_r0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p0_r0.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p0_r0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u0_p0_r1.vqh

Index: _44u0_p0_r1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p0_r1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p0_r1.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p0_r1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u0_p1_0.vqh

Index: _44u0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p1_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p1_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p1_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u0_p1_r0.vqh

Index: _44u0_p1_r0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p1_r0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p1_r0.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p1_r0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u0_p1_r1.vqh

Index: _44u0_p1_r1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p1_r1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p1_r1.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p1_r1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +41 -40    vorbis/lib/books/uncoupled/_44u0_p2_0.vqh

Index: _44u0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p2_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p2_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p2_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,46 +27,46 @@
 };
 
 static long _vq_lengthlist__44u0_p2_0[] = {
-	 3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 6, 7, 9, 9, 8,
-	 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
-	 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12, 9,10,10,
-	11,12, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,
-	10, 9,10,10,12,11, 9,10,10,12,12, 8,10,10,12,12,
-	 9,11,10,13,12, 9,10,10,13,12,11,12,12,14,14,11,
-	12,12,13,14, 8,10,10,12,12, 9,10,10,12,12, 9,10,
-	11,12,13,11,12,12,14,13,11,12,12,14,14, 5, 7, 7,
-	10,10, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,10,12,
-	12,10,10,11,12,12, 7, 8, 8,11,11, 8, 9, 9,11,11,
-	 8, 9, 9,11,11,11,11,11,12,13,10,11,11,13,13, 7,
-	 8, 8,10,10, 8, 9, 8,11,11, 8, 9, 9,11,11,10,11,
-	10,13,12,10,11,11,13,13, 9,11,11,13,13,10,11,11,
-	13,13,10,11,11,14,13,12,12,13,13,14,12,13,13,15,
-	15, 9,10,10,13,13,10,11,10,13,13,10,11,11,13,14,
-	12,13,12,14,13,12,13,13,15,15, 5, 7, 7,10,10, 7,
-	 8, 8,10,10, 7, 8, 8,10,11,10,11,10,12,12,10,10,
-	11,12,12, 7, 8, 8,10,10, 8, 9, 9,11,11, 8, 8, 9,
-	11,11,10,11,11,13,13,10,10,11,12,13, 7, 8, 8,11,
-	11, 8, 9, 9,11,11, 8, 9, 9,11,11,10,11,11,13,13,
-	11,11,11,13,12, 9,10,10,13,13,10,11,11,14,13,10,
-	10,11,13,13,12,13,13,15,15,12,12,13,13,15, 9,11,
-	11,13,13,10,11,11,13,13,10,11,11,13,13,12,13,13,
-	15,15,12,13,12,14,13, 8,10,10,12,12, 9,11,10,13,
-	13, 9,10,11,13,13,12,13,13,15,14,12,13,13,14,14,
-	 9,11,11,13,13,10,11,12,13,14,10,11,11,14,13,13,
-	13,14,15,15,13,13,13,15,15, 9,10,10,13,13,10,11,
-	11,14,13,10,11,11,13,14,12,14,13,15,14,12,13,13,
-	15,15,11,13,12,15,14,12,12,13,15,15,12,13,13,15,
-	15,14,13,15,13,17,14,14,15,16,17,11,12,12,14,15,
-	11,13,12,15,14,12,13,13,15,16,13,15,13,16,14,14,
-	15,15,16,17, 8,10,10,12,12, 9,11,10,13,13, 9,11,
-	11,13,13,12,13,13,14,14,12,13,13,14,14, 9,10,10,
-	13,13,10,11,11,14,13,10,11,11,13,14,12,13,13,15,
-	15,13,13,14,14,15, 9,10,11,13,13,10,11,11,13,14,
-	10,12,11,14,14,12,13,13,15,15,13,14,13,15,15,11,
-	12,12,15,14,12,13,13,15,15,11,12,13,14,15,14,15,
-	14,16,17,14,13,15,14,16,11,12,13,14,15,12,13,13,
-	15,15,12,13,12,15,14,14,15,14,17,17,14,15,13,16,
-	13,
+	 2, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8,
+	10, 9,11,11, 8, 9,10,11,12, 5, 7, 7,10,10, 7, 8,
+	 8,11,10, 7, 8, 8,10,11,10,11,10,12,12, 9,10,10,
+	12,12, 6, 7, 7,10,10, 7, 8, 8,11,10, 7, 8, 8,11,
+	11, 9,10,10,12,12,10,10,11,12,12, 9,10,10,13,12,
+	10,11,11,14,13, 9,11,11,13,13,12,13,13,14,14,12,
+	12,13,14,14, 9,10,10,12,13, 9,11,11,13,13,10,11,
+	11,13,14,12,12,12,14,14,12,13,13,14,14, 5, 7, 7,
+	10,10, 7, 9, 8,11,11, 7, 8, 9,11,11,10,11,11,13,
+	13,10,11,11,13,13, 7, 9, 8,11,11, 8, 9,10,11,12,
+	 8,10,10,12,12,11,12,12,12,14,11,11,12,14,14, 7,
+	 8, 8,11,11, 8,10, 9,12,11, 8, 9,10,12,12,11,12,
+	11,14,12,11,12,12,14,14,10,11,11,14,13,11,11,12,
+	14,14,11,12,12,14,14,13,12,14,13,15,13,14,14,15,
+	15, 9,11,11,13,14,10,12,11,14,13,10,12,12,14,14,
+	12,14,12,15,13,13,14,14,15,16, 5, 7, 7,10,10, 7,
+	 9, 8,11,11, 7, 8, 9,11,11,10,11,11,13,13,10,11,
+	11,13,13, 7, 8, 8,11,11, 8,10, 9,12,12, 8, 9,10,
+	11,12,11,12,12,14,14,11,11,12,12,14, 7, 8, 9,11,
+	11, 8,10,10,12,12, 8,10, 9,12,11,11,12,12,14,13,
+	11,12,11,14,13, 9,11,11,14,13,11,12,12,14,14,10,
+	11,11,13,14,13,14,14,16,16,12,12,14,13,15,10,11,
+	11,13,14,11,12,12,14,15,11,12,11,14,14,13,14,13,
+	15,16,13,14,12,16,13, 8,10,10,13,13,10,11,11,14,
+	14,10,11,11,14,13,13,14,14,16,15,12,13,13,15,15,
+	 9,11,11,14,14,11,12,12,14,14,11,12,12,15,14,13,
+	14,14,15,16,13,14,14,15,16, 9,11,11,13,14,10,12,
+	11,15,14,11,12,12,14,15,13,14,14,16,15,13,14,14,
+	16,16,12,13,13,15,15,12,13,13,15,16,13,14,14,16,
+	15,15,13,16,14,18,14,15,16,18,17,11,13,13,15,15,
+	12,13,12,16,15,13,14,14,15,17,14,16,13,17,14,15,
+	15,16,17,17, 8,10,10,13,13,10,11,11,13,14,10,11,
+	11,14,14,12,13,13,15,15,13,14,14,15,16, 9,11,11,
+	13,13,11,12,12,15,14,10,11,12,13,15,13,14,14,16,
+	16,13,13,14,15,16, 9,11,11,14,14,11,12,12,14,15,
+	11,12,12,14,14,13,14,14,15,16,14,15,14,16,15,11,
+	13,13,15,15,12,14,14,16,16,12,12,14,15,16,14,15,
+	15,17,17,14,13,15,14,17,12,13,13,15,16,13,14,14,
+	16,16,12,14,13,16,15,14,16,15,17,17,14,15,13,17,
+	14,
 };
 
 static float _vq_quantthresh__44u0_p2_0[] = {

1.3       +7 -6      vorbis/lib/books/uncoupled/_44u0_p3_0.vqh

Index: _44u0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p3_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p3_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p3_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,12 +31,12 @@
 };
 
 static long _vq_lengthlist__44u0_p3_0[] = {
-	 2, 4, 3, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 8, 7,
-	 9, 9, 4, 5, 5, 6, 6, 8, 8, 9, 9, 6, 7, 6, 8, 8,
-	 9, 9,10,10, 6, 6, 7, 8, 8, 8, 9,10,10, 7, 8, 8,
-	 9, 9,10, 9,11,11, 7, 8, 8, 9, 9,10,10,11,11, 9,
-	 9, 9,10,10,11,11,12,12, 9, 9, 9,10,10,11,11,12,
-	12,
+	 1, 4, 4, 7, 7, 8, 8, 9, 9, 4, 6, 5, 8, 8, 9, 8,
+	10,10, 4, 5, 6, 7, 8, 8, 9,10,10, 7, 8, 7, 9, 9,
+	10, 9,11,11, 7, 7, 8, 9, 9, 9,10,11,11, 8, 9, 8,
+	10,10,11,11,12,12, 8, 8, 9, 9,10,10,11,12,12, 9,
+	10,10,11,11,12,12,13,13, 9,10,10,11,11,12,12,13,
+	13,
 };
 
 static float _vq_quantthresh__44u0_p3_0[] = {

1.3       +21 -20    vorbis/lib/books/uncoupled/_44u0_p4_0.vqh

Index: _44u0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p4_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p4_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p4_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -41,28 +42,28 @@
 
 static long _vq_lengthlist__44u0_p4_0[] = {
          1, 4, 4, 6, 6, 8, 8, 9, 9,10,10,11,11,12,12,12,
-	13,13,13, 4, 6, 6, 8, 7, 9, 9,10, 9,11,10,12,11,
-	13,12,13,13,14,13, 4, 6, 6, 8, 8, 9, 9,10,10,10,
-	11,11,12,12,13,13,13,13,14, 7, 8, 8, 9, 9,10,10,
-	11,11,12,12,13,12,13,13,14,14,14,14, 7, 8, 8, 9,
-	 9,10,10,11,11,11,12,12,12,13,13,14,14,14,14, 8,
+	13,13,13, 4, 6, 6, 7, 7, 9, 9,10,10,11,11,12,11,
+	12,12,13,13,14,13, 5, 6, 6, 7, 7, 9, 9, 9,10,10,
+	11,11,12,12,12,13,13,13,14, 6, 8, 7, 9, 9,10,10,
+	10,10,11,11,12,12,13,13,14,14,14,14, 7, 7, 8, 9,
+	 9,10,10,10,11,11,11,12,12,13,13,13,14,14,14, 8,
          9, 9,10,10,11,10,11,11,12,12,13,13,14,14,14,14,
-	15,15, 8, 9, 9,10,10,11,11,11,11,12,12,13,13,14,
-	14,14,14,15,15, 9,10,10,11,11,12,11,12,12,13,13,
-	14,14,15,14,15,15,15,15, 9,10,10,11,11,12,12,12,
+	15,15, 8, 9, 9,10,10,10,11,11,11,12,12,13,13,14,
+	14,14,14,14,15, 9,10,10,11,11,12,11,12,12,13,13,
+	14,14,14,14,15,15,15,15, 9,10,10,11,11,11,12,12,
         12,13,13,14,14,14,14,15,15,15,15,10,11,11,12,12,
-	13,13,13,13,14,14,15,14,15,15,16,16,16,16,10,11,
-	11,12,12,13,13,13,13,14,14,14,15,15,15,15,16,16,
-	16,11,12,12,13,13,13,13,14,14,15,14,15,15,15,15,
-	16,16,16,16,11,12,12,13,13,13,13,14,14,14,15,15,
-	15,15,15,16,16,16,16,12,13,13,14,13,14,14,15,15,
-	15,15,15,15,16,16,16,16,16,16,12,13,13,13,14,14,
-	14,14,15,15,15,15,15,16,16,16,16,16,16,13,13,13,
-	14,14,14,14,15,15,15,15,16,16,16,16,16,16,16,16,
-	13,14,13,14,14,14,15,15,15,15,15,16,16,16,16,16,
-	16,16,16,13,14,14,15,14,15,15,15,15,15,16,16,16,
-	16,16,16,17,17,17,14,14,14,15,15,15,15,15,15,16,
-	16,16,16,16,16,16,16,17,16,
+	13,13,13,13,14,14,14,14,15,15,15,15,15,15,10,11,
+	11,12,12,13,12,13,13,14,14,14,14,15,15,15,15,15,
+	15,12,12,12,13,13,13,13,14,14,15,14,15,15,15,15,
+	15,15,16,16,12,12,12,13,13,13,13,14,14,14,14,15,
+	15,15,15,15,15,15,15,12,13,13,13,13,14,14,14,14,
+	14,15,15,15,15,15,15,15,15,15,12,13,13,13,13,14,
+	14,14,14,14,14,15,15,15,15,15,15,15,15,13,13,13,
+	14,14,14,14,14,14,15,15,15,15,15,15,15,16,16,16,
+	13,13,14,14,14,14,14,15,14,15,15,15,15,15,15,15,
+	16,15,15,13,14,14,14,14,15,15,15,15,15,15,15,16,
+	16,15,16,16,16,16,14,14,14,14,14,14,15,15,15,15,
+	15,15,16,15,16,16,16,16,16,
 };
 
 static float _vq_quantthresh__44u0_p4_0[] = {

1.3       +7 -6      vorbis/lib/books/uncoupled/_44u0_p4_1.vqh

Index: _44u0_p4_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p4_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p4_1.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p4_1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,12 +25,12 @@
 };
 
 static long _vq_lengthlist__44u0_p4_1[] = {
-	 3, 5, 5, 5, 6, 6, 5, 6, 6, 6, 7, 7, 6, 7, 7, 6,
-	 7, 7, 6, 7, 7, 6, 7, 7, 6, 7, 7, 5, 7, 7, 7, 7,
-	 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7,
-	 7, 7, 7, 7, 7, 7, 5, 7, 7, 7, 7, 7, 7, 7, 7, 6,
-	 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7,
-	 7,
+	 2, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7,
+	 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 5, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 8, 6, 7, 7,
+	 7, 8, 8, 7, 8, 8, 5, 7, 7, 7, 7, 7, 7, 7, 7, 6,
+	 7, 7, 7, 8, 8, 7, 7, 8, 6, 7, 7, 7, 8, 8, 7, 8,
+	 8,
 };
 
 static float _vq_quantthresh__44u0_p4_1[] = {

1.3       +5 -4      vorbis/lib/books/uncoupled/_44u0_p5_0.vqh

Index: _44u0_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p5_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p5_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p5_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -25,10 +26,10 @@
 
 static long _vq_lengthlist__44u0_p5_0[] = {
          1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7,
-	 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 7, 9,
-	 9, 7, 9, 9, 7, 9, 9, 9,10,11, 9,11,11, 7, 9, 9,
-	 9,11,10, 9,11,11, 5, 7, 8, 7, 9, 9, 8, 9,10, 7,
-	 9, 9, 9,11,11, 9,10,11, 7, 9,10, 9,11,11, 9,11,
+	 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 8,10,
+	 9, 7, 9, 9, 7,10, 9, 9,10,11, 9,11,11, 7, 9, 9,
+	 9,11, 9, 9,11,11, 5, 7, 7, 7, 9, 9, 8, 9,10, 7,
+	 9, 9, 9,11,11, 9, 9,11, 7, 9,10, 9,11,11, 9,11,
         10,
 };
 

1.3       +6 -5      vorbis/lib/books/uncoupled/_44u0_p6_0.vqh

Index: _44u0_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p6_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p6_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p6_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,12 +31,12 @@
 };
 
 static long _vq_lengthlist__44u0_p6_0[] = {
-	 1, 4, 4, 7, 7, 9, 9,12,11, 4, 5, 5, 7, 7,10,10,
-	12,12, 4, 5, 5, 7, 7,10,10,12,12, 7, 7, 7, 9, 9,
+	 1, 4, 4, 7, 7, 9,10,12,12, 4, 5, 5, 7, 7,10,10,
+	13,12, 4, 5, 5, 7, 7,10,10,12,13, 7, 7, 7, 8, 9,
         11,11,13,13, 7, 7, 7, 9, 9,11,11,13,13,10,10,10,
-	11,11,12,12,14,14,10,10,10,11,11,12,12,14,13,12,
-	12,12,13,13,14,14,14,15,12,12,12,13,13,14,14,15,
-	14,
+	11,11,12,13,14,14,10,10,10,11,11,12,12,14,14,12,
+	13,12,13,13,14,14,15,15,12,12,13,13,13,14,14,15,
+	15,
 };
 
 static float _vq_quantthresh__44u0_p6_0[] = {

1.3       +3 -2      vorbis/lib/books/uncoupled/_44u0_p7_0.vqh

Index: _44u0_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p7_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p7_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,8 +27,8 @@
 };
 
 static long _vq_lengthlist__44u0_p7_0[] = {
-	 1, 3, 3, 7, 6, 3, 7, 7,10,10, 4, 7, 7,11,10, 9,
-	11,12,14,14,10,12,12,14,14,
+	 1, 3, 3, 7, 6, 3, 7, 7, 9,11, 4, 7, 7,11, 9,10,
+	12,12,16,15,10,12,13,14,16,
 };
 
 static float _vq_quantthresh__44u0_p7_0[] = {

1.3       +33 -32    vorbis/lib/books/uncoupled/_44u0_p7_1.vqh

Index: _44u0_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p7_1.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p7_1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -44,39 +45,39 @@
 };
 
 static long _vq_lengthlist__44u0_p7_1[] = {
-	 1, 4, 5, 6, 6, 8, 8, 9, 9,10,10,11,10,11,11,11,
-	11,11,11,10,11,11,11, 5, 6, 6, 7, 7, 9, 9,10, 9,
-	10,10,11,10,11,11,11,12,12,12,11,11,12,11, 5, 6,
-	 6, 7, 7, 9, 9, 9,10,10,10,11,11,11,11,12,12,12,
-	12,11,11,12,12, 7, 8, 7, 9, 9,10, 9,10,10,11,11,
-	11,11,12,12,12,12,12,12,11,11,12,12, 7, 7, 8, 9,
-	 9, 9,10,10,10,11,11,11,11,12,12,12,12,12,12,11,
-	11,12,12, 8, 9, 9,10,10,10,10,11,11,11,11,12,12,
-	12,12,12,12,13,13,12,12,12,13, 8, 9, 9,10,10,10,
-	10,11,11,11,11,12,12,12,12,12,12,13,12,12,12,12,
-	12, 9,10,10,11,10,11,11,11,11,12,12,12,12,13,13,
-	13,13,13,13,12,12,13,13,10,10,10,10,11,11,11,11,
-	11,12,12,12,12,12,12,12,13,13,13,12,12,13,13,10,
-	11,11,11,11,12,12,12,12,13,12,13,13,13,13,13,13,
-	13,13,12,12,13,13,10,11,11,11,11,12,12,12,12,12,
-	12,13,13,13,13,13,13,13,13,12,12,13,13,11,12,12,
-	12,12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,
-	13,12,13,13,11,11,12,12,12,12,12,12,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,12,12,12,12,12,
-	13,12,13,13,13,13,13,13,13,13,14,14,13,13,13,13,
-	13,13,12,12,12,12,12,13,13,13,13,13,13,13,13,13,
-	14,13,13,13,13,13,13,13,13,12,12,12,13,13,13,13,
-	13,13,13,13,13,13,14,13,14,14,14,14,13,13,13,14,
+	 1, 4, 5, 7, 7, 8, 8, 9, 9,10,10,10,10,11,11,11,
+	11,11,11,10,10,11,11, 5, 6, 6, 8, 7, 9, 9, 9, 9,
+	10,10,11,11,11,11,11,11,11,11,11,11,11,11, 5, 6,
+	 6, 7, 7, 9, 9, 9, 9,10,10,11,11,11,11,11,11,12,
+	11,10,11,11,11, 7, 8, 8, 8, 8, 9, 9,10,10,11,10,
+	11,11,12,11,12,12,12,12,11,11,12,12, 7, 8, 8, 8,
+	 8, 9, 9,10,10,11,11,11,11,11,12,12,12,12,12,11,
+	11,12,12, 9, 9, 9,10, 9,10,10,11,10,11,11,11,11,
+	12,12,12,12,12,12,11,12,12,12, 9, 9, 9, 9, 9,10,
+	10,10,10,11,11,11,12,12,12,12,12,12,12,11,12,12,
+	12,10,10,10,11,10,11,11,11,11,12,12,12,12,12,12,
+	13,12,12,12,12,12,12,12,10,10,10,10,10,11,11,11,
+	11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,10,
+	11,11,11,11,11,11,12,12,12,12,12,12,13,13,13,12,
+	13,13,12,12,13,13,11,11,11,11,11,11,12,12,12,12,
+	12,13,12,13,13,13,13,13,13,12,12,13,13,11,11,11,
+	12,12,12,12,12,12,13,12,13,13,13,13,13,13,13,13,
+	12,12,13,13,11,11,11,12,12,12,12,12,12,12,13,13,
+	13,13,13,13,13,13,13,12,12,13,13,12,12,12,12,12,
+	12,12,13,13,13,13,13,13,13,13,13,13,13,13,12,12,
+	13,13,12,12,12,12,12,12,12,13,13,12,13,13,13,13,
+	13,13,13,13,13,12,12,13,13,12,12,12,12,12,13,13,
+	13,13,13,13,13,13,13,13,14,13,13,13,12,12,13,13,
         12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,13,
-	13,14,14,13,13,14,13,12,12,12,13,13,13,13,13,13,
-	13,14,13,13,14,14,14,13,14,14,13,13,13,14,12,12,
-	12,13,13,13,13,13,13,13,13,13,13,14,14,13,14,14,
-	14,13,13,14,14,11,11,11,12,12,12,12,12,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,14,14,11,11,12,12,
-	12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,13,
-	13,14,14,12,12,12,13,12,13,13,13,13,13,13,13,13,
-	14,14,14,14,14,14,14,14,14,14,12,12,12,13,12,13,
-	13,13,13,13,13,14,14,14,14,14,14,14,14,14,14,14,
+	13,13,13,12,12,13,13,12,12,12,12,13,13,13,13,13,
+	13,13,13,13,13,13,14,13,13,13,13,13,13,13,12,12,
+	12,12,13,13,13,13,13,13,13,13,13,13,14,13,13,13,
+	13,13,13,13,13,11,11,11,12,12,12,12,12,12,12,12,
+	12,12,13,12,13,13,13,13,13,13,13,14,11,11,11,12,
+	12,12,12,12,12,12,12,13,13,13,12,13,13,13,13,13,
+	13,13,13,12,12,12,12,12,12,13,13,13,13,13,13,13,
+	13,13,13,14,14,14,14,13,14,14,12,12,12,12,12,13,
+	13,13,13,13,13,13,13,13,13,13,13,14,13,13,14,14,
         14,
 };
 

1.3       +6 -5      vorbis/lib/books/uncoupled/_44u0_p7_2.vqh

Index: _44u0_p7_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u0_p7_2.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u0_p7_2.vqh	2001/12/17 00:17:32	1.2
+++ _44u0_p7_2.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
 };
 
 static long _vq_lengthlist__44u0_p7_2[] = {
-	 2, 5, 5, 6, 7, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7,
-	 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7,
-	 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 3, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 6,
+	 7, 7, 6, 6, 6, 6, 7, 7, 6, 7, 7, 6, 6, 6, 7, 7,
+	 7, 6, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7,
+	 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 7, 7, 7, 7, 7, 6,
+	 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7,
          7,
 };
 

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u4_p0_r0.vqh

Index: _44u4_p0_r0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p0_r0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p0_r0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p0_r0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u4_p0_r1.vqh

Index: _44u4_p0_r1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p0_r1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p0_r1.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p0_r1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +6 -5      vorbis/lib/books/uncoupled/_44u4_p1_0.vqh

Index: _44u4_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p1_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p1_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p1_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
 };
 
 static long _vq_lengthlist__44u4_p1_0[] = {
-	 1, 5, 5, 6, 7, 7, 6, 7, 7, 5, 7, 7, 7, 9, 9, 7,
-	 8, 9, 5, 7, 7, 7, 9, 8, 7, 9, 9, 5, 7, 7, 7, 9,
-	 9, 7, 8, 9, 7, 9, 9, 9, 9,10, 9,10,10, 7, 8, 9,
-	 8,10, 9, 9,10,10, 5, 7, 7, 7, 9, 9, 7, 9, 9, 7,
-	 9, 9, 9,10,10, 8, 9,10, 7, 9, 9, 9,10,10, 9,10,
+	 2, 5, 5, 5, 7, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6,
+	 7, 8, 5, 6, 6, 6, 8, 7, 7, 8, 8, 5, 6, 6, 7, 8,
+	 8, 7, 8, 8, 7, 8, 8, 8, 9,10, 8, 9, 9, 6, 8, 8,
+	 7, 9, 8, 8, 9,10, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
+	 8, 8, 8,10, 9, 7, 8, 9, 6, 8, 8, 8, 9, 9, 8,10,
          9,
 };
 

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u4_p1_r0.vqh

Index: _44u4_p1_r0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p1_r0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p1_r0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p1_r0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u4_p1_r1.vqh

Index: _44u4_p1_r1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p1_r1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p1_r1.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p1_r1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +5 -4      vorbis/lib/books/uncoupled/_44u4_p2_0.vqh

Index: _44u4_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p2_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p2_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p2_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
 };
 
 static long _vq_lengthlist__44u4_p2_0[] = {
-	 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7,
-	 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 8, 9,
+	 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 8, 9, 9, 7,
+	 9, 9, 5, 7, 7, 7, 9, 9, 8, 9, 9, 5, 7, 7, 8, 9,
          9, 7, 9, 9, 7, 9, 9, 9,10,11, 9,11,11, 7, 9, 9,
-	 9,11,10, 9,10,11, 5, 7, 8, 7, 9, 9, 8, 9, 9, 7,
-	 9, 9, 9,11,10, 9, 9,11, 7, 9, 9, 9,11,11, 9,11,
+	 9,11, 9, 9,11,11, 5, 7, 7, 7, 9, 9, 7, 9, 9, 7,
+	 9, 9, 9,11,11, 9, 9,11, 7, 9, 9, 9,11,11, 9,11,
         10,
 };
 

1.3       +39 -38    vorbis/lib/books/uncoupled/_44u4_p3_0.vqh

Index: _44u4_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p3_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p3_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p3_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,46 +27,46 @@
 };
 
 static long _vq_lengthlist__44u4_p3_0[] = {
-	 3, 5, 5, 8, 8, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8,
-	 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8,
-	 8,10,10, 7, 7, 8, 9,10, 9,10,10,11,12, 9, 9,10,
-	11,12, 6, 7, 7, 9, 9, 7, 8, 7,10,10, 7, 8, 8,10,
-	10, 9,10, 9,12,11, 9,10,10,12,11, 8, 9, 9,12,11,
-	 9,10,10,12,12, 9,10,10,12,12,11,12,12,13,13,11,
-	11,12,13,13, 8, 9, 9,11,12, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,11,13,13,11,12,12,13,13, 5, 7, 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,10,10, 8, 8, 9,11,11,
+	 3, 5, 5, 8, 8, 6, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9,
+	 9, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
+	 8,10,10, 7, 8, 8,10,10,10,10,10,11,12, 9,10,10,
+	11,12, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,
+	10, 9,10,10,12,11, 9,10,10,12,12, 8,10,10,12,12,
+	10,10,10,13,12, 9,10,10,12,12,12,12,12,13,14,11,
+	11,12,13,14, 9,10,10,12,12, 9,10,10,12,12,10,10,
+	10,12,12,11,12,11,14,13,12,12,12,14,13, 5, 7, 7,
+	 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,
+	12, 9,10,10,12,12, 7, 8, 8,10,10, 8, 9, 9,11,11,
          8, 9, 9,11,11,10,11,11,12,13,10,11,11,12,13, 7,
-	 8, 8,10,10, 7, 9, 8,11,10, 8, 9, 9,11,11,10,11,
-	10,13,11,10,11,11,12,12, 9,10,10,12,12,10,11,11,
-	12,13,10,11,11,13,13,12,12,13,13,14,12,12,12,14,
-	14, 9,10,10,12,12, 9,11,10,13,12,10,11,11,13,13,
-	11,12,11,14,12,12,12,13,14,14, 5, 7, 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,10,10, 8, 9, 9,11,11, 7, 8, 9,
-	10,11,10,11,11,12,12,10,10,11,11,13, 7, 8, 8,10,
+	 8, 8,10,10, 8, 9, 8,11,10, 8, 9, 9,11,11,10,11,
+	10,13,11,10,11,11,13,13, 9,11,10,13,12,10,11,11,
+	13,13,10,11,11,13,13,12,12,13,12,15,12,13,13,14,
+	14, 9,10,10,12,12,10,11,10,13,12,10,11,11,13,13,
+	12,13,11,14,12,12,13,13,14,15, 5, 7, 7, 9, 9, 7,
+	 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12,10,10,
+	11,12,12, 7, 8, 8,10,10, 8, 9, 9,11,11, 8, 8, 9,
+	10,11,10,11,11,13,13,10,10,11,11,13, 7, 8, 8,10,
         10, 8, 9, 9,11,11, 8, 9, 9,11,11,10,11,11,13,12,
-	10,11,11,13,12, 9,10,10,12,12,10,11,11,13,12,10,
-	10,11,12,13,12,13,13,14,14,11,11,12,12,14, 9,10,
-	10,12,12,10,11,11,13,13,10,11,11,13,12,12,13,12,
-	14,14,12,12,12,14,12, 8, 9, 9,12,12, 9,10,10,12,
-	12, 9,10,10,12,12,12,12,12,14,14,11,12,12,13,13,
-	 9,10,10,12,12,10,11,11,13,13,10,11,11,13,12,12,
-	13,13,14,14,12,12,13,14,14, 9,10,10,12,12,10,11,
-	10,13,12,10,11,11,12,13,12,13,12,15,13,12,12,13,
-	14,14,11,12,12,14,14,11,12,12,14,14,12,13,13,14,
-	14,13,13,14,13,15,13,14,14,15,15,11,12,12,13,14,
-	11,12,11,14,13,12,12,13,14,14,13,14,12,15,13,13,
-	14,14,15,16, 8, 9, 9,12,12, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,12,13,13,12,12,12,13,14, 9,10,10,
-	12,12,10,11,11,13,12,10,10,11,12,13,12,13,13,14,
-	14,12,12,13,13,14, 9,10,10,12,12,10,11,11,13,13,
-	10,11,11,13,13,12,13,13,14,14,12,13,12,14,14,11,
-	12,12,14,13,12,12,12,14,14,11,11,12,13,14,14,14,
-	14,15,15,13,12,14,13,15,11,12,12,13,14,12,13,13,
-	14,14,11,12,12,14,14,13,14,14,15,16,13,14,13,15,
-	13,
+	10,11,11,13,12, 9,10,10,12,12,10,11,11,13,13,10,
+	10,11,12,13,12,13,13,15,14,12,11,13,12,14, 9,10,
+	10,12,13,10,11,11,13,13,10,11,11,13,13,12,13,13,
+	14,14,12,13,12,14,12, 8, 9, 9,12,12, 9,11,10,13,
+	13, 9,10,10,12,12,12,13,13,14,14,12,12,12,14,13,
+	 9,10,10,13,12,10,11,11,13,13,10,11,11,13,13,13,
+	13,13,14,15,12,13,13,14,14, 9,10,10,12,13,10,11,
+	10,13,12,10,11,11,12,13,12,13,12,15,14,12,13,13,
+	14,15,11,12,12,14,14,12,12,13,14,15,12,13,13,15,
+	14,13,13,14,12,16,14,14,14,16,15,11,12,12,14,14,
+	11,12,12,14,14,12,13,13,14,15,13,14,12,16,13,14,
+	14,15,15,16, 8, 9, 9,12,12, 9,10,10,13,12, 9,10,
+	10,12,13,12,12,12,14,14,12,12,13,14,14, 9,10,10,
+	12,12,10,11,11,13,13,10,10,11,12,13,12,13,13,15,
+	14,12,12,13,13,15, 9,10,10,12,13,10,11,11,13,13,
+	10,11,11,13,13,12,13,13,14,14,13,13,13,14,14,11,
+	12,12,14,14,12,13,13,15,14,11,12,12,13,14,14,15,
+	14,16,15,13,12,14,13,15,12,12,12,14,14,12,13,13,
+	14,15,12,13,12,15,14,14,14,14,16,16,14,14,12,16,
+	12,
 };
 
 static float _vq_quantthresh__44u4_p3_0[] = {

1.3       +29 -28    vorbis/lib/books/uncoupled/_44u4_p4_0.vqh

Index: _44u4_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p4_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p4_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p4_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -27,44 +28,44 @@
 
 static long _vq_lengthlist__44u4_p4_0[] = {
          3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8,
-	 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
+	10, 9,12,11, 8, 9, 9,11,12, 5, 7, 7, 9, 9, 7, 8,
          8,10,10, 7, 8, 8,10,10,10,10,10,12,12, 9,10,10,
-	11,12, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,
-	10, 9,10,10,12,11, 9,10,10,12,12, 9,10,10,12,12,
-	10,10,10,13,12, 9,10,10,12,12,12,12,12,14,14,11,
-	12,12,13,14, 8,10,10,12,12, 9,10,10,12,12,10,10,
-	10,12,13,11,12,12,14,13,12,12,12,14,14, 5, 7, 7,
-	 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,10,12,
+	11,13, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,
+	10, 9,10,10,12,11,10,10,10,12,12, 9,10,10,12,12,
+	10,11,10,13,12, 9,10,10,12,12,12,12,12,13,14,11,
+	12,12,13,14, 8, 9,10,12,12, 9,10,10,12,12,10,10,
+	10,12,13,11,12,12,14,13,12,13,12,14,14, 5, 7, 7,
+	 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,10,13,
         12,10,10,10,12,12, 7, 8, 8,11,10, 8, 9, 9,11,11,
-	 8, 9, 9,11,11,10,11,11,12,13,10,11,11,13,13, 7,
+	 8, 9, 9,11,11,11,11,11,12,13,10,11,11,13,13, 7,
          8, 8,10,10, 8, 9, 8,11,10, 8, 9, 9,11,11,10,11,
         10,13,12,10,11,11,13,13,10,11,10,13,12,10,11,11,
-	13,13,10,11,11,13,13,12,12,13,13,15,12,13,13,14,
+	13,13,10,11,11,13,13,12,12,13,12,15,12,13,13,14,
         15, 9,10,10,12,13,10,11,10,13,12,10,11,11,13,13,
-	12,13,12,14,13,12,13,13,15,15, 5, 7, 7, 9, 9, 7,
-	 8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,12,10,10,
-	11,12,12, 7, 8, 8,10,10, 8, 9, 9,11,11, 8, 8, 9,
+	12,13,11,15,12,12,13,13,15,15, 5, 7, 7, 9, 9, 7,
+	 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12,10,10,
+	11,12,13, 7, 8, 8,10,10, 8, 9, 9,11,11, 8, 8, 9,
         10,11,10,11,11,13,13,10,10,11,12,13, 7, 8, 8,10,
         11, 8, 9, 9,11,11, 8, 9, 9,11,11,10,11,11,13,13,
-	11,11,11,13,12, 9,10,10,13,12,10,11,11,13,13,10,
-	10,11,12,13,12,13,13,15,14,12,12,13,13,14,10,10,
+	10,11,11,13,12, 9,10,10,13,12,10,11,11,14,13,10,
+	10,11,12,13,13,13,13,15,15,12,11,13,12,15,10,10,
         11,12,13,10,11,11,13,13,10,11,11,13,13,12,13,13,
-	15,14,12,13,12,15,13, 8,10,10,12,12,10,11,10,13,
-	13, 9,10,10,13,13,12,13,13,14,14,12,12,12,14,14,
-	 9,10,10,13,13,10,11,11,13,13,10,11,11,13,13,13,
-	13,13,14,15,12,13,13,15,14, 9,10,10,13,13,10,11,
-	11,13,13,10,11,11,13,13,12,13,12,15,14,12,13,13,
-	14,15,12,13,12,14,14,12,12,13,14,15,12,13,13,15,
-	14,14,13,15,13,16,14,15,15,16,16,11,12,12,14,14,
-	11,13,12,15,14,12,13,13,14,15,13,14,13,16,14,14,
-	15,15,16,16, 8, 9,10,12,12, 9,10,10,13,12,10,10,
-	11,13,13,12,13,12,14,14,12,13,13,14,14, 9,10,10,
-	13,13,10,11,11,13,13,10,11,11,13,13,12,13,13,15,
-	14,12,13,13,14,15, 9,10,10,13,13,10,11,11,13,13,
+	14,14,12,13,12,15,12, 8,10,10,12,12,10,11,10,13,
+	13, 9,10,10,13,13,12,13,13,15,14,12,12,12,14,14,
+	 9,10,10,13,13,10,11,11,13,13,10,11,11,14,13,13,
+	13,14,14,15,12,13,13,15,14, 9,10,10,12,13,10,11,
+	10,13,12,10,11,11,13,13,12,13,12,15,14,13,13,13,
+	14,15,12,12,12,15,14,12,12,13,14,15,12,13,13,15,
+	15,14,13,15,13,16,14,15,15,17,16,11,12,12,14,14,
+	11,13,12,15,14,12,13,13,14,15,13,15,12,16,13,14,
+	15,15,16,16, 8, 9,10,12,12, 9,10,10,13,13,10,10,
+	11,13,13,12,13,12,14,14,12,13,13,14,15, 9,10,10,
+	13,12,10,11,11,14,13,10,10,11,13,13,13,13,13,15,
+	14,12,12,13,14,15, 9,10,11,13,13,10,11,11,13,14,
         10,11,11,13,13,13,13,13,14,15,13,13,13,15,14,11,
         12,12,14,14,12,13,13,15,14,11,12,13,14,15,14,15,
-	15,16,16,13,13,14,13,16,12,12,12,14,14,12,13,13,
-	14,15,12,13,12,15,14,14,15,14,16,16,14,15,13,16,
+	15,17,16,13,12,15,13,16,12,12,12,14,14,12,13,13,
+	14,15,12,13,12,15,14,14,15,15,16,17,14,15,12,17,
         13,
 };
 

1.3       +7 -6      vorbis/lib/books/uncoupled/_44u4_p5_0.vqh

Index: _44u4_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p5_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p5_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p5_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,12 +31,12 @@
 };
 
 static long _vq_lengthlist__44u4_p5_0[] = {
-	 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7,
-	 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7,
-	 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7,
-	 8, 8, 9, 9,11,10, 7, 7, 7, 8, 8, 9, 9,10,11, 9,
-	 9, 9,10,10,11,10,11,11, 9, 9, 9,10,10,10,11,11,
-	11,
+	 2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 8, 7,
+	 9, 9, 4, 5, 5, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7,
+	 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7,
+	 8, 8,10, 9,11,11, 7, 7, 8, 8, 8, 9, 9,11,11, 9,
+	 9, 9,10,10,11,11,12,12, 9, 9, 9,10,10,11,11,12,
+	12,
 };
 
 static float _vq_quantthresh__44u4_p5_0[] = {

1.3       +4 -3      vorbis/lib/books/uncoupled/_44u4_p6_0.vqh

Index: _44u4_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p6_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p6_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p6_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,11 +31,11 @@
 };
 
 static long _vq_lengthlist__44u4_p6_0[] = {
-	 2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 8, 7,
-	 9, 9, 4, 5, 5, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7,
+	 2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 7, 7,
+	10, 9, 4, 5, 5, 6, 6, 7, 7, 9,10, 6, 6, 6, 7, 7,
          8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7,
          8, 8, 9, 9,11,11, 7, 7, 8, 8, 8, 9, 9,11,11, 9,
-	 9, 9,10,10,11,11,12,12, 9, 9,10,10,10,11,11,12,
+	10,10,10,10,11,11,12,12, 9, 9,10,10,10,11,11,12,
         12,
 };
 

1.3       +9 -8      vorbis/lib/books/uncoupled/_44u4_p7_0.vqh

Index: _44u4_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p7_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p7_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -32,14 +33,14 @@
 };
 
 static long _vq_lengthlist__44u4_p7_0[] = {
-	 1, 4, 4, 7, 6, 9, 9,10,10,11,11, 4, 6, 5, 7, 7,
-	10, 9,11,11,12,12, 4, 5, 6, 7, 7, 9, 9,11,11,12,
-	12, 7, 7, 7, 9, 9,10,10,12,12,13,13, 7, 7, 7, 9,
-	 9,10,10,12,12,13,13, 9,10, 9,11,10,11,11,13,13,
-	14,13, 9, 9,10,10,10,11,11,13,13,13,14,10,11,11,
-	12,12,13,12,13,13,14,14,10,11,11,12,12,13,13,13,
-	13,14,14,12,12,12,13,13,14,13,14,14,15,15,12,12,
-	12,13,13,13,14,14,14,15,15,
+	 1, 4, 4, 6, 6, 8, 8,10,10,11,11, 4, 6, 6, 7, 7,
+	 9, 9,11,10,12,12, 4, 6, 6, 7, 7, 9, 9,10,11,12,
+	12, 6, 8, 7, 9, 9,10,10,12,11,12,12, 6, 7, 8, 9,
+	 9,10,10,11,12,12,12, 8, 9, 9,10,10,11,11,12,12,
+	13,13, 8, 9, 9,10,10,11,11,12,12,13,13,10,11,11,
+	12,11,12,12,13,13,14,14,10,11,11,11,12,12,12,13,
+	13,14,14,11,12,12,13,12,13,13,14,14,14,14,11,12,
+	12,12,13,13,13,14,14,14,14,
 };
 
 static float _vq_quantthresh__44u4_p7_0[] = {

1.3       +5 -4      vorbis/lib/books/uncoupled/_44u4_p7_1.vqh

Index: _44u4_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p7_1.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p7_1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,10 +25,10 @@
 };
 
 static long _vq_lengthlist__44u4_p7_1[] = {
-	 4, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 6,
-	 7, 7, 6, 6, 6, 6, 7, 7, 6, 7, 7, 5, 6, 6, 6, 7,
-	 7, 6, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7,
-	 7, 7, 7, 7, 7, 7, 5, 6, 6, 6, 7, 7, 6, 7, 7, 6,
+	 3, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 7, 7, 6,
+	 7, 7, 6, 7, 6, 6, 7, 7, 6, 7, 7, 5, 6, 7, 6, 7,
+	 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7,
+	 7, 7, 7, 7, 7, 7, 5, 7, 7, 7, 7, 7, 7, 7, 7, 6,
          7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7,
          7,
 };

1.3       +18 -17    vorbis/lib/books/uncoupled/_44u4_p8_0.vqh

Index: _44u4_p8_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p8_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p8_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p8_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -39,24 +40,24 @@
 
 static long _vq_lengthlist__44u4_p8_0[] = {
          1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,11,12,
-	12, 4, 6, 6, 8, 7, 9, 9, 9, 9,10,10,11,11,11,11,
+	12, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,11,11,
         12,12, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,11,
-	11,12,12, 7, 8, 8, 9, 9,10, 9,10,10,11,11,11,11,
-	12,12,13,13, 7, 8, 8, 9, 9,10,10,10,10,11,11,11,
-	11,12,12,13,13, 8, 9, 9,10,10,10,10,11,11,11,11,
-	12,12,13,12,13,13, 8, 9, 9,10,10,10,10,11,11,11,
-	11,12,12,12,13,13,13, 8, 9, 9,10,10,11,11,12,11,
-	12,12,13,13,13,13,14,14, 8, 9, 9,10,10,11,11,11,
-	11,12,12,13,13,13,13,13,14,10,10,10,11,11,12,11,
-	12,12,13,13,13,13,13,14,14,14,10,10,10,11,11,11,
-	11,12,12,13,13,13,13,14,14,14,14,10,11,11,12,12,
-	12,12,13,13,13,13,14,14,14,14,14,14,10,11,11,12,
-	12,12,12,13,13,13,13,14,14,14,14,14,14,11,12,12,
-	12,12,13,13,13,13,14,14,14,14,14,14,14,14,11,12,
-	12,12,12,13,13,13,13,13,14,14,14,14,14,14,14,12,
-	12,12,13,13,13,13,14,14,14,14,14,14,14,15,15,15,
-	12,12,12,13,13,13,13,14,14,14,14,14,14,15,14,15,
-	15,
+	11,12,12, 7, 8, 8, 9, 9,10,10,10,10,11,11,11,11,
+	12,12,12,12, 7, 8, 8, 9, 9, 9,10,10,10,11,11,11,
+	11,12,12,12,12, 8, 9, 9,10,10,10,10,11,11,11,11,
+	12,12,12,12,13,13, 8, 9, 9,10,10,10,10,11,11,11,
+	12,12,12,12,12,13,13, 8, 9, 9,10,10,11,11,12,11,
+	12,12,12,12,13,13,13,13, 8, 9, 9,10,10,11,11,11,
+	12,12,12,13,13,13,13,13,13,10,10,10,11,11,11,11,
+	12,12,13,13,13,13,13,13,14,13, 9,10,10,11,11,11,
+	11,12,12,12,12,13,13,13,13,13,14,10,11,11,12,12,
+	12,12,13,13,13,13,13,13,14,14,14,14,10,11,11,11,
+	12,12,12,12,12,13,13,13,13,14,13,14,14,11,12,12,
+	12,12,13,12,13,13,14,13,14,14,14,14,14,14,11,12,
+	12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,12,
+	12,12,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
+	12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,14,
+	14,
 };
 
 static float _vq_quantthresh__44u4_p8_0[] = {

1.3       +20 -19    vorbis/lib/books/uncoupled/_44u4_p8_1.vqh

Index: _44u4_p8_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p8_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p8_1.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p8_1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,27 +27,27 @@
 };
 
 static long _vq_lengthlist__44u4_p8_1[] = {
-	 4, 7, 7, 8, 8, 7, 8, 8, 9, 9, 7, 8, 8, 9, 9, 9,
+	 4, 6, 7, 8, 8, 7, 8, 8, 9, 9, 7, 8, 8, 9, 9, 9,
          9, 9, 9, 9, 9, 9, 9, 9, 9, 7, 8, 8, 9, 9, 8, 9,
-	 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 7, 8, 8, 9, 9, 8, 9, 9, 9, 9, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 9,10,10,
-	 9, 9, 9,10,10, 9, 9, 9,10,10, 9,10,10,10,10, 9,
-	10,10,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10, 9, 9,
-	 9,10,10, 9,10,10,10,10, 9,10,10,10,10, 7, 8, 8,
+	 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9,10,10, 9, 9, 9,
+	 9,10, 7, 8, 8, 9, 9, 8, 9, 9, 9, 9, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9,10, 9, 9, 9,10,10, 9, 9, 9,10,10,
+	 9, 9,10,10,10, 9, 9, 9,10,10, 9,10,10,10,10, 9,
+	10,10,10,10, 9, 9, 9,10,10, 9, 9,10,10,10, 9,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10, 6, 8, 8,
          9, 9, 8, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9,10,10,10,
         10, 9,10,10,10,10, 8, 9, 9,10,10, 9, 9, 9,10,10,
-	 9, 9, 9,10,10, 9,10,10,10,10, 9,10,10,10,10, 8,
-	 9, 9, 9, 9, 9, 9, 9,10,10, 9, 9, 9,10,10, 9,10,
-	10,10,10, 9,10,10,10,10, 9,10,10,10,10, 9,10,10,
+	 9, 9, 9,10,10, 9,10,10,10,10,10,10,10,10,10, 8,
+	 9, 9,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10, 9,10,
+	10,10,10,10,10,10,10,10, 9,10,10,10,10, 9,10,10,
         10,10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,
         10, 9,10, 9,10,10, 9,10,10,10,10, 9,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10, 7, 8, 8, 9, 9, 8,
-	 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9,10,10, 9, 9,
-	10,10,10, 8, 9, 9, 9,10, 9, 9, 9,10,10, 9, 9, 9,
-	10,10, 9,10,10,10,10, 9,10,10,10,10, 8, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,10, 6, 8, 8, 9, 9, 8,
+	 9, 9, 9, 9, 8, 9, 9, 9, 9, 9,10,10,10,10, 9,10,
+	 9,10,10, 8, 9, 9,10,10, 9, 9, 9,10,10, 9, 9, 9,
+	10,10, 9,10,10,10,10, 9,10,10,10,10, 8, 9, 9,10,
         10, 9, 9, 9,10,10, 9, 9, 9,10,10, 9,10,10,10,10,
-	 9,10,10,10,10, 9,10, 9,10,10, 9,10,10,10,10, 9,
+	10,10,10,10,10, 9,10,10,10,10, 9,10,10,10,10, 9,
         10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,10,
          9,10,10, 9,10,10,10,10, 9,10,10,10,10,10,10,10,
         10,10,10,10,10,10,10, 8, 9, 9,10,10, 9,10,10,10,
@@ -56,15 +57,15 @@
         10,10,10, 9,10,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,10,10,10,10,10,10,10,10, 9,10,10,10,10,
-	 9,10,10,10,10, 9,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10, 8, 9, 9,10,10, 9,10,10,10,10, 9, 9,
-	10,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10, 8, 9, 9,10,10, 9,10,10,10,10, 9,10,
+	 9,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
         10,10, 9,10,10,10,10, 9,10,10,10,10,10,10,10,10,
         10,10,10,10,10,10, 9, 9,10,10,10, 9,10,10,10,10,
          9,10,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,
         10,10,10,10,10,10,10,10, 9,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,10,10,10,10,10,10,10,10,10,10,10,
         10,
 };
 

1.3       +4 -3      vorbis/lib/books/uncoupled/_44u4_p9_0.vqh

Index: _44u4_p9_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p9_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p9_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p9_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -28,9 +29,9 @@
 };
 
 static long _vq_lengthlist__44u4_p9_0[] = {
-	 1, 3, 2, 9,11,11,11, 4,11,10,11,11,11,11, 5, 8,
-	11,11,11, 9,11,11,11,11,11,11,11,11,11,11,11,11,
-	11,11,11,11,11,11,11,11,11,11,11,10,10,10,10,10,
+	 1, 2, 3,11,11,11,11, 4,11,10,11,11,11,11, 5, 9,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
         10,
 };
 

1.3       +11 -10    vorbis/lib/books/uncoupled/_44u4_p9_1.vqh

Index: _44u4_p9_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p9_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p9_1.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p9_1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -34,17 +35,17 @@
 };
 
 static long _vq_lengthlist__44u4_p9_1[] = {
-	 1, 3, 4, 6, 6, 8, 8, 8, 9, 9, 9,10,10, 4, 6, 6,
+	 1, 3, 4, 6, 6, 8, 7, 9, 8,10, 9,11,11, 4, 6, 6,
          8, 8,10, 9,11,10,12,11,12,11, 4, 6, 6, 8, 8, 9,
-	 9,10,11,11,12,12,12, 7, 8, 9,10,10,12,11,13,13,
-	14,14,15,14, 7, 8, 9,10,10,11,12,13,13,14,13,14,
-	14, 9,10,10,12,12,14,14,15,15,15,15,18,16, 9,11,
-	10,12,12,13,13,15,14,16,16,16,16,11,12,13,14,14,
-	15,14,17,16,16,17,17,17,11,13,13,14,14,14,15,17,
-	16,16,17,18,17,13,14,14,14,15,15,16,16,17,18,18,
-	19,19,13,14,14,15,15,16,16,16,16,18,17,18,17,14,
-	14,15,15,16,16,16,18,17,18,18,18,18,14,14,15,17,
-	15,16,16,16,17,18,18,17,17,
+	10,10,11,11,12,12,12, 7, 8, 9,10,10,12,11,13,13,
+	13,14,15,14, 7, 8, 9,10,10,12,12,13,13,14,13,14,
+	14, 9,10,11,12,12,14,14,15,15,15,15,19,15, 9,11,
+	11,12,12,13,13,15,14,16,16,17,16,11,12,13,14,13,
+	15,15,16,17,16,16,17,17,11,13,13,14,14,14,15,16,
+	16,16,16,17,16,13,13,14,15,15,15,15,15,17,17,18,
+	19,19,13,14,14,15,15,15,16,15,17,17,16,18,16,14,
+	14,15,15,16,17,16,18,17,17,18,17,19,14,14,15,18,
+	15,16,16,17,16,16,19,16,19,
 };
 
 static float _vq_quantthresh__44u4_p9_1[] = {

1.3       +2 -1      vorbis/lib/books/uncoupled/_44u4_p9_2.vqh

Index: _44u4_p9_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u4_p9_2.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u4_p9_2.vqh	2001/12/17 00:17:32	1.2
+++ _44u4_p9_2.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -70,7 +71,7 @@
 };
 
 static long _vq_lengthlist__44u4_p9_2[] = {
-	 2, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6,
+	 3, 3, 3, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6,
          6, 6, 6, 7, 7, 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,

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u7_p0_r0.vqh

Index: _44u7_p0_r0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p0_r0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p0_r0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p0_r0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u7_p0_r1.vqh

Index: _44u7_p0_r1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p0_r1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p0_r1.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p0_r1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +9 -8      vorbis/lib/books/uncoupled/_44u7_p1_0.vqh

Index: _44u7_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p1_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p1_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p1_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -41,21 +42,21 @@
          3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9,10,10,11,
         11, 5, 6, 5, 6, 6, 7, 7, 8, 8, 9, 9,10, 9,10,10,
         11,11, 5, 5, 6, 6, 6, 7, 7, 8, 8, 9, 9, 9,10,10,
-	10,11,11, 6, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10,
+	10,11,11, 6, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9,10,10,
         11,10,11,11, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9,10,
         10,10,11,11,11, 7, 7, 7, 8, 7, 8, 8, 9, 8, 9, 9,
         10,10,11,11,12,11, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9,
          9,10,10,11,11,11,12, 8, 8, 8, 8, 8, 9, 8, 9, 9,
         10,10,11,10,11,11,12,12, 8, 8, 8, 8, 8, 8, 9, 9,
-	 9,10,10,10,11,11,11,12,12, 8, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,11,11,12,12,13,12, 8, 9, 9, 9, 9, 9,
-	 9,10,10,10,10,11,11,11,12,12,12, 9,10, 9,10,10,
-	10,10,11,10,11,11,12,11,12,12,13,12, 9, 9,10,10,
-	10,10,10,10,11,11,11,11,12,12,12,13,13,10,10,10,
+	 9,10,10,10,11,11,11,12,12, 9, 9, 9, 9, 9, 9, 9,
+	10, 9,10,10,11,11,12,11,13,12, 8, 9, 9, 9, 9, 9,
+	 9, 9,10,10,10,11,11,11,12,12,12, 9, 9, 9,10, 9,
+	10,10,11,10,11,11,12,11,12,12,13,12, 9, 9, 9,10,
+	10,10,10,10,11,11,11,11,12,12,12,12,13,10,10,10,
         11,10,11,11,11,11,12,11,12,12,13,12,13,13,10,10,
         10,10,11,11,11,11,11,11,12,12,12,12,13,13,13,11,
-	11,11,11,11,12,12,12,12,12,12,13,12,13,13,14,13,
-	11,11,11,11,12,11,12,12,12,12,12,13,13,13,13,13,
+	11,11,11,11,12,11,12,12,12,12,13,12,13,13,14,13,
+	11,11,11,11,11,11,12,12,12,12,12,12,13,13,13,13,
         14,
 };
 

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u7_p1_r0.vqh

Index: _44u7_p1_r0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p1_r0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p1_r0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p1_r0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +2 -1      vorbis/lib/books/uncoupled/_44u7_p1_r1.vqh

Index: _44u7_p1_r1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p1_r1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p1_r1.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p1_r1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -24,7 +25,7 @@
 };
 
 static long _vq_lengthlist__44u7_p1_r1[] = {
-	 2, 3, 3, 3, 4, 4, 3, 4, 4,
+	 3, 3, 3, 3, 4, 3, 3, 3, 4,
 };
 
 static float _vq_quantthresh__44u7_p1_r1[] = {

1.3       +19 -18    vorbis/lib/books/uncoupled/_44u7_p2_0.vqh

Index: _44u7_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p2_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p2_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p2_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,24 +39,24 @@
 };
 
 static long _vq_lengthlist__44u7_p2_0[] = {
-	 2, 4, 4, 6, 6, 7, 7, 9, 9,10,10,10,11,11,11,12,
-	12, 4, 5, 5, 6, 6, 8, 8, 9, 9,10,10,11,11,12,12,
-	12,12, 4, 5, 5, 6, 6, 8, 8, 9, 9,10,10,11,11,12,
-	12,12,12, 6, 6, 6, 8, 8, 9, 9,10,10,11,11,12,11,
-	12,12,13,13, 6, 6, 6, 8, 8, 9, 9,10,10,11,11,11,
-	12,12,12,13,13, 7, 8, 8, 9, 9,10,10,11,10,11,11,
-	12,12,13,12,13,13, 7, 8, 8, 9, 9,10,10,10,11,11,
-	11,12,12,13,13,13,13, 9, 9, 9,10,10,11,10,11,11,
-	12,12,13,12,13,13,14,14, 9, 9, 9,10,10,11,11,11,
-	11,12,12,13,13,13,13,14,14,10,10,10,11,11,11,11,
-	12,12,13,12,13,13,14,14,14,14,10,10,10,11,11,11,
-	11,12,12,12,13,13,13,14,14,14,14,11,11,11,12,12,
-	12,12,13,13,13,13,14,14,14,14,14,14,11,11,11,11,
-	12,12,12,13,13,13,13,14,14,14,14,14,14,11,12,12,
-	12,12,13,13,13,13,14,14,14,14,14,14,15,15,11,12,
-	12,12,12,13,13,13,13,14,14,14,14,14,14,14,15,12,
-	13,12,13,13,13,13,14,14,14,14,14,14,15,15,15,15,
-	12,12,12,13,13,13,13,14,14,14,14,14,15,15,15,15,
+	 2, 4, 4, 6, 6, 7, 7, 9, 9,10,10,10,10,11,11,12,
+	12, 4, 5, 5, 7, 6, 8, 8, 9, 9,10,10,11,11,12,11,
+	12,12, 4, 5, 5, 6, 7, 8, 8, 9, 9,10,10,11,11,11,
+	12,12,12, 6, 7, 6, 8, 7, 9, 8,10,10,10,10,11,11,
+	12,12,13,12, 6, 6, 7, 7, 8, 9, 9, 9,10,10,10,11,
+	11,12,12,12,12, 7, 8, 8, 9, 8, 9, 9,10,10,11,11,
+	12,12,12,12,13,13, 7, 8, 8, 9, 9, 9, 9,10,10,11,
+	11,12,12,12,12,13,13, 9, 9, 9,10,10,10,10,11,11,
+	12,11,12,12,13,13,13,13, 9, 9, 9, 9,10,10,10,11,
+	11,11,12,12,12,13,13,13,13,10,10,10,11,10,11,11,
+	12,11,12,12,13,12,13,13,14,14,10,10,10,10,11,11,
+	11,11,12,12,12,13,13,13,13,14,14,10,11,11,11,11,
+	12,12,12,12,13,13,13,13,14,14,14,14,10,11,11,11,
+	11,12,12,12,12,13,13,13,13,14,14,14,14,11,12,12,
+	12,12,12,12,13,13,13,13,14,14,14,14,15,14,11,12,
+	12,12,12,12,12,13,13,13,13,13,14,14,14,14,14,12,
+	12,12,13,13,13,13,13,13,14,13,14,14,14,14,15,15,
+	12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,14,
         15,
 };
 

1.3       +26 -25    vorbis/lib/books/uncoupled/_44u7_p2_1.vqh

Index: _44u7_p2_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p2_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p2_1.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p2_1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,44 +27,44 @@
 };
 
 static long _vq_lengthlist__44u7_p2_1[] = {
-	 5, 7, 7, 8, 8, 8, 9, 8, 9, 9, 8, 8, 9, 9, 9, 9,
+	 5, 8, 8, 9, 9, 8, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9,
          9, 9, 9, 9, 9, 9, 9, 9, 9, 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, 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, 9, 9,10,
-	 9, 9, 9,10,10, 9, 9, 9,10,10, 9,10,10,10,10, 9,
-	10,10,10,10, 9, 9, 9,10, 9, 9, 9, 9,10,10, 9, 9,
-	 9,10,10, 9, 9,10,10,10, 9, 9,10,10,10, 7, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	10, 9, 9, 9,10,10, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,10, 9, 9, 9,10,10, 8,
          9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10, 9,
+	 9, 9,10,10, 9, 9, 9,10, 9, 9, 9, 9,10,10, 9, 9,
+	 9,10,10, 9, 9,10,10,10, 9,10, 9,10,10, 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, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10, 9, 9, 9,10,10, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
          9,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10, 9, 9,10,
-	10,10, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
-	10, 9, 9, 9,10,10, 9, 9, 9,10,10, 9,10, 9,10,10,
-	10,10,10,10,10, 9,10,10,10,10, 7, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10, 9, 9,
-	 9,10, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9,10, 9, 9, 9,10,10, 9, 9, 9,10,10, 8, 9, 9, 9,
-	 9, 9, 9, 9,10, 9, 9, 9, 9,10, 9, 9, 9,10,10,10,
-	 9,10,10,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10, 9,
-	 9, 9,10,10, 9,10,10,10,10,10,10,10,10,10, 9, 9,
-	 9,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10,10,10,10,
-	10,10,10,10,10,10,10, 9, 9, 9,10,10, 9, 9, 9,10,
+	10,10, 9,10, 9,10,10, 9,10,10,10,10,10,10,10,10,
+	10, 9, 9, 9,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10,
+	10,10,10,10,10, 9,10,10,10,10, 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, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,10, 9, 9, 9,10,10, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
+	 9, 9, 9,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10, 9,
+	 9, 9,10,10, 9,10,10,10,10, 9,10,10,10,10, 9, 9,
+	 9,10,10, 9, 9, 9,10,10, 9, 9,10,10,10, 9,10,10,
+	10,10, 9,10,10,10,10, 9, 9, 9, 9,10, 9, 9, 9,10,
         10, 9, 9, 9,10,10,10,10,10,10,10, 9,10,10,10,10,
-	 9, 9, 9,10,10, 9, 9,10,10,10, 9,10, 9,10,10,10,
+	 9, 9, 9,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10,10,
         10,10,10,10,10,10,10,10,10, 9, 9, 9,10,10, 9, 9,
          9,10,10, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,
-	10,10, 9,10,10,10,10, 9,10,10,10,10, 9,10,10,10,
+	10,10, 9, 9,10,10,10, 9,10,10,10,10, 9,10,10,10,
         10,10,10,10,10,10,10,10,10,10,10, 9,10,10,10,10,
          9,10,10,10,10, 9,10,10,10,10,10,10,10,10,10,10,
         10,10,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10, 9, 9,
          9,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
-	10,10, 9,10, 9,10,10, 9, 9,10,10,10,10,10,10,10,
+	10,10, 9, 9, 9,10,10, 9, 9, 9,10,10,10,10,10,10,
         10,10,10,10,10,10, 9, 9, 9,10,10, 9, 9, 9,10,10,
-	 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10, 9,
-	10,10,10,10, 9,10,10,10,10, 9,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10, 9,10,10,10,10, 9,10,10,
+	 9, 9, 9,10,10, 9,10,10,10,10,10,10,10,10,10, 9,
+	 9, 9,10,10, 9,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10, 9, 9, 9,10,10, 9,10, 9,
         10,10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,
         10,
 };

1.3       +5 -4      vorbis/lib/books/uncoupled/_44u7_p3_0.vqh

Index: _44u7_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p3_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p3_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p3_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -25,10 +26,10 @@
 
 static long _vq_lengthlist__44u7_p3_0[] = {
          1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7,
-	 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 8,10,
-	 9, 7, 9, 9, 7,10, 9, 9,10,11, 9,11,11, 7, 9, 9,
-	 9,11,10, 9,11,11, 5, 7, 7, 7, 9, 9, 8, 9, 9, 7,
-	 9, 9, 9,11,11, 9,10,11, 7, 9, 9, 9,11,11, 9,11,
+	 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 8, 9,
+	 9, 7, 9, 9, 7, 9, 9, 9,10,11, 9,11,11, 7, 9, 9,
+	 9,11, 9, 9,11,11, 5, 7, 7, 8, 9, 9, 8, 9, 9, 7,
+	 9, 9, 9,11,11, 9, 9,11, 7, 9, 9, 9,11,11, 9,11,
         10,
 };
 

1.3       +24 -23    vorbis/lib/books/uncoupled/_44u7_p4_0.vqh

Index: _44u7_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p4_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p4_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p4_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -26,45 +27,45 @@
 };
 
 static long _vq_lengthlist__44u7_p4_0[] = {
-	 3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8,
+	 3, 5, 5, 8, 8, 6, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8,
          9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8,
-	 8,10,10, 7, 8, 8,10,10, 9,10,10,11,12, 9,10,10,
+	 8,10,10, 7, 8, 8, 9,10, 9,10,10,11,12, 9,10,10,
         11,12, 6, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,
-	10, 9,10,10,12,11, 9,10,10,12,11, 8, 9, 9,11,11,
+	10, 9,10, 9,12,11, 9,10,10,12,11, 9, 9, 9,11,11,
          9,10,10,12,12, 9,10,10,12,12,11,12,12,13,13,11,
-	11,12,13,13, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
+	11,12,13,13, 8, 9, 9,11,12, 9,10,10,12,12, 9,10,
         10,12,12,11,12,11,13,13,11,12,12,13,13, 5, 7, 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,10,10, 8, 9, 9,10,11,
-	 8, 9, 9,11,11,10,10,11,12,12,10,11,11,12,12, 7,
+	12, 9,10,10,11,12, 7, 8, 8,10,10, 8, 9, 9,11,11,
+	 8, 9, 9,11,11,10,10,11,12,12,10,10,11,12,12, 7,
          8, 8,10,10, 8, 9, 8,11,10, 8, 9, 9,11,11,10,11,
         10,12,11,10,11,11,12,12, 9,10,10,12,12,10,11,11,
-	12,12,10,11,11,13,13,12,12,12,13,14,12,12,12,14,
+	12,13,10,11,11,12,12,12,12,12,13,14,12,12,12,13,
         14, 9,10,10,12,12,10,11,10,12,12,10,11,11,12,13,
-	11,12,11,14,12,12,12,12,14,14, 5, 7, 7, 9, 9, 7,
+	11,12,11,14,12,12,13,12,14,14, 5, 7, 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,10,10, 8, 9, 9,11,11, 8, 8, 9,
-	10,11,10,11,11,12,12,10,10,11,11,12, 7, 8, 8,10,
-	10, 8, 9, 9,11,11, 8, 9, 9,11,10,10,11,11,12,12,
+	10,12,12, 7, 8, 8,10,10, 8, 9, 9,11,10, 8, 8, 9,
+	10,11,10,11,11,12,12,10,10,11,11,13, 7, 8, 8,10,
+	10, 8, 9, 9,11,11, 8, 9, 9,11,11,10,11,10,12,12,
         10,11,11,12,12, 9,10,10,12,12,10,11,11,13,12,10,
-	10,11,12,12,12,13,12,14,14,11,11,12,12,14, 9,10,
-	10,12,12,10,11,11,12,12,10,11,11,13,13,12,12,12,
+	10,11,12,12,12,13,13,14,14,11,11,12,12,14, 9,10,
+	10,12,12,10,11,11,12,12,10,11,11,13,12,12,12,12,
         14,14,12,13,12,14,13, 8, 9, 9,11,11, 9,10,10,12,
-	12, 9,10,10,12,12,11,12,12,14,13,11,12,12,13,13,
-	 9,10,10,12,12,10,11,11,13,13,10,11,11,13,12,12,
-	12,13,14,14,12,12,12,14,14, 9,10,10,12,12,10,11,
+	12, 9,10,10,12,12,12,12,12,14,13,11,12,12,13,13,
+	 9,10,10,12,12,10,11,11,12,13,10,11,11,13,12,12,
+	13,13,14,14,12,12,13,14,14, 9,10,10,12,12,10,11,
         10,13,12,10,11,11,12,13,12,13,12,14,13,12,12,13,
-	14,14,11,12,12,14,13,12,12,12,14,14,12,13,12,14,
-	14,13,13,14,13,15,13,14,14,15,15,11,12,12,13,13,
-	11,12,12,14,13,12,12,12,13,14,13,14,13,15,13,14,
+	14,14,11,12,12,14,13,12,12,12,14,14,12,13,13,14,
+	14,13,13,14,13,15,14,14,14,15,15,11,12,12,13,13,
+	11,12,11,14,13,12,12,13,14,14,13,13,12,15,13,14,
         14,14,15,15, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,12,13,13,11,12,12,13,14, 9,10,10,
+	10,12,12,11,12,12,13,13,12,12,12,13,13, 9,10,10,
         12,12,10,11,11,13,12,10,10,11,12,13,12,13,12,14,
         14,12,12,13,13,14, 9,10,10,12,12,10,11,11,12,13,
-	10,11,11,13,13,12,12,12,14,14,12,13,12,14,14,11,
+	10,11,11,12,12,12,12,12,14,14,12,13,12,14,13,11,
         12,12,13,13,12,12,12,14,14,11,11,12,13,14,13,14,
-	14,15,15,13,12,14,13,15,11,12,12,13,14,12,13,12,
-	14,14,11,12,12,14,14,13,14,14,15,15,13,14,13,15,
+	14,15,15,13,12,14,12,15,11,12,12,13,14,12,13,13,
+	14,14,12,12,12,14,14,13,14,14,15,15,13,14,13,15,
         13,
 };
 

1.3       +6 -5      vorbis/lib/books/uncoupled/_44u7_p5_0.vqh

Index: _44u7_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p5_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p5_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p5_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -30,11 +31,11 @@
 };
 
 static long _vq_lengthlist__44u7_p5_0[] = {
-	 3, 4, 4, 5, 5, 7, 7, 8, 8, 4, 5, 4, 6, 6, 7, 7,
-	 9, 9, 4, 5, 5, 6, 6, 7, 7, 9, 9, 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, 7, 7, 7, 8, 8, 9, 9,10,10, 8,
-	 9, 9, 9, 9,10,10,11,11, 9, 9, 9, 9, 9,10,10,11,
+	 3, 4, 4, 5, 5, 7, 7, 8, 8, 4, 5, 5, 6, 6, 7, 7,
+	 9, 8, 4, 5, 5, 6, 6, 7, 7, 8, 9, 5, 6, 6, 7, 6,
+	 8, 7, 9, 9, 5, 6, 6, 6, 7, 8, 8, 9, 9, 7, 7, 7,
+	 8, 8, 9, 8,10,10, 7, 7, 7, 8, 8, 8, 9,10,10, 8,
+	 9, 9, 9, 9,10,10,11,11, 8, 8, 9, 9, 9,10,10,11,
         11,
 };
 

1.3       +13 -12    vorbis/lib/books/uncoupled/_44u7_p6_0.vqh

Index: _44u7_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p6_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p6_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p6_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -38,24 +39,24 @@
 };
 
 static long _vq_lengthlist__44u7_p6_0[] = {
-	 4, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
+	 4, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,11,11,
         11, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 9,11,11,
         12,12, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9,10,11,
-	11,12,12, 6, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9,10,10,
+	11,12,12, 6, 6, 6, 7, 6, 7, 7, 8, 8, 9, 9,10,10,
         11,11,12,12, 6, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9,10,
-	10,11,11,12,12, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,
+	10,11,11,12,12, 7, 7, 7, 7, 7, 8, 8, 9, 8, 9, 9,
         10,10,11,11,12,12, 7, 7, 7, 7, 7, 8, 8, 8, 9, 9,
-	 9,10,10,11,11,12,12, 8, 8, 8, 8, 8, 9, 9, 9, 9,
-	10,10,11,10,12,11,12,12, 8, 8, 8, 8, 8, 9, 9, 9,
+	 9,10,10,11,11,12,12, 8, 8, 8, 8, 8, 9, 8, 9, 9,
+	10, 9,11,10,12,11,12,12, 8, 8, 8, 8, 8, 8, 9, 9,
          9,10,10,10,11,11,12,12,12, 8, 8, 8, 9, 9, 9, 9,
-	10,10,10,10,11,11,12,12,13,13, 8, 8, 8, 9, 9, 9,
+	10, 9,10,10,11,11,12,12,13,12, 8, 8, 8, 9, 9, 9,
          9,10,10,10,10,11,11,12,12,13,13, 9,10, 9,10,10,
-	10,10,11,10,11,11,12,12,12,12,13,13, 9, 9,10,10,
-	10,10,10,10,11,11,11,12,12,12,12,13,13,10,11,11,
-	11,11,11,11,12,11,12,12,12,12,13,13,14,14,11,11,
-	11,11,11,11,11,11,12,12,12,12,12,13,13,14,14,12,
-	12,12,12,12,12,12,13,12,13,13,13,13,14,14,14,14,
-	12,12,12,12,12,12,12,12,13,13,13,13,13,14,14,14,
+	10,10,11,10,11,11,12,11,12,12,13,13, 9, 9,10,10,
+	10,10,10,10,11,11,11,11,12,12,12,13,13,11,11,11,
+	11,11,11,11,12,11,12,12,12,12,13,13,14,13,11,11,
+	11,11,11,11,11,11,12,12,12,12,12,13,13,13,14,12,
+	12,12,12,12,12,12,12,12,13,13,13,13,14,13,14,14,
+	12,12,12,12,12,12,12,12,13,13,13,13,13,13,14,14,
         14,
 };
 

1.3       +9 -8      vorbis/lib/books/uncoupled/_44u7_p7_0.vqh

Index: _44u7_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p7_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p7_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -32,14 +33,14 @@
 };
 
 static long _vq_lengthlist__44u7_p7_0[] = {
-	 2, 4, 4, 6, 6, 7, 7, 9, 9,10,10, 4, 5, 5, 6, 6,
-	 8, 8, 9, 9,11,10, 4, 5, 5, 6, 6, 8, 8, 9, 9,10,
-	11, 6, 6, 6, 7, 7, 8, 8,10, 9,11,11, 6, 6, 7, 7,
-	 7, 8, 8, 9,10,11,11, 7, 8, 8, 8, 8, 9, 9,10,10,
-	11,11, 7, 8, 8, 8, 8, 9, 9,10,10,11,12, 9, 9, 9,
-	10,10,10,10,11,11,12,12, 9, 9, 9,10,10,10,10,11,
-	11,12,12,10,11,10,11,11,12,11,12,12,13,13,10,10,
-	11,11,11,11,11,12,12,13,13,
+	 3, 4, 4, 6, 5, 7, 7, 8, 8,10,10, 4, 5, 4, 6, 6,
+	 7, 7, 9, 8,10,10, 4, 5, 5, 6, 6, 7, 7, 8, 9,10,
+	10, 6, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 6, 6, 7,
+	 7, 8, 8, 9, 9,10,10, 7, 7, 7, 8, 8, 9, 8,10, 9,
+	11,11, 7, 7, 7, 8, 8, 8, 9,10,10,11,11, 8, 9, 8,
+	 9, 9,10, 9,10,10,11,11, 8, 8, 9, 9, 9, 9,10,10,
+	10,11,11,10,10,10,10,10,11,11,11,11,12,12,10,10,
+	10,10,10,11,11,11,11,12,12,
 };
 
 static float _vq_quantthresh__44u7_p7_0[] = {

1.3       +5 -4      vorbis/lib/books/uncoupled/_44u7_p7_1.vqh

Index: _44u7_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p7_1.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p7_1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -25,10 +26,10 @@
 
 static long _vq_lengthlist__44u7_p7_1[] = {
          5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6,
-	 6, 6, 6, 6, 6, 6, 7, 6, 6, 6, 7, 6, 6, 6, 6, 7,
-	 7, 6, 7, 7, 6, 7, 7, 6, 7, 7, 6, 7, 7, 6, 7, 7,
-	 6, 7, 7, 7, 7, 7, 6, 6, 6, 6, 7, 7, 6, 7, 7, 6,
-	 7, 7, 6, 7, 7, 6, 7, 7, 6, 7, 7, 6, 7, 7, 6, 7,
+	 6, 7, 6, 6, 6, 6, 7, 6, 6, 6, 6, 6, 6, 6, 6, 7,
+	 7, 6, 7, 7, 6, 6, 7, 6, 7, 7, 6, 7, 7, 6, 7, 7,
+	 6, 7, 7, 6, 7, 7, 6, 6, 6, 6, 7, 7, 6, 7, 7, 6,
+	 7, 7, 7, 7, 7, 6, 7, 7, 6, 7, 7, 6, 7, 7, 7, 7,
          7,
 };
 

1.3       +18 -17    vorbis/lib/books/uncoupled/_44u7_p8_0.vqh

Index: _44u7_p8_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p8_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p8_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p8_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -39,23 +40,23 @@
 
 static long _vq_lengthlist__44u7_p8_0[] = {
          2, 4, 4, 6, 6, 7, 7, 9, 9,10,10,11,11,11,11,12,
-	12, 4, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11,11,11,
-	12,12, 4, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11,11,
-	11,12,12, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10,11,11,
-	12,12,12,12, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10,11,
-	11,12,12,12,12, 7, 8, 8, 8, 8, 9, 9,10,10,11,11,
-	12,11,12,12,13,13, 7, 8, 8, 8, 8, 9, 9,10,10,11,
-	11,11,12,12,12,13,13, 9, 9, 9, 9, 9,10,10,11,11,
-	11,11,12,12,12,12,13,13, 9, 9, 9, 9, 9,10,10,10,
-	11,11,11,12,12,12,12,13,13,10,10,10,10,10,11,11,
-	11,11,12,12,12,12,13,13,13,13,10,10,10,10,10,11,
-	11,11,11,12,12,12,12,13,13,13,13,11,11,11,11,11,
-	12,11,12,12,12,12,13,13,13,13,14,14,11,11,11,11,
-	11,11,12,12,12,12,12,13,13,13,13,14,14,11,11,11,
-	12,12,12,12,13,12,13,13,13,13,14,14,14,14,11,11,
-	11,12,12,12,12,12,12,13,13,13,13,14,14,14,14,12,
-	12,12,13,12,13,13,13,13,13,13,14,14,14,14,14,15,
-	12,12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,
+	12, 4, 5, 5, 7, 6, 8, 8, 9, 9,10,10,11,11,12,11,
+	12,12, 4, 5, 5, 6, 7, 8, 8, 9, 9,10,10,11,11,11,
+	12,12,12, 6, 7, 7, 7, 7, 8, 8,10, 9,11,10,11,11,
+	12,12,13,13, 6, 7, 7, 7, 7, 8, 8, 9,10,10,11,11,
+	11,12,12,13,13, 7, 8, 8, 8, 8, 9, 9,10,10,11,11,
+	12,12,12,12,13,13, 8, 8, 8, 8, 8, 9, 9,10,10,11,
+	11,12,12,12,12,13,13, 9, 9, 9,10, 9,10,10,11,11,
+	11,11,12,12,13,12,13,13, 9, 9, 9, 9,10,10,10,11,
+	11,11,11,12,12,13,13,13,13,10,10,10,11,10,11,11,
+	11,11,12,12,13,13,13,13,14,14,10,10,10,10,11,11,
+	11,11,11,12,12,13,13,13,13,14,14,11,11,11,11,11,
+	12,12,12,12,13,13,13,13,13,13,14,14,11,11,11,11,
+	11,12,12,12,12,13,13,13,13,13,13,14,14,11,12,12,
+	12,12,12,12,13,13,13,13,13,13,14,14,14,14,11,12,
+	12,12,12,12,12,13,13,13,13,13,13,14,14,14,14,12,
+	12,12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,
+	12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,15,
         15,
 };
 

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u7_p8_1.vqh

Index: _44u7_p8_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p8_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p8_1.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p8_1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.3       +16 -15    vorbis/lib/books/uncoupled/_44u7_p9_0.vqh

Index: _44u7_p9_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p9_0.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p9_0.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p9_0.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -36,21 +37,21 @@
 };
 
 static long _vq_lengthlist__44u7_p9_0[] = {
-	 1, 3, 3, 5, 5, 9, 7,13,12,17,17,17,17,17,17, 4,
-	 7, 6,10, 9,14,13,17,17,17,17,17,17,17,17, 4, 7,
-	 7,10, 9,14,14,17,17,17,17,17,17,17,17, 9,13,12,
-	15,15,17,17,17,17,17,17,17,17,17,17, 9,12,12,14,
-	15,17,17,17,17,17,17,17,17,17,17,13,14,15,17,17,
-	17,17,17,17,17,17,17,17,17,17,12,16,13,17,17,17,
-	17,17,17,17,17,17,17,17,17,14,17,17,17,17,17,17,
-	17,17,17,17,17,17,17,17,14,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,17,17,17,17,17,17,17,
-	17,17,17,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,
+	 1, 3, 3, 5, 6, 9, 7,12,10,15,15,15,15,15,15, 4,
+	 7, 6, 9, 9,12,12,14,14,15,15,15,15,15,15, 4, 7,
+	 7, 9, 9,12,13,14,14,15,15,15,15,15,15, 9,11,11,
+	13,11,15,15,15,15,15,15,15,15,15,15, 8,10,11,11,
+	14,15,15,15,15,15,15,15,15,15,15,11,12,12,15,15,
+	15,15,15,15,15,15,15,15,15,15,10,13,12,15,15,15,
+	15,15,15,15,15,15,15,15,15,12,14,15,15,15,15,15,
+	15,15,15,15,15,15,15,15,11,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,15,15,15,15,15,15,15,15,15,15,15,14,14,14,
+	14,14,14,14,14,14,14,14,14,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__44u7_p9_0[] = {

1.3       +27 -26    vorbis/lib/books/uncoupled/_44u7_p9_1.vqh

Index: _44u7_p9_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p9_1.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p9_1.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p9_1.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother
@@ -46,37 +47,37 @@
 static long _vq_lengthlist__44u7_p9_1[] = {
          1, 4, 4, 7, 7, 8, 8,10,10,11,11,12,12,13,13,13,
         13,13,14,14,14,14,14, 4, 5, 5, 8, 8,10, 9,11,10,
-	11,11,12,12,13,13,14,14,14,14,14,14,14,14, 4, 5,
-	 6, 8, 8, 9, 9,10,11,11,12,12,12,13,13,13,14,14,
+	11,11,12,12,13,12,13,13,14,14,14,14,14,14, 4, 5,
+	 6, 8, 8, 9, 9,10,11,11,12,12,12,13,13,13,13,14,
         14,14,14,14,14, 7, 8, 8, 9, 9,10,10,11,11,12,12,
-	13,13,14,13,14,14,14,14,14,15,15,15, 7, 8, 8, 9,
+	13,13,14,13,14,14,15,14,15,15,15,15, 7, 8, 8, 9,
          9,10,10,11,11,12,12,13,13,13,14,14,14,14,14,14,
-	14,15,15, 9,10,10,11,10,11,11,12,12,13,13,14,13,
+	14,15,15, 9,10,10,10,10,11,11,12,12,13,13,14,13,
         14,14,15,15,15,15,15,15,15,15, 9,10,10,10,10,11,
-	11,12,12,13,13,13,13,14,14,14,15,15,15,15,15,15,
+	11,12,12,13,13,13,14,14,14,15,15,15,15,15,15,15,
         15,10,11,11,11,11,12,12,13,13,13,14,14,14,15,15,
-	15,15,15,15,16,15,16,15,10,11,11,12,11,12,12,13,
-	13,13,13,14,14,15,15,15,15,15,15,15,15,16,15,11,
-	12,12,12,12,13,13,14,13,14,14,15,15,15,15,16,16,
-	16,16,16,16,16,15,12,12,12,12,13,13,13,14,14,15,
+	15,15,15,16,16,15,16,16,10,11,11,11,11,12,12,13,
+	12,13,13,14,14,15,15,15,15,16,15,16,16,16,16,12,
+	12,12,12,13,13,13,14,13,14,14,15,15,15,15,16,16,
+	16,16,16,16,16,16,12,12,12,13,12,13,13,14,14,14,
         14,15,15,15,15,16,16,16,16,16,16,16,16,13,13,13,
-	13,13,14,14,14,14,15,15,15,15,16,16,16,16,16,16,
-	16,16,16,16,13,13,13,13,14,14,14,14,14,15,15,16,
-	16,16,16,16,16,16,16,16,16,17,16,13,14,14,14,14,
-	15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,17,
-	17,17,13,13,14,14,14,15,14,15,15,15,15,16,16,16,
-	16,16,16,16,17,16,16,17,16,14,14,14,14,14,15,15,
-	15,15,16,16,16,16,16,16,16,17,17,17,17,16,17,17,
-	14,14,14,14,15,15,15,15,15,15,16,16,16,16,16,16,
-	16,17,16,17,17,16,17,14,14,15,15,15,15,15,16,15,
-	16,16,16,16,16,17,16,17,17,17,17,17,17,16,14,14,
-	14,15,15,15,16,16,16,16,16,16,16,16,16,17,17,17,
-	16,17,17,17,17,14,15,15,15,15,15,16,16,16,16,16,
-	16,16,17,17,16,17,16,17,17,17,17,17,14,15,15,15,
-	15,16,15,16,16,16,16,16,16,16,16,17,16,16,17,17,
-	17,16,17,15,15,15,15,15,16,15,16,16,16,16,17,16,
-	17,17,16,17,16,16,17,17,17,17,15,15,15,15,15,16,
-	16,16,16,16,16,17,16,16,16,17,16,17,17,17,17,16,
+	13,14,14,14,14,14,15,15,15,15,16,16,16,16,16,16,
+	16,16,16,16,13,13,13,14,13,14,14,14,14,15,15,15,
+	16,16,16,16,16,17,16,16,17,17,17,13,13,14,14,14,
+	15,14,15,15,15,16,16,16,16,16,16,17,17,17,17,16,
+	17,17,14,14,14,14,14,14,14,15,15,16,15,16,16,16,
+	16,17,16,16,17,16,17,17,17,14,14,14,14,15,15,15,
+	15,15,15,15,16,16,17,16,17,17,17,17,17,17,17,17,
+	14,14,14,15,14,15,15,15,15,16,16,16,16,16,16,17,
+	16,17,16,17,16,17,17,14,14,15,15,15,15,15,16,16,
+	16,16,16,17,17,17,17,16,17,17,17,17,18,17,14,15,
+	15,15,15,16,15,16,16,16,16,16,16,16,16,17,17,17,
+	17,17,17,17,17,14,15,15,15,15,16,16,16,16,17,16,
+	16,16,17,16,17,17,17,18,17,17,17,17,15,15,15,15,
+	15,16,16,16,16,17,16,17,16,17,17,17,17,17,17,17,
+	17,17,17,15,15,15,16,15,16,16,16,16,16,16,17,17,
+	17,17,17,17,16,17,17,17,17,17,15,15,15,15,15,16,
+	16,17,16,17,17,17,17,17,17,17,17,17,17,17,17,17,
         17,
 };
 

1.3       +1 -0      vorbis/lib/books/uncoupled/_44u7_p9_2.vqh

Index: _44u7_p9_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/uncoupled/_44u7_p9_2.vqh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _44u7_p9_2.vqh	2001/12/17 00:17:32	1.2
+++ _44u7_p9_2.vqh	2001/12/19 01:10:18	1.3
@@ -7,6 +7,7 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: static codebook autogenerated by vq/somethingorother

1.4       +48 -78    vorbis/lib/modes/psych_44.h

Index: psych_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/psych_44.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- psych_44.h	2001/12/14 07:21:29	1.3
+++ psych_44.h	2001/12/19 01:10:27	1.4
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: psych_44.h,v 1.3 2001/12/14 07:21:29 xiphmont Exp $
+ last mod: $Id: psych_44.h,v 1.4 2001/12/19 01:10:27 xiphmont Exp $
 
  ********************************************************************/
 
@@ -566,92 +566,50 @@
   10,10,100,
 };
 
-static vorbis_info_psy _psy_settings[11]={
-  /* zero */
-  { /* ATH style              ,float,min */ 
-    {-1},-100.,-110.,
+static double _psy_tone_masteratt[11]={
+  3.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,
+};
+
+static double _psy_tone_masterguard[11]={
+  -18.,-24.,-24.,-24.,-26.,-40.,-40.,-40.,-45.,-45.,-45.,
+};
+
+static double _psy_tone_suppress[11]={
+  -10.,-20.,-20.,-20.,-30.,-30.,-40.,-40.,-45.,-45.,-45.,
+};
+
+static double _psy_tone_0dB[11]={
+  95.,95.,95.,95.,95.,105.,105.,105.,105.,105.,105.,
+};
+
+static double _psy_noise_suppress[11]={
+   -0.,-24.,-24.,-24.,-24.,-30.,-40.,-40.,-45.,-45.,-45.,
+};
 
+static int _psy_ehmer_bandlimit[11]={
+  0,0,0,0,4,4,30,30,30,30,30,
+};
+
+static vorbis_info_psy _psy_info_template={
+    {-1},-110.,-140.,
     /* tonemask att,guard,suppr,curves  peakattp,curvelimitp,peaksettings*/
-    0.f,            -18.f,-10.f, {{{0.}}},         1,          0,        {{{0.}}},
+    0.f,            -40.f,-40.f, {{{0.}}},         1,          0,        {{{0.}}},
     
     /*noisemaskp,supp, low/high window, low/hi guard, minimum */
     1,          -0.f,         .5f, .5f,         0,0,0,
-    {-1},{-1},95.f,{{-1}}
-  },
-  /* one */
-  { 
-    {-1},-100.,-110.,
-    0.f,-24.f,-20.f, {{{0.}}},  1,0,{{{0.}}},
-    1,-24.f,.5f,.5f,0,0,0,
-    {-1},{-1},95.f,{{-1}}
-  },
-  /* two */
-  { 
-    {-1},-100.,-120.,
-    0.f,-24.f,-20.f, {{{0.}}},  1,0,{{{0.}}},
-    1,-24.f,.5f,.5f,0,0,0,
-    {-1},{-1},95.f,{{-1}}
-  },
-  /* three */
-  { 
-    {-1},-100.,-140.,
-    0.f,-24.f,-20.f, {{{0.}}},  1,0,{{{0.}}},
-    1,-24.f,.5f,.5f,0,0,0,
-    {-1},{-1},95.f,{{-1}}
-  },
-  /* four */
-  { 
-    {-1},-100.,-140.,
-    0.f,-26.f,-30.f, {{{0.}}},  1,4,{{{0.}}},
-    1,-24.f,.5f,.5f,0,0,0,
-    {-1},{-1},95.f,{{-1}}
-  },
-  /* five */
-  { 
-    {-1},-100.,-140.,
-    0.f,-40.f,-30.f, {{{0.}}},  1,4,{{{0.}}},
-    1,-30.f,.5f,.5f,0,0,0,
-    {-1},{-1},105.f,{{-1}}
-  },
-  /* six */
-  { 
-    {-1},-100.,-140.,
-    0.f,-40.f,-40.f, {{{0.}}},  1,30,{{{0.}}},
-    1,-40.f,.5f,.5f,0,0,0,
-    {-1},{-1},105.f,{{-1}}
-  },
-  /* seven */
-  { 
-    {-1},-100.,-140.,
-    0.f,-40.f,-40.f, {{{0.}}},  1,30,{{{0.}}},
-    1,-40.f,.5f,.5f,0,0,0,
-    {-1},{-1},105.f,{{-1}}
-  },
-  /* eight */
-  { 
-    {-1},-100.,-140.,
-    0.f,-45.f,-45.f, {{{0.}}},  1,30,{{{0.}}},
-    1,-45.f,.5f,.5f,0,0,0,
-    {-1},{-1},105.f,{{-1}}
-  },
-  /* nine */
-  { 
-    {-1},-110.,-140.,
-    0.f,-45.f,-45.f, {{{0.}}},  1,30,{{{0.}}},
-    1,-45.f,.5f,.5f,0,0,0,
-    {-1},{-1},105.f,{{-1}}
-  },
-  /* ten */
-  { 
-    {-1},-120.,-150.,
-    0.f,-45.f,-45.f, {{{0.}}},  1,30,{{{0.}}},
-    1,-45.f,.5f,.5f,0,0,0,
-    {-1},{-1},105.f,{{-1}}
-  }
+    {-1},{-1},105.f,{{-1,-1,{{-1,-1,-1,-1}}}}
 };
 
 /* ath ****************/
 
+static double _psy_ath_floater[11]={
+  -100.,-100.,-100.,-100.,-100.,-100.,-105.,-105.,-105.,-110.,-120.,
+};
+
+static double _psy_ath_abs[11]={
+  -110.,-110.,-120.,-140.,-140.,-140.,-140.,-140.,-140.,-140.,-150.,
+};
+
 static float ATH_Bark_dB[][27]={
   {
      0.f,  15.f,  15.f,   15.f,   11.f,       10.f,   8.f,  7.f,   7.f,  7.f,
@@ -668,4 +626,16 @@
     6.f,   2.f,   0.f,    0.f,   -3.f,       -5.f,  -6.f, -6.f,-4.5f, 0.f,
     2.f,   6.f,   5.f,    5.f,   15.f,       15.f,  15.f,
   }
+};
+
+/* stereo ****************/
+static int _psy_stereo_point_dB_44[11]={3,  3,  2,  2,   1,  0,  0,  0,  0,  0,  0};
+static double _psy_stereo_point_kHz_44[2][11]={
+  {4., 6., 6., 6., 10., 6., 6., 4., 4., 4., 4.},
+  {6., 6., 6., 10., 10., 6., 6., 4., 4., 4., 4.}
+};
+
+/* lowpass **************/
+static double _psy_lowpass_44[11]={
+  15.1,15.8,16.5,17.9,20.5,48.,999.,999.,999.,999.,999.
 };

1.5       +605 -137  vorbis/lib/modes/residue_44.h

Index: residue_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/residue_44.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- residue_44.h	2001/12/16 04:15:56	1.4
+++ residue_44.h	2001/12/19 01:10:27	1.5
@@ -8,10 +8,10 @@
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
- ********************************************************************
+v ********************************************************************
 
  function: toplevel residue templates for 32/44.1/48kHz
- last mod: $Id: residue_44.h,v 1.4 2001/12/16 04:15:56 xiphmont Exp $
+ last mod: $Id: residue_44.h,v 1.5 2001/12/19 01:10:27 xiphmont Exp $
 
  ********************************************************************/
 
@@ -127,11 +127,37 @@
 #include "books/coupled/_44c0_s0_p3_0.vqh"
 #include "books/coupled/_44c0_s0_p4_0.vqh"
 #include "books/coupled/_44c0_s0_p4_1.vqh"
+#include "books/coupled/_44c0_s0_p5_0.vqh"
 #include "books/coupled/_44c0_s1_p5_0.vqh"
+#include "books/coupled/_44c0_s0_p6_0.vqh"
+#include "books/coupled/_44c0_s1_p6_0.vqh"
 #include "books/coupled/_44c0_s2_p6_0.vqh"
-#include "books/coupled/_44c0_s4_p7_0.vqh"
-#include "books/coupled/_44c0_s4_p7_1.vqh"
-#include "books/coupled/_44c0_s4_p7_2.vqh"
+#include "books/coupled/_44c0_s0_p7_0.vqh"
+#include "books/coupled/_44c0_s0_p7_1.vqh"
+#include "books/coupled/_44c0_s0_p7_2.vqh"
+#include "books/coupled/_44c0_s1_p7_0.vqh"
+#include "books/coupled/_44c0_s1_p7_1.vqh"
+#include "books/coupled/_44c0_s1_p7_2.vqh"
+#include "books/coupled/_44c0_s2_p7_0.vqh"
+#include "books/coupled/_44c0_s2_p7_1.vqh"
+#include "books/coupled/_44c0_s2_p7_2.vqh"
+#include "books/coupled/_44c0_s3_p7_0.vqh"
+#include "books/coupled/_44c0_s3_p7_1.vqh"
+#include "books/coupled/_44c0_s3_p7_2.vqh"
+
+#include "books/coupled/_44c0_s1_p5_s0.vqh"
+#include "books/coupled/_44c0_s1_p6_s0.vqh"
+#include "books/coupled/_44c0_s1_p7_s0.vqh"
+#include "books/coupled/_44c0_s2_p6_s0.vqh"
+#include "books/coupled/_44c0_s2_p7_s0.vqh"
+#include "books/coupled/_44c0_s3_p7_s0.vqh"
+
+#include "books/coupled/_44c0_s0_p0_r0.vqh"
+#include "books/coupled/_44c0_s0_pN_r0.vqh"
+#include "books/coupled/_44c0_s1_pS_r0.vqh"
+#include "books/coupled/_44c0_s0_p0_r1.vqh"
+#include "books/coupled/_44c0_s0_pN_r1.vqh"
+#include "books/coupled/_44c0_s1_pS_r1.vqh"
 
 #include "books/coupled/_44c1_short.vqh"
 #include "books/coupled/_44c1_long.vqh"
@@ -141,8 +167,20 @@
 #include "books/coupled/_44c1_s0_p3_0.vqh"
 #include "books/coupled/_44c1_s0_p4_0.vqh"
 #include "books/coupled/_44c1_s0_p4_1.vqh"
+#include "books/coupled/_44c1_s0_p5_0.vqh"
 #include "books/coupled/_44c1_s1_p5_0.vqh"
+#include "books/coupled/_44c1_s0_p6_0.vqh"
+#include "books/coupled/_44c1_s1_p6_0.vqh"
 #include "books/coupled/_44c1_s2_p6_0.vqh"
+#include "books/coupled/_44c1_s0_p7_0.vqh"
+#include "books/coupled/_44c1_s0_p7_1.vqh"
+#include "books/coupled/_44c1_s0_p7_2.vqh"
+#include "books/coupled/_44c1_s1_p7_0.vqh"
+#include "books/coupled/_44c1_s1_p7_1.vqh"
+#include "books/coupled/_44c1_s1_p7_2.vqh"
+#include "books/coupled/_44c1_s2_p7_0.vqh"
+#include "books/coupled/_44c1_s2_p7_1.vqh"
+#include "books/coupled/_44c1_s2_p7_2.vqh"
 #include "books/coupled/_44c1_s3_p7_0.vqh"
 #include "books/coupled/_44c1_s3_p7_1.vqh"
 #include "books/coupled/_44c1_s3_p7_2.vqh"
@@ -155,12 +193,25 @@
 #include "books/coupled/_44c2_s0_p3_0.vqh"
 #include "books/coupled/_44c2_s0_p4_0.vqh"
 #include "books/coupled/_44c2_s0_p4_1.vqh"
+#include "books/coupled/_44c2_s0_p5_0.vqh"
 #include "books/coupled/_44c2_s1_p5_0.vqh"
+#include "books/coupled/_44c2_s0_p6_0.vqh"
+#include "books/coupled/_44c2_s1_p6_0.vqh"
 #include "books/coupled/_44c2_s2_p6_0.vqh"
+#include "books/coupled/_44c2_s0_p7_0.vqh"
+#include "books/coupled/_44c2_s0_p7_1.vqh"
+#include "books/coupled/_44c2_s0_p7_2.vqh"
+#include "books/coupled/_44c2_s1_p7_0.vqh"
+#include "books/coupled/_44c2_s1_p7_1.vqh"
+#include "books/coupled/_44c2_s1_p7_2.vqh"
 #include "books/coupled/_44c2_s2_p7_0.vqh"
 #include "books/coupled/_44c2_s2_p7_1.vqh"
 #include "books/coupled/_44c2_s2_p7_2.vqh"
+#include "books/coupled/_44c2_s3_p7_0.vqh"
+#include "books/coupled/_44c2_s3_p7_1.vqh"
+#include "books/coupled/_44c2_s3_p7_2.vqh"
 
+
 #include "books/coupled/_44c3_short.vqh"
 #include "books/coupled/_44c3_long.vqh"
 
@@ -169,62 +220,170 @@
 #include "books/coupled/_44c3_s0_p3_0.vqh"
 #include "books/coupled/_44c3_s0_p4_0.vqh"
 #include "books/coupled/_44c3_s0_p4_1.vqh"
+#include "books/coupled/_44c3_s0_p5_0.vqh"
 #include "books/coupled/_44c3_s1_p5_0.vqh"
+#include "books/coupled/_44c3_s0_p6_0.vqh"
+#include "books/coupled/_44c3_s1_p6_0.vqh"
 #include "books/coupled/_44c3_s2_p6_0.vqh"
+#include "books/coupled/_44c3_s0_p7_0.vqh"
+#include "books/coupled/_44c3_s0_p7_1.vqh"
+#include "books/coupled/_44c3_s0_p7_2.vqh"
+#include "books/coupled/_44c3_s1_p7_0.vqh"
+#include "books/coupled/_44c3_s1_p7_1.vqh"
+#include "books/coupled/_44c3_s1_p7_2.vqh"
 #include "books/coupled/_44c3_s2_p7_0.vqh"
 #include "books/coupled/_44c3_s2_p7_1.vqh"
 #include "books/coupled/_44c3_s2_p7_2.vqh"
+#include "books/coupled/_44c3_s3_p7_0.vqh"
+#include "books/coupled/_44c3_s3_p7_1.vqh"
+#include "books/coupled/_44c3_s3_p7_2.vqh"
 
 #include "books/coupled/_44c4_short.vqh"
 #include "books/coupled/_44c4_long.vqh"
 
 #include "books/coupled/_44c4_s0_p1_0.vqh"
+#include "books/coupled/_44c4_s0_p2_0.vqh"
 #include "books/coupled/_44c4_s1_p2_0.vqh"
 #include "books/coupled/_44c4_s0_p3_0.vqh"
+#include "books/coupled/_44c4_s0_p4_0.vqh"
 #include "books/coupled/_44c4_s1_p4_0.vqh"
 #include "books/coupled/_44c4_s0_p5_0.vqh"
+#include "books/coupled/_44c4_s0_p6_0.vqh"
 #include "books/coupled/_44c4_s1_p6_0.vqh"
+#include "books/coupled/_44c4_s2_p6_0.vqh"
+#include "books/coupled/_44c4_s0_p7_0.vqh"
+#include "books/coupled/_44c4_s0_p7_1.vqh"
 #include "books/coupled/_44c4_s1_p7_0.vqh"
 #include "books/coupled/_44c4_s1_p7_1.vqh"
+#include "books/coupled/_44c4_s2_p7_0.vqh"
+#include "books/coupled/_44c4_s2_p7_1.vqh"
+#include "books/coupled/_44c4_s3_p7_0.vqh"
+#include "books/coupled/_44c4_s3_p7_1.vqh"
+#include "books/coupled/_44c4_s0_p8_0.vqh"
+#include "books/coupled/_44c4_s0_p8_1.vqh"
 #include "books/coupled/_44c4_s1_p8_0.vqh"
 #include "books/coupled/_44c4_s1_p8_1.vqh"
+#include "books/coupled/_44c4_s2_p8_0.vqh"
+#include "books/coupled/_44c4_s2_p8_1.vqh"
+#include "books/coupled/_44c4_s3_p8_0.vqh"
+#include "books/coupled/_44c4_s3_p8_1.vqh"
+#include "books/coupled/_44c4_s0_p9_0.vqh"
+#include "books/coupled/_44c4_s0_p9_1.vqh"
+#include "books/coupled/_44c4_s0_p9_2.vqh"
 #include "books/coupled/_44c4_s1_p9_0.vqh"
 #include "books/coupled/_44c4_s1_p9_1.vqh"
 #include "books/coupled/_44c4_s1_p9_2.vqh"
+#include "books/coupled/_44c4_s2_p9_0.vqh"
+#include "books/coupled/_44c4_s2_p9_1.vqh"
+#include "books/coupled/_44c4_s2_p9_2.vqh"
+#include "books/coupled/_44c4_s3_p9_0.vqh"
+#include "books/coupled/_44c4_s3_p9_1.vqh"
+#include "books/coupled/_44c4_s3_p9_2.vqh"
+
+#include "books/coupled/_44c4_s1_p2_s0.vqh"
+#include "books/coupled/_44c4_s1_p4_s0.vqh"
+#include "books/coupled/_44c4_s1_p6_s0.vqh"
+#include "books/coupled/_44c4_s1_p7_s0.vqh"
+#include "books/coupled/_44c4_s1_p8_s0.vqh"
+#include "books/coupled/_44c4_s1_p9_s0.vqh"
+
+#include "books/coupled/_44c4_s2_p6_s0.vqh"
+#include "books/coupled/_44c4_s2_p7_s0.vqh"
+#include "books/coupled/_44c4_s2_p8_s0.vqh"
+#include "books/coupled/_44c4_s2_p9_s0.vqh"
+
+#include "books/coupled/_44c4_s3_p9_s0.vqh"
+
+#include "books/coupled/_44c4_s0_p0_r0.vqh"
+#include "books/coupled/_44c4_s0_p0_r1.vqh"
+#include "books/coupled/_44c4_s0_pN_r0.vqh"
+#include "books/coupled/_44c4_s0_pN_r1.vqh"
+#include "books/coupled/_44c4_s1_pS_r0.vqh"
+#include "books/coupled/_44c4_s1_pS_r1.vqh"
 
 #include "books/coupled/_44c5_short.vqh"
 #include "books/coupled/_44c5_long.vqh"
 
 #include "books/coupled/_44c5_s0_p1_0.vqh"
 #include "books/coupled/_44c5_s0_p2_0.vqh"
+#include "books/coupled/_44c5_s1_p2_0.vqh"
 #include "books/coupled/_44c5_s0_p3_0.vqh"
 #include "books/coupled/_44c5_s0_p4_0.vqh"
+#include "books/coupled/_44c5_s1_p4_0.vqh"
 #include "books/coupled/_44c5_s0_p5_0.vqh"
 #include "books/coupled/_44c5_s0_p6_0.vqh"
+#include "books/coupled/_44c5_s1_p6_0.vqh"
+#include "books/coupled/_44c5_s2_p6_0.vqh"
 #include "books/coupled/_44c5_s0_p7_0.vqh"
 #include "books/coupled/_44c5_s0_p7_1.vqh"
+#include "books/coupled/_44c5_s1_p7_0.vqh"
+#include "books/coupled/_44c5_s1_p7_1.vqh"
+#include "books/coupled/_44c5_s2_p7_0.vqh"
+#include "books/coupled/_44c5_s2_p7_1.vqh"
+#include "books/coupled/_44c5_s3_p7_0.vqh"
+#include "books/coupled/_44c5_s3_p7_1.vqh"
 #include "books/coupled/_44c5_s0_p8_0.vqh"
 #include "books/coupled/_44c5_s0_p8_1.vqh"
+#include "books/coupled/_44c5_s1_p8_0.vqh"
+#include "books/coupled/_44c5_s1_p8_1.vqh"
+#include "books/coupled/_44c5_s2_p8_0.vqh"
+#include "books/coupled/_44c5_s2_p8_1.vqh"
+#include "books/coupled/_44c5_s3_p8_0.vqh"
+#include "books/coupled/_44c5_s3_p8_1.vqh"
 #include "books/coupled/_44c5_s0_p9_0.vqh"
 #include "books/coupled/_44c5_s0_p9_1.vqh"
 #include "books/coupled/_44c5_s0_p9_2.vqh"
+#include "books/coupled/_44c5_s1_p9_0.vqh"
+#include "books/coupled/_44c5_s1_p9_1.vqh"
+#include "books/coupled/_44c5_s1_p9_2.vqh"
+#include "books/coupled/_44c5_s2_p9_0.vqh"
+#include "books/coupled/_44c5_s2_p9_1.vqh"
+#include "books/coupled/_44c5_s2_p9_2.vqh"
+#include "books/coupled/_44c5_s3_p9_0.vqh"
+#include "books/coupled/_44c5_s3_p9_1.vqh"
+#include "books/coupled/_44c5_s3_p9_2.vqh"
 
 #include "books/coupled/_44c6_short.vqh"
 #include "books/coupled/_44c6_long.vqh"
 
 #include "books/coupled/_44c6_s0_p1_0.vqh"
 #include "books/coupled/_44c6_s0_p2_0.vqh"
+#include "books/coupled/_44c6_s1_p2_0.vqh"
 #include "books/coupled/_44c6_s0_p3_0.vqh"
 #include "books/coupled/_44c6_s0_p4_0.vqh"
+#include "books/coupled/_44c6_s1_p4_0.vqh"
 #include "books/coupled/_44c6_s0_p5_0.vqh"
 #include "books/coupled/_44c6_s0_p6_0.vqh"
+#include "books/coupled/_44c6_s1_p6_0.vqh"
+#include "books/coupled/_44c6_s2_p6_0.vqh"
 #include "books/coupled/_44c6_s0_p7_0.vqh"
 #include "books/coupled/_44c6_s0_p7_1.vqh"
+#include "books/coupled/_44c6_s1_p7_0.vqh"
+#include "books/coupled/_44c6_s1_p7_1.vqh"
+#include "books/coupled/_44c6_s2_p7_0.vqh"
+#include "books/coupled/_44c6_s2_p7_1.vqh"
+#include "books/coupled/_44c6_s3_p7_0.vqh"
+#include "books/coupled/_44c6_s3_p7_1.vqh"
 #include "books/coupled/_44c6_s0_p8_0.vqh"
 #include "books/coupled/_44c6_s0_p8_1.vqh"
+#include "books/coupled/_44c6_s1_p8_0.vqh"
+#include "books/coupled/_44c6_s1_p8_1.vqh"
+#include "books/coupled/_44c6_s2_p8_0.vqh"
+#include "books/coupled/_44c6_s2_p8_1.vqh"
+#include "books/coupled/_44c6_s3_p8_0.vqh"
+#include "books/coupled/_44c6_s3_p8_1.vqh"
 #include "books/coupled/_44c6_s0_p9_0.vqh"
 #include "books/coupled/_44c6_s0_p9_1.vqh"
 #include "books/coupled/_44c6_s0_p9_2.vqh"
+#include "books/coupled/_44c6_s1_p9_0.vqh"
+#include "books/coupled/_44c6_s1_p9_1.vqh"
+#include "books/coupled/_44c6_s1_p9_2.vqh"
+#include "books/coupled/_44c6_s2_p9_0.vqh"
+#include "books/coupled/_44c6_s2_p9_1.vqh"
+#include "books/coupled/_44c6_s2_p9_2.vqh"
+#include "books/coupled/_44c6_s3_p9_0.vqh"
+#include "books/coupled/_44c6_s3_p9_1.vqh"
+#include "books/coupled/_44c6_s3_p9_2.vqh"
 
 #include "books/coupled/_44c7_short.vqh"
 #include "books/coupled/_44c7_long.vqh"
@@ -246,6 +405,11 @@
 #include "books/coupled/_44c7_s0_p9_1.vqh"
 #include "books/coupled/_44c7_s0_p9_2.vqh"
 
+#include "books/coupled/_44c7_s0_p0_r0.vqh"
+#include "books/coupled/_44c7_s0_p0_r1.vqh"
+#include "books/coupled/_44c7_s0_pN_r0.vqh"
+#include "books/coupled/_44c7_s0_pN_r1.vqh"
+
 #include "books/coupled/_44c8_short.vqh"
 #include "books/coupled/_44c8_long.vqh"
 
@@ -293,123 +457,240 @@
   /* mode 0; 64-ish */
   {{&_residue_44_low, &_residue_44_low},  
    {&_huff_book__44c0_short,&_huff_book__44c0_long},
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
+   /* mostly temporary entries pending training */
+   { {{0},{0,0,&_44c0_s0_p1_0},{0,0,&_44c0_s0_p2_0},{0,0,&_44c0_s0_p3_0},
+      {&_44c0_s0_p4_0,&_44c0_s0_p4_1},{0,0,&_44c0_s0_p5_0},{0,0,&_44c0_s0_p6_0},
+      {&_44c0_s0_p7_0,&_44c0_s0_p7_1,&_44c0_s0_p7_2}}, /* lossless stereo */
      {{0},{0,0,&_44c0_s0_p1_0},{0,0,&_44c0_s0_p2_0},{0,0,&_44c0_s0_p3_0},
+      {&_44c0_s0_p4_0,&_44c0_s0_p4_1},{0,0,&_44c0_s1_p5_0},{0,0,&_44c0_s1_p6_0},
+      {&_44c0_s1_p7_0,&_44c0_s1_p7_1,&_44c0_s1_p7_2}}, /* 6dB (2.5) stereo */
+     {{0},{0,0,&_44c0_s0_p1_0},{0,0,&_44c0_s0_p2_0},{0,0,&_44c0_s0_p3_0},
+      {&_44c0_s0_p4_0,&_44c0_s0_p4_1},{0,0,&_44c0_s1_p5_0},{0,0,&_44c0_s2_p6_0},
+      {&_44c0_s2_p7_0,&_44c0_s2_p7_1,&_44c0_s2_p7_2}}, /* 12dB (4.5) stereo */
+     {{0},{0,0,&_44c0_s0_p1_0},{0,0,&_44c0_s0_p2_0},{0,0,&_44c0_s0_p3_0},
       {&_44c0_s0_p4_0,&_44c0_s0_p4_1},{0,0,&_44c0_s1_p5_0},{0,0,&_44c0_s2_p6_0},
-      {&_44c0_s4_p7_0,&_44c0_s4_p7_1,&_44c0_s4_p7_2}}, /* 24dB (16.5) stereo */
+      {&_44c0_s3_p7_0,&_44c0_s3_p7_1,&_44c0_s3_p7_2}}, /* 18dB (8.5) stereo */
+     {{0}}, /* 24dB (16.5) stereo */
    },
    { {0}, /* lossless stereo */
-     {0}, /* 6dB (2.5) stereo */
-     {0}, /* 12dB (4.5) stereo */
-     {0}, /* 18dB (8.5) stereo */
+     {0,0,0,0,0,&_44c0_s1_p5_s0,&_44c0_s1_p6_s0,&_44c0_s1_p7_s0}, /* 6dB (2.5) stereo */
+     {0,0,0,0,0,0,&_44c0_s2_p6_s0,&_44c0_s2_p7_s0}, /* 12dB (4.5) stereo */
+     {0,0,0,0,0,0,0,&_44c0_s3_p7_s0}, /* 18dB (8.5) stereo */
      {0},
-     //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
    },
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
-     //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
-     // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
-     // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
-     // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
-     // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
+   { 
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* lossless stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 6dB (2.5) stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 12dB (4.5) stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 18dB (8.5) stereo */
      {{0}}, /* 24dB (16.5) stereo */
    },
   },
-
   /* mode 1; 80-ish */
   {{&_residue_44_low, &_residue_44_low},  
    {&_huff_book__44c1_short,&_huff_book__44c1_long},
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
+   /* mostly temporary entries pending training */
+   { {{0},{0,0,&_44c1_s0_p1_0},{0,0,&_44c1_s0_p2_0},{0,0,&_44c1_s0_p3_0},
+      {&_44c1_s0_p4_0,&_44c1_s0_p4_1},{0,0,&_44c1_s0_p5_0},{0,0,&_44c1_s0_p6_0},
+      {&_44c1_s0_p7_0,&_44c1_s0_p7_1,&_44c1_s0_p7_2}}, /* lossless stereo */
+     {{0},{0,0,&_44c1_s0_p1_0},{0,0,&_44c1_s0_p2_0},{0,0,&_44c1_s0_p3_0},
+      {&_44c1_s0_p4_0,&_44c1_s0_p4_1},{0,0,&_44c1_s1_p5_0},{0,0,&_44c1_s1_p6_0},
+      {&_44c1_s1_p7_0,&_44c1_s1_p7_1,&_44c1_s1_p7_2}}, /* 6dB (2.5) stereo */
      {{0},{0,0,&_44c1_s0_p1_0},{0,0,&_44c1_s0_p2_0},{0,0,&_44c1_s0_p3_0},
       {&_44c1_s0_p4_0,&_44c1_s0_p4_1},{0,0,&_44c1_s1_p5_0},{0,0,&_44c1_s2_p6_0},
-      {&_44c1_s3_p7_0,&_44c1_s3_p7_1,&_44c1_s3_p7_2}}, /* 24dB (8.5) stereo */
+      {&_44c1_s2_p7_0,&_44c1_s2_p7_1,&_44c1_s2_p7_2}}, /* 12dB (4.5) stereo */
+     {{0},{0,0,&_44c1_s0_p1_0},{0,0,&_44c1_s0_p2_0},{0,0,&_44c1_s0_p3_0},
+      {&_44c1_s0_p4_0,&_44c1_s0_p4_1},{0,0,&_44c1_s1_p5_0},{0,0,&_44c1_s2_p6_0},
+      {&_44c1_s3_p7_0,&_44c1_s3_p7_1,&_44c1_s3_p7_2}}, /* 18dB (8.5) stereo */
      {{0}}, /* 24dB (16.5) stereo */
    },
    { {0}, /* lossless stereo */
-     {0}, /* 6dB (2.5) stereo */
-     {0}, /* 12dB (4.5) stereo */
-     {0}, /* 18dB (8.5) stereo */
+     {0,0,0,0,0,&_44c0_s1_p5_s0,&_44c0_s1_p6_s0,&_44c0_s1_p7_s0}, /* 6dB (2.5) stereo */
+     {0,0,0,0,0,0,&_44c0_s2_p6_s0,&_44c0_s2_p7_s0}, /* 12dB (4.5) stereo */
+     {0,0,0,0,0,0,0,&_44c0_s3_p7_s0}, /* 18dB (8.5) stereo */
      {0},
-     //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
    },
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
-     //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
-     // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
-     // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
-     // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
-     // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
+   { 
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* lossless stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 6dB (2.5) stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 12dB (4.5) stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 18dB (8.5) stereo */
      {{0}}, /* 24dB (16.5) stereo */
    },
   },
-
   /* mode 2; 96-ish */
   {{&_residue_44_low, &_residue_44_low},  
    {&_huff_book__44c2_short,&_huff_book__44c2_long},
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
+   /* mostly temporary entries pending training */
+   { {{0},{0,0,&_44c2_s0_p1_0},{0,0,&_44c2_s0_p2_0},{0,0,&_44c2_s0_p3_0},
+      {&_44c2_s0_p4_0,&_44c2_s0_p4_1},{0,0,&_44c2_s0_p5_0},{0,0,&_44c2_s0_p6_0},
+      {&_44c2_s0_p7_0,&_44c2_s0_p7_1,&_44c2_s0_p7_2}}, /* lossless stereo */
      {{0},{0,0,&_44c2_s0_p1_0},{0,0,&_44c2_s0_p2_0},{0,0,&_44c2_s0_p3_0},
+      {&_44c2_s0_p4_0,&_44c2_s0_p4_1},{0,0,&_44c2_s1_p5_0},{0,0,&_44c2_s1_p6_0},
+      {&_44c2_s1_p7_0,&_44c2_s1_p7_1,&_44c2_s1_p7_2}}, /* 6dB (2.5) stereo */
+     {{0},{0,0,&_44c2_s0_p1_0},{0,0,&_44c2_s0_p2_0},{0,0,&_44c2_s0_p3_0},
       {&_44c2_s0_p4_0,&_44c2_s0_p4_1},{0,0,&_44c2_s1_p5_0},{0,0,&_44c2_s2_p6_0},
       {&_44c2_s2_p7_0,&_44c2_s2_p7_1,&_44c2_s2_p7_2}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
+     {{0},{0,0,&_44c2_s0_p1_0},{0,0,&_44c2_s0_p2_0},{0,0,&_44c2_s0_p3_0},
+      {&_44c2_s0_p4_0,&_44c2_s0_p4_1},{0,0,&_44c2_s1_p5_0},{0,0,&_44c2_s2_p6_0},
+      {&_44c2_s3_p7_0,&_44c2_s3_p7_1,&_44c2_s3_p7_2}}, /* 18dB (8.5) stereo */
      {{0}}, /* 24dB (16.5) stereo */
    },
    { {0}, /* lossless stereo */
-     {0}, /* 6dB (2.5) stereo */
-     {0}, /* 12dB (4.5) stereo */
-     {0}, /* 18dB (8.5) stereo */
+     {0,0,0,0,0,&_44c0_s1_p5_s0,&_44c0_s1_p6_s0,&_44c0_s1_p7_s0}, /* 6dB (2.5) stereo */
+     {0,0,0,0,0,0,&_44c0_s2_p6_s0,&_44c0_s2_p7_s0}, /* 12dB (4.5) stereo */
+     {0,0,0,0,0,0,0,&_44c0_s3_p7_s0}, /* 18dB (8.5) stereo */
      {0},
-     //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
    },
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
-     //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
-     // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
-     // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
-     // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
-     // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
+   { 
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* lossless stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 6dB (2.5) stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 12dB (4.5) stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 18dB (8.5) stereo */
      {{0}}, /* 24dB (16.5) stereo */
    },
   },
-
   /* mode 3; 112-ish */
   {{&_residue_44_low, &_residue_44_low},  
    {&_huff_book__44c3_short,&_huff_book__44c3_long},
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
+   /* mostly temporary entries pending training */
+   { {{0},{0,0,&_44c3_s0_p1_0},{0,0,&_44c3_s0_p2_0},{0,0,&_44c3_s0_p3_0},
+      {&_44c3_s0_p4_0,&_44c3_s0_p4_1},{0,0,&_44c3_s0_p5_0},{0,0,&_44c3_s0_p6_0},
+      {&_44c3_s0_p7_0,&_44c3_s0_p7_1,&_44c3_s0_p7_2}}, /* lossless stereo */
      {{0},{0,0,&_44c3_s0_p1_0},{0,0,&_44c3_s0_p2_0},{0,0,&_44c3_s0_p3_0},
+      {&_44c3_s0_p4_0,&_44c3_s0_p4_1},{0,0,&_44c3_s1_p5_0},{0,0,&_44c3_s1_p6_0},
+      {&_44c3_s1_p7_0,&_44c3_s1_p7_1,&_44c3_s1_p7_2}}, /* 6dB (2.5) stereo */
+     {{0},{0,0,&_44c3_s0_p1_0},{0,0,&_44c3_s0_p2_0},{0,0,&_44c3_s0_p3_0},
       {&_44c3_s0_p4_0,&_44c3_s0_p4_1},{0,0,&_44c3_s1_p5_0},{0,0,&_44c3_s2_p6_0},
       {&_44c3_s2_p7_0,&_44c3_s2_p7_1,&_44c3_s2_p7_2}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
+     {{0},{0,0,&_44c3_s0_p1_0},{0,0,&_44c3_s0_p2_0},{0,0,&_44c3_s0_p3_0},
+      {&_44c3_s0_p4_0,&_44c3_s0_p4_1},{0,0,&_44c3_s1_p5_0},{0,0,&_44c3_s2_p6_0},
+      {&_44c3_s3_p7_0,&_44c3_s3_p7_1,&_44c3_s3_p7_2}}, /* 18dB (8.5) stereo */
      {{0}}, /* 24dB (16.5) stereo */
    },
    { {0}, /* lossless stereo */
-     {0}, /* 6dB (2.5) stereo */
-     {0}, /* 12dB (4.5) stereo */
-     {0}, /* 18dB (8.5) stereo */
+     {0,0,0,0,0,&_44c0_s1_p5_s0,&_44c0_s1_p6_s0,&_44c0_s1_p7_s0}, /* 6dB (2.5) stereo */
+     {0,0,0,0,0,0,&_44c0_s2_p6_s0,&_44c0_s2_p7_s0}, /* 12dB (4.5) stereo */
+     {0,0,0,0,0,0,0,&_44c0_s3_p7_s0}, /* 18dB (8.5) stereo */
      {0},
-     //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
    },
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
-     //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
-     // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
-     // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
-     // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
-     // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
+   { 
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* lossless stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+      {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 6dB (2.5) stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 12dB (4.5) stereo */
+     {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+       {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 18dB (8.5) stereo */
      {{0}}, /* 24dB (16.5) stereo */
    },
   },
@@ -417,99 +698,256 @@
   /* mode 4; 128-ish */
   {{&_residue_44_mid, &_residue_44_mid},  
    {&_huff_book__44c4_short,&_huff_book__44c4_long},
-   { {{0}}, /* lossless stereo */
+   { 
+     {{0},{0,0,&_44c4_s0_p1_0},{0,0,&_44c4_s0_p2_0},{0,0,&_44c4_s0_p3_0},
+      {0,0,&_44c4_s0_p4_0},{0,0,&_44c4_s0_p5_0},{0,0,&_44c4_s0_p6_0},
+      {&_44c4_s0_p7_0,&_44c4_s0_p7_1},{&_44c4_s0_p8_0,&_44c4_s0_p8_1},
+      {&_44c4_s0_p9_0,&_44c4_s0_p9_1,&_44c4_s0_p9_2}},
      {{0},{0,0,&_44c4_s0_p1_0},{0,0,&_44c4_s1_p2_0},{0,0,&_44c4_s0_p3_0},
       {0,0,&_44c4_s1_p4_0},{0,0,&_44c4_s0_p5_0},{0,0,&_44c4_s1_p6_0},
       {&_44c4_s1_p7_0,&_44c4_s1_p7_1},{&_44c4_s1_p8_0,&_44c4_s1_p8_1},
-      {&_44c4_s1_p9_0,&_44c4_s1_p9_1,&_44c4_s1_p9_2}}, 
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
+      {&_44c4_s1_p9_0,&_44c4_s1_p9_1,&_44c4_s1_p9_2}},
+     {{0},{0,0,&_44c4_s0_p1_0},{0,0,&_44c4_s1_p2_0},{0,0,&_44c4_s0_p3_0},
+      {0,0,&_44c4_s1_p4_0},{0,0,&_44c4_s0_p5_0},{0,0,&_44c4_s2_p6_0},
+      {&_44c4_s2_p7_0,&_44c4_s2_p7_1},{&_44c4_s2_p8_0,&_44c4_s2_p8_1},
+      {&_44c4_s2_p9_0,&_44c4_s2_p9_1,&_44c4_s2_p9_2}},
+     {{0},{0,0,&_44c4_s0_p1_0},{0,0,&_44c4_s1_p2_0},{0,0,&_44c4_s0_p3_0},
+      {0,0,&_44c4_s1_p4_0},{0,0,&_44c4_s0_p5_0},{0,0,&_44c4_s2_p6_0},
+      {&_44c4_s3_p7_0,&_44c4_s3_p7_1},{&_44c4_s3_p8_0,&_44c4_s3_p8_1},
+      {&_44c4_s3_p9_0,&_44c4_s3_p9_1,&_44c4_s3_p9_2}},
      {{0}}, /* 24dB (16.5) stereo */
    },
+
    { {0}, /* lossless stereo */
-     {0}, /* 6dB (2.5) stereo */
-     {0}, /* 12dB (4.5) stereo */
-     {0}, /* 18dB (8.5) stereo */
+     {0,0,&_44c4_s1_p2_s0,0,&_44c4_s1_p4_s0,0,&_44c4_s1_p6_s0,&_44c4_s1_p7_s0,
+      &_44c4_s1_p8_s0,&_44c4_s1_p9_s0}, /* (2.5) stereo */
+     {0,0,0,0,0,0,&_44c4_s2_p6_s0,&_44c4_s2_p7_s0,&_44c4_s2_p8_s0,
+      &_44c4_s2_p9_s0}, /* (4.5) stereo */
+     {0,0,0,0,0,0,0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0}, /* (8.5) stereo */
      {0},
-     //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
    },
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
-     //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
-     // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
-     // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
-     // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
-     // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
-     {{0}}, /* 24dB (16.5) stereo */
+   {
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* lossless stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 6dB stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 12dB stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 18dB stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 24dB stereo */
    },
   },
-
   /* mode 5; 160-ish */
   {{&_residue_44_mid, &_residue_44_mid},  
    {&_huff_book__44c5_short,&_huff_book__44c5_long},
-   { {{0},{0,0,&_44c5_s0_p1_0},{0,0,&_44c5_s0_p2_0},{0,0,&_44c5_s0_p3_0},
+   { 
+     {{0},{0,0,&_44c5_s0_p1_0},{0,0,&_44c5_s0_p2_0},{0,0,&_44c5_s0_p3_0},
       {0,0,&_44c5_s0_p4_0},{0,0,&_44c5_s0_p5_0},{0,0,&_44c5_s0_p6_0},
       {&_44c5_s0_p7_0,&_44c5_s0_p7_1},{&_44c5_s0_p8_0,&_44c5_s0_p8_1},
-      {&_44c5_s0_p9_0,&_44c5_s0_p9_1,&_44c5_s0_p9_2}}, 
-     {{0}}, /* 6dB  (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
+      {&_44c5_s0_p9_0,&_44c5_s0_p9_1,&_44c5_s0_p9_2}},
+     {{0},{0,0,&_44c5_s0_p1_0},{0,0,&_44c5_s1_p2_0},{0,0,&_44c5_s0_p3_0},
+      {0,0,&_44c5_s1_p4_0},{0,0,&_44c5_s0_p5_0},{0,0,&_44c5_s1_p6_0},
+      {&_44c5_s1_p7_0,&_44c5_s1_p7_1},{&_44c5_s1_p8_0,&_44c5_s1_p8_1},
+      {&_44c5_s1_p9_0,&_44c5_s1_p9_1,&_44c5_s1_p9_2}},
+     {{0},{0,0,&_44c5_s0_p1_0},{0,0,&_44c5_s1_p2_0},{0,0,&_44c5_s0_p3_0},
+      {0,0,&_44c5_s1_p4_0},{0,0,&_44c5_s0_p5_0},{0,0,&_44c5_s2_p6_0},
+      {&_44c5_s2_p7_0,&_44c5_s2_p7_1},{&_44c5_s2_p8_0,&_44c5_s2_p8_1},
+      {&_44c5_s2_p9_0,&_44c5_s2_p9_1,&_44c5_s2_p9_2}},
+     {{0},{0,0,&_44c5_s0_p1_0},{0,0,&_44c5_s1_p2_0},{0,0,&_44c5_s0_p3_0},
+      {0,0,&_44c5_s1_p4_0},{0,0,&_44c5_s0_p5_0},{0,0,&_44c5_s2_p6_0},
+      {&_44c5_s3_p7_0,&_44c5_s3_p7_1},{&_44c5_s3_p8_0,&_44c5_s3_p8_1},
+      {&_44c5_s3_p9_0,&_44c5_s3_p9_1,&_44c5_s3_p9_2}},
      {{0}}, /* 24dB (16.5) stereo */
    },
+
    { {0}, /* lossless stereo */
-     {0}, /* 6dB (2.5) stereo */
-     {0}, /* 12dB (4.5) stereo */
-     {0}, /* 18dB (8.5) stereo */
+     {0,0,&_44c4_s1_p2_s0,0,&_44c4_s1_p4_s0,0,&_44c4_s1_p6_s0,&_44c4_s1_p7_s0,
+      &_44c4_s1_p8_s0,&_44c4_s1_p9_s0}, /* (2.5) stereo */
+     {0,0,0,0,0,0,&_44c4_s2_p6_s0,&_44c4_s2_p7_s0,&_44c4_s2_p8_s0,
+      &_44c4_s2_p9_s0}, /* (4.5) stereo */
+     {0,0,0,0,0,0,0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0}, /* (8.5) stereo */
      {0},
-     //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
    },
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
-     //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
-     // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
-     // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
-     // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
-     // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
-     {{0}}, /* 24dB (16.5) stereo */
+   {
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* lossless stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 6dB stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 12dB stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 18dB stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 24dB stereo */
    },
   },
-
   /* mode 6; 192-ish */
   {{&_residue_44_mid, &_residue_44_mid},  
    {&_huff_book__44c6_short,&_huff_book__44c6_long},
-   { {{0},{0,0,&_44c6_s0_p1_0},{0,0,&_44c6_s0_p2_0},{0,0,&_44c6_s0_p3_0},
+   { 
+     {{0},{0,0,&_44c6_s0_p1_0},{0,0,&_44c6_s0_p2_0},{0,0,&_44c6_s0_p3_0},
       {0,0,&_44c6_s0_p4_0},{0,0,&_44c6_s0_p5_0},{0,0,&_44c6_s0_p6_0},
       {&_44c6_s0_p7_0,&_44c6_s0_p7_1},{&_44c6_s0_p8_0,&_44c6_s0_p8_1},
-      {&_44c6_s0_p9_0,&_44c6_s0_p9_1,&_44c6_s0_p9_2}}, 
-     {{0}}, /* 6dB  (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
+      {&_44c6_s0_p9_0,&_44c6_s0_p9_1,&_44c6_s0_p9_2}},
+     {{0},{0,0,&_44c6_s0_p1_0},{0,0,&_44c6_s1_p2_0},{0,0,&_44c6_s0_p3_0},
+      {0,0,&_44c6_s1_p4_0},{0,0,&_44c6_s0_p5_0},{0,0,&_44c6_s1_p6_0},
+      {&_44c6_s1_p7_0,&_44c6_s1_p7_1},{&_44c6_s1_p8_0,&_44c6_s1_p8_1},
+      {&_44c6_s1_p9_0,&_44c6_s1_p9_1,&_44c6_s1_p9_2}},
+     {{0},{0,0,&_44c6_s0_p1_0},{0,0,&_44c6_s1_p2_0},{0,0,&_44c6_s0_p3_0},
+      {0,0,&_44c6_s1_p4_0},{0,0,&_44c6_s0_p5_0},{0,0,&_44c6_s2_p6_0},
+      {&_44c6_s2_p7_0,&_44c6_s2_p7_1},{&_44c6_s2_p8_0,&_44c6_s2_p8_1},
+      {&_44c6_s2_p9_0,&_44c6_s2_p9_1,&_44c6_s2_p9_2}},
+     {{0},{0,0,&_44c6_s0_p1_0},{0,0,&_44c6_s1_p2_0},{0,0,&_44c6_s0_p3_0},
+      {0,0,&_44c6_s1_p4_0},{0,0,&_44c6_s0_p5_0},{0,0,&_44c6_s2_p6_0},
+      {&_44c6_s3_p7_0,&_44c6_s3_p7_1},{&_44c6_s3_p8_0,&_44c6_s3_p8_1},
+      {&_44c6_s3_p9_0,&_44c6_s3_p9_1,&_44c6_s3_p9_2}},
      {{0}}, /* 24dB (16.5) stereo */
    },
+
    { {0}, /* lossless stereo */
-     {0}, /* 6dB (2.5) stereo */
-     {0}, /* 12dB (4.5) stereo */
-     {0}, /* 18dB (8.5) stereo */
+     {0,0,&_44c4_s1_p2_s0,0,&_44c4_s1_p4_s0,0,&_44c4_s1_p6_s0,&_44c4_s1_p7_s0,
+      &_44c4_s1_p8_s0,&_44c4_s1_p9_s0}, /* (2.5) stereo */
+     {0,0,0,0,0,0,&_44c4_s2_p6_s0,&_44c4_s2_p7_s0,&_44c4_s2_p8_s0,
+      &_44c4_s2_p9_s0}, /* (4.5) stereo */
+     {0,0,0,0,0,0,0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0}, /* (8.5) stereo */
      {0},
-     //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
    },
-   { {{0}}, /* lossless stereo */
-     {{0}}, /* 6dB (2.5) stereo */
-     {{0}}, /* 12dB (4.5) stereo */
-     {{0}}, /* 18dB (8.5) stereo */
-     //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
-     // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
-     // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
-     // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
-     // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
-     {{0}}, /* 24dB (16.5) stereo */
+   {
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* lossless stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 6dB stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 12dB stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 18dB stereo */
+     {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+      {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 24dB stereo */
    },
   },
-  
+
   /* mode 7; 224-ish */
   {{&_residue_44_high, &_residue_44_high},  
    {&_huff_book__44c7_short,&_huff_book__44c7_long},
@@ -532,7 +970,17 @@
      {0},
      //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
    },
-   { {{0}}, /* lossless stereo */
+   { 
+     {{&_44c7_s0_p0_r0,&_44c7_s0_p0_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1}}, /* lossless stereo */
      {{0}}, /* 6dB (2.5) stereo */
      {{0}}, /* 12dB (4.5) stereo */
      {{0}}, /* 18dB (8.5) stereo */
@@ -567,7 +1015,17 @@
      {0},
      //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
    },
-   { {{0}}, /* lossless stereo */
+   { 
+     {{&_44c7_s0_p0_r0,&_44c7_s0_p0_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1}}, /* lossless stereo */
      {{0}}, /* 6dB (2.5) stereo */
      {{0}}, /* 12dB (4.5) stereo */
      {{0}}, /* 18dB (8.5) stereo */
@@ -601,7 +1059,17 @@
      {0},
      //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
    },
-   { {{0}}, /* lossless stereo */
+   { 
+     {{&_44c7_s0_p0_r0,&_44c7_s0_p0_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+      {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1}}, /* lossless stereo */
      {{0}}, /* 6dB (2.5) stereo */
      {{0}}, /* 12dB (4.5) stereo */
      {{0}}, /* 18dB (8.5) stereo */

1.2       +15 -17    vorbis/vq/44u0.vqs

Index: 44u0.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/44u0.vqs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 44u0.vqs	2001/12/16 04:15:57	1.1
+++ 44u0.vqs	2001/12/19 01:10:28	1.2
@@ -1,5 +1,3 @@
-cat res_part1_pass3.vqd res_part2_pass3.vqd res_part3_pass3.vqd res_part4_pass3.vqd res_part5_pass3.vqd res_part6_pass3.vqd res_part7_pass3.vqd > temp_pass3.vqd
-cat res_part1_pass4.vqd res_part2_pass4.vqd res_part3_pass4.vqd res_part4_pass4.vqd res_part5_pass4.vqd res_part6_pass4.vqd res_part7_pass4.vqd > temp_pass4.vqd
 
 GO
 
@@ -15,24 +13,24 @@
 #   2                   .           .
 #   4       .   .   .       .   .   .
 
-:_p1_0 res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 
-:_p2_0 res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p3_0 res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p4_0 res_part4_pass0.vqd, 2, nonseq , 0 +- 3 6 9 12 15 18 21 24 27
-:_p4_1 res_part4_pass1.vqd, 4, nonseq cull, 0 +- 1 
-:_p5_0 res_part5_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p6_0 res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-
-:_p7_0 res_part7_pass0.vqd, 2, nonseq, 0 +- 67 134
-:_p7_1 res_part7_pass1.vqd, 2, nonseq, 0 +- 3 6 9 12 15 18 21 24 27 30 33
-:_p7_2 res_part7_pass2.vqd, 4, nonseq, 0 +- 1 
+:_p1_0 44u0/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 
+:_p2_0 44u0/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p3_0 44u0/res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p4_0 44u0/res_part4_pass0.vqd, 2, nonseq , 0 +- 3 6 9 12 15 18 21 24 27
+:_p4_1 44u0/res_part4_pass1.vqd, 4, nonseq cull, 0 +- 1 
+:_p5_0 44u0/res_part5_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p6_0 44u0/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+
+:_p7_0 44u0/res_part7_pass0.vqd, 2, nonseq, 0 +- 67 134
+:_p7_1 44u0/res_part7_pass1.vqd, 2, nonseq, 0 +- 3 6 9 12 15 18 21 24 27 30 33
+:_p7_2 44u0/res_part7_pass2.vqd, 4, nonseq, 0 +- 1 
 
 #iter 1
 
-:_p0_r0 res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
-:_p1_r0 temp_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p0_r0 44u0/res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p1_r0 44u0/res_partN_pass3.vqd, 2, nonseq cull, 0 +- .33333333
 
 #iter 2
 
-:_p0_r1 res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
-:_p1_r1 temp_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p0_r1 44u0/res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p1_r1 44u0/res_partN_pass4.vqd, 2, nonseq cull, 0 +- .11111111

1.2       +17 -20    vorbis/vq/44u4.vqs

Index: 44u4.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/44u4.vqs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 44u4.vqs	2001/12/16 04:15:57	1.1
+++ 44u4.vqs	2001/12/19 01:10:28	1.2
@@ -1,6 +1,3 @@
-cat res_part1_pass3.vqd res_part2_pass3.vqd res_part3_pass3.vqd res_part4_pass3.vqd res_part5_pass3.vqd res_part6_pass3.vqd res_part7_pass3.vqd res_part8_pass3.vqd res_part9_pass3.vqd > temp_pass3.vqd
-cat res_part1_pass4.vqd res_part2_pass4.vqd res_part3_pass4.vqd res_part4_pass4.vqd res_part5_pass4.vqd res_part6_pass4.vqd res_part7_pass4.vqd res_part8_pass4.vqd res_part9_pass4.vqd > temp_pass4.vqd
-
 GO
 
 >_44u4 noninterleaved
@@ -16,25 +13,25 @@
 # 2                               .   .   .
 # 4       .   .   .   .   .   .           .
  
-:_p1_0 res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p2_0 res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p3_0 res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p4_0 res_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p5_0 res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p7_0 res_part7_pass0.vqd, 2, nonseq cull, 0 +- 3 6 9 12 15
-:_p7_1 res_part7_pass1.vqd, 4, nonseq cull, 0 +- 1 
-:_p8_0 res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30 35 40
-:_p8_1 res_part8_pass1.vqd, 4, nonseq cull, 0 +- 1 2
-:_p9_0 res_part9_pass0.vqd, 2, nonseq, 0 +- 637 1274 1911
-:_p9_1 res_part9_pass1.vqd, 2, nonseq, 0 +- 49 98 147 196 245 294
-:_p9_2 res_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 
+:_p1_0 44u4/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p2_0 44u4/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p3_0 44u4/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p4_0 44u4/res_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p5_0 44u4/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p6_0 44u4/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p7_0 44u4/res_part7_pass0.vqd, 2, nonseq cull, 0 +- 3 6 9 12 15
+:_p7_1 44u4/res_part7_pass1.vqd, 4, nonseq cull, 0 +- 1 
+:_p8_0 44u4/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30 35 40
+:_p8_1 44u4/res_part8_pass1.vqd, 4, nonseq cull, 0 +- 1 2
+:_p9_0 44u4/res_part9_pass0.vqd, 2, nonseq, 0 +- 637 1274 1911
+:_p9_1 44u4/res_part9_pass1.vqd, 2, nonseq, 0 +- 49 98 147 196 245 294
+:_p9_2 44u4/res_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 
 #iter 1
 
-:_p0_r0 res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
-:_p1_r0 temp_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p0_r0 44u4/res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p1_r0 44u4/res_partN_pass3.vqd, 2, nonseq cull, 0 +- .33333333
 
 #iter 2
 
-:_p0_r1 res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
-:_p1_r1 temp_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p0_r1 44u4/res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p1_r1 44u4/res_partN_pass4.vqd, 2, nonseq cull, 0 +- .11111111

1.2       +22 -25    vorbis/vq/44u7.vqs

Index: 44u7.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/44u7.vqs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 44u7.vqs	2001/12/16 04:15:57	1.1
+++ 44u7.vqs	2001/12/19 01:10:28	1.2
@@ -1,6 +1,3 @@
-#cat res_part1_pass3.vqd res_part2_pass3.vqd res_part3_pass3.vqd res_part4_pass3.vqd res_part5_pass3.vqd res_part6_pass3.vqd res_part7_pass3.vqd res_part8_pass3.vqd res_part9_pass3.vqd > temp_pass3.vqd
-#cat res_part1_pass4.vqd res_part2_pass4.vqd res_part3_pass4.vqd res_part4_pass4.vqd res_part5_pass4.vqd res_part6_pass4.vqd res_part7_pass4.vqd res_part8_pass4.vqd res_part9_pass4.vqd > temp_pass4.vqd
-
 GO
 
 >_44u7 noninterleaved
@@ -13,31 +10,31 @@
 # 2           .                   .   .   .
 # 4       .       .   .   .   .           .
 
-:_p1_0 res_part1_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
-:_p2_0 res_part2_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30 35 40
-:_p2_1 res_part2_pass1.vqd, 4, nonseq cull, 0 +- 1 2
-
-:_p3_0 res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p4_0 res_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p5_0 res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
-:_p7_0 res_part7_pass0.vqd, 2, nonseq cull, 0 +- 3 6 9 12 15
-:_p7_1 res_part7_pass1.vqd, 4, nonseq cull, 0 +- 1 
-
-:_p8_0 res_part8_pass0.vqd, 2, nonseq cull, 0 +- 7 14 21 28 35 42 49 56
-:_p8_1 res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3
-
-
-:_p9_0 res_part9_pass0.vqd, 2, nonseq, 0 +- 1863 3726 5589 7452 9315 11178 13041 
-:_p9_1 res_part9_pass1.vqd, 2, nonseq, 0 +- 81 162 243 324 405 486 567 648 729 810 891
-:_p9_2 res_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 
+:_p1_0 44u7/res_part1_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p2_0 44u7/res_part2_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30 35 40
+:_p2_1 44u7/res_part2_pass1.vqd, 4, nonseq cull, 0 +- 1 2
+
+:_p3_0 44u7/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p4_0 44u7/res_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p5_0 44u7/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p6_0 44u7/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p7_0 44u7/res_part7_pass0.vqd, 2, nonseq cull, 0 +- 3 6 9 12 15
+:_p7_1 44u7/res_part7_pass1.vqd, 4, nonseq cull, 0 +- 1 
+
+:_p8_0 44u7/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 7 14 21 28 35 42 49 56
+:_p8_1 44u7/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3
+
+
+:_p9_0 44u7/res_part9_pass0.vqd, 2, nonseq, 0 +- 1863 3726 5589 7452 9315 11178 13041 
+:_p9_1 44u7/res_part9_pass1.vqd, 2, nonseq, 0 +- 81 162 243 324 405 486 567 648 729 810 891
+:_p9_2 44u7/res_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 
 
 #iter 1
 
-:_p0_r0 res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
-:_p1_r0 temp_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p0_r0 44u7/res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p1_r0 44u7/res_partN_pass3.vqd, 2, nonseq cull, 0 +- .33333333
 
 #iter 2
 
-:_p0_r1 res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
-:_p1_r1 temp_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p0_r1 44u7/res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p1_r1 44u7/res_partN_pass4.vqd, 2, nonseq cull, 0 +- .11111111

1.2       +74 -0     vorbis/vq/44c0.vqs

1.2       +51 -0     vorbis/vq/44c1.vqs

1.2       +51 -0     vorbis/vq/44c2.vqs

1.2       +52 -0     vorbis/vq/44c3.vqs

1.2       +105 -0    vorbis/vq/44c4.vqs

1.2       +67 -0     vorbis/vq/44c5.vqs

1.2       +67 -0     vorbis/vq/44c6.vqs

1.2       +57 -0     vorbis/vq/44c7.vqs

1.2       +44 -0     vorbis/vq/44c8.vqs

1.2       +44 -0     vorbis/vq/44c9.vqs

--- >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