Mode 0 is just about there.

svn path=/branches/branch_monty_20011009/vorbis/; revision=2511

36 files changed, 141 insertions, 517 deletions

diff --git a/lib/books/coupled/_44c0_long.vqh b/lib/books/coupled/_44c0_long.vqh
index 871b42a2..1697ee1f 100644
--- a/lib/books/coupled/_44c0_long.vqh
+++ b/lib/books/coupled/_44c0_long.vqh
@@ -20,17 +20,14 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c0_long[] = {
-	 5,10,11,12,15, 5, 8,10,14,16,11, 4, 6, 8,11,16,
-	16,16,16,16,10, 5, 6, 7,10,16,16,16,16,16,10, 6,
-	 7, 8, 9,16,16,16,16,16,11, 8, 7, 5, 5,16,16,16,
-	16,13, 4,16,16,16,16, 1, 5, 8,11,16, 8,16,16,16,
-	16, 5, 7, 9,12,16,10,16,16,16,16, 8, 9,10,12,16,
-	13,16,16,16,16,11,13,12,14,16,16,13,13,10, 5,16,
-	16,16,15,11,
+	 3,10,10,12,14, 4, 8,15, 8, 3, 5, 8,11, 5, 8,15,
+	 9, 4, 5, 7,10, 7,10,14, 9, 6, 6, 6, 8,10,13,14,
+	11, 8, 7, 7, 4,17,17,15, 4,16,16,16,16, 2, 6,14,
+	 8,16,16,16,16, 6, 8,13,14,13,14,11, 8,13,13,16,
 };
 
 static static_codebook _huff_book__44c0_long = {
-	2, 100,
+	2, 64,
 	_huff_lengthlist__44c0_long,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/coupled/_44c0_s0_p1_0.vqh b/lib/books/coupled/_44c0_s0_p1_0.vqh
index 64bf8861..6685d913 100644
--- a/lib/books/coupled/_44c0_s0_p1_0.vqh
+++ b/lib/books/coupled/_44c0_s0_p1_0.vqh
@@ -29,15 +29,15 @@ static long _vq_quantlist__44c0_s0_p1_0[] = {
 static long _vq_lengthlist__44c0_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, 9, 8, 0, 0, 0, 9,
-	 8, 0, 0, 0, 8, 8, 0, 0, 0,12,11, 0, 0, 0, 0, 0,
-	 0, 0, 6, 8, 9, 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,
+	 8, 0, 0, 0, 9, 8, 0, 0, 0,12,11, 0, 0, 0, 0, 0,
+	 0, 0, 6, 8, 9, 0, 0, 0, 8, 9, 0, 0, 0, 8, 9, 0,
+	 0, 0,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, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 9, 0, 0, 0, 8, 7, 0, 0,
-	 0, 7, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5,
+	 0, 0, 0, 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 7, 0, 0,
+	 0, 7, 8, 0, 0, 0,11, 9, 0, 0, 0, 0, 0, 0, 0, 5,
 	 9, 9, 0, 0, 0, 7, 8, 0, 0, 0, 8, 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,
@@ -52,9 +52,9 @@ static long _vq_lengthlist__44c0_s0_p1_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 8,11,11, 0, 0, 0,10,10, 0, 0, 0,10,11, 0, 0, 0,
-	12,11, 0, 0, 0, 0, 0, 0, 0, 9,12,11, 0, 0, 0,10,
-	10, 0, 0, 0,11,10, 0, 0, 0,11,12, 0, 0, 0, 0, 0,
+	 8,11,12, 0, 0, 0,10,10, 0, 0, 0, 9,11, 0, 0, 0,
+	12,11, 0, 0, 0, 0, 0, 0, 0, 8,12,11, 0, 0, 0,10,
+	10, 0, 0, 0,11, 9, 0, 0, 0,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/lib/books/coupled/_44c0_s0_p2_0.vqh b/lib/books/coupled/_44c0_s0_p2_0.vqh
index 3662f4e3..ae0a3ef3 100644
--- a/lib/books/coupled/_44c0_s0_p2_0.vqh
+++ b/lib/books/coupled/_44c0_s0_p2_0.vqh
@@ -31,10 +31,10 @@ static long _vq_quantlist__44c0_s0_p2_0[] = {
 };
 
 static long _vq_lengthlist__44c0_s0_p2_0[] = {
-	 1, 4, 4, 7, 7, 0, 0, 0, 0, 0, 4, 4, 7, 6, 0, 0,
+	 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, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
-	 9,10, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0,
+	10, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0,
 	 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
diff --git a/lib/books/coupled/_44c0_s0_p3_0.vqh b/lib/books/coupled/_44c0_s0_p3_0.vqh
index a8453aad..60d4f393 100644
--- a/lib/books/coupled/_44c0_s0_p3_0.vqh
+++ b/lib/books/coupled/_44c0_s0_p3_0.vqh
@@ -39,22 +39,22 @@ static long _vq_quantlist__44c0_s0_p3_0[] = {
 };
 
 static long _vq_lengthlist__44c0_s0_p3_0[] = {
-	 1, 5, 4, 7, 7, 7, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 4, 7, 7, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 4, 4, 7, 7, 8, 7, 9, 9, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 7, 8, 8, 8, 8, 9,10, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 9,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, 8, 8, 9, 9,11,10, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10, 9,10,11,11,
+	 1, 4, 4, 7, 7, 7, 7, 9, 9, 0, 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, 4, 4, 7, 7, 8, 8, 9,10, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 7, 8, 7, 8, 8,10,10, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 8, 7, 8, 8,10,10, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 9, 8, 9, 9,10,10, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9,11,10, 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,11,11,
-	11,12, 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,10,10,
+	12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
 	11,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	12,11,12,13, 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,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,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,
 	 0,
diff --git a/lib/books/coupled/_44c0_s0_p4_0.vqh b/lib/books/coupled/_44c0_s0_p4_0.vqh
index 3c716a9f..35fbafac 100644
--- a/lib/books/coupled/_44c0_s0_p4_0.vqh
+++ b/lib/books/coupled/_44c0_s0_p4_0.vqh
@@ -37,21 +37,21 @@ static long _vq_quantlist__44c0_s0_p4_0[] = {
 };
 
 static long _vq_lengthlist__44c0_s0_p4_0[] = {
-	 1, 3, 3, 6, 6, 8, 8,11,11,18,18,18,18,18,18, 6,
-	 5, 5, 8, 8, 9, 9,12,13,18,18,18,18,17,17, 7, 5,
-	 5, 8, 8, 9,10,12,13,17,17,17,17,17,17,17, 8, 8,
-	 9, 9,10,11,14,14,17,17,17,17,17,17,17, 8, 8, 9,
-	 9,11,10,13,14,17,17,17,17,17,17,17,12,12,10,10,
-	12,11,14,14,17,17,17,17,17,17,17,13,13,10,10,11,
-	11,14,14,17,17,17,17,17,17,17,17,17,12,12,12,12,
-	14,15,17,17,17,17,17,17,17,17,17,12,12,11,11,16,
-	15,17,17,17,17,17,17,17,17,17,14,15,13,12,14,15,
-	17,17,17,17,17,17,17,17,17,16,16,13,13,15,15,17,
-	17,17,17,17,17,17,17,17,17,17,13,14,15,16,17,17,
-	17,17,17,17,17,17,17,17,17,13,14,16,15,17,17,17,
-	17,17,17,17,17,17,17,17,16,17,14,15,17,17,17,17,
-	17,17,17,17,17,17,17,17,17,15,14,17,17,17,17,17,
-	17,
+	 1, 3, 3, 6, 6, 9, 9,13,12,17,17,17,17,17,17, 5,
+	 5, 5, 8, 8,12,11,15,15,17,17,17,17,17,17, 6, 5,
+	 5, 8, 8,11,11,14,14,17,17,17,17,17,17,17, 8, 8,
+	 9, 9,14,13,15,16,17,17,17,17,17,17,17, 9, 9,10,
+	10,15,14,17,17,17,17,17,17,17,17,17,13,13,11,11,
+	14,14,15,17,17,17,17,17,17,17,17,13,13,11,11,14,
+	15,17,16,17,17,17,17,17,17,17,17,17,11,14,13,15,
+	17,17,17,17,17,17,17,17,17,17,17,14,13,15,16,17,
+	17,17,17,17,17,17,17,17,17,17,13,17,10,17,13,17,
+	17,17,17,17,17,17,17,17,17,17,15,17,13,17,17,17,
+	17,17,17,17,17,17,17,17,17,17,13,17,11,17,17,17,
+	17,17,17,17,17,17,17,17,17,17,13,17,16,17,17,17,
+	17,17,16,16,16,16,16,16,16,16,15,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,16,16,15,16,16,16,16,16,
+	16,
 };
 
 static float _vq_quantthresh__44c0_s0_p4_0[] = {
diff --git a/lib/books/coupled/_44c0_s0_p4_1.vqh b/lib/books/coupled/_44c0_s0_p4_1.vqh
index 85789987..77a5bf51 100644
--- a/lib/books/coupled/_44c0_s0_p4_1.vqh
+++ b/lib/books/coupled/_44c0_s0_p4_1.vqh
@@ -29,10 +29,10 @@ static long _vq_quantlist__44c0_s0_p4_1[] = {
 };
 
 static long _vq_lengthlist__44c0_s0_p4_1[] = {
-	 3, 4, 4, 5, 5, 6, 6, 7, 5, 5, 6, 6, 6, 6, 7, 5,
-	 5, 5, 5, 6, 6, 7, 6, 6, 6, 6, 6, 6, 7, 7, 7, 6,
-	 6, 6, 6, 7, 7, 7, 6, 6, 6, 6, 7, 7, 7, 6, 6, 6,
-	 6,
+	 2, 4, 4, 5, 5, 6, 6, 8, 5, 5, 6, 6, 6, 6, 8, 5,
+	 5, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 8, 8, 8, 6,
+	 6, 6, 6, 8, 8, 8, 7, 7, 7, 7, 8, 8, 8, 6, 6, 7,
+	 7,
 };
 
 static float _vq_quantthresh__44c0_s0_p4_1[] = {
diff --git a/lib/books/coupled/_44c0_s1_p5_0.vqh b/lib/books/coupled/_44c0_s1_p5_0.vqh
index 81a1731d..37961b9e 100644
--- a/lib/books/coupled/_44c0_s1_p5_0.vqh
+++ b/lib/books/coupled/_44c0_s1_p5_0.vqh
@@ -25,8 +25,8 @@ static long _vq_quantlist__44c0_s1_p5_0[] = {
 };
 
 static long _vq_lengthlist__44c0_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, 6, 6, 0, 0, 0, 0,
+	 0, 0, 3, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/lib/books/coupled/_44c0_s4_p8_0.vqh b/lib/books/coupled/_44c0_s4_p8_0.vqh
deleted file mode 100644
index c11adb0c..00000000
--- a/lib/books/coupled/_44c0_s4_p8_0.vqh
+++ /dev/null
@@ -1,86 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V__44c0_s4_p8_0_VQH_
-#define _V__44c0_s4_p8_0_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist__44c0_s4_p8_0[] = {
-	7,
-	6,
-	8,
-	5,
-	9,
-	4,
-	10,
-	3,
-	11,
-	2,
-	12,
-	1,
-	13,
-	0,
-	14,
-};
-
-static long _vq_lengthlist__44c0_s4_p8_0[] = {
-	 1, 4, 4,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9,
-};
-
-static float _vq_quantthresh__44c0_s4_p8_0[] = {
-	-45.5, -38.5, -31.5, -24.5, -17.5, -10.5, -3.5, 3.5, 
-	10.5, 17.5, 24.5, 31.5, 38.5, 45.5, 
-};
-
-static long _vq_quantmap__44c0_s4_p8_0[] = {
-	   13,   11,    9,    7,    5,    3,    1,    0,
-	    2,    4,    6,    8,   10,   12,   14,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_s4_p8_0 = {
-	_vq_quantthresh__44c0_s4_p8_0,
-	_vq_quantmap__44c0_s4_p8_0,
-	15,
-	15
-};
-
-static static_codebook _44c0_s4_p8_0 = {
-	2, 225,
-	_vq_lengthlist__44c0_s4_p8_0,
-	1, -524779520, 1616642048, 4, 0,
-	_vq_quantlist__44c0_s4_p8_0,
-	NULL,
-	&_vq_auxt__44c0_s4_p8_0,
-	NULL,
-	0
-};
-
-
-#endif
diff --git a/lib/books/coupled/_44c0_s4_p8_1.vqh b/lib/books/coupled/_44c0_s4_p8_1.vqh
deleted file mode 100644
index ace42185..00000000
--- a/lib/books/coupled/_44c0_s4_p8_1.vqh
+++ /dev/null
@@ -1,65 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V__44c0_s4_p8_1_VQH_
-#define _V__44c0_s4_p8_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist__44c0_s4_p8_1[] = {
-	3,
-	2,
-	4,
-	1,
-	5,
-	0,
-	6,
-};
-
-static long _vq_lengthlist__44c0_s4_p8_1[] = {
-	 1, 3, 3, 4, 4, 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,
-};
-
-static float _vq_quantthresh__44c0_s4_p8_1[] = {
-	-2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 
-};
-
-static long _vq_quantmap__44c0_s4_p8_1[] = {
-	    5,    3,    1,    0,    2,    4,    6,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_s4_p8_1 = {
-	_vq_quantthresh__44c0_s4_p8_1,
-	_vq_quantmap__44c0_s4_p8_1,
-	7,
-	7
-};
-
-static static_codebook _44c0_s4_p8_1 = {
-	2, 49,
-	_vq_lengthlist__44c0_s4_p8_1,
-	1, -533200896, 1611661312, 3, 0,
-	_vq_quantlist__44c0_s4_p8_1,
-	NULL,
-	&_vq_auxt__44c0_s4_p8_1,
-	NULL,
-	0
-};
-
-
-#endif
diff --git a/lib/books/coupled/_44c0_s4_p9_0.vqh b/lib/books/coupled/_44c0_s4_p9_0.vqh
deleted file mode 100644
index 66d57bc1..00000000
--- a/lib/books/coupled/_44c0_s4_p9_0.vqh
+++ /dev/null
@@ -1,65 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V__44c0_s4_p9_0_VQH_
-#define _V__44c0_s4_p9_0_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist__44c0_s4_p9_0[] = {
-	3,
-	2,
-	4,
-	1,
-	5,
-	0,
-	6,
-};
-
-static long _vq_lengthlist__44c0_s4_p9_0[] = {
-	 1, 3, 3, 9, 8,12,11, 4, 4, 8,12,10,12,12, 5, 7,
-	 4,12,10,11,12,12,10,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,
-};
-
-static float _vq_quantthresh__44c0_s4_p9_0[] = {
-	-167.5, -100.5, -33.5, 33.5, 100.5, 167.5, 
-};
-
-static long _vq_quantmap__44c0_s4_p9_0[] = {
-	    5,    3,    1,    0,    2,    4,    6,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_s4_p9_0 = {
-	_vq_quantthresh__44c0_s4_p9_0,
-	_vq_quantmap__44c0_s4_p9_0,
-	7,
-	7
-};
-
-static static_codebook _44c0_s4_p9_0 = {
-	2, 49,
-	_vq_lengthlist__44c0_s4_p9_0,
-	1, -520544256, 1624293376, 3, 0,
-	_vq_quantlist__44c0_s4_p9_0,
-	NULL,
-	&_vq_auxt__44c0_s4_p9_0,
-	NULL,
-	0
-};
-
-
-#endif
diff --git a/lib/books/coupled/_44c0_s4_p9_1.vqh b/lib/books/coupled/_44c0_s4_p9_1.vqh
deleted file mode 100644
index 35d33c96..00000000
--- a/lib/books/coupled/_44c0_s4_p9_1.vqh
+++ /dev/null
@@ -1,115 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V__44c0_s4_p9_1_VQH_
-#define _V__44c0_s4_p9_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist__44c0_s4_p9_1[] = {
-	11,
-	10,
-	12,
-	9,
-	13,
-	8,
-	14,
-	7,
-	15,
-	6,
-	16,
-	5,
-	17,
-	4,
-	18,
-	3,
-	19,
-	2,
-	20,
-	1,
-	21,
-	0,
-	22,
-};
-
-static long _vq_lengthlist__44c0_s4_p9_1[] = {
-	 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 7, 8, 8, 8, 9, 9,
-	 9, 8, 9, 8, 9, 9, 9, 7, 6, 6, 7, 7, 7, 7, 8, 8,
-	 8, 8, 8, 9, 9, 9,10,10,10, 9,10, 9,10,10,12, 5,
-	 5, 7, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10, 9,
-	 9, 9, 9,10,10,15, 7, 8, 7, 8, 8, 8, 9, 9, 9,10,
-	10,10,10,10,10,11,10,10,10, 9,11,10,14, 8, 6, 7,
-	 6, 8, 8, 9, 9, 9, 9,10,10,11,10,11,11,10,11, 9,
-	11,11,11,13,10,11, 8, 8, 9, 9, 9, 9,10,10,10,10,
-	11,11,11,11,11,11,11,10,11,12,15,15,14, 7, 7, 8,
-	 8, 9, 9,10,10,10,10,11,11,11,11,11,10,10,10,11,
-	12,15,14,15, 9, 8, 9, 9, 9, 9,10,10,11,10,11,11,
-	12,11,11,12,11,12,12,11,15,15,15, 8, 9, 8, 8, 9,
-	 9,10, 9,10,10,12,12,12,12,11,11,11,11,11,12,13,
-	15,13,12,11, 9, 8,10, 9,10,11,10,11,12,11,12,11,
-	12,12,12,12,13,12,15,15,15,14,15, 8, 8, 9, 8,10,
-	 9,11,10,11,11,12,12,11,11,11,11,12,12,15,15,15,
-	15,15,11, 9,10, 9,10,10,11,11,11,11,11,12,12,11,
-	12,12,12,12,15,15,15,15,15,10,10,10, 7,10, 9,11,
-	10,11,11,12,12,12,12,12,12,13,12,15,15,15,15,14,
-	12,12,10,10,11,11,11,11,12,12,12,12,13,11,12,12,
-	12,13,15,15,15,14,15,15,15,11, 8, 9,10,10,11,12,
-	11,11,12,12,12,12,12,13,15,15,14,15,14,13,15,15,
-	11,11,10,12,11,11,12,12,12,12,13,12,12,11,12,12,
-	15,15,15,14,15,15,15,12,10,10,11,11,11,11,11,12,
-	12,12,11,12,12,13,13,15,15,15,13,15,15,14,14,14,
-	10,11,11,11,11,12,12,12,12,12,12,12,13,13,14,14,
-	15,15,15,14,15,15,15,11,11,11,11,11,10,12,11,13,
-	12,12,12,12,13,15,15,15,15,14,15,15,15,15,12,12,
-	12,11,12,12,12,12,11,12,12,12,12,13,15,15,15,15,
-	15,15,15,14,15,12,12,11,11,12,12,12,12,11,13,12,
-	12,12,12,15,15,14,15,15,15,15,15,15,13,15,11,11,
-	13,12,12,13,13,12,12,12,14,14,15,15,15,15,15,15,
-	15,15,15,15,15,12,12,12,12,13,13,12,13,12,13,15,
-	12,
-};
-
-static float _vq_quantthresh__44c0_s4_p9_1[] = {
-	-31.5, -28.5, -25.5, -22.5, -19.5, -16.5, -13.5, -10.5, 
-	-7.5, -4.5, -1.5, 1.5, 4.5, 7.5, 10.5, 13.5, 
-	16.5, 19.5, 22.5, 25.5, 28.5, 31.5, 
-};
-
-static long _vq_quantmap__44c0_s4_p9_1[] = {
-	   21,   19,   17,   15,   13,   11,    9,    7,
-	    5,    3,    1,    0,    2,    4,    6,    8,
-	   10,   12,   14,   16,   18,   20,   22,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_s4_p9_1 = {
-	_vq_quantthresh__44c0_s4_p9_1,
-	_vq_quantmap__44c0_s4_p9_1,
-	23,
-	23
-};
-
-static static_codebook _44c0_s4_p9_1 = {
-	2, 529,
-	_vq_lengthlist__44c0_s4_p9_1,
-	1, -525303808, 1614282752, 5, 0,
-	_vq_quantlist__44c0_s4_p9_1,
-	NULL,
-	&_vq_auxt__44c0_s4_p9_1,
-	NULL,
-	0
-};
-
-
-#endif
diff --git a/lib/books/coupled/_44c0_s4_p9_2.vqh b/lib/books/coupled/_44c0_s4_p9_2.vqh
deleted file mode 100644
index d8531504..00000000
--- a/lib/books/coupled/_44c0_s4_p9_2.vqh
+++ /dev/null
@@ -1,63 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V__44c0_s4_p9_2_VQH_
-#define _V__44c0_s4_p9_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist__44c0_s4_p9_2[] = {
-	1,
-	0,
-	2,
-};
-
-static long _vq_lengthlist__44c0_s4_p9_2[] = {
-	 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6,
-	 6, 6, 6, 6, 6, 7, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7,
-	 7, 7, 7, 7, 6, 6, 7, 7, 7, 7, 7, 6, 7, 6, 6, 6,
-	 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 6,
-	 6, 6, 7, 7, 6, 7, 7, 6, 6, 6, 6, 7, 7, 7, 6, 6,
-	 6,
-};
-
-static float _vq_quantthresh__44c0_s4_p9_2[] = {
-	-0.5, 0.5, 
-};
-
-static long _vq_quantmap__44c0_s4_p9_2[] = {
-	    1,    0,    2,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_s4_p9_2 = {
-	_vq_quantthresh__44c0_s4_p9_2,
-	_vq_quantmap__44c0_s4_p9_2,
-	3,
-	3
-};
-
-static static_codebook _44c0_s4_p9_2 = {
-	4, 81,
-	_vq_lengthlist__44c0_s4_p9_2,
-	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c0_s4_p9_2,
-	NULL,
-	&_vq_auxt__44c0_s4_p9_2,
-	NULL,
-	0
-};
-
-
-#endif
diff --git a/lib/books/coupled/_44c0_short.vqh b/lib/books/coupled/_44c0_short.vqh
index e527f7c2..9ee5a65c 100644
--- a/lib/books/coupled/_44c0_short.vqh
+++ b/lib/books/coupled/_44c0_short.vqh
@@ -20,17 +20,14 @@
 #include "codebook.h"
 
 static long _huff_lengthlist__44c0_short[] = {
-	10,14,14,14,14, 8,10,11,14,14,11,14,13,14,14, 4,
-	 4, 7,10,14,10,13,14,14,14, 4, 5, 8,11,14,11,14,
-	14,14,14, 6, 7, 9,11,14,10, 5, 4, 4, 7, 9,11,11,
-	12,14, 8,14,14,14,14, 2, 5,10,12,14,11,14,14,14,
-	14, 3, 6,10,13,14,11,14,14,14,14, 5, 9,10,12,14,
-	13,14,14,14,14, 8,11,11,12,14,14, 6, 5, 5, 6,14,
-	14,14,13,13,
+	 4,15,15,15,15, 6,11,15,15,15,14,15,15, 6, 5,10,
+	12,14,15,15,15, 5, 5,10,12,15,15,15,15, 7, 6,11,
+	11, 6, 4, 4, 6, 8, 9,11, 3,15,15,15,15, 2, 5,11,
+	 6,15,15,15,15, 3, 4,10,11,12,10,12,13, 8, 8,10,
 };
 
 static static_codebook _huff_book__44c0_short = {
-	2, 100,
+	2, 64,
 	_huff_lengthlist__44c0_short,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_0sub0.vqh b/lib/books/floor/line_1024x31_0sub0.vqh
index ca15fc42..f33441f2 100644
--- a/lib/books/floor/line_1024x31_0sub0.vqh
+++ b/lib/books/floor/line_1024x31_0sub0.vqh
@@ -20,11 +20,12 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_0sub0[] = {
-	 3, 4, 4, 4, 3, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5,
+	 4, 5, 5, 4, 5, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5,
+	 6, 5, 5, 5, 6, 5, 6, 5, 7, 5, 7, 6, 7, 6, 7, 6,
 };
 
 static static_codebook _huff_book_line_1024x31_0sub0 = {
-	1, 16,
+	1, 32,
 	_huff_lengthlist_line_1024x31_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_0sub1.vqh b/lib/books/floor/line_1024x31_0sub1.vqh
index b6d7b73f..86f1e65f 100644
--- a/lib/books/floor/line_1024x31_0sub1.vqh
+++ b/lib/books/floor/line_1024x31_0sub1.vqh
@@ -21,13 +21,17 @@
 
 static long _huff_lengthlist_line_1024x31_0sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7,
-	 6, 6, 6, 7, 8, 7, 6, 6, 8, 9, 9, 9, 9, 9, 5, 6,
-	 8,10,10, 9, 9,12,10,11,12,10, 8, 8,12,12,12,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 5, 4, 5, 4, 5, 4, 5, 4, 6, 4, 6, 4, 6, 4, 6, 4,
+	 6, 5, 6, 5, 7, 5, 7, 5, 8, 6, 8, 6, 8, 6, 8, 6,
+	 9, 7,10, 7, 9, 7,10, 8,10, 9,12,11,12,11,11,11,
+	10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
 };
 
 static static_codebook _huff_book_line_1024x31_0sub1 = {
-	1, 64,
+	1, 128,
 	_huff_lengthlist_line_1024x31_0sub1,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_1sub0.vqh b/lib/books/floor/line_1024x31_1sub0.vqh
index bebc344d..bd756d11 100644
--- a/lib/books/floor/line_1024x31_1sub0.vqh
+++ b/lib/books/floor/line_1024x31_1sub0.vqh
@@ -20,11 +20,12 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_1sub0[] = {
-	 2, 3, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6,
+	 2, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5,
+	 6, 6, 6, 6, 7, 6, 7, 6, 7, 7, 8, 7, 8, 7, 8, 8,
 };
 
 static static_codebook _huff_book_line_1024x31_1sub0 = {
-	1, 16,
+	1, 32,
 	_huff_lengthlist_line_1024x31_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_1sub1.vqh b/lib/books/floor/line_1024x31_1sub1.vqh
index 3295378b..8d759793 100644
--- a/lib/books/floor/line_1024x31_1sub1.vqh
+++ b/lib/books/floor/line_1024x31_1sub1.vqh
@@ -21,13 +21,17 @@
 
 static long _huff_lengthlist_line_1024x31_1sub1[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 3, 3, 3, 3, 4, 3, 5, 4, 5, 4, 6, 6, 7, 7, 7, 9,
-	 7,10, 8,11, 8,10, 9, 9, 9,11, 8, 8, 8, 8, 8, 9,
-	 7, 8, 8, 9,11, 9,12,12,12,12,12,12,12,12,12,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 4, 4, 4, 4, 4, 3, 4, 3, 5, 4, 5, 5, 6, 5, 6, 6,
+	 6, 6, 7, 6, 9, 6, 7, 7, 8, 8,10,10,10,11,11,11,
+	11,11,10,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
 };
 
 static static_codebook _huff_book_line_1024x31_1sub1 = {
-	1, 64,
+	1, 128,
 	_huff_lengthlist_line_1024x31_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_2sub1.vqh b/lib/books/floor/line_1024x31_2sub1.vqh
index 0d0eba71..4753c767 100644
--- a/lib/books/floor/line_1024x31_2sub1.vqh
+++ b/lib/books/floor/line_1024x31_2sub1.vqh
@@ -20,11 +20,12 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_2sub1[] = {
-	 0, 3, 3, 2, 3, 3, 4, 3, 4,
+	 0, 4, 4, 4, 4, 3, 5, 3, 5, 3, 5, 4, 5, 4, 5, 5,
+	 5, 5,
 };
 
 static static_codebook _huff_book_line_1024x31_2sub1 = {
-	1, 9,
+	1, 18,
 	_huff_lengthlist_line_1024x31_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_2sub2.vqh b/lib/books/floor/line_1024x31_2sub2.vqh
index 5dfb2d43..150f2647 100644
--- a/lib/books/floor/line_1024x31_2sub2.vqh
+++ b/lib/books/floor/line_1024x31_2sub2.vqh
@@ -20,12 +20,14 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_2sub2[] = {
-	 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,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 5, 7, 5, 8,
+	 5,10, 4,10, 4,10, 4,12, 4,13, 5,13, 5,13, 5,13,
+	 6,12,
 };
 
 static static_codebook _huff_book_line_1024x31_2sub2 = {
-	1, 25,
+	1, 50,
 	_huff_lengthlist_line_1024x31_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_2sub3.vqh b/lib/books/floor/line_1024x31_2sub3.vqh
index 7aefb1d9..a1f86f88 100644
--- a/lib/books/floor/line_1024x31_2sub3.vqh
+++ b/lib/books/floor/line_1024x31_2sub3.vqh
@@ -21,13 +21,17 @@
 
 static long _huff_lengthlist_line_1024x31_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, 4, 2, 5, 2, 7, 4, 7,
-	 4, 9, 4, 9, 5, 8, 6, 6, 6, 9, 6, 6, 6, 6, 7, 9,
-	 8, 9, 7, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 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, 2, 9, 4, 9, 3, 9, 4, 9, 5, 8, 5, 8, 4, 8,
+	 6, 8, 5, 8, 5, 8, 6, 8, 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,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
 static static_codebook _huff_book_line_1024x31_2sub3 = {
-	1, 64,
+	1, 128,
 	_huff_lengthlist_line_1024x31_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_3sub1.vqh b/lib/books/floor/line_1024x31_3sub1.vqh
index 304002a4..ef7db9d5 100644
--- a/lib/books/floor/line_1024x31_3sub1.vqh
+++ b/lib/books/floor/line_1024x31_3sub1.vqh
@@ -20,11 +20,12 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_3sub1[] = {
-	 0, 3, 3, 2, 3, 3, 4, 3, 4,
+	 0, 3, 3, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 5, 4,
+	 5, 5,
 };
 
 static static_codebook _huff_book_line_1024x31_3sub1 = {
-	1, 9,
+	1, 18,
 	_huff_lengthlist_line_1024x31_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_3sub2.vqh b/lib/books/floor/line_1024x31_3sub2.vqh
index d354dc19..ef9ad63f 100644
--- a/lib/books/floor/line_1024x31_3sub2.vqh
+++ b/lib/books/floor/line_1024x31_3sub2.vqh
@@ -20,12 +20,14 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_3sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 2, 5, 3, 7, 3,
-	 7, 4, 8, 5, 8, 6, 8, 6, 8,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 3, 3, 4, 3, 4, 4, 5, 4, 6, 4, 6, 5, 7, 5,
+	 7, 5, 7, 6, 9, 6, 8, 6,10, 6, 8, 6,10, 6, 9, 6,
+	 9, 7,
 };
 
 static static_codebook _huff_book_line_1024x31_3sub2 = {
-	1, 25,
+	1, 50,
 	_huff_lengthlist_line_1024x31_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_3sub3.vqh b/lib/books/floor/line_1024x31_3sub3.vqh
index 1f911384..31919a1b 100644
--- a/lib/books/floor/line_1024x31_3sub3.vqh
+++ b/lib/books/floor/line_1024x31_3sub3.vqh
@@ -21,13 +21,17 @@
 
 static long _huff_lengthlist_line_1024x31_3sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 5, 6, 5,
-	 4, 6, 5, 6, 6, 8, 5, 8, 5, 8, 5, 8, 7, 8, 5, 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, 6, 3, 7, 3, 6, 3, 7, 3, 7, 4, 8, 4, 8, 5,
+	 6, 6, 7, 8, 8, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
 static static_codebook _huff_book_line_1024x31_3sub3 = {
-	1, 64,
+	1, 128,
 	_huff_lengthlist_line_1024x31_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
diff --git a/lib/books/floor/line_1024x31_class0.vqh b/lib/books/floor/line_1024x31_class0.vqh
index 774a165e..bc8cb7d8 100644
--- a/lib/books/floor/line_1024x31_class0.vqh
+++ b/lib/books/floor/line_1024x31_class0.vqh
@@ -20,7 +20,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class0[] = {
-	 1, 3, 4, 3, 3, 5, 6, 6,
+	 1, 3, 4, 5, 2, 6, 7, 7,
 };
 
 static static_codebook _huff_book_line_1024x31_class0 = {
diff --git a/lib/books/floor/line_1024x31_class1.vqh b/lib/books/floor/line_1024x31_class1.vqh
index 6f120eed..84243c97 100644
--- a/lib/books/floor/line_1024x31_class1.vqh
+++ b/lib/books/floor/line_1024x31_class1.vqh
@@ -20,7 +20,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class1[] = {
-	 1, 3, 4, 7, 7, 8, 7,11, 3, 4, 4, 5,10,11,10,10,
+	 1, 3, 3, 4, 7, 9,11,11, 3, 5, 7, 7,10, 9,10,10,
 };
 
 static static_codebook _huff_book_line_1024x31_class1 = {
diff --git a/lib/books/floor/line_1024x31_class2.vqh b/lib/books/floor/line_1024x31_class2.vqh
index f577f2e4..76cb7aec 100644
--- a/lib/books/floor/line_1024x31_class2.vqh
+++ b/lib/books/floor/line_1024x31_class2.vqh
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class2[] = {
-	 2, 3, 4,10, 6, 4, 5,10, 8, 6, 6,11,14,12,15,11,
-	 5, 3, 5, 9, 6, 4, 6, 9, 8, 5, 7,13,16,16,13,16,
-	 8, 6, 6, 9, 9, 6, 6, 9,10, 7, 8,11,16,15,15,15,
-	15,15,15,15,14,14,15,15,15,13,13,15,15,15,15,15,
+	 1, 3, 5,10, 8, 4, 6, 9,12, 8,10,14,15,15,15,15,
+	 7, 3, 5,10, 8, 4, 7,10,12, 9,10,13,15,15,15,15,
+	12, 9, 9,14,11, 9, 9,14,15,12,12,15,15,15,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
 };
 
 static static_codebook _huff_book_line_1024x31_class2 = {
diff --git a/lib/books/floor/line_1024x31_class3.vqh b/lib/books/floor/line_1024x31_class3.vqh
index ff6da706..52d01611 100644
--- a/lib/books/floor/line_1024x31_class3.vqh
+++ b/lib/books/floor/line_1024x31_class3.vqh
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_1024x31_class3[] = {
-	 1, 4, 3,10, 7, 4, 5,11,10, 7,10,10,12,12,11,12,
-	 7, 4, 5,10, 7, 5, 6,12,11, 8,11,14,14,14,14,14,
-	11, 8, 6, 9,11, 9, 8,11,12,10,12,14,14,14,14,14,
-	14,10,10,10,14,13,12,13,14,12,14,13,14,14,14,14,
+	 1, 3, 6,10, 7, 3, 6,12,10, 7,10,15,15,15,15,15,
+	 7, 4, 6, 8, 8, 4, 6,10,13, 7, 9,13,15,14,14,14,
+	13,10, 9, 9,12, 8, 8,11,14,10,11,12,14,14,14,14,
+	14,14,14,12,14,14,14,14,14,14,14,14,14,14,14,14,
 };
 
 static static_codebook _huff_book_line_1024x31_class3 = {
diff --git a/lib/books/floor/line_128x7_0sub0.vqh b/lib/books/floor/line_128x7_0sub0.vqh
index 9c5f98b5..d6ae2c9b 100644
--- a/lib/books/floor/line_128x7_0sub0.vqh
+++ b/lib/books/floor/line_128x7_0sub0.vqh
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x7_0sub0[] = {
-	 5, 5, 5, 6, 4, 6, 4, 7, 4, 7, 4, 8, 4, 9, 4,11,
-	 4,12, 4,13, 5,13, 5,13, 5,13, 5,13, 5,13, 5,13,
-	 5,13, 6,13, 6,13, 6,13, 5,13, 6,13, 6,12, 7,12,
-	 7,12, 9,11, 9,11,11,12,12,13,13,13,13,13,13,13,
+	 4, 4, 4, 4, 5, 4, 4, 4, 5, 5, 5, 4, 5, 5, 5, 5,
+	 5, 5, 6, 5, 6, 6, 6, 7, 6, 8, 6, 9, 7,10, 7,10,
+	 7,13, 7,13, 8,13, 9,13, 9,13, 9,12,11,13,11,13,
+	12,13,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
 };
 
 static static_codebook _huff_book_line_128x7_0sub0 = {
diff --git a/lib/books/floor/line_128x7_1sub1.vqh b/lib/books/floor/line_128x7_1sub1.vqh
index fc63d2fe..d388f564 100644
--- a/lib/books/floor/line_128x7_1sub1.vqh
+++ b/lib/books/floor/line_128x7_1sub1.vqh
@@ -20,7 +20,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x7_1sub1[] = {
-	 0, 4, 2, 5, 2, 5, 3, 3, 3,
+	 0, 3, 4, 3, 4, 2, 4, 2, 4,
 };
 
 static static_codebook _huff_book_line_128x7_1sub1 = {
diff --git a/lib/books/floor/line_128x7_1sub2.vqh b/lib/books/floor/line_128x7_1sub2.vqh
index e3d56c4a..7210e3f6 100644
--- a/lib/books/floor/line_128x7_1sub2.vqh
+++ b/lib/books/floor/line_128x7_1sub2.vqh
@@ -20,8 +20,8 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x7_1sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 1, 6, 2, 9, 3,11,
-	 5,12, 7,12, 9,12, 9,12,11,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 3, 4, 5,
+	 4, 6, 5, 7, 6, 9, 6, 9, 8,
 };
 
 static static_codebook _huff_book_line_128x7_1sub2 = {
diff --git a/lib/books/floor/line_128x7_1sub3.vqh b/lib/books/floor/line_128x7_1sub3.vqh
index 5c8a9379..ad602002 100644
--- a/lib/books/floor/line_128x7_1sub3.vqh
+++ b/lib/books/floor/line_128x7_1sub3.vqh
@@ -21,9 +21,9 @@
 
 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, 3, 4, 6, 5, 6, 6, 6,
-	 4, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 4, 6, 4, 6, 5, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5,
+	 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
 };
 
 static static_codebook _huff_book_line_128x7_1sub3 = {
diff --git a/lib/books/floor/line_128x7_2sub1.vqh b/lib/books/floor/line_128x7_2sub1.vqh
index c0395a85..6be0ce85 100644
--- a/lib/books/floor/line_128x7_2sub1.vqh
+++ b/lib/books/floor/line_128x7_2sub1.vqh
@@ -20,7 +20,7 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x7_2sub1[] = {
-	 0, 3, 3, 2, 4, 2, 5, 3, 5,
+	 0, 3, 3, 3, 3, 3, 3, 3, 3,
 };
 
 static static_codebook _huff_book_line_128x7_2sub1 = {
diff --git a/lib/books/floor/line_128x7_2sub2.vqh b/lib/books/floor/line_128x7_2sub2.vqh
index 345edb0c..fad7a643 100644
--- a/lib/books/floor/line_128x7_2sub2.vqh
+++ b/lib/books/floor/line_128x7_2sub2.vqh
@@ -20,8 +20,8 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x7_2sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 5, 2, 6, 3, 7, 3,
-	 8, 4, 9, 4,11, 5,10, 5,11,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 3, 4, 4,
+	 5, 4, 5, 4, 6, 4, 7, 5, 7,
 };
 
 static static_codebook _huff_book_line_128x7_2sub2 = {
diff --git a/lib/books/floor/line_128x7_2sub3.vqh b/lib/books/floor/line_128x7_2sub3.vqh
index d5feb59a..5787f190 100644
--- a/lib/books/floor/line_128x7_2sub3.vqh
+++ b/lib/books/floor/line_128x7_2sub3.vqh
@@ -21,9 +21,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, 1, 9, 2, 9, 3, 9, 5,
-	 9, 6, 8, 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, 8, 8,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 2, 4, 3, 6, 5,
+	 6, 4, 6, 5, 8, 6, 8, 8, 9, 9, 9, 9, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8,
 };
 
 static static_codebook _huff_book_line_128x7_2sub3 = {
diff --git a/lib/books/floor/line_128x7_class1.vqh b/lib/books/floor/line_128x7_class1.vqh
index 5feb4284..aaaa764c 100644
--- a/lib/books/floor/line_128x7_class1.vqh
+++ b/lib/books/floor/line_128x7_class1.vqh
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x7_class1[] = {
-	 1, 3,10,13,13, 5, 6,13,12, 6, 6,13,13,13,13,13,
-	 6, 4,10,13,12, 7,12,13,13,12,13,13,13,13,13,13,
-	 4, 3,12,13, 9, 7,10,13,12, 8,11,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	 2, 3, 4,14,11, 9,11,14,13,10,12,13,13,13,13,13,
+	 5, 2, 4,13,11, 8,13,13,12, 9,12,13,13,13,13,13,
+	 7, 3, 4,13,10, 8,10,13,12,10,12,13,13,13,13,13,
+	13,12,11,13,13,13,13,13,13,13,13,13,13,13,13,13,
 };
 
 static static_codebook _huff_book_line_128x7_class1 = {
diff --git a/lib/books/floor/line_128x7_class2.vqh b/lib/books/floor/line_128x7_class2.vqh
index 85018d24..3fffe472 100644
--- a/lib/books/floor/line_128x7_class2.vqh
+++ b/lib/books/floor/line_128x7_class2.vqh
@@ -20,10 +20,10 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_line_128x7_class2[] = {
-	 5, 4, 4,10, 7, 4, 5,13,13, 8, 8,13,13,13,13,13,
-	 6, 3, 3, 7, 7, 4, 4, 9,11, 8, 8,13,13,13,13,13,
-	 9, 5, 3, 5, 8, 5, 4, 7,10, 7, 7,11,13,13,13,13,
-	13,13,12,13,13,12,13,13,13,13,12,12,12,12,12,12,
+	 9, 7, 8,10, 7, 5, 6, 9, 9, 7, 8, 9,13,13,13,12,
+	 7, 5, 6, 8, 5, 2, 3, 6, 7, 4, 5, 8,13,10,10,13,
+	11, 7, 6, 9, 7, 4, 3, 6, 8, 5, 5, 8,11, 8, 8,13,
+	13,10,12,13,11, 9,11,13,10, 9,11,13,13,13,12,12,
 };
 
 static static_codebook _huff_book_line_128x7_class2 = {