Ongoing bitrate management work

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

31 files changed, 1216 insertions, 364 deletions

diff --git a/lib/books/res_44c_A_1024aux.vqh b/lib/books/res_44c_A_1024aux.vqh
index 33519310..70ea837e 100644
--- a/lib/books/res_44c_A_1024aux.vqh
+++ b/lib/books/res_44c_A_1024aux.vqh
@@ -20,13 +20,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res_44c_A_1024aux[] = {
-	 3, 5,18,18,17,17,17,17,11,17, 5, 4,17,17,17,17,
-	17,17, 8,16,17,17, 3,17, 6,17, 7, 9,13,17,17,17,
-	17, 1,17, 7, 9,11,15,17,17,17, 6,17, 7,17, 9,10,
-	16,17,17,17,17, 7,17, 8,10,15,17,17,17,17, 8, 9,
-	 9,10, 9,11,16,17,17,17, 9,13,10,17,11,12,15,17,
-	 9, 6,14,15,17,17,16,15, 7,14,12, 8,16,17,17,17,
-	17,16,11,16,
+	 3, 6,18,18,17,17,17,17,11,17, 5, 5,17,17,17,17,
+	17,17, 9,17,17,17, 3,17, 5,17, 7,10,13,17,17,17,
+	17, 1,17, 7, 9,11,15,17,17,17, 5,17, 6,17, 8,10,
+	17,17,17,17,17, 6,17, 8, 9,14,17,17,17,17, 8, 9,
+	 8, 9, 8,11,16,17,17,17,10,12,11,15,10,12,15,17,
+	 9, 6,14,15,16,17,16,14, 7,17,13,12,17,17,17,17,
+	17,17,12,17,
 };
 
 static static_codebook _huff_book_res_44c_A_1024aux = {
diff --git a/lib/books/res_44c_A_128aux.vqh b/lib/books/res_44c_A_128aux.vqh
index 20188dce..9e27f5cf 100644
--- a/lib/books/res_44c_A_128aux.vqh
+++ b/lib/books/res_44c_A_128aux.vqh
@@ -20,13 +20,13 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res_44c_A_128aux[] = {
-	16,17, 3,17, 7,17,11,13,17,17, 8,12,11,17,13,17,
-	15,17,17,17,17,17, 2,17, 8,17,11,14,17,17,17,17,
-	17, 1,17, 8,10,17,17,17,17,17, 6,17,10,17,13,16,
-	17,17,17,17,17, 9,17,13,15,17,17,17,17,17,10,11,
-	13,15,15,17,17,17,17,17,12,16,14,17,15,17,17,17,
-	 4, 9,17,17,17,17,17,17,17,17, 6,10,17,16,16,16,
-	16,16,16,16,
+	15,15, 4,15, 5,15, 8,12,15,15, 7,12,11,15,12,15,
+	12,15,15,15,15,15, 3,15, 6,15, 9,13,15,15,15,15,
+	15, 1,15, 7, 8,12,15,15,15,15, 4,15, 7,15,10,13,
+	15,15,15,15,15, 7,15,10,13,15,15,15,15,15, 7, 9,
+	 9,13,11,15,15,15,15,15,12,13,12,14,13,15,15,15,
+	 3, 9,15,15,15,15,15,15,15,15, 6,11,15,15,15,15,
+	15,15,15,15,
 };
 
 static static_codebook _huff_book_res_44c_A_128aux = {
diff --git a/lib/books/res_Ac_0.vqh b/lib/books/res_Ac_0.vqh
new file mode 100644
index 00000000..e400de09
--- /dev/null
+++ b/lib/books/res_Ac_0.vqh
@@ -0,0 +1,93 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_0_VQH_
+#define _V_res_Ac_0_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_0[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
+};
+
+static long _vq_lengthlist_res_Ac_0[] = {
+	 1, 4, 4, 8, 8,10,10,11,11, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 4, 4, 7, 7,10,10,11,11, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 4, 4, 7, 7,10,10,11,11, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 7, 8, 8,10,10,11,11, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 7, 7, 8, 7,10,10,12,11, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,10,10,11,11, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,10,10,12,12, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11,12,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11,12,
+	12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,
+	12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
+	12,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	14,14,14,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,14,14,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static float _vq_quantthresh_res_Ac_0[] = {
+	-7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 
+	0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 
+};
+
+static long _vq_quantmap_res_Ac_0[] = {
+	   15,   13,   11,    9,    7,    5,    3,    1,
+	    0,    2,    4,    6,    8,   10,   12,   14,
+	   16,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_0 = {
+	_vq_quantthresh_res_Ac_0,
+	_vq_quantmap_res_Ac_0,
+	17,
+	17
+};
+
+static static_codebook _vq_book_res_Ac_0 = {
+	2, 289,
+	_vq_lengthlist_res_Ac_0,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist_res_Ac_0,
+	NULL,
+	&_vq_auxt_res_Ac_0,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_0a.vqh b/lib/books/res_Ac_0a.vqh
index c895d35b..c11efc1c 100644
--- a/lib/books/res_Ac_0a.vqh
+++ b/lib/books/res_Ac_0a.vqh
@@ -19,58 +19,20 @@
 #include "codebook.h"
 
 static long _vq_quantlist_res_Ac_0a[] = {
-	202,
-	101,
-	303,
+	2,
+	1,
+	3,
 	0,
-	405,
+	4,
 };
 
 static long _vq_lengthlist_res_Ac_0a[] = {
-	 3, 5, 5, 0, 0, 7, 6, 6, 0, 0, 7, 6, 6, 0, 0, 0,
-	 6, 6, 0, 0, 0, 7, 7, 0, 0, 5, 6, 6, 0, 0, 8, 7,
-	 7, 0, 0, 8, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9,
-	 0, 0, 5, 6, 6, 0, 0, 8, 7, 7, 0, 0, 8, 7, 7, 0,
-	 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8,
-	 0, 0, 9, 9, 9, 0, 0, 9, 9, 9, 0, 0, 0, 9, 9, 0,
-	 0, 0,10,10, 0, 0, 6, 7, 7, 0, 0, 9, 8, 8, 0, 0,
-	 9, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 6,
-	 7, 7, 0, 0, 9, 8, 8, 0, 0, 9, 8, 8, 0, 0, 0, 8,
-	 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 9,
-	 9, 9, 0, 0, 9, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0,10,
-	10, 0, 0, 6, 7, 7, 0, 0, 9, 8, 8, 0, 0, 9, 8, 8,
-	 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 6, 7, 7, 0,
-	 0, 9, 8, 8, 0, 0, 9, 8, 8, 0, 0, 0, 8, 8, 0, 0,
-	 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 6, 8, 8, 0, 0, 9, 8, 8, 0, 0, 9, 8, 8, 0, 0, 0,
-	 9, 9, 0, 0, 0,10,10, 0, 0, 6, 8, 8, 0, 0, 9, 8,
-	 8, 0, 0, 9, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0,10,10,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9,
-	 0, 0,10, 9,10, 0, 0,10,10, 9, 0, 0, 0,10,10, 0,
-	 0, 0,11,10, 0, 0, 7, 9, 9, 0, 0,10,10, 9, 0, 0,
-	10, 9, 9, 0, 0, 0,10,10, 0, 0, 0,10,11, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
+	 2, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
+	 5, 5, 0, 0, 0, 5, 5, 0, 0,
 };
 
 static float _vq_quantthresh_res_Ac_0a[] = {
-	-0.5005, -0.1675, 0.1655, 0.50015, 
+	-0.5, -0.16667, 0.16667, 0.5, 
 };
 
 static long _vq_quantmap_res_Ac_0a[] = {
@@ -85,9 +47,9 @@ static encode_aux_threshmatch _vq_auxt_res_Ac_0a = {
 };
 
 static static_codebook _vq_book_res_Ac_0a = {
-	4, 625,
+	2, 25,
 	_vq_lengthlist_res_Ac_0a,
-	1, -537569264, 1593508447, 9, 0,
+	1, -537569962, 1607816532, 3, 0,
 	_vq_quantlist_res_Ac_0a,
 	NULL,
 	&_vq_auxt_res_Ac_0a,
diff --git a/lib/books/res_Ac_0b.vqh b/lib/books/res_Ac_0b.vqh
new file mode 100644
index 00000000..f0dfc822
--- /dev/null
+++ b/lib/books/res_Ac_0b.vqh
@@ -0,0 +1,61 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_0b_VQH_
+#define _V_res_Ac_0b_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_0b[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static long _vq_lengthlist_res_Ac_0b[] = {
+	 2, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
+	 5, 5, 0, 0, 0, 5, 5, 0, 0,
+};
+
+static float _vq_quantthresh_res_Ac_0b[] = {
+	-0.16667, -0.055555, 0.055555, 0.16667, 
+};
+
+static long _vq_quantmap_res_Ac_0b[] = {
+	    3,    1,    0,    2,    4,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_0b = {
+	_vq_quantthresh_res_Ac_0b,
+	_vq_quantmap_res_Ac_0b,
+	5,
+	5
+};
+
+static static_codebook _vq_book_res_Ac_0b = {
+	2, 25,
+	_vq_lengthlist_res_Ac_0b,
+	1, -541298235, 1604088261, 3, 0,
+	_vq_quantlist_res_Ac_0b,
+	NULL,
+	&_vq_auxt_res_Ac_0b,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_1.vqh b/lib/books/res_Ac_1.vqh
index 75abea39..95c039ed 100644
--- a/lib/books/res_Ac_1.vqh
+++ b/lib/books/res_Ac_1.vqh
@@ -31,16 +31,16 @@ static long _vq_quantlist_res_Ac_1[] = {
 };
 
 static long _vq_lengthlist_res_Ac_1[] = {
-	 1, 4, 3, 6, 6, 8, 8,10,10, 5, 5, 5, 7, 7, 9, 9,
-	10,10, 6, 5, 5, 7, 7, 9, 9,10,11, 0, 7, 8, 8, 8,
-	 9,10,11,11, 0, 8, 8, 8, 8,10,10,11,11, 0,12,12,
-	 9, 9,10,10,12,11, 0,13,12,10, 9,11,11,12,12, 0,
-	 0, 0,11,11,12,11,12,13, 0, 0, 0,12,12,12,12,13,
-	13,
+	 1, 3, 3, 7, 7,17,17,17,17, 5, 5, 5, 7, 8,17,17,
+	17,17, 5, 5, 5, 8, 8,17,17,17,17,17, 8, 8, 9, 9,
+	17,17,17,17,17, 8, 8, 9,10,17,17,17,17,17,13,13,
+	10,10,17,17,17,17,17,12,13,11,10,17,17,17,17,17,
+	17,17,13,13,17,17,17,17,17,17,17,13,13,17,17,16,
+	16,
 };
 
 static float _vq_quantthresh_res_Ac_1[] = {
-	-17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 12.5, 17.5, 
+	-31.5, -22.5, -13.5, -4.5, 4.5, 13.5, 22.5, 31.5, 
 };
 
 static long _vq_quantmap_res_Ac_1[] = {
@@ -58,7 +58,7 @@ static encode_aux_threshmatch _vq_auxt_res_Ac_1 = {
 static static_codebook _vq_book_res_Ac_1 = {
 	2, 81,
 	_vq_lengthlist_res_Ac_1,
-	1, -527171584, 1616117760, 4, 0,
+	1, -525205504, 1618083840, 4, 0,
 	_vq_quantlist_res_Ac_1,
 	NULL,
 	&_vq_auxt_res_Ac_1,
diff --git a/lib/books/res_Ac_1a.vqh b/lib/books/res_Ac_1a.vqh
new file mode 100644
index 00000000..198ca4f5
--- /dev/null
+++ b/lib/books/res_Ac_1a.vqh
@@ -0,0 +1,70 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_1a_VQH_
+#define _V_res_Ac_1a_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_1a[] = {
+	4,
+	3,
+	5,
+	2,
+	6,
+	1,
+	7,
+	0,
+	8,
+};
+
+static long _vq_lengthlist_res_Ac_1a[] = {
+	 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 4, 4, 6, 6, 7, 7,
+	 8, 8, 9, 4, 4, 6, 6, 7, 7, 8, 8, 9, 7, 7, 7, 7,
+	 8, 8, 8, 8, 9, 7, 7, 7, 7, 8, 8, 8, 8,10,10, 9,
+	 7, 8, 8, 8, 8, 8,10,10,10, 8, 7, 8, 8, 8, 8,10,
+	10,10, 9, 9, 8, 8, 8, 8,10,10, 9, 8, 9, 8, 8, 8,
+	 8,
+};
+
+static float _vq_quantthresh_res_Ac_1a[] = {
+	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
+};
+
+static long _vq_quantmap_res_Ac_1a[] = {
+	    7,    5,    3,    1,    0,    2,    4,    6,
+	    8,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_1a = {
+	_vq_quantthresh_res_Ac_1a,
+	_vq_quantmap_res_Ac_1a,
+	9,
+	9
+};
+
+static static_codebook _vq_book_res_Ac_1a = {
+	2, 81,
+	_vq_lengthlist_res_Ac_1a,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist_res_Ac_1a,
+	NULL,
+	&_vq_auxt_res_Ac_1a,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_2a.vqh b/lib/books/res_Ac_2a.vqh
index d6b55492..80e4e8d7 100644
--- a/lib/books/res_Ac_2a.vqh
+++ b/lib/books/res_Ac_2a.vqh
@@ -19,46 +19,75 @@
 #include "codebook.h"
 
 static long _vq_quantlist_res_Ac_2a[] = {
-	4,
-	3,
-	5,
 	2,
-	6,
 	1,
-	7,
+	3,
 	0,
-	8,
+	4,
 };
 
 static long _vq_lengthlist_res_Ac_2a[] = {
-	 1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 5, 0, 0, 0, 0,
-	 0, 0, 3, 4, 4, 0, 0, 0, 0, 0, 0, 6, 9, 9, 6, 6,
-	 0, 0, 0, 0, 0, 8, 8,14,13, 0, 0, 0, 0, 0,11,10,
-	16,14, 0, 0, 0, 0, 0,10,10,13,14, 0, 0, 0, 0, 0,
-	 0, 0,17,17, 0, 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0,
+	 1, 0, 0, 0, 0, 4, 6, 6, 0, 0, 4, 6, 6, 0, 0, 7,
+	 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 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, 7, 9, 9, 0, 0, 7, 8, 8, 0, 0, 9, 0, 0, 0,
+	 0, 9, 0, 0, 0, 0, 6, 0, 0, 0, 0, 8,10, 9, 0, 0,
+	 9,10,10, 0, 0,11, 0, 0, 0, 0,11, 0, 0, 0, 0, 6,
+	 0, 0, 0, 0, 9,10,10, 0, 0, 8,10,10, 0, 0,11, 0,
+	 0, 0, 0,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, 5, 0, 0, 0, 0, 7,
+	 9, 9, 0, 0, 7, 8, 8, 0, 0, 9, 0, 0, 0, 0, 9, 0,
+	 0, 0, 0, 6, 0, 0, 0, 0, 8,10,10, 0, 0, 9,10, 9,
+	 0, 0,11, 0, 0, 0, 0,11, 0, 0, 0, 0, 6, 0, 0, 0,
+	 0, 8,10,10, 0, 0, 8, 9,10, 0, 0,11, 0, 0, 0, 0,
+	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, 7, 0, 0, 0, 0, 9,11,11, 0,
+	 0, 9,11,11, 0, 0,11, 0, 0, 0, 0,10, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 0, 0, 0, 0, 9,11,11, 0, 0, 9,11,
+	11, 0, 0,10, 0, 0, 0, 0,11, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
 
 static float _vq_quantthresh_res_Ac_2a[] = {
-	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
+	-1.5, -0.5, 0.5, 1.5, 
 };
 
 static long _vq_quantmap_res_Ac_2a[] = {
-	    7,    5,    3,    1,    0,    2,    4,    6,
-	    8,
+	    3,    1,    0,    2,    4,
 };
 
 static encode_aux_threshmatch _vq_auxt_res_Ac_2a = {
 	_vq_quantthresh_res_Ac_2a,
 	_vq_quantmap_res_Ac_2a,
-	9,
-	9
+	5,
+	5
 };
 
 static static_codebook _vq_book_res_Ac_2a = {
-	2, 81,
+	4, 625,
 	_vq_lengthlist_res_Ac_2a,
-	1, -531628032, 1611661312, 4, 0,
+	1, -533725184, 1611661312, 3, 0,
 	_vq_quantlist_res_Ac_2a,
 	NULL,
 	&_vq_auxt_res_Ac_2a,
diff --git a/lib/books/res_Ac_2b.vqh b/lib/books/res_Ac_2b.vqh
new file mode 100644
index 00000000..3ee211ac
--- /dev/null
+++ b/lib/books/res_Ac_2b.vqh
@@ -0,0 +1,61 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_2b_VQH_
+#define _V_res_Ac_2b_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_2b[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static long _vq_lengthlist_res_Ac_2b[] = {
+	 2, 3, 3, 0, 0, 5, 4, 4, 0, 0, 5, 4, 4, 0, 0, 0,
+	 5, 4, 0, 0, 0, 5, 4, 0, 0,
+};
+
+static float _vq_quantthresh_res_Ac_2b[] = {
+	-0.5, -0.16667, 0.16667, 0.5, 
+};
+
+static long _vq_quantmap_res_Ac_2b[] = {
+	    3,    1,    0,    2,    4,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_2b = {
+	_vq_quantthresh_res_Ac_2b,
+	_vq_quantmap_res_Ac_2b,
+	5,
+	5
+};
+
+static static_codebook _vq_book_res_Ac_2b = {
+	2, 25,
+	_vq_lengthlist_res_Ac_2b,
+	1, -537569962, 1607816532, 3, 0,
+	_vq_quantlist_res_Ac_2b,
+	NULL,
+	&_vq_auxt_res_Ac_2b,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_2c.vqh b/lib/books/res_Ac_2c.vqh
new file mode 100644
index 00000000..409c710a
--- /dev/null
+++ b/lib/books/res_Ac_2c.vqh
@@ -0,0 +1,61 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_2c_VQH_
+#define _V_res_Ac_2c_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_2c[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static long _vq_lengthlist_res_Ac_2c[] = {
+	 2, 4, 4, 0, 0, 4, 4, 3, 0, 0, 4, 4, 3, 0, 0, 0,
+	 5, 5, 0, 0, 0, 5, 5, 0, 0,
+};
+
+static float _vq_quantthresh_res_Ac_2c[] = {
+	-0.16667, -0.055555, 0.055555, 0.16667, 
+};
+
+static long _vq_quantmap_res_Ac_2c[] = {
+	    3,    1,    0,    2,    4,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_2c = {
+	_vq_quantthresh_res_Ac_2c,
+	_vq_quantmap_res_Ac_2c,
+	5,
+	5
+};
+
+static static_codebook _vq_book_res_Ac_2c = {
+	2, 25,
+	_vq_lengthlist_res_Ac_2c,
+	1, -541298235, 1604088261, 3, 0,
+	_vq_quantlist_res_Ac_2c,
+	NULL,
+	&_vq_auxt_res_Ac_2c,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_3a.vqh b/lib/books/res_Ac_3a.vqh
new file mode 100644
index 00000000..db7136a7
--- /dev/null
+++ b/lib/books/res_Ac_3a.vqh
@@ -0,0 +1,58 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_3a_VQH_
+#define _V_res_Ac_3a_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_3a[] = {
+	1,
+	0,
+	2,
+};
+
+static long _vq_lengthlist_res_Ac_3a[] = {
+	 1, 2, 2, 0, 0, 0, 0, 0, 0,
+};
+
+static float _vq_quantthresh_res_Ac_3a[] = {
+	-0.16667, 0.16667, 
+};
+
+static long _vq_quantmap_res_Ac_3a[] = {
+	    1,    0,    2,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_3a = {
+	_vq_quantthresh_res_Ac_3a,
+	_vq_quantmap_res_Ac_3a,
+	3,
+	3
+};
+
+static static_codebook _vq_book_res_Ac_3a = {
+	2, 9,
+	_vq_lengthlist_res_Ac_3a,
+	1, -539667116, 1607816532, 2, 0,
+	_vq_quantlist_res_Ac_3a,
+	NULL,
+	&_vq_auxt_res_Ac_3a,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_3b.vqh b/lib/books/res_Ac_3b.vqh
new file mode 100644
index 00000000..dffcd43b
--- /dev/null
+++ b/lib/books/res_Ac_3b.vqh
@@ -0,0 +1,58 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_3b_VQH_
+#define _V_res_Ac_3b_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_3b[] = {
+	1,
+	0,
+	2,
+};
+
+static long _vq_lengthlist_res_Ac_3b[] = {
+	 1, 2, 2, 0, 0, 0, 0, 0, 0,
+};
+
+static float _vq_quantthresh_res_Ac_3b[] = {
+	-0.055555, 0.055555, 
+};
+
+static long _vq_quantmap_res_Ac_3b[] = {
+	    1,    0,    2,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_3b = {
+	_vq_quantthresh_res_Ac_3b,
+	_vq_quantmap_res_Ac_3b,
+	3,
+	3
+};
+
+static static_codebook _vq_book_res_Ac_3b = {
+	2, 9,
+	_vq_lengthlist_res_Ac_3b,
+	1, -543395387, 1604088261, 2, 0,
+	_vq_quantlist_res_Ac_3b,
+	NULL,
+	&_vq_auxt_res_Ac_3b,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_4.vqh b/lib/books/res_Ac_4.vqh
index 3e39361e..27d0bf04 100644
--- a/lib/books/res_Ac_4.vqh
+++ b/lib/books/res_Ac_4.vqh
@@ -27,13 +27,13 @@ static long _vq_quantlist_res_Ac_4[] = {
 };
 
 static long _vq_lengthlist_res_Ac_4[] = {
-	 1, 4, 4, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0,
+	 2, 3, 3, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 4, 8, 8, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 5, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 6, 9, 9,
+	 0, 0, 3, 4, 5, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 7,10,10,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 6, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 8, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/lib/books/res_Ac_4a.vqh b/lib/books/res_Ac_4a.vqh
new file mode 100644
index 00000000..daa358d8
--- /dev/null
+++ b/lib/books/res_Ac_4a.vqh
@@ -0,0 +1,70 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_4a_VQH_
+#define _V_res_Ac_4a_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_4a[] = {
+	4,
+	3,
+	5,
+	2,
+	6,
+	1,
+	7,
+	0,
+	8,
+};
+
+static long _vq_lengthlist_res_Ac_4a[] = {
+	 1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 5, 0, 0, 0, 0,
+	 0, 0, 3, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0,
+	 0, 0, 0, 0, 5, 7, 7,11,11, 0, 0, 0, 0, 8, 8, 8,
+	 0, 0, 0, 0, 0, 0, 8, 7, 8, 0, 0, 0, 0, 0, 0,10,
+	 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static float _vq_quantthresh_res_Ac_4a[] = {
+	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
+};
+
+static long _vq_quantmap_res_Ac_4a[] = {
+	    7,    5,    3,    1,    0,    2,    4,    6,
+	    8,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_4a = {
+	_vq_quantthresh_res_Ac_4a,
+	_vq_quantmap_res_Ac_4a,
+	9,
+	9
+};
+
+static static_codebook _vq_book_res_Ac_4a = {
+	2, 81,
+	_vq_lengthlist_res_Ac_4a,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist_res_Ac_4a,
+	NULL,
+	&_vq_auxt_res_Ac_4a,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_4b.vqh b/lib/books/res_Ac_4b.vqh
new file mode 100644
index 00000000..6eb85207
--- /dev/null
+++ b/lib/books/res_Ac_4b.vqh
@@ -0,0 +1,61 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_4b_VQH_
+#define _V_res_Ac_4b_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_4b[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static long _vq_lengthlist_res_Ac_4b[] = {
+	 3, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
+	 4, 4, 0, 0, 0, 4, 4, 0, 0,
+};
+
+static float _vq_quantthresh_res_Ac_4b[] = {
+	-0.5, -0.16667, 0.16667, 0.5, 
+};
+
+static long _vq_quantmap_res_Ac_4b[] = {
+	    3,    1,    0,    2,    4,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_4b = {
+	_vq_quantthresh_res_Ac_4b,
+	_vq_quantmap_res_Ac_4b,
+	5,
+	5
+};
+
+static static_codebook _vq_book_res_Ac_4b = {
+	2, 25,
+	_vq_lengthlist_res_Ac_4b,
+	1, -537569962, 1607816532, 3, 0,
+	_vq_quantlist_res_Ac_4b,
+	NULL,
+	&_vq_auxt_res_Ac_4b,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_4c.vqh b/lib/books/res_Ac_4c.vqh
new file mode 100644
index 00000000..9e02fd4c
--- /dev/null
+++ b/lib/books/res_Ac_4c.vqh
@@ -0,0 +1,61 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_4c_VQH_
+#define _V_res_Ac_4c_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_4c[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static long _vq_lengthlist_res_Ac_4c[] = {
+	 2, 4, 4, 0, 0, 4, 4, 4, 0, 0, 4, 3, 3, 0, 0, 0,
+	 5, 5, 0, 0, 0, 5, 5, 0, 0,
+};
+
+static float _vq_quantthresh_res_Ac_4c[] = {
+	-0.16667, -0.055555, 0.055555, 0.16667, 
+};
+
+static long _vq_quantmap_res_Ac_4c[] = {
+	    3,    1,    0,    2,    4,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_4c = {
+	_vq_quantthresh_res_Ac_4c,
+	_vq_quantmap_res_Ac_4c,
+	5,
+	5
+};
+
+static static_codebook _vq_book_res_Ac_4c = {
+	2, 25,
+	_vq_lengthlist_res_Ac_4c,
+	1, -541298235, 1604088261, 3, 0,
+	_vq_quantlist_res_Ac_4c,
+	NULL,
+	&_vq_auxt_res_Ac_4c,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_5.vqh b/lib/books/res_Ac_5.vqh
index 91749ed1..36830e3f 100644
--- a/lib/books/res_Ac_5.vqh
+++ b/lib/books/res_Ac_5.vqh
@@ -27,13 +27,13 @@ static long _vq_quantlist_res_Ac_5[] = {
 };
 
 static long _vq_lengthlist_res_Ac_5[] = {
-	 1, 4, 4, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 6, 0, 0,
+	 1, 4, 4, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 4, 8, 8, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 4, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 6,10, 8,
+	 0, 0, 4, 4, 5, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 7,11,10,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 6, 7, 9,10, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 8, 7, 8, 9,11, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/lib/books/res_Ac_5a.vqh b/lib/books/res_Ac_5a.vqh
index 91dd7339..715b9c09 100644
--- a/lib/books/res_Ac_5a.vqh
+++ b/lib/books/res_Ac_5a.vqh
@@ -19,46 +19,34 @@
 #include "codebook.h"
 
 static long _vq_quantlist_res_Ac_5a[] = {
-	4,
-	3,
-	5,
-	2,
-	6,
 	1,
-	7,
 	0,
-	8,
+	2,
 };
 
 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, 5, 0, 0, 0, 0, 0, 0, 5, 8, 8, 6, 6,
-	 0, 0, 0, 0, 8, 8, 8, 0,10, 0, 0, 0, 0, 7, 8,10,
-	 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0, 0, 0, 0, 0, 7,
-	 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
+	 2, 1, 2, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh_res_Ac_5a[] = {
-	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
+	-0.16667, 0.16667, 
 };
 
 static long _vq_quantmap_res_Ac_5a[] = {
-	    7,    5,    3,    1,    0,    2,    4,    6,
-	    8,
+	    1,    0,    2,
 };
 
 static encode_aux_threshmatch _vq_auxt_res_Ac_5a = {
 	_vq_quantthresh_res_Ac_5a,
 	_vq_quantmap_res_Ac_5a,
-	9,
-	9
+	3,
+	3
 };
 
 static static_codebook _vq_book_res_Ac_5a = {
-	2, 81,
+	2, 9,
 	_vq_lengthlist_res_Ac_5a,
-	1, -531628032, 1611661312, 4, 0,
+	1, -539667116, 1607816532, 2, 0,
 	_vq_quantlist_res_Ac_5a,
 	NULL,
 	&_vq_auxt_res_Ac_5a,
diff --git a/lib/books/res_Ac_5b.vqh b/lib/books/res_Ac_5b.vqh
new file mode 100644
index 00000000..e98f7690
--- /dev/null
+++ b/lib/books/res_Ac_5b.vqh
@@ -0,0 +1,58 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_5b_VQH_
+#define _V_res_Ac_5b_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_5b[] = {
+	1,
+	0,
+	2,
+};
+
+static long _vq_lengthlist_res_Ac_5b[] = {
+	 1, 2, 2, 0, 0, 0, 0, 0, 0,
+};
+
+static float _vq_quantthresh_res_Ac_5b[] = {
+	-0.055555, 0.055555, 
+};
+
+static long _vq_quantmap_res_Ac_5b[] = {
+	    1,    0,    2,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_5b = {
+	_vq_quantthresh_res_Ac_5b,
+	_vq_quantmap_res_Ac_5b,
+	3,
+	3
+};
+
+static static_codebook _vq_book_res_Ac_5b = {
+	2, 9,
+	_vq_lengthlist_res_Ac_5b,
+	1, -543395387, 1604088261, 2, 0,
+	_vq_quantlist_res_Ac_5b,
+	NULL,
+	&_vq_auxt_res_Ac_5b,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_6.vqh b/lib/books/res_Ac_6.vqh
index 4b0d9129..5021dabb 100644
--- a/lib/books/res_Ac_6.vqh
+++ b/lib/books/res_Ac_6.vqh
@@ -31,7 +31,7 @@ static long _vq_quantlist_res_Ac_6[] = {
 };
 
 static long _vq_lengthlist_res_Ac_6[] = {
-	 1, 3, 2, 5, 5, 5, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0,
+	 1, 2, 3, 5, 4, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/lib/books/res_Ac_6a.vqh b/lib/books/res_Ac_6a.vqh
new file mode 100644
index 00000000..7448ec6d
--- /dev/null
+++ b/lib/books/res_Ac_6a.vqh
@@ -0,0 +1,93 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_6a_VQH_
+#define _V_res_Ac_6a_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_6a[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
+};
+
+static long _vq_lengthlist_res_Ac_6a[] = {
+	 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 3, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 5, 7, 7,13,14, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 5, 7, 6,12,12, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 7, 7, 7,11,11, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 8, 7, 7,10,11, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 8, 9, 8,12,12, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9,12,11,16, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9,14,13, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9,12,13, 0,
+	16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,11,11, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,11,11,15,
+	14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,
+	13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static float _vq_quantthresh_res_Ac_6a[] = {
+	-7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 
+	0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 
+};
+
+static long _vq_quantmap_res_Ac_6a[] = {
+	   15,   13,   11,    9,    7,    5,    3,    1,
+	    0,    2,    4,    6,    8,   10,   12,   14,
+	   16,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_6a = {
+	_vq_quantthresh_res_Ac_6a,
+	_vq_quantmap_res_Ac_6a,
+	17,
+	17
+};
+
+static static_codebook _vq_book_res_Ac_6a = {
+	2, 289,
+	_vq_lengthlist_res_Ac_6a,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist_res_Ac_6a,
+	NULL,
+	&_vq_auxt_res_Ac_6a,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_6b.vqh b/lib/books/res_Ac_6b.vqh
new file mode 100644
index 00000000..15f9b516
--- /dev/null
+++ b/lib/books/res_Ac_6b.vqh
@@ -0,0 +1,70 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_6b_VQH_
+#define _V_res_Ac_6b_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_6b[] = {
+	4,
+	3,
+	5,
+	2,
+	6,
+	1,
+	7,
+	0,
+	8,
+};
+
+static long _vq_lengthlist_res_Ac_6b[] = {
+	 1,14,14,14,14,14,14,14,14, 3, 5, 5,14,14,14,14,
+	14,14, 3, 5, 5,14,14,14,14,14,14, 5, 7, 8, 6, 6,
+	14,14,14,14, 8, 8, 8,14,14,14,14,14,14, 8, 9, 8,
+	14,14,14,14,14,14, 7, 8, 8,14,14,14,14,14,14, 8,
+	14,14,14,14,14,14, 8, 9,14,14,13,13,13,13,13,13,
+	13,
+};
+
+static float _vq_quantthresh_res_Ac_6b[] = {
+	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
+};
+
+static long _vq_quantmap_res_Ac_6b[] = {
+	    7,    5,    3,    1,    0,    2,    4,    6,
+	    8,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_6b = {
+	_vq_quantthresh_res_Ac_6b,
+	_vq_quantmap_res_Ac_6b,
+	9,
+	9
+};
+
+static static_codebook _vq_book_res_Ac_6b = {
+	2, 81,
+	_vq_lengthlist_res_Ac_6b,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist_res_Ac_6b,
+	NULL,
+	&_vq_auxt_res_Ac_6b,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_7.vqh b/lib/books/res_Ac_7.vqh
index 43a2fc8c..62b395f9 100644
--- a/lib/books/res_Ac_7.vqh
+++ b/lib/books/res_Ac_7.vqh
@@ -31,16 +31,16 @@ static long _vq_quantlist_res_Ac_7[] = {
 };
 
 static long _vq_lengthlist_res_Ac_7[] = {
-	 1, 3, 3, 6, 6, 8, 7, 8, 8, 0, 5, 5, 7, 7, 8, 9,
-	10,12, 0, 5, 5, 7, 7, 9, 8,10,12, 0, 7, 7,10,11,
-	 0, 0, 0,12, 0, 8, 8,12, 9,12, 0, 0, 0, 0,12, 0,
-	12, 0, 0, 0, 0, 0, 0, 0, 0, 0,11, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0,
-	 0,
+	 1, 2, 3, 7, 7,12,12,12,12,12, 6, 6,10,10,12,12,
+	12,12,12, 6, 5,12,10,12,12,12,12,12,11,12,12,12,
+	12,12,12,12,12,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,
 };
 
 static float _vq_quantthresh_res_Ac_7[] = {
-	-17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 12.5, 17.5, 
+	-31.5, -22.5, -13.5, -4.5, 4.5, 13.5, 22.5, 31.5, 
 };
 
 static long _vq_quantmap_res_Ac_7[] = {
@@ -58,7 +58,7 @@ static encode_aux_threshmatch _vq_auxt_res_Ac_7 = {
 static static_codebook _vq_book_res_Ac_7 = {
 	2, 81,
 	_vq_lengthlist_res_Ac_7,
-	1, -527171584, 1616117760, 4, 0,
+	1, -525205504, 1618083840, 4, 0,
 	_vq_quantlist_res_Ac_7,
 	NULL,
 	&_vq_auxt_res_Ac_7,
diff --git a/lib/books/res_Ac_7a.vqh b/lib/books/res_Ac_7a.vqh
index 4237f850..c13ad3ae 100644
--- a/lib/books/res_Ac_7a.vqh
+++ b/lib/books/res_Ac_7a.vqh
@@ -19,75 +19,46 @@
 #include "codebook.h"
 
 static long _vq_quantlist_res_Ac_7a[] = {
+	4,
+	3,
+	5,
 	2,
+	6,
 	1,
-	3,
+	7,
 	0,
-	4,
+	8,
 };
 
 static long _vq_lengthlist_res_Ac_7a[] = {
-	 1, 5, 4, 7, 7,11,13,13, 0,14,10,11,14,13,12,10,
-	13, 0,12,13,10,12,13,12,12, 5, 6, 5, 7, 7,10,12,
-	11, 0,12,10,13,12,12,11, 9,13,13,12,12, 9, 0,12,
-	12,12, 4, 5, 6, 7, 7,10,12,13,13,12, 9,12,11,12,
-	12,10,12,11,13, 0,10,13,12,11,13, 7, 7, 7, 8, 8,
-	10,12,12,13, 0,10,13,12, 0,12,10,13,12,12,13, 9,
-	13,11, 0,12, 7, 7, 7, 7, 8,10,11,11,12,13, 9,12,
-	12,13, 0,10,12,11,13,13, 9,11,11, 0,13, 9, 9,10,
-	10,10, 0,13, 0, 0,12, 0, 0, 0, 0,13,13, 0, 0,13,
-	13,12,13, 0,13, 0,11,12,11,11,13,13,13, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0,13, 0, 0, 0, 0, 0, 0, 0, 0,12,
-	11, 0,11,12, 0, 0, 0,13,13,13, 0,13, 0, 0, 0,13,
-	 0, 0, 0, 0, 0,13, 0,13,12,12,11,12,11, 0, 0, 0,
-	 0, 0,12, 0,13,13, 0,12, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,12, 0,12,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,13,13, 0, 0, 0, 0,10,10, 9, 9, 9, 0,
-	 0, 0,13, 0,12, 0, 0,13, 0, 0, 0,13,13, 0,13,13,
-	 0, 0,12,13,11,11,13,11, 0, 0, 0, 0, 0,12, 0, 0,
-	 0, 0,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,11,12,12,
-	13, 0, 0,13,13, 0, 0, 0,13, 0, 0, 0, 0, 0, 0, 0,
-	12,13, 0, 0,13,13,12,12,12,13, 0,12, 0, 0, 0, 0,
-	13,13, 0, 0, 0, 0, 0, 0, 0,13, 0, 0, 0, 0,12,11,
-	13,11,12, 0,13, 0, 0, 0, 0, 0, 0, 0, 0,13, 0, 0,
-	 0,13, 0, 0, 0, 0, 0,10, 9, 9,10, 9,13, 0, 0, 0,
-	 0,13, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,
-	13,12,11,11,11, 0, 0, 0, 0, 0, 0,13, 0,13, 0, 0,
-	13, 0, 0, 0, 0, 0, 0, 0, 0,13,11,12,11,12, 0, 0,
-	13, 0, 0, 0, 0, 0, 0, 0,12, 0, 0,13, 0, 0, 0,13,
-	 0, 0, 0,12, 0, 0,11, 0, 0, 0, 0,13, 0, 0, 0, 0,
-	13, 0, 0, 0, 0, 0, 0,13, 0, 0,12,13,12,11,12,13,
-	12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13, 0,13, 0, 0,
-	 0, 0, 0, 0,10, 9, 9,10,10, 0,13,13, 0, 0, 0, 0,
-	 0, 0,13, 0,13, 0, 0, 0,12,13, 0,13,13,12,11,12,
-	12,12, 0, 0,13, 0,12, 0, 0,13, 0, 0, 0,13, 0, 0,
-	 0,13, 0,13, 0,13,13,11,13,13,12, 0, 0, 0, 0, 0,
-	 0,13, 0, 0,12,12, 0,13,13, 0, 0,13, 0, 0,13,13,
-	13,12,13,12, 0, 0, 0, 0,13, 0, 0, 0, 0, 0,13, 0,
-	13, 0, 0, 0, 0, 0, 0, 0,13,13,12, 0,13, 0, 0, 0,
-	 0, 0, 0, 0,13, 0,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
+	 1, 3, 3, 4, 5, 6, 6, 6, 6,10,10,11,10,10, 9, 9,
+	 8, 8,10,10,10,10,10,10,10, 8, 8,10,11,11,10,11,
+	 9,10, 8, 8,10,11,11,10,11,10,10, 8, 9,12,10,11,
+	11,10,10,10, 9, 8,11,11,11,11,10,10,10, 9, 9,11,
+	11,11,11,12,10,11, 9, 8,10,11,11,11,11,11,10, 9,
+	 9,
 };
 
 static float _vq_quantthresh_res_Ac_7a[] = {
-	-1.5, -0.5, 0.5, 1.5, 
+	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
 };
 
 static long _vq_quantmap_res_Ac_7a[] = {
-	    3,    1,    0,    2,    4,
+	    7,    5,    3,    1,    0,    2,    4,    6,
+	    8,
 };
 
 static encode_aux_threshmatch _vq_auxt_res_Ac_7a = {
 	_vq_quantthresh_res_Ac_7a,
 	_vq_quantmap_res_Ac_7a,
-	5,
-	5
+	9,
+	9
 };
 
 static static_codebook _vq_book_res_Ac_7a = {
-	4, 625,
+	2, 81,
 	_vq_lengthlist_res_Ac_7a,
-	1, -533725184, 1611661312, 3, 0,
+	1, -531628032, 1611661312, 4, 0,
 	_vq_quantlist_res_Ac_7a,
 	NULL,
 	&_vq_auxt_res_Ac_7a,
diff --git a/lib/books/res_Ac_8.vqh b/lib/books/res_Ac_8.vqh
index a5c2da37..3b235d27 100644
--- a/lib/books/res_Ac_8.vqh
+++ b/lib/books/res_Ac_8.vqh
@@ -29,161 +29,14 @@ static long _vq_quantlist_res_Ac_8[] = {
 };
 
 static long _vq_lengthlist_res_Ac_8[] = {
-	 1, 5, 4, 8, 8,11, 9, 7, 7, 7,10, 9,13,11, 7, 7,
-	 6,10,10,12,11, 0,11,10,12,11,13,14, 0,11,10,11,
-	11,16,16, 0,14,14,13,15, 0,14, 0, 0, 0,13,12,14,
-	13, 4, 7, 7,10, 9,12,11,10, 9, 9,12,12,14,12,10,
-	10, 9,12,12,14,14, 0,14,13,15,14,15, 0, 0,14,14,
-	13,15, 0, 0, 0, 0, 0, 0,14, 0,15, 0, 0, 0, 0, 0,
-	 0, 0, 4, 7, 7,10, 9,12,12,10,10, 9,12,12,14,15,
-	11,10,10,11,14, 0,15, 0,13,13,13,15, 0, 0, 0,13,
-	14,14,13, 0,15, 0,15, 0, 0, 0,15, 0, 0,15, 0, 0,
-	 0, 0, 0, 8,10,10,12,11,15, 0,14,12,13,13,14, 0,
-	15,14,12,13,15,13,15,15, 0,15,15,15,15, 0, 0, 0,
-	15, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 8, 9,10,12,12,15,14,15,15,12, 0,13,
-	 0, 0,15,13,13,15,15, 0,14, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0,10,11,12,14,13, 0, 0,15, 0,14, 0,
-	15, 0, 0, 0, 0,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,11,13,12,13, 0, 0,15,15, 0,14,
-	 0, 0, 0, 0, 0,14, 0,15, 0,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, 6,10,10,13,14, 0,15,11,11,
-	11, 0,15, 0, 0,11,10,11,14,14,15, 0, 0,14,15,14,
-	 0, 0, 0, 0,14,14,14,15, 0, 0, 0, 0, 0, 0, 0, 0,
-	15, 0, 0, 0, 0,13, 0, 0, 6,10, 9,12,13, 0,15,11,
-	11,11,14,15, 0,15,11,10,10,13,14,14,14, 0,14,13,
-	 0,14,15,15, 0,13,14,13,14,15, 0, 0, 0,15, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,10,10,12,13,14, 0,
-	12,10,10,14,14, 0,15,11,10,10,13,13,15,15, 0,14,
-	 0,15,14, 0,14, 0,14,14,14,15, 0,15, 0, 0, 0,15,
-	 0,14, 0, 0, 0, 0, 0, 0, 0, 0,10,11,12, 0,14, 0,
-	 0,15,14,13,15,15,15, 0,14,12,14,14,14, 0, 0, 0,
-	 0,15, 0, 0, 0, 0, 0, 0, 0,15, 0, 0,14, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,13,12,14, 0,
-	 0, 0,14,13,14, 0,15, 0,15,14,14,13,15, 0, 0, 0,
-	 0,15, 0,15, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,14,14,15,
-	14, 0, 0, 0, 0,15, 0,14, 0, 0,15,15,14, 0,15, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,14, 0,
-	14, 0, 0, 0, 0, 0, 0,14, 0, 0, 0, 0,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, 7,10,
-	10,14,14,15, 0,11,11,11,13,13, 0, 0,11,11,12,15,
-	 0, 0,15, 0,14,14,15,14, 0, 0, 0,14,14,15,15, 0,
-	 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 7,
-	10,10,13,14,14,15,11,10,10,14,13,13,15,11,11,11,
-	14,15, 0, 0, 0,14,13,14, 0,15,14, 0,15,13, 0,15,
-	 0, 0, 0, 0, 0,14, 0, 0, 0, 0, 0, 0, 0,15, 0, 0,
-	 7, 9,10,13,13, 0,14,10,10,10,13,13, 0, 0,12,11,
-	11,14,15, 0, 0, 0,15,13,14,13,14, 0, 0,14,14,14,
-	14, 0, 0, 0, 0, 0,14, 0, 0, 0, 0, 0, 0,15,15, 0,
-	15,10,12,12,14,14,15,15, 0,14,14,15, 0, 0, 0, 0,
-	14,13, 0, 0, 0, 0, 0,15,14,15, 0, 0, 0, 0, 0, 0,
-	 0,15, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0,
-	 0, 0,10,11,13,15,15,15, 0,14,14,12,15, 0,15, 0,
-	14,14,14,15,15, 0,15, 0, 0, 0,15, 0,15, 0, 0, 0,
-	15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0,12,13, 0,15,14, 0, 0,15,15, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,12,14,14,14, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0,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, 0,
-	 0, 0, 0, 0, 0, 0,11,13,13, 0, 0, 0, 0, 0,15,14,
-	15,15, 0, 0,15,15,13, 0, 0, 0, 0, 0,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,11,13, 0,15, 0,15,15,15,15,
-	15, 0, 0,15, 0,14,14,13, 0, 0, 0, 0, 0,15,14,15,
-	 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,12,14,15, 0, 0, 0, 0, 0,
-	15,14,15, 0, 0, 0, 0,15,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,12,14,13, 0, 0, 0, 0,
-	 0,15,15, 0, 0, 0, 0,14,15,13, 0, 0, 0,15, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0,15, 0, 0, 0,15,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14, 0, 0, 0, 0,
-	 0, 0, 0,15, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,14,14,
-	 0, 0, 0, 0,15,15,13, 0, 0, 0, 0, 0,15,15, 0, 0,
-	 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,14,
-	14, 0, 0, 0, 0,15,13,14, 0, 0, 0, 0,15,15,15, 0,
-	 0, 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
-	13,14, 0,15, 0, 0, 0,13,14,15, 0, 0, 0, 0,15,15,
-	 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,
-	13,14,14, 0, 0, 0, 0, 0,13,14, 0,14, 0, 0,15,15,
-	15,15, 0, 0, 0, 0, 0,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,14, 0,15, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0,
-	 0,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,15, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0,
-	 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0,14, 0, 0, 0,15, 0, 0,15,15, 0,
-	 0, 0, 0, 0, 0, 0, 0,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,14,15,15, 0, 0, 0, 0,15,15,
-	 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,15,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0,
-	 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0,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,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15,15, 0,
-	 0, 0, 0, 0, 0, 0,14, 0, 0, 0, 0, 0,14, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14, 0,
-	 0, 0, 0, 0, 0, 0,15,13, 0, 0, 0, 0,15,15, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14,
-	 0,15, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,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,
+	 1, 3, 3, 8, 7,13,13, 5, 6, 5,10, 9,13,13, 4, 6,
+	 5,10,10,13,13,13, 6,10,11,12,13,13,13,10, 6,13,
+	12,13,13,13, 8,12, 8,13,13,13,13,13,11,13,11,13,
+	13,
 };
 
 static float _vq_quantthresh_res_Ac_8[] = {
-	-62.5, -37.5, -12.5, 12.5, 37.5, 62.5, 
+	-137.5, -82.5, -27.5, 27.5, 82.5, 137.5, 
 };
 
 static long _vq_quantmap_res_Ac_8[] = {
@@ -198,9 +51,9 @@ static encode_aux_threshmatch _vq_auxt_res_Ac_8 = {
 };
 
 static static_codebook _vq_book_res_Ac_8 = {
-	4, 2401,
+	2, 49,
 	_vq_lengthlist_res_Ac_8,
-	1, -523059200, 1620639744, 3, 0,
+	1, -520839168, 1622900736, 3, 0,
 	_vq_quantlist_res_Ac_8,
 	NULL,
 	&_vq_auxt_res_Ac_8,
diff --git a/lib/books/res_Ac_8a.vqh b/lib/books/res_Ac_8a.vqh
index 5daac200..ff093405 100644
--- a/lib/books/res_Ac_8a.vqh
+++ b/lib/books/res_Ac_8a.vqh
@@ -19,37 +19,41 @@
 #include "codebook.h"
 
 static long _vq_quantlist_res_Ac_8a[] = {
+	3,
 	2,
+	4,
 	1,
-	3,
+	5,
 	0,
-	4,
+	6,
 };
 
 static long _vq_lengthlist_res_Ac_8a[] = {
-	 2, 3, 3, 5, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 7,
-	 6, 6, 6, 6, 7, 6, 6, 5, 6,
+	 1, 4, 4, 6, 6, 7, 7, 6, 5, 5, 6, 6, 8, 7, 6, 5,
+	 5, 7, 7, 8, 8,10, 7, 7, 7, 7, 8, 8,11, 7, 7, 7,
+	 7, 8, 8,12,11,11, 8, 8, 9, 9,12,10,10, 8, 8,10,
+	 9,
 };
 
 static float _vq_quantthresh_res_Ac_8a[] = {
-	-7.5, -2.5, 2.5, 7.5, 
+	-22.5, -13.5, -4.5, 4.5, 13.5, 22.5, 
 };
 
 static long _vq_quantmap_res_Ac_8a[] = {
-	    3,    1,    0,    2,    4,
+	    5,    3,    1,    0,    2,    4,    6,
 };
 
 static encode_aux_threshmatch _vq_auxt_res_Ac_8a = {
 	_vq_quantthresh_res_Ac_8a,
 	_vq_quantmap_res_Ac_8a,
-	5,
-	5
+	7,
+	7
 };
 
 static static_codebook _vq_book_res_Ac_8a = {
-	2, 25,
+	2, 49,
 	_vq_lengthlist_res_Ac_8a,
-	1, -529268736, 1616117760, 3, 0,
+	1, -526712832, 1618083840, 3, 0,
 	_vq_quantlist_res_Ac_8a,
 	NULL,
 	&_vq_auxt_res_Ac_8a,
diff --git a/lib/books/res_Ac_8b.vqh b/lib/books/res_Ac_8b.vqh
new file mode 100644
index 00000000..7144caab
--- /dev/null
+++ b/lib/books/res_Ac_8b.vqh
@@ -0,0 +1,70 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_8b_VQH_
+#define _V_res_Ac_8b_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_8b[] = {
+	4,
+	3,
+	5,
+	2,
+	6,
+	1,
+	7,
+	0,
+	8,
+};
+
+static long _vq_lengthlist_res_Ac_8b[] = {
+	 4, 5, 5, 6, 6, 6, 6, 6, 6, 7, 6, 6, 6, 6, 6, 6,
+	 6, 6, 7, 6, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 6, 6,
+	 6, 7, 6, 7, 7, 7, 7, 6, 6, 6, 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, 7, 7, 7, 7, 7, 7, 7, 7,
+	 6,
+};
+
+static float _vq_quantthresh_res_Ac_8b[] = {
+	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
+};
+
+static long _vq_quantmap_res_Ac_8b[] = {
+	    7,    5,    3,    1,    0,    2,    4,    6,
+	    8,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_8b = {
+	_vq_quantthresh_res_Ac_8b,
+	_vq_quantmap_res_Ac_8b,
+	9,
+	9
+};
+
+static static_codebook _vq_book_res_Ac_8b = {
+	2, 81,
+	_vq_lengthlist_res_Ac_8b,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist_res_Ac_8b,
+	NULL,
+	&_vq_auxt_res_Ac_8b,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_8c.vqh b/lib/books/res_Ac_8c.vqh
new file mode 100644
index 00000000..6c9858cb
--- /dev/null
+++ b/lib/books/res_Ac_8c.vqh
@@ -0,0 +1,100 @@
+/********************************************************************
+ *                                                                  *
+ * 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_res_Ac_8c_VQH_
+#define _V_res_Ac_8c_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Ac_8c[] = {
+	9,
+	8,
+	10,
+	7,
+	11,
+	6,
+	12,
+	5,
+	13,
+	4,
+	14,
+	3,
+	15,
+	2,
+	16,
+	1,
+	17,
+	0,
+	18,
+};
+
+static long _vq_lengthlist_res_Ac_8c[] = {
+	 1,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10, 6, 7, 6,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10, 5, 7, 7,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10, 9, 7, 8,10, 8,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10, 8,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	 8, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10, 9, 8,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10, 8, 9, 9,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10, 8,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10, 9,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	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,
+};
+
+static float _vq_quantthresh_res_Ac_8c[] = {
+	-8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, 
+	-0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 
+	7.5, 8.5, 
+};
+
+static long _vq_quantmap_res_Ac_8c[] = {
+	   17,   15,   13,   11,    9,    7,    5,    3,
+	    1,    0,    2,    4,    6,    8,   10,   12,
+	   14,   16,   18,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Ac_8c = {
+	_vq_quantthresh_res_Ac_8c,
+	_vq_quantmap_res_Ac_8c,
+	19,
+	19
+};
+
+static static_codebook _vq_book_res_Ac_8c = {
+	2, 361,
+	_vq_lengthlist_res_Ac_8c,
+	1, -529399808, 1611661312, 5, 0,
+	_vq_quantlist_res_Ac_8c,
+	NULL,
+	&_vq_auxt_res_Ac_8c,
+	NULL,
+	0
+};
+
+
+#endif
diff --git a/lib/books/res_Ac_9.vqh b/lib/books/res_Ac_9.vqh
index a37535fb..ac606d23 100644
--- a/lib/books/res_Ac_9.vqh
+++ b/lib/books/res_Ac_9.vqh
@@ -29,10 +29,10 @@ static long _vq_quantlist_res_Ac_9[] = {
 };
 
 static long _vq_lengthlist_res_Ac_9[] = {
-	 1, 4, 4,10,10,10,10, 3, 4,10,10,10,10,10, 3, 9,
-	 7,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,
+	 1, 3, 3, 9, 9, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 7,
+	 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8,
 };
 
 static float _vq_quantthresh_res_Ac_9[] = {
diff --git a/lib/books/res_Ac_9a.vqh b/lib/books/res_Ac_9a.vqh
index 46511cdf..c9a0d97d 100644
--- a/lib/books/res_Ac_9a.vqh
+++ b/lib/books/res_Ac_9a.vqh
@@ -35,17 +35,17 @@ static long _vq_quantlist_res_Ac_9a[] = {
 };
 
 static long _vq_lengthlist_res_Ac_9a[] = {
-	 2, 3, 3, 7, 7,10, 8,10, 9,11, 9, 9, 8, 5, 5, 5,
-	 9, 9,10,10,10,11,12, 9,10, 9, 5, 4, 4, 8, 9,10,
-	 9,10,11,11,10, 9, 9,12, 8, 8,10,10,11,10,12,12,
-	12,10,10,11,13, 6, 5, 6, 6,11,11,11,12,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,12,
-	12,12,13,12,12, 8,12,10,13,13,13,12, 9,13,10,12,
-	12, 8,13,11,12,13,13,13,13,12,12,13,13, 9,11, 9,
-	12,12,13,13,12,13,13,12,12, 8,13, 9,12,13,13,12,
-	13,13,13,13,13,13,11, 9,11,10,11,12,13,13,13,13,
-	13,11,12, 9,13,12,12,12,12,
+	 1, 4, 4, 5, 6, 8, 7, 9, 7, 9, 7, 9,10, 7, 6, 6,
+	10, 9, 8, 9, 9, 9,11, 8,10,11, 6, 6, 5, 8, 8, 9,
+	 8, 8,10, 9, 8,11,11,10, 9, 9, 8, 9,10, 9,10,10,
+	10, 8,10,11,11, 7, 7, 7, 7,10, 9, 9,10, 8,10,11,
+	11,11,11, 9, 8, 8,10,11,11,10, 9,10,11,11,11,10,
+	11, 8, 8,10, 9,10,10,11,10,10,11,11,10,11,10,11,
+	11,11,11,11,10,11,11,10,11,11,11,11, 9,11,11,11,
+	11,10,11,11,11,11,11,11,11,10,10,11,11,11,10,11,
+	10,11,11,11,10,11,11,11,10,10,11,11,10,11,11,10,
+	11,11,11,11,11,11,10,11,11,11,11,11,11,11,11,11,
+	11,11,11,10,11,11,10,11,11,
 };
 
 static float _vq_quantthresh_res_Ac_9a[] = {
diff --git a/lib/books/res_Ac_9b.vqh b/lib/books/res_Ac_9b.vqh
index f7511a54..408e9846 100644
--- a/lib/books/res_Ac_9b.vqh
+++ b/lib/books/res_Ac_9b.vqh
@@ -35,17 +35,17 @@ static long _vq_quantlist_res_Ac_9b[] = {
 };
 
 static long _vq_lengthlist_res_Ac_9b[] = {
-	 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 9, 8, 8, 8, 8, 7, 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, 9, 8, 8, 7, 7, 8,
-	 7, 7, 8, 7, 8, 8, 8, 9, 8, 8, 8, 8, 8, 8, 8, 7,
-	 7, 7, 8, 9, 8, 9, 8, 7, 8, 7, 7, 7, 8, 8, 7, 8,
-	 9, 8, 8, 9, 7, 8, 8, 7, 8, 7, 7, 8, 9, 9, 9, 8,
-	 8, 9, 9, 7, 7, 8, 7, 8, 8,
+	 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 6, 8, 6, 9, 6, 6,
+	 6, 7, 7, 6, 7, 8, 7, 7, 6, 7, 7, 7, 7, 7, 6, 7,
+	 6, 7, 7, 7, 7, 8, 7, 8, 8, 9, 8, 8, 7, 8, 8, 9,
+	 7, 7, 8, 7, 8, 8, 8, 8, 7, 8, 7, 7, 9, 7, 8, 7,
+	 8, 8, 9, 7, 7, 8, 8, 8, 9, 8, 8, 9, 7, 8, 9, 8,
+	 8, 8, 9, 8, 8, 8, 8, 8, 9, 7, 8, 9, 9, 9, 9, 8,
+	 8, 8, 9, 8, 9, 8, 8, 8, 8, 9, 8, 7, 9, 9, 7, 8,
+	 9, 8, 8, 8, 8,10, 8, 9, 9, 8, 9, 8, 9, 8,10, 8,
+	 7, 7, 8, 9, 8, 9, 9, 8, 8, 9, 8, 8, 9, 8, 9, 9,
+	 8, 8, 8, 8, 8, 9, 9, 8, 9, 8, 8, 9, 9, 9, 8, 9,
+	 9, 9, 8, 9, 8, 9, 8, 9, 8,
 };
 
 static float _vq_quantthresh_res_Ac_9b[] = {