[xiph-cvs] cvs commit: vorbis/vq bookutil.c res_44c_A.vqs

Monty xiphmont at xiph.org
Thu Oct 11 17:08:17 PDT 2001



xiphmont    01/10/11 17:08:16

  Modified:    lib      Tag: branch_monty_20011009 res0.c
               lib/books Tag: branch_monty_20011009 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_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_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
                        res_44c_A_1024aux.vqh res_44c_A_128aux.vqh
                        res_Ac_0a.vqh res_Ac_1.vqh res_Ac_2.vqh
                        res_Ac_2a.vqh res_Ac_3.vqh res_Ac_4.vqh
                        res_Ac_5.vqh res_Ac_5a.vqh res_Ac_6.vqh
                        res_Ac_7.vqh res_Ac_7a.vqh res_Ac_7b.vqh
                        res_Ac_8.vqh res_Ac_8a.vqh res_Ac_9.vqh
                        res_Ac_9a.vqh res_Ac_9b.vqh
               lib/modes Tag: branch_monty_20011009 mode_44c_A.h
               vq       Tag: branch_monty_20011009 bookutil.c res_44c_A.vqs
  Log:
  A good VBR mode A starting point.

Revision  Changes    Path
No                   revision

No                   revision

1.37.2.3  +5 -3      vorbis/lib/res0.c

Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -u -r1.37.2.2 -r1.37.2.3
--- res0.c	2001/10/11 15:41:45	1.37.2.2
+++ res0.c	2001/10/12 00:08:06	1.37.2.3
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.37.2.2 2001/10/11 15:41:45 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.37.2.3 2001/10/12 00:08:06 xiphmont Exp $
 
  ********************************************************************/
 
@@ -594,8 +594,10 @@
             if(statebook){
               int ret=encode(&vb->opb,in[j]+offset,samples_per_partition,
                              statebook,look);
-	      look->postbits+=ret;
-	      resbits[partword[j][i]]+=ret;
+	      if(!stoppos){
+		look->postbits+=ret;
+		resbits[partword[j][i]]+=ret;
+	      }
             }
           }
         }

No                   revision

No                   revision

1.3.4.3   +1 -1      vorbis/lib/books/line_1024x31_0sub0.vqh

Index: line_1024x31_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_0sub0.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_0sub0.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_0sub0.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,7 +20,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_0sub0[] = {
-	 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5,
 };
 
 static static_codebook _huff_book_line_1024x31_0sub0 = {

1.3.4.3   +4 -4      vorbis/lib/books/line_1024x31_0sub1.vqh

Index: line_1024x31_0sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_0sub1.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_0sub1.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_0sub1.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_0sub1[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7,
+	 6, 8, 8,10,10,10, 8,12, 9,12,10,12,11,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
 };
 
 static static_codebook _huff_book_line_1024x31_0sub1 = {

1.3.4.3   +1 -1      vorbis/lib/books/line_1024x31_1sub0.vqh

Index: line_1024x31_1sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_1sub0.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_1sub0.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_1sub0.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,7 +20,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_1sub0[] = {
-	 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	 2, 3, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6,
 };
 
 static static_codebook _huff_book_line_1024x31_1sub0 = {

1.3.4.3   +4 -4      vorbis/lib/books/line_1024x31_1sub1.vqh

Index: line_1024x31_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_1sub1.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_1sub1.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_1sub1.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_1sub1[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 3, 3, 3, 3, 4, 3, 5, 3, 5, 4, 7, 5, 8, 7,10, 9,
+	12,10,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,11,
 };
 
 static static_codebook _huff_book_line_1024x31_1sub1 = {

1.3.4.3   +1 -1      vorbis/lib/books/line_1024x31_2sub1.vqh

Index: line_1024x31_2sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_2sub1.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_2sub1.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_2sub1.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,7 +20,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_2sub1[] = {
-	 0, 3, 3, 3, 3, 3, 3, 3, 3,
+	 0, 3, 3, 2, 3, 3, 4, 3, 4,
 };
 
 static static_codebook _huff_book_line_1024x31_2sub1 = {

1.3.4.3   +2 -2      vorbis/lib/books/line_1024x31_2sub2.vqh

Index: line_1024x31_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_2sub2.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_2sub2.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_2sub2.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,8 +20,8 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_2sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4,
-	 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 4, 4, 5,
+	 4, 6, 5, 6, 5, 7, 5, 7, 6,
 };
 
 static static_codebook _huff_book_line_1024x31_2sub2 = {

1.3.4.3   +4 -4      vorbis/lib/books/line_1024x31_2sub3.vqh

Index: line_1024x31_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_2sub3.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_2sub3.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_2sub3.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_2sub3[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
-	 0, 0, 2, 0, 0, 0, 0, 1, 0, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 0, 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, 1, 5, 2, 8, 4, 9,
+	 6, 9, 7, 9, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 };
 
 static static_codebook _huff_book_line_1024x31_2sub3 = {

1.3.4.3   +2 -2      vorbis/lib/books/line_1024x31_3sub2.vqh

Index: line_1024x31_3sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_3sub2.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_3sub2.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_3sub2.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,8 +20,8 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_3sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4,
-	 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 2, 5, 3, 7, 3,
+	 8, 4, 9, 5,10, 5,11, 6,11,
 };
 
 static static_codebook _huff_book_line_1024x31_3sub2 = {

1.3.4.3   +4 -4      vorbis/lib/books/line_1024x31_3sub3.vqh

Index: line_1024x31_3sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_3sub3.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_3sub3.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_3sub3.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_3sub3[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
-	 0, 0, 2, 0, 0, 0, 0, 1, 0, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 0, 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, 7, 2, 7, 3, 7, 4,
+	 7, 5, 7, 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,
 };
 
 static static_codebook _huff_book_line_1024x31_3sub3 = {

1.2.4.3   +1 -1      vorbis/lib/books/line_1024x31_class0.vqh

Index: line_1024x31_class0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class0.vqh,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -r1.2.4.2 -r1.2.4.3
--- line_1024x31_class0.vqh	2001/10/11 15:41:47	1.2.4.2
+++ line_1024x31_class0.vqh	2001/10/12 00:08:07	1.2.4.3
@@ -20,7 +20,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class0[] = {
-	 3, 3, 3, 3, 3, 3, 3, 3,
+	 1, 2, 4, 5, 3, 6, 7, 7,
 };
 
 static static_codebook _huff_book_line_1024x31_class0 = {

1.3.4.3   +1 -1      vorbis/lib/books/line_1024x31_class1.vqh

Index: line_1024x31_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class1.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_class1.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_class1.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,7 +20,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class1[] = {
-	 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	 1, 3, 5, 7, 9, 9,10,11, 2, 5, 5, 6,10,11,11,11,
 };
 
 static static_codebook _huff_book_line_1024x31_class1 = {

1.3.4.3   +4 -4      vorbis/lib/books/line_1024x31_class2.vqh

Index: line_1024x31_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class2.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_class2.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_class2.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class2[] = {
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 2, 3, 4,10, 6, 4, 5,10, 8, 6, 6,15,16,15,16,15,
+	 5, 3, 5, 9, 6, 4, 6, 9, 8, 5, 7,14,15,15,15,15,
+	 8, 6, 6, 9, 8, 6, 6, 9,10, 7, 8,14,15,15,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
 };
 
 static static_codebook _huff_book_line_1024x31_class2 = {

1.3.4.3   +4 -4      vorbis/lib/books/line_1024x31_class3.vqh

Index: line_1024x31_class3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class3.vqh,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_class3.vqh	2001/10/11 15:41:47	1.3.4.2
+++ line_1024x31_class3.vqh	2001/10/12 00:08:07	1.3.4.3
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class3[] = {
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 1, 4, 3,11, 6, 4, 5,13,10, 8,10,15,15,15,15,15,
+	 7, 4, 5,11, 7, 5, 6,12,11, 8,11,15,14,14,14,14,
+	11, 8, 6, 9,11, 9, 8,11,13,10,12,14,14,14,14,14,
+	14,14,11, 9,14,14,12,11,14,14,14,14,14,14,14,14,
 };
 
 static static_codebook _huff_book_line_1024x31_class3 = {

1.3.2.2   +4 -4      vorbis/lib/books/line_128x19_0sub0.vqh

Index: line_128x19_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_0sub0.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- line_128x19_0sub0.vqh	2001/10/11 15:41:47	1.3.2.1
+++ line_128x19_0sub0.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_0sub0[] = {
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 6, 4, 6, 5,
+	 6, 5, 6, 5, 7, 6, 7, 6, 7, 7, 7, 8, 8, 8, 8, 9,
+	 8,10, 8,11, 8,12, 8,13, 8,10, 8,10, 9,11, 9,11,
+	 9,10,10,11,12,14,14,14,14,16,16,16,16,16,16,15,
 };
 
 static static_codebook _huff_book_line_128x19_0sub0 = {

1.3.2.2   +2 -2      vorbis/lib/books/line_128x19_1sub2.vqh

Index: line_128x19_1sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_1sub2.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- line_128x19_1sub2.vqh	2001/10/11 15:41:47	1.3.2.1
+++ line_128x19_1sub2.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -20,8 +20,8 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_1sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4,
-	 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 4, 3, 4,
+	 4, 5, 4, 6, 5, 7, 6, 7, 6,
 };
 
 static static_codebook _huff_book_line_128x19_1sub2 = {

1.3.2.2   +4 -4      vorbis/lib/books/line_128x19_1sub3.vqh

Index: line_128x19_1sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_1sub3.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- line_128x19_1sub3.vqh	2001/10/11 15:41:47	1.3.2.1
+++ line_128x19_1sub3.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_1sub3[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
-	 0, 0, 2, 0, 0, 0, 0, 1, 0, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 0, 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, 6, 3, 7, 2, 8,
+	 3,10, 4,10, 5,10, 5,10, 7,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,
 };
 
 static static_codebook _huff_book_line_128x19_1sub3 = {

1.1.4.2   +1 -1      vorbis/lib/books/line_128x19_2sub1.vqh

Index: line_128x19_2sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_2sub1.vqh,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- line_128x19_2sub1.vqh	2001/10/11 15:41:47	1.1.4.1
+++ line_128x19_2sub1.vqh	2001/10/12 00:08:07	1.1.4.2
@@ -20,7 +20,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_2sub1[] = {
-	 0, 3, 3, 3, 3, 3, 3, 3, 3,
+	 0, 3, 3, 3, 3, 2, 4, 3, 4,
 };
 
 static static_codebook _huff_book_line_128x19_2sub1 = {

1.3.2.2   +2 -2      vorbis/lib/books/line_128x19_2sub2.vqh

Index: line_128x19_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_2sub2.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- line_128x19_2sub2.vqh	2001/10/11 15:41:47	1.3.2.1
+++ line_128x19_2sub2.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -20,8 +20,8 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_2sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4,
-	 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 2, 5, 3, 6, 4,
+	 7, 4, 8, 4, 9, 5,10, 5,10,
 };
 
 static static_codebook _huff_book_line_128x19_2sub2 = {

1.3.2.2   +4 -4      vorbis/lib/books/line_128x19_2sub3.vqh

Index: line_128x19_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_2sub3.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- line_128x19_2sub3.vqh	2001/10/11 15:41:47	1.3.2.1
+++ line_128x19_2sub3.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_2sub3[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
-	 0, 0, 2, 0, 0, 0, 0, 1, 0, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 0, 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, 7, 2, 8, 4, 9, 4,
+	 7, 6, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
 static static_codebook _huff_book_line_128x19_2sub3 = {

1.3.2.2   +4 -4      vorbis/lib/books/line_128x19_class1.vqh

Index: line_128x19_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_class1.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- line_128x19_class1.vqh	2001/10/11 15:41:47	1.3.2.1
+++ line_128x19_class1.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_class1[] = {
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 3, 3, 4,11, 6, 4, 5,12, 7, 5, 6,12,14,13,13,15,
+	 5, 3, 4,10, 7, 5, 6,12, 8, 5, 7,12,14,13,14,15,
+	 7, 4, 5,11, 8, 5, 6,11, 9, 6, 6,12,15,12,13,15,
+	14,11,10,13,11, 8, 8,12,11, 8, 9,14,15,15,14,14,
 };
 
 static static_codebook _huff_book_line_128x19_class1 = {

1.3.2.2   +4 -4      vorbis/lib/books/line_128x19_class2.vqh

Index: line_128x19_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_class2.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- line_128x19_class2.vqh	2001/10/11 15:41:47	1.3.2.1
+++ line_128x19_class2.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x19_class2[] = {
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 1, 3, 4,13, 6, 4, 5,14, 9, 6, 8,15,15,15,15,15,
+	 6, 4, 6,12, 7, 5, 6,13,10, 8, 9,15,15,15,15,15,
+	11, 8, 7, 9,11, 9, 8,10,13,11,11,13,15,15,15,15,
+	15,15,10,11,15,15,11,12,15,15,13,14,15,15,15,15,
 };
 
 static static_codebook _huff_book_line_128x19_class2 = {

1.3.2.2   +7 -7      vorbis/lib/books/res_44c_A_1024aux.vqh

Index: res_44c_A_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_44c_A_1024aux.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_44c_A_1024aux.vqh	2001/10/11 15:41:47	1.3.2.1
+++ res_44c_A_1024aux.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -20,13 +20,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res_44c_A_1024aux[] = {
-	 3,11, 6,17,11,10,10, 9,17,17,11, 5,17, 7, 5,17,
-	 6, 8,15,17, 5,17, 3,17,17, 7, 8, 9,17,17,15, 6,
-	17, 5,17,17, 6, 7,14,17,10, 5,17,16, 4,16, 5, 8,
-	16,16,10,16, 6,16,16, 9,10,11,16,16,10, 6, 7, 5,
-	 6,10, 4, 5,12,16,11, 7, 9, 6, 8,11, 4, 4, 8,16,
-	15,12,16,12,16,16,11, 7, 5,14,16,16,16,16,16,16,
-	15, 8, 8,14,
+	 3,11, 6,15,11,10,10,10,17,17,11, 4,17, 7, 5,17,
+	 6, 8,14,17, 5,17, 3,17,17, 7, 8,10,17,17,15, 6,
+	17, 5,17,17, 5, 7,13,17,11, 5,17,17, 4,17, 5, 8,
+	17,17,11,17, 6,17,17, 8, 9,11,17,17,10, 6, 8, 5,
+	 6, 9, 4, 5,12,17,12, 7,10, 6, 9,11, 5, 4, 8,17,
+	17,13,17,12,17,17,10, 6, 6,14,17,17,17,17,17,17,
+	16, 8, 9,16,
 };
 
 static static_codebook _huff_book_res_44c_A_1024aux = {

1.3.2.3   +7 -7      vorbis/lib/books/res_44c_A_128aux.vqh

Index: res_44c_A_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_44c_A_128aux.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_44c_A_128aux.vqh	2001/10/11 15:41:47	1.3.2.2
+++ res_44c_A_128aux.vqh	2001/10/12 00:08:07	1.3.2.3
@@ -20,13 +20,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res_44c_A_128aux[] = {
-	 8,15, 9,15,15,12,12,11,15,15,13, 6,15,15, 5,15,
-	 7,13,15,15, 6,15, 2,15,15, 6, 7, 7,15,15,15, 6,
-	15,15, 4,15, 6,10,15,15,14, 4,15,15, 3,15, 5,10,
-	15,15, 9,15, 6,15,15, 9,11,13,15,15,10, 5, 8,15,
-	 4,11, 5, 9,15,15,12, 9,10,11, 7,12, 8,11,15,15,
-	15,11,15, 5,15,15, 4, 6,15,15,15,14,15, 7,15,15,
-	 5, 7,15,15,
+	 4,15, 7,15,15,11,10,12,15,15,13, 4,15,15, 5,15,
+	 8,12,15,15, 4,15, 2,15,15, 7, 7,10,15,15,15, 5,
+	15,15, 5,15, 6,11,15,15,14, 4,15,15, 4,15, 6,10,
+	15,15, 9,15, 7,15,15,10,11,13,15,15,10, 5, 8,15,
+	 4,12, 6,10,15,15,12, 9,11,12, 7,13, 8,12,15,15,
+	15,11,15, 5,15,15, 4, 6,15,15,15,15,15, 7,15,15,
+	 6, 8,14,15,
 };
 
 static static_codebook _huff_book_res_44c_A_128aux = {

1.1.2.2   +13 -13    vorbis/lib/books/Attic/res_Ac_0a.vqh

Index: res_Ac_0a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_0a.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_0a.vqh	2001/10/11 20:34:15	1.1.2.1
+++ res_Ac_0a.vqh	2001/10/12 00:08:07	1.1.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -27,8 +27,6 @@
 };
 
 static long _vq_lengthlist_res_Ac_0a[] = {
-	 1, 0, 0, 0, 0, 0, 4, 4, 0, 0, 0, 5, 4, 0, 0, 0,
-	 0, 0,13, 0, 0, 0, 0,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,
@@ -36,17 +34,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, 4, 0, 0, 0, 0, 0, 8, 7, 0, 0,
-	 0,10, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
-	 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 9, 9, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 8,11, 0, 0, 0, 8, 8,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0,
-	 0, 0, 9, 8, 0, 0, 0, 7, 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,
@@ -65,7 +57,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,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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.2   +9 -9      vorbis/lib/books/res_Ac_1.vqh

Index: res_Ac_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_1.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_1.vqh	2001/10/11 15:41:47	1.3.2.1
+++ res_Ac_1.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -25,11 +25,11 @@
 };
 
 static long _vq_lengthlist_res_Ac_1[] = {
-	 2, 6, 6, 0, 5, 4, 0, 5, 4, 6, 9, 8, 0, 7, 8, 0,
-	 9, 7, 6, 8, 9, 0, 8, 7, 0, 7, 9, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 4, 9, 7, 0, 7, 6, 0, 7, 6, 4, 7, 9,
-	 0, 6, 7, 0, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
-	 7, 8, 0, 6, 7, 0, 7, 6, 4, 8, 8, 0, 7, 6, 0, 6,
+	 2, 5, 5, 0, 4, 4, 0, 4, 5, 5, 7, 6, 0, 8, 7, 0,
+	 8, 7, 5, 6, 7, 0, 7, 8, 0, 7, 8, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 5, 8, 7, 0, 7, 6, 0, 7, 7, 5, 7, 8,
+	 0, 7, 7, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
+	 8, 7, 0, 7, 7, 0, 7, 7, 5, 7, 8, 0, 7, 7, 0, 6,
          7,
 };
 

1.3.2.2   +4 -4      vorbis/lib/books/res_Ac_2.vqh

Index: res_Ac_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_2.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_2.vqh	2001/10/11 15:41:47	1.3.2.1
+++ res_Ac_2.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 

1.1.2.2   +7 -7      vorbis/lib/books/Attic/res_Ac_2a.vqh

Index: res_Ac_2a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_2a.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_2a.vqh	2001/10/11 20:34:15	1.1.2.1
+++ res_Ac_2a.vqh	2001/10/12 00:08:07	1.1.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -29,9 +29,9 @@
 };
 
 static long _vq_lengthlist_res_Ac_2a[] = {
-	 1, 0, 0, 0, 0, 0, 0, 3, 4, 4, 0, 0, 0, 0, 3, 5,
-	 5, 0, 0, 0, 0, 5,10, 9, 6, 7, 0, 0, 0, 9,10, 0,
-	 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0,11,11, 0, 0, 0,
+	 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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.2   +39 -39    vorbis/lib/books/res_Ac_3.vqh

Index: res_Ac_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_3.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_3.vqh	2001/10/11 15:41:47	1.3.2.1
+++ res_Ac_3.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -27,45 +27,45 @@
 };
 
 static long _vq_lengthlist_res_Ac_3[] = {
-	 3, 6, 6,10,10, 0, 5, 5, 9, 9, 0, 5, 5, 9, 9, 0,
-	 7, 7, 9, 9, 0, 0, 0, 9, 9, 6, 8, 8,12,11, 0, 7,
-	 8,10,10, 0, 8, 7,11,10, 0, 9,10,10,11, 0, 0, 0,
-	12,10, 6, 7, 8,11,12, 0, 8, 7,10,10, 0, 7, 8,10,
-	11, 0,10, 9,11,10, 0, 0, 0,10,11,10,12,11,14,13,
-	 0,11,12,12,13, 0,12,10,14,12, 0,12,13,13,15, 0,
-	 0, 0,16,13,10,11,12,13,13, 0,12,11,13,13, 0,10,
-	12,13,13, 0,14,12,16,13, 0, 0, 0,12,14, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 5, 8, 7,12,11, 0, 7, 7,11, 9,
-	 0, 7, 6,11,10, 0, 8, 8,10,10, 0, 0, 0,11,10, 5,
-	 7, 8,10,13, 0, 7, 7,10,11, 0, 6, 7,10,11, 0, 8,
-	 8,10,10, 0, 0, 0,10,11, 9,11,10,15,13, 0,10,11,
-	12,12, 0,11, 9,13,11, 0,11,12,13,13, 0, 0, 0,14,
-	12, 9, 9,11,12,13, 0,10,10,12,13, 0, 9,11,11,13,
-	 0,12,11,13,13, 0, 0, 0,12,14, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 5, 7, 8,10,12, 0, 6, 7,10,11, 0, 7, 6,
-	10,10, 0, 7, 9,10,11, 0, 0, 0,11,10, 5, 8, 7,12,
-	11, 0, 7, 6,11, 9, 0, 7, 7,10,10, 0, 9, 8,11,10,
-	 0, 0, 0,10,10, 9,11,10,12,13, 0, 9,11,12,13, 0,
-	11, 9,12,12, 0,11,12,12,14, 0, 0, 0,14,12, 9,10,
-	10,13,12, 0,10, 9,13,11, 0, 9,11,12,12, 0,13,11,
-	13,12, 0, 0, 0,12,14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 6,10, 9,14,12, 0, 9, 8,12,11, 0, 8, 8,12,11, 0,
-	 9, 9,12,11, 0, 0, 0,11,11, 6, 9,10,12,15, 0, 8,
-	 9,11,12, 0, 8, 8,11,12, 0, 9, 9,11,12, 0, 0, 0,
-	11,11, 9,11,10,15,12, 0,10,10,14,12, 0,11,10,15,
-	12, 0,11,12,13,12, 0, 0, 0,13,12, 9,10,11,12,15,
-	 0,10,11,12,13, 0,10,11,12,13, 0,11,12,12,13, 0,
-	 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 3, 6, 6, 9, 9, 0, 5, 5, 9, 9, 0, 5, 5, 9, 9, 0,
+	 7, 7, 9, 9, 0, 0, 0, 9, 9, 6, 8, 7,11,10, 0, 8,
+	 7,11,10, 0, 7, 7,10,10, 0, 9, 9,11,10, 0, 0, 0,
+	11,11, 6, 7, 8,10,11, 0, 7, 8,10,11, 0, 7, 7,10,
+	10, 0, 9, 9,10,11, 0, 0, 0,10,11, 9,11,10,13,12,
+	 0,11,11,13,13, 0,11,11,13,13, 0,13,12,14,14, 0,
+	 0, 0,14,15, 9,10,11,12,12, 0,11,11,12,14, 0,11,
+	11,12,13, 0,13,13,13,15, 0, 0, 0,14,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, 5, 7, 7,11,11, 0, 7, 6,10,10,
+	 0, 7, 7,10,10, 0, 9, 8,11,10, 0, 0, 0,10,10, 5,
+	 7, 7,12,11, 0, 6, 7,10,10, 0, 7, 7,10,10, 0, 8,
+	 9,10,10, 0, 0, 0,10,10, 9,10,10,13,12, 0,10,10,
+	12,12, 0,10,10,12,12, 0,12,11,13,12, 0, 0, 0,13,
+	13, 9,10,10,13,13, 0,10,11,12,12, 0,10,10,12,12,
+	 0,11,12,12,14, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 5, 8, 7,12,11, 0, 7, 7,10,10, 0, 7, 6,
+	10,10, 0, 8, 8,10,10, 0, 0, 0,10,10, 5, 7, 8,11,
+	11, 0, 7, 7,10,10, 0, 6, 7,10,10, 0, 8, 8,10,10,
+	 0, 0, 0,10,10, 9,10,10,13,13, 0,10,10,13,12, 0,
+	10,10,13,12, 0,12,12,14,13, 0, 0, 0,13,12, 9,10,
+	10,12,13, 0,10,10,12,13, 0,10,10,11,12, 0,11,12,
+	12,13, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 7, 9, 9,13,14, 0, 8, 8,11,12, 0, 8, 9,11,12, 0,
+	10, 9,11,11, 0, 0, 0,11,12, 7, 9, 9,13,13, 0, 8,
+	 8,12,12, 0, 9, 8,12,11, 0, 9,10,11,12, 0, 0, 0,
+	12,11, 9,11,11,13,15, 0,10,10,13,13, 0,10,10,12,
+	13, 0,12,11,13,12, 0, 0, 0,12,13, 9,11,11,14,14,
+	 0,10,11,13,13, 0,10,10,13,13, 0,11,12,12,13, 0,
+	 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
-	11,11,13,14, 0,10,11,12,14, 0,10,10,13,13, 0,11,
-	12,12,13, 0, 0, 0,13,12, 9,11,10,14,13, 0,11,10,
-	15,12, 0,10,10,13,12, 0,12,11,13,12, 0, 0, 0,12,
+	11,10,14,13, 0,10,10,13,13, 0,10,10,13,12, 0,12,
+	12,13,13, 0, 0, 0,13,13, 9,10,11,13,14, 0,10,10,
+	12,13, 0,10,10,13,13, 0,11,11,13,13, 0, 0, 0,12,
         13,
 };
 

1.3.2.2   +40 -40    vorbis/lib/books/res_Ac_4.vqh

Index: res_Ac_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_4.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_4.vqh	2001/10/11 15:41:47	1.3.2.1
+++ res_Ac_4.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -27,45 +27,45 @@
 };
 
 static long _vq_lengthlist_res_Ac_4[] = {
-	 2, 7, 7,13,13, 0, 5, 5,10,10, 0, 5, 5,10,10, 0,
-	 6, 6, 9, 9, 0, 0, 0,10,10, 7,10, 9,15,14, 0, 8,
-	 8,12,12, 0, 9, 7,13,11, 0, 9,10,11,12, 0, 0, 0,
-	13,11, 7, 9,10,13,15, 0, 8, 8,12,12, 0, 7, 9,11,
-	14, 0,10, 9,12,11, 0, 0, 0,11,14,13,16,15, 0,18,
-	 0,14,14,16,15, 0,16,13, 0,14, 0,14,15,15,16, 0,
-	 0, 0,18,15,13,14,15, 0,17, 0,15,14,18,17, 0,13,
-	15,15,18, 0,17,14,16,17, 0, 0, 0,14,17, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 5, 9, 7,16,12, 0, 7, 7,12,11,
-	 0, 7, 6,13,11, 0, 8, 8,11,10, 0, 0, 0,11,10, 5,
-	 7, 9,13,16, 0, 7, 7,11,12, 0, 6, 7,10,12, 0, 8,
-	 8,10,11, 0, 0, 0,10,11,10,14,11,18,15, 0,11,12,
-	15,14, 0,13,10,17,13, 0,12,13,15,14, 0, 0, 0,15,
-	13,10,11,14,16, 0, 0,11,12,13,18, 0,10,13,13,17,
-	 0,14,12,15,14, 0, 0, 0,13,16, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 5, 8, 8,14,15, 0, 6, 7,11,12, 0, 7, 6,
-	11,11, 0, 8, 8,10,11, 0, 0, 0,11,10, 5, 8, 8,14,
-	14, 0, 7, 6,12,11, 0, 7, 7,11,11, 0, 9, 8,11,10,
-	 0, 0, 0,10,11,10,12,12,15,16, 0,11,12,14,15, 0,
-	12,11,16,14, 0,11,14,14,18, 0, 0, 0,18,13,10,12,
-	13,16,18, 0,13,11,18,14, 0,11,12,14,16, 0,14,12,
-	15,13, 0, 0, 0,13,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 6,10, 9,17,14, 0, 8, 7,13,12, 0, 8, 8,13,12, 0,
-	 9, 8,13,11, 0, 0, 0,12,12, 6, 9,10,14,16, 0, 8,
-	 8,12,15, 0, 8, 8,12,14, 0, 8, 9,11,13, 0, 0, 0,
-	12,12,10,13,11,18,14, 0,11,10,15,13, 0,12,10,16,
-	13, 0,12,12,14,13, 0, 0, 0,15,13, 9,11,13,15,18,
-	 0,10,11,13,16, 0,10,11,13, 0, 0,12,12,13,14, 0,
-	 0, 0,14,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 2, 6, 6,11,10, 0, 5, 5, 9, 9, 0, 5, 5, 9, 9, 0,
+	 6, 6, 9, 9, 0, 0, 0, 9, 9, 6, 8, 7,12,11, 0, 8,
+	 8,11,10, 0, 8, 8,11,11, 0,10, 9,12,12, 0, 0, 0,
+	12,11, 6, 7, 8,11,12, 0, 8, 8,11,12, 0, 8, 8,10,
+	11, 0, 9,10,11,12, 0, 0, 0,11,12,10,12,11,14,13,
+	 0,12,12,15,14, 0,13,12,15,14, 0,14,16,16,16, 0,
+	 0, 0,18,15,10,11,12,13,15, 0,12,13,14,15, 0,12,
+	13,13,15, 0,15,15,14,17, 0, 0, 0,15,18, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 5, 8, 8,13,13, 0, 7, 7,11,10,
+	 0, 7, 7,11,11, 0, 9, 8,11,10, 0, 0, 0,11,11, 5,
+	 8, 8,12,13, 0, 7, 7,11,11, 0, 7, 7,11,11, 0, 8,
+	 9,10,11, 0, 0, 0,11,11, 9,11,11,15,14, 0,11,11,
+	14,13, 0,11,11,14,13, 0,13,12,15,13, 0, 0, 0,14,
+	14,10,10,11,13,15, 0,10,11,13,14, 0,11,11,14,14,
+	 0,12,13,13,14, 0, 0, 0,14,16, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 5, 8, 8,13,12, 0, 7, 7,11,11, 0, 7, 7,
+	11,10, 0, 8, 8,11,11, 0, 0, 0,11,10, 5, 8, 8,13,
+	13, 0, 7, 7,11,11, 0, 7, 7,10,11, 0, 8, 8,11,11,
+	 0, 0, 0,10,11, 9,11,11,14,14, 0,11,11,14,13, 0,
+	11,11,14,13, 0,13,13,15,14, 0, 0, 0,14,13, 9,10,
+	11,14,16, 0,11,11,14,14, 0,11,11,13,14, 0,13,13,
+	14,15, 0, 0, 0,13,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,
+	 6,10,10,15,15, 0, 8, 8,14,13, 0, 8, 9,14,13, 0,
+	10, 9,14,12, 0, 0, 0,12,13, 7,10,10,16,15, 0, 8,
+	 8,13,14, 0, 9, 8,13,13, 0, 9,10,12,13, 0, 0, 0,
+	13,12,10,12,11,18,16, 0,11,10,15,14, 0,11,11,15,
+	15, 0,13,12,15,13, 0, 0, 0,14,14, 9,11,12,15,16,
+	 0,10,11,14,15, 0,11,11,14,17, 0,12,13,13,15, 0,
+	 0, 0,15,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
-	11,12,16,17, 0,10,11,13,15, 0,11,10,14,14, 0,11,
-	13,13,16, 0, 0, 0,15,13,10,13,11,17,16, 0,12,10,
-	16,13, 0,10,11,14,14, 0,13,11,15,13, 0, 0, 0,13,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+	12,11,18,16, 0,11,11,15,14, 0,11,10,15,14, 0,12,
+	13,14,14, 0, 0, 0,15,13, 9,11,12,15,16, 0,11,11,
+	14,15, 0,10,11,13,14, 0,13,12,15,14, 0, 0, 0,13,
         14,
 };
 

1.3.2.2   +9 -9      vorbis/lib/books/res_Ac_5.vqh

Index: res_Ac_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_5.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_5.vqh	2001/10/11 15:41:48	1.3.2.1
+++ res_Ac_5.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -27,13 +27,13 @@
 };
 
 static long _vq_lengthlist_res_Ac_5[] = {
-	 2, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
+	 2, 4, 4, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 4, 7, 6, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 4, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8,
+	 0, 0, 3, 4, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6,10, 9,
          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 6, 7, 8,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,

1.1.2.2   +9 -9      vorbis/lib/books/Attic/res_Ac_5a.vqh

Index: res_Ac_5a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_5a.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_5a.vqh	2001/10/11 20:34:15	1.1.2.1
+++ res_Ac_5a.vqh	2001/10/12 00:08:07	1.1.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -31,11 +31,11 @@
 };
 
 static long _vq_lengthlist_res_Ac_5a[] = {
-	 1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 5, 0, 0, 0, 0,
-	 0, 0, 3, 5, 6, 0, 0, 0, 0, 0, 0, 5, 7, 7, 6, 6,
-	 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8,
-	 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 8,
-	 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0,
+	 1, 3, 2, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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.2   +7 -7      vorbis/lib/books/res_Ac_6.vqh

Index: res_Ac_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_6.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_6.vqh	2001/10/11 15:41:48	1.3.2.1
+++ res_Ac_6.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -31,10 +31,10 @@
 };
 
 static long _vq_lengthlist_res_Ac_6[] = {
-	 2, 4, 4, 7, 7, 9, 9,10,10, 0, 4, 4, 6, 6, 8, 8,
-	10,10, 0, 4, 4, 6, 6, 8, 8,10,10, 0, 5, 4, 6, 6,
+	 2, 4, 4, 7, 7, 8, 8,10,10, 0, 4, 4, 6, 6, 8, 8,
+	10,10, 0, 4, 3, 6, 6, 8, 8,10,10, 0, 5, 5, 7, 6,
          8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0,
-	 6, 6, 9, 9,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0,
+	 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
          0, 0, 8, 8, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
         11,
 };

1.3.2.2   +7 -7      vorbis/lib/books/res_Ac_7.vqh

Index: res_Ac_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_7.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_7.vqh	2001/10/11 15:41:48	1.3.2.1
+++ res_Ac_7.vqh	2001/10/12 00:08:07	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -29,9 +29,9 @@
 };
 
 static long _vq_lengthlist_res_Ac_7[] = {
-	 1, 4, 4, 7, 7, 9, 9, 5, 5, 4, 8, 7, 9,10, 5, 4,
-	 4, 7, 7, 9, 9, 0, 8, 7, 9, 9,11,11, 0, 8, 8, 8,
-	 8,10,10, 0,13,12,10,10,12,13, 0,13,13,10,10,11,
+	 1, 4, 4, 6, 6, 8, 8, 5, 4, 4, 7, 7, 9, 9, 5, 5,
+	 5, 7, 7, 9, 9, 0, 7, 7, 8, 8,10,10, 0, 8, 8, 9,
+	 9,10,10, 0,12,12, 9,10,11,10, 0,13,13,10,10,12,
         11,
 };
 

1.3.2.2   +43 -43    vorbis/lib/books/res_Ac_7a.vqh

Index: res_Ac_7a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_7a.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_7a.vqh	2001/10/11 15:41:48	1.3.2.1
+++ res_Ac_7a.vqh	2001/10/12 00:08:08	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -27,45 +27,45 @@
 };
 
 static long _vq_lengthlist_res_Ac_7a[] = {
-	 3, 6, 6, 8, 8,11, 6, 6, 8, 8,11, 6, 6, 8, 8,10,
-	 8, 8, 8, 8,11,11,11, 8, 9, 6, 8, 7, 9, 9,11, 8,
-	 8,10, 9,11, 8, 8,10, 9,11, 9,10,10, 9,11,11,11,
-	10, 9, 6, 7, 8, 9,10,11, 8, 8, 9,10,11, 8, 8, 9,
-	10,11,10,10,10, 9,11,11,11, 9,10, 8, 9, 9,10,10,
-	12,10,10,10,10,12,10,10,10,10,12,10,10,10,11,12,
-	12,12,10,10, 9, 9, 9,10,10,12,10,10,10,10,12,10,
-	10,10,10,11,10,10,10,10,12,12,12,10,10,10,11,11,
-	12,12,13,11,12,12,12,13,11,11,12,12,13,12,12,12,
-	12,13,13,13,12,12, 6, 8, 8,10,10,11, 8, 8,10,10,
-	11, 8, 8, 9,10,11, 9, 9,10, 9,11,11,11,10, 9, 6,
-	 8, 8,10,10,11, 8, 8,10,10,11, 8, 8, 9,10,11, 9,
-	 9, 9, 9,11,11,11, 9,10, 8, 9, 9,10,10,12,10,10,
-	10,10,11,10, 9,10,10,12,10,10,10,10,11,11,12,10,
-	10, 8, 9, 9,10,10,12,10,10,11,10,12, 9,10,10,10,
-	12,10,10,10,10,11,12,11,10,10,11,11,11,12,12,13,
-	11,11,11,12,13,11,11,12,11,14,12,12,12,12,13,13,
-	12,11,12, 6, 8, 8,10,10,11, 8, 8, 9, 9,11, 8, 8,
-	 9,10,11, 9, 9, 9, 9,11,11,11,10, 9, 6, 8, 8,10,
-	10,11, 8, 8,10,10,11, 8, 8, 9,10,11, 9, 9,10, 9,
-	11,11,11, 9, 9, 8,10, 9,10,10,11, 9, 9,10,10,11,
-	10, 9,10,10,11,10,10,10,10,12,11,11,10,10, 8, 9,
-	10,10,10,12, 9, 9,10,10,12, 9,10,10,10,11,10,10,
-	10,10,12,11,12,10,10,11,11,11,12,12,13,11,12,12,
-	12,13,11,11,12,11,13,12,12,11,11,13,13,13,11,11,
-	 8,10,10,11,10,12, 9, 9,11,10,12, 9, 9,10,10,12,
-	10, 9,10,10,11,12,12,10,10, 8, 9,10,11,10,12, 9,
-	 9,10,10,11, 9, 9,10,10,12, 9,10,10,10,12,12,12,
-	10,10, 8,10,10,10,10,11, 9, 9,10,10,11, 9, 9,10,
-	10,12,10,10,10,10,11,11,11,10,10, 8, 9,10,10,10,
-	11, 9,10,10,10,11, 9, 9,10,10,12,10,10,10,10,12,
-	12,11,10,10,11,11,11,12,12,14,11,11,12,11,13,11,
-	12,12,12,13,12,12,12,12,12,12,13,12,11,11,11,12,
-	12,12,12,11,11,12,12,13,11,11,11,12,12,12,12,12,
-	11,12,13,13,11,12,11,12,11,12,12,13,11,11,12,12,
-	13,12,11,12,12,12,12,12,12,12,13,13,13,12,12, 8,
-	10,10,10,10,11, 9,10,10,10,12, 9, 9,10,10,12,10,
-	10,10,10,12,11,11,10,10, 8,10,10,10,10,11, 9, 9,
-	10,10,12, 9, 9,10,10,11,10,10,10,10,11,12,11,10,
+	 3, 6, 6, 8, 8,10, 6, 6, 8, 8,10, 6, 6, 8, 8,11,
+	 8, 8, 8, 8,11,11,11, 8, 8, 6, 7, 7, 9, 9,11, 8,
+	 8, 9, 9,11, 8, 8, 9, 9,11,10,10,10,10,11,11,11,
+	10,10, 6, 7, 7, 9, 9,11, 8, 8,10, 9,11, 8, 8, 9,
+	10,11,10,10,10,10,11,11,11, 9,10, 8, 9, 9,10, 9,
+	11,10,10,10,10,11,10,10,10,10,12,11,11,11,10,12,
+	12,12,11,11, 8, 9, 9,10,10,12,10,10,10,10,11,10,
+	10,10,10,12,11,11,10,10,11,12,12,10,10,10,11,11,
+	11,12,13,11,11,11,11,13,12,11,12,12,13,12,12,12,
+	12,13,13,12,11,11, 6, 8, 8,10,10,11, 8, 8,10, 9,
+	12, 8, 8,10, 9,11, 9, 9, 9,10,11,11,11, 9, 9, 6,
+	 8, 8,10,10,11, 8, 8,10,10,12, 8, 8, 9,10,11, 9,
+	 9, 9, 9,11,11,11, 9,10, 8, 9, 9,10,10,11,10, 9,
+	10,10,12,10,10,10,10,12,11,11,10,10,12,12,12,11,
+	10, 8, 9,10,10,10,12,10,10,10,10,11,10,10,10,10,
+	12,11,10,11,11,12,12,11,10,11,10,11,11,12,11,13,
+	11,11,12,12,13,11,11,11,12,12,12,12,12,12,13,12,
+	12,12,12, 6, 8, 8,10,10,12, 8, 8,10,10,11, 8, 8,
+	 9, 9,11, 9, 9, 9, 9,11,12,11,10, 9, 6, 8, 8,10,
+	10,11, 8, 8,10,10,11, 8, 8, 9,10,11, 9, 9, 9, 9,
+	11,11,12, 9, 9, 8, 9, 9,10,10,12,10,10,10,10,12,
+	 9, 9,10,10,11,10,10,10,10,11,11,11,10,10, 8, 9,
+	10,10,10,12,10, 9,10,10,12, 9, 9,10,10,11,10,10,
+	10,10,11,12,11,10,10,11,11,11,12,12,13,11,11,12,
+	12,13,11,12,12,12,13,12,12,11,11,13,13,13,11,12,
+	 8,10,10,11,10,12, 9, 9,11,11,12, 9, 9,10,10,12,
+	10,10,10,10,12,12,12,10,10, 8,10, 9,11,11,12, 9,
+	 9,10,10,12, 9, 9,10,10,12,10,10,10,10,12,12,12,
+	10,10, 9,10,10,10,10,12, 9, 9,10,10,12, 9, 9,10,
+	10,12,10,10,10,10,11,12,12,10,10, 8, 9,10,10,10,
+	11, 9,10,10,10,11, 9, 9,10,10,11,10,10,10,10,11,
+	12,12,10,10,10,11,11,12,12,12,11,11,11,12,13,11,
+	11,12,12,12,12,12,12,11,13,12,13,11,12,11,11,11,
+	12,12,13,11,11,12,12,13,12,11,12,12,12,12,12,12,
+	11,12,12,13,12,12,11,12,11,12,12,13,11,12,12,12,
+	13,11,11,12,12,13,12,12,12,11,12,13,12,11,12, 8,
+	10,10,10,11,12, 9, 9,10,11,12, 9, 9,10,10,11,10,
+	10,10,10,11,12,12,10,10, 8,10,10,10,11,11, 9, 9,
+	10,11,12, 9, 9,10,10,12,10,10,10,10,12,12,12,10,
         10,
 };
 

1.1.2.2   +15 -15    vorbis/lib/books/Attic/res_Ac_7b.vqh

Index: res_Ac_7b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_7b.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_7b.vqh	2001/10/11 20:34:15	1.1.2.1
+++ res_Ac_7b.vqh	2001/10/12 00:08:08	1.1.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -35,17 +35,17 @@
 };
 
 static long _vq_lengthlist_res_Ac_7b[] = {
-	 1,14,14,13,13,13,13,13,13,13,13,13,13, 4, 5, 5,
-	13,13,13,13,13,13,13,13,13,13, 3, 5, 5,13,13,13,
-	13,13,13,13,13,13,13, 5, 7, 7, 6, 6,13,13,13,13,
-	13,13,13,13, 7, 7, 7,13,13,13,13,13,13,13,13,13,
-	13, 7, 7, 7,13,13,13,13,13,13,13,13,13,13, 6, 7,
-	 7,13,13,13,13,13,13,13,13,13,13, 7,13,13,13,13,
-	13,13, 8, 9,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,
+	 2, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9, 8, 8,17, 4, 4,
+	 7, 7, 8, 8, 9, 9, 9, 9, 8, 8,17, 4, 4, 6, 7, 8,
+	 8, 9, 9, 9, 9, 8, 8,17, 6, 6, 7, 7, 8, 8, 9, 9,
+	10,10, 9, 9,17,17,17, 7, 7, 8, 8, 9, 9,10,10, 9,
+	 9,17,17,17, 8, 8, 9, 9,10,10, 9,10, 9, 9,17,17,
+	17, 8, 8, 9, 9,10,10,10,10, 9, 9,17,17,17, 8, 8,
+	 9, 9,10,10,10,10, 9, 9,17,17,17,17,17, 9, 9,10,
+	10,10,10, 9, 9,16,16,16,16,16, 9, 9,10,10,10,11,
+	 9, 9,16,16,16,16,16, 9, 9,10,10,10,10, 9, 9,16,
+	16,16,16,16,10, 9, 9, 9, 9, 9, 7, 7,16,16,16,16,
+	16,16,16, 9, 9, 9, 9, 8, 8,
 };
 
 static float _vq_quantthresh_res_Ac_7b[] = {

1.3.2.2   +15 -15    vorbis/lib/books/res_Ac_8.vqh

Index: res_Ac_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_8.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_8.vqh	2001/10/11 15:41:48	1.3.2.1
+++ res_Ac_8.vqh	2001/10/12 00:08:08	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -35,17 +35,17 @@
 };
 
 static long _vq_lengthlist_res_Ac_8[] = {
-	 1, 3, 4, 6, 6, 8, 8, 9, 9,11,10,12,11, 6, 5, 5,
-	 7, 7, 9, 9,10,10,12,12,13,13, 6, 5, 5, 7, 7, 9,
-	 9,10,10,11,11,13,13, 0, 7, 8, 8, 8,10, 9,12,11,
-	13,14,13,13, 0, 7, 7, 8, 8, 9, 9,11,12,12,13,13,
-	13, 0,13,14,10,10,10,11,13,12,14,13,16,15, 0,14,
-	14, 9,10,11,11,12,12,13,13,13,14, 0, 0, 0,12,12,
-	12,11,13,13,14,14,16,15, 0, 0, 0,12,12,12,12,13,
-	13,14,14,16,16, 0, 0, 0,16, 0,12,13,13,13,14,16,
-	16,16, 0, 0, 0, 0,15,14,13,14,13,15,13,15,15, 0,
-	 0, 0, 0, 0,16,16,14,15,16,14, 0,16, 0, 0, 0, 0,
-	 0,16,16,15,15,16,16, 0,15,
+	 1, 4, 3, 6, 6, 8, 8, 9, 9,10,10,11,10, 6, 5, 5,
+	 7, 7, 9, 9,10,10,11,11,13,12, 6, 5, 5, 7, 7, 9,
+	 9,10,10,12,11,13,12, 0, 7, 7, 8, 8,10, 9,11,12,
+	12,13,13,13, 0, 8, 8, 8, 8,10,10,11,11,13,14,14,
+	13, 0,12,12, 9, 9,10,10,12,12,13,13,14,14, 0,13,
+	13,10, 9,10,11,12,13,14,14,17,17, 0, 0, 0,12,11,
+	12,12,13,12,14,14,15,14, 0, 0, 0,12,12,11,11,13,
+	13,14,15,15,16, 0, 0, 0,16,14,13,12,14,14,15,15,
+	16,15, 0, 0, 0,16, 0,13,13,13,14,15,15,16, 0, 0,
+	 0, 0, 0, 0,14,14,15,15,15,15,16,16, 0, 0, 0, 0,
+	 0,15,15,16,13,15,13,16, 0,
 };
 
 static float _vq_quantthresh_res_Ac_8[] = {

1.3.2.2   +10 -10    vorbis/lib/books/res_Ac_8a.vqh

Index: res_Ac_8a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_8a.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_8a.vqh	2001/10/11 15:41:48	1.3.2.1
+++ res_Ac_8a.vqh	2001/10/12 00:08:08	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -35,12 +35,12 @@
 };
 
 static long _vq_lengthlist_res_Ac_8a[] = {
-	 4, 5, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6,
-	 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 9, 6, 6, 6, 6, 7,
-	 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7, 7, 7, 7, 7,
-	 8, 7, 7, 7, 9, 9, 9, 7, 7, 7, 7, 7, 8, 8, 8, 7,
-	 8, 9, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
-	 9, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
+	 4, 5, 5, 6, 6, 7, 7, 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,
+	 8, 7, 7, 8, 9, 9, 9, 7, 7, 7, 7, 7, 7, 8, 8, 7,
+	 8, 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9,
+	 9, 7, 7, 8, 7, 8, 8, 7, 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,

1.3.2.2   +8 -8      vorbis/lib/books/res_Ac_9.vqh

Index: res_Ac_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_9.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_9.vqh	2001/10/11 15:41:48	1.3.2.1
+++ res_Ac_9.vqh	2001/10/12 00:08:08	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -29,10 +29,10 @@
 };
 
 static long _vq_lengthlist_res_Ac_9[] = {
-	 1, 4, 3, 9,10,11,11, 3,10, 5,11,11,11,11, 4, 4,
-	 9,11,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,
+	 1, 4, 4,10,10,10,10, 3, 4,10,10,10,10,10, 3,10,
+	 7,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9,
 };
 
 static float _vq_quantthresh_res_Ac_9[] = {

1.3.2.2   +15 -15    vorbis/lib/books/res_Ac_9a.vqh

Index: res_Ac_9a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_9a.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_9a.vqh	2001/10/11 15:41:48	1.3.2.1
+++ res_Ac_9a.vqh	2001/10/12 00:08:08	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -35,17 +35,17 @@
 };
 
 static long _vq_lengthlist_res_Ac_9a[] = {
-	 2, 3, 3, 7, 7, 8, 8, 9, 9, 8, 9, 7, 7, 4, 5, 4,
-	 8, 8, 9, 9,10,10,10,10, 8, 8, 6, 5, 6, 9, 9,10,
-	 9,10, 9,10,10, 9, 8,12, 5, 5, 7, 6,10,11,13,10,
-	 9,11, 8, 9,13, 9, 7,10, 9,10,11,11,11,10,10, 9,
-	 8,13, 9, 9, 7, 6,11,10,11,11, 9,11, 9,12,12,12,
-	 9,10, 9,10,12,12,11,12,10,11, 8,13,12,13,13, 9,
-	11,10,13,13,10,13,12,12,13,13,13,11,11,12,12,12,
-	12,13,10,12, 9,12,13,12,13,13,12,12,11,13,11,13,
-	13,13,13,12,13,13,13,11,13,12,12,11,11,12,12,13,
-	13,13,13,13,12,13,11,13,13,11,12,11,13,13,13,12,
-	13,13,12,12,11,12,11,11,12,
+	 2, 3, 3, 7, 7, 9, 8,10, 9,11, 9, 9, 9, 5, 5, 5,
+	 9, 9,10,10,10,11,13,10, 9, 9, 5, 4, 4, 8, 9,10,
+	 9,10,12,11,10, 9, 9,13, 8, 8,10,10,11,10,12,12,
+	12,11,10,11,13, 6, 5, 6, 6,11,11,11,11,10,11, 8,
+	 9,13,12, 9, 9, 8,11,12,12,12,11, 9,12, 9,13,10,
+	10, 7, 6,11,10,12,12, 8,12, 9,11,13,12,13,11,11,
+	12,12,12,12,12, 8,12,10,13,13,13,12, 9,13, 9,12,
+	12, 8,13,11,12,13,13,13,13,13,12,13,13, 9,11, 9,
+	12,12,13,13,12,13,13,12,12, 8,13, 9,12,13,13,13,
+	13,13,13,13,13,13,11, 9,11,10,11,11,13,13,13,13,
+	13,11,12, 9,12,12,12,12,11,
 };
 
 static float _vq_quantthresh_res_Ac_9a[] = {

1.3.2.2   +15 -15    vorbis/lib/books/res_Ac_9b.vqh

Index: res_Ac_9b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_9b.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_Ac_9b.vqh	2001/10/11 15:41:48	1.3.2.1
+++ res_Ac_9b.vqh	2001/10/12 00:08:08	1.3.2.2
@@ -1,12 +1,12 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
@@ -35,17 +35,17 @@
 };
 
 static long _vq_lengthlist_res_Ac_9b[] = {
-	 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 9, 7, 8, 7, 8, 7, 8, 7, 8,
-	 7, 7, 7, 7, 9, 8, 9, 8, 8, 8, 8, 7, 8, 7, 7, 7,
-	 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 7, 7, 7, 7, 9, 8,
-	 9, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 8, 9, 8, 8, 8,
-	 8, 8, 7, 8, 7, 7, 7, 7, 9, 9, 8, 9, 8, 8, 8, 8,
-	 8, 8, 7, 7, 7, 8, 9, 8, 8, 8, 8, 8, 8, 7, 7, 7,
-	 7, 7, 8, 9, 8, 8, 9, 8, 8, 7, 7, 8, 7, 7, 7, 8,
-	 9, 8, 8, 8, 7, 8, 8, 7, 7, 8, 8, 7, 9, 8, 9, 9,
-	 8, 8, 8, 8, 7, 8, 7, 7, 7,
+	 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 8, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 8,
+	 7, 8, 7, 7, 8, 8, 8, 7, 8, 7, 7, 7, 7, 8, 7, 7,
+	 7, 9, 9, 8, 8, 7, 8, 8, 7, 8, 7, 8, 7, 7, 8, 8,
+	 9, 8, 8, 7, 8, 7, 7, 7, 7, 7, 7, 9, 9, 9, 8, 8,
+	 8, 8, 8, 8, 8, 7, 7, 7, 9, 8, 8, 8, 8, 7, 7, 8,
+	 7, 7, 8, 7, 8, 8, 8, 9, 8, 8, 8, 8, 8, 7, 8, 7,
+	 7, 7, 8, 9, 8, 9, 8, 7, 8, 7, 7, 7, 7, 8, 7, 8,
+	 9, 8, 8, 8, 7, 8, 8, 7, 8, 7, 7, 7, 9, 9, 9, 8,
+	 8, 9, 8, 7, 7, 8, 7, 8, 7,
 };
 
 static float _vq_quantthresh_res_Ac_9b[] = {

No                   revision

No                   revision

1.4.2.4   +8 -8      vorbis/lib/modes/mode_44c_A.h

Index: mode_44c_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_44c_A.h,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- mode_44c_A.h	2001/10/11 20:34:16	1.4.2.3
+++ mode_44c_A.h	2001/10/12 00:08:15	1.4.2.4
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_A.h,v 1.4.2.3 2001/10/11 20:34:16 xiphmont Exp $
+ last mod: $Id: mode_44c_A.h,v 1.4.2.4 2001/10/12 00:08:15 xiphmont Exp $
 
  ********************************************************************/
 
@@ -107,10 +107,10 @@
 
 static float _psy_compand_44c_A[NOISE_COMPAND_LEVELS]={
   0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f,  7.f,     /* 7dB */
-  8.f, 8.f, 7.f, 6.f, 5.f, 4.f, 3.f,  2.f,     /* 15dB */
-  1.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,  0.f,     /* 23dB */
-  0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,  0.f,     /* 31dB */
-  1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f,  8.f,     /* 39dB */
+  8.f, 8.f, 7.f, 6.f, 5.f, 4.f, 4.f,  4.f,     /* 15dB */
+  4.f, 4.f, 5.f, 5.f, 5.f, 6.f, 6.f,  6.f,     /* 23dB */
+  7.f, 7.f, 7.f, 8.f, 8.f, 8.f, 9.f, 10.f,     /* 31dB */
+ 11.f,12.f,13.f,14.f,15.f,16.f,17.f, 18.f,     /* 39dB */
 };
 
 
@@ -155,7 +155,7 @@
       4,4,100,
 
   /*63     125     250     500      1k      2k      4k       8k     16k*/
-  {-30,-30,-30,-30,-26,-20,-20,-10, -6,  -2,  -3,  -3,  0,   0,  0,  0,  3},
+  {-30,-30,-30,-30,-26,-20,-20,-10, -6,  -2,  -5,  -5,  -2,   0,  0,  0,  3},
   _psy_compand_44c_A,
 
   95.f,  /* even decade + 5 is important; saves an rint() later in a
@@ -180,7 +180,7 @@
       4,4,100,
 
   /*63     125     250     500      1k      2k      4k       8k     16k*/
-  {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3,  0,  0,  0,  0,  3},
+  {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -5, -5,  -2,  0,  0,  0,  3},
   _psy_compand_44c_A,
 
   95.f,  /* even decade + 5 is important; saves an rint() later in a
@@ -212,7 +212,7 @@
   60,30,500,
   999,999,1,18.,
   8,70,
-  96};
+  112};
 
 
 static vorbis_info_floor1 _floor_set_44c_A={
@@ -246,7 +246,7 @@
   896};
 
 static vorbis_info_residue0 _residue_set_44c_A0={
-  0,192, 16, 10,23,
+  0,224, 16, 10,23,
   {64,4,40,
    2,2,20,
    18,22,22,7},

No                   revision

No                   revision

1.24.6.1  +6 -6      vorbis/vq/bookutil.c

Index: bookutil.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/bookutil.c,v
retrieving revision 1.24
retrieving revision 1.24.6.1
diff -u -r1.24 -r1.24.6.1
--- bookutil.c	2001/05/27 06:44:07	1.24
+++ bookutil.c	2001/10/12 00:08:15	1.24.6.1
@@ -7,11 +7,11 @@
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
  * by the XIPHOPHORUS Company http://www.xiph.org/                  *
-
+ *                                                                  *
  ********************************************************************
 
  function: utility functions for loading .vqh and .vqd files
- last mod: $Id: bookutil.c,v 1.24 2001/05/27 06:44:07 xiphmont Exp $
+ last mod: $Id: bookutil.c,v 1.24.6.1 2001/10/12 00:08:15 xiphmont Exp $
 
  ********************************************************************/
 
@@ -538,12 +538,12 @@
   "/********************************************************************\n"
   " *                                                                  *\n"
   " * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *\n"
-  " * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *\n"
-  " * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *\n"
-  " * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *\n"
+  " * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *\n"
+  " * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *\n"
+  " * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *\n"
   " *                                                                  *\n"
   " * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *\n"
-  " * by the XIPHOPHORUS Company, http://www.xiph.org/                 *\n"
+  " * by the XIPHOPHORUS Company http://www.xiph.org/                  *\n"
   " *                                                                  *\n"
   " ********************************************************************\n"
   "\n"

1.1.4.3   +2 -2      vorbis/vq/res_44c_A.vqs

Index: res_44c_A.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/res_44c_A.vqs,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- res_44c_A.vqs	2001/10/11 15:41:56	1.1.4.2
+++ res_44c_A.vqs	2001/10/12 00:08:15	1.1.4.3
@@ -27,7 +27,7 @@
 huffbuild line_1024x31_3sub2.vqd 9-25
 huffbuild line_1024x31_3sub3.vqd 25-64
 
-residuesplit residue_0#0.vqd 0,192,16 res_A ,.7,    ,1.5,8 ,1.5 ,2.5,3 ,2.5,8 ,2.5 ,4.5 ,17.5 ,84.5 
+residuesplit residue_0#0.vqd 0,224,16 res_A ,.7,    ,1.5,8 ,1.5 ,2.5,3 ,2.5,8 ,2.5 ,4.5 ,17.5 ,84.5 
 mv res_Aaux.vqd res_44c_A_128aux.vqd
 
 residuesplit residue_1#0.vqd residue_1#1.vqd 0,1792,32 res_B ,.7, ,1.5,32 ,1.5 ,2.5,18 ,2.5,32 ,2.5 ,4.5 ,17.5 ,84.5
@@ -36,7 +36,7 @@
 GO
 
 >res_Ac_128 noninterleaved
-haux res_44c_A_128aux.vqd 0,12,2
+haux res_44c_A_128aux.vqd 0,14,2
 
 >res_Ac noninterleaved
 haux res_44c_A_1024aux.vqd 0,56,2

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