Correct bug in 16kHz coupled books similar to the bug that had popped up in

uncoupled output.  It would cause efficiency loss and unstable tones in 
high-rate encoding (q5 and higher).


svn path=/trunk/vorbis/; revision=17025

2 files changed, 558 insertions, 518 deletions

diff --git a/lib/books/coupled/res_books_stereo.h b/lib/books/coupled/res_books_stereo.h
index 9f688e7e..5dff539e 100644
--- a/lib/books/coupled/res_books_stereo.h
+++ b/lib/books/coupled/res_books_stereo.h
@@ -16,6 +16,7 @@
  ********************************************************************/
 
 #include "codebook.h"
+
 static const long _vq_quantlist__16c0_s_p1_0[] = {
         1,
         0,
@@ -1766,624 +1767,666 @@ static const static_codebook _huff_book__16c1_s_short = {
 };
 
 static const long _huff_lengthlist__16c2_s_long[] = {
-         4, 7, 9, 9, 9, 8, 9,10,15,19, 5, 4, 5, 6, 7, 7,
-         8, 9,14,16, 6, 5, 4, 5, 6, 7, 8,10,12,19, 7, 6,
-         5, 4, 5, 6, 7, 9,11,18, 8, 7, 6, 5, 5, 5, 7, 9,
-        10,17, 8, 7, 7, 5, 5, 5, 6, 7,12,18, 8, 8, 8, 7,
-         7, 5, 5, 7,12,18, 8, 9,10, 9, 9, 7, 6, 7,12,17,
-        14,18,16,16,15,12,11,10,12,18,15,17,18,18,18,15,
-        14,14,16,18,
+	 4, 7, 9, 9, 9, 8, 9,10,13,16, 5, 4, 5, 6, 7, 7,
+	 8, 9,12,16, 6, 5, 5, 5, 7, 7, 9,10,12,15, 7, 6,
+	 5, 4, 5, 6, 8, 9,10,13, 8, 7, 7, 5, 5, 5, 7, 9,
+	10,12, 7, 7, 7, 6, 5, 5, 6, 7,10,12, 8, 8, 8, 7,
+	 7, 5, 5, 6, 9,11, 8, 9, 9, 8, 8, 6, 6, 5, 8,11,
+	10,11,12,12,11, 9, 9, 8, 9,12,13,14,15,15,14,12,
+	12,11,11,13,
 };
 
 static const static_codebook _huff_book__16c2_s_long = {
-        2, 100,
-        (long *)_huff_lengthlist__16c2_s_long,
-        0, 0, 0, 0, 0,
-        NULL,
-        0
+	2, 100,
+	(long *)_huff_lengthlist__16c2_s_long,
+	0, 0, 0, 0, 0,
+	NULL,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p1_0[] = {
-        1,
-        0,
-        2,
+	1,
+	0,
+	2,
 };
 
 static const long _vq_lengthlist__16c2_s_p1_0[] = {
-         1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0,
-         0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0,
+	 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0,
+	 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
 };
 
 static const static_codebook _16c2_s_p1_0 = {
-        4, 81,
-        (long *)_vq_lengthlist__16c2_s_p1_0,
-        1, -535822336, 1611661312, 2, 0,
-        (long *)_vq_quantlist__16c2_s_p1_0,
-        0
+	4, 81,
+	(long *)_vq_lengthlist__16c2_s_p1_0,
+	1, -535822336, 1611661312, 2, 0,
+	(long *)_vq_quantlist__16c2_s_p1_0,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p2_0[] = {
-        2,
-        1,
-        3,
-        0,
-        4,
+	2,
+	1,
+	3,
+	0,
+	4,
 };
 
 static const long _vq_lengthlist__16c2_s_p2_0[] = {
-         2, 4, 3, 7, 7, 0, 0, 0, 7, 8, 0, 0, 0, 8, 8, 0,
-         0, 0, 8, 8, 0, 0, 0, 8, 8, 4, 5, 4, 8, 8, 0, 0,
-         0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0,
-         9, 9, 4, 4, 5, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8,
-         8, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 7, 8, 8,10,10,
-         0, 0, 0,12,11, 0, 0, 0,11,11, 0, 0, 0,14,13, 0,
-         0, 0,14,13, 7, 8, 8, 9,10, 0, 0, 0,11,12, 0, 0,
-         0,11,11, 0, 0, 0,14,14, 0, 0, 0,13,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, 8, 8, 8,11,11, 0, 0, 0,
-        11,11, 0, 0, 0,12,11, 0, 0, 0,12,12, 0, 0, 0,13,
-        13, 8, 8, 8,11,11, 0, 0, 0,11,11, 0, 0, 0,11,12,
-         0, 0, 0,12,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 8, 8, 8,12,11, 0, 0, 0,12,11, 0,
-         0, 0,11,11, 0, 0, 0,13,13, 0, 0, 0,13,12, 8, 8,
-         8,11,12, 0, 0, 0,11,12, 0, 0, 0,11,11, 0, 0, 0,
-        13,13, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 8, 9, 9,14,13, 0, 0, 0,13,12, 0, 0, 0,13,
-        13, 0, 0, 0,13,12, 0, 0, 0,13,13, 8, 9, 9,13,14,
-         0, 0, 0,12,13, 0, 0, 0,13,13, 0, 0, 0,12,13, 0,
-         0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,
-         9, 9,14,13, 0, 0, 0,13,13, 0, 0, 0,13,12, 0, 0,
-         0,13,13, 0, 0, 0,13,12, 8, 9, 9,14,14, 0, 0, 0,
-        13,13, 0, 0, 0,12,13, 0, 0, 0,13,13, 0, 0, 0,12,
-        13,
+	 2, 4, 4, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0,
+	 0, 0, 8, 8, 0, 0, 0, 8, 8, 4, 4, 4, 8, 7, 0, 0,
+	 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0,
+	 9, 9, 4, 4, 4, 7, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8,
+	 8, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 7, 8, 8,10, 9,
+	 0, 0, 0,12,11, 0, 0, 0,11,12, 0, 0, 0,14,13, 0,
+	 0, 0,14,14, 7, 8, 8, 9,10, 0, 0, 0,11,12, 0, 0,
+	 0,11,11, 0, 0, 0,14,14, 0, 0, 0,14,14, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8,11,11, 0, 0, 0,
+	12,11, 0, 0, 0,12,12, 0, 0, 0,13,12, 0, 0, 0,13,
+	13, 8, 8, 8,11,11, 0, 0, 0,11,11, 0, 0, 0,12,12,
+	 0, 0, 0,13,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 8, 9, 8,12,11, 0, 0, 0,12,12, 0,
+	 0, 0,12,11, 0, 0, 0,13,13, 0, 0, 0,13,13, 8, 8,
+	 8,11,12, 0, 0, 0,11,12, 0, 0, 0,11,12, 0, 0, 0,
+	13,14, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 8, 9, 9,14,14, 0, 0, 0,13,13, 0, 0, 0,13,
+	13, 0, 0, 0,13,12, 0, 0, 0,13,13, 8, 9, 9,14,14,
+	 0, 0, 0,13,13, 0, 0, 0,13,13, 0, 0, 0,12,13, 0,
+	 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,
+	 9, 9,14,14, 0, 0, 0,13,13, 0, 0, 0,13,13, 0, 0,
+	 0,13,13, 0, 0, 0,13,12, 8, 9, 9,14,14, 0, 0, 0,
+	13,13, 0, 0, 0,13,13, 0, 0, 0,13,13, 0, 0, 0,12,
+	12,
 };
 
 static const static_codebook _16c2_s_p2_0 = {
-        4, 625,
-        (long *)_vq_lengthlist__16c2_s_p2_0,
-        1, -533725184, 1611661312, 3, 0,
-        (long *)_vq_quantlist__16c2_s_p2_0,
-        0
+	4, 625,
+	(long *)_vq_lengthlist__16c2_s_p2_0,
+	1, -533725184, 1611661312, 3, 0,
+	(long *)_vq_quantlist__16c2_s_p2_0,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p3_0[] = {
-        4,
-        3,
-        5,
-        2,
-        6,
-        1,
-        7,
-        0,
-        8,
+	4,
+	3,
+	5,
+	2,
+	6,
+	1,
+	7,
+	0,
+	8,
 };
 
 static const long _vq_lengthlist__16c2_s_p3_0[] = {
-         1, 3, 3, 6, 6, 7, 7, 8, 8, 0, 0, 0, 6, 6, 7, 7,
-         9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, 7, 7,
-         8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
-         7, 7, 9, 9,10,10, 0, 0, 0, 7, 7, 9, 9,10,10, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0,
+	 1, 3, 3, 5, 5, 7, 7, 8, 8, 0, 0, 0, 6, 6, 8, 8,
+	 9, 9, 0, 0, 0, 6, 6, 8, 8, 9, 9, 0, 0, 0, 7, 7,
+	 8, 9,10,10, 0, 0, 0, 7, 7, 9, 9,10,10, 0, 0, 0,
+	 8, 8, 9, 9,11,11, 0, 0, 0, 7, 7, 9, 9,11,11, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
 };
 
 static const static_codebook _16c2_s_p3_0 = {
-        2, 81,
-        (long *)_vq_lengthlist__16c2_s_p3_0,
-        1, -531628032, 1611661312, 4, 0,
-        (long *)_vq_quantlist__16c2_s_p3_0,
-        0
+	2, 81,
+	(long *)_vq_lengthlist__16c2_s_p3_0,
+	1, -531628032, 1611661312, 4, 0,
+	(long *)_vq_quantlist__16c2_s_p3_0,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p4_0[] = {
-        8,
-        7,
-        9,
-        6,
-        10,
-        5,
-        11,
-        4,
-        12,
-        3,
-        13,
-        2,
-        14,
-        1,
-        15,
-        0,
-        16,
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
 };
 
 static const long _vq_lengthlist__16c2_s_p4_0[] = {
-         2, 3, 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,
-        10, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,
-        11,11, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,
-        10,10,11, 0, 0, 0, 6, 6, 8, 8, 8, 8, 9, 9,10,10,
-        10,11,11,11, 0, 0, 0, 6, 6, 8, 8, 9, 9, 9, 9,10,
-        10,11,11,11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,
-        10,10,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9,
-         9,10,10,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,
-        10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 8, 8, 9,
-         9,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 5, 5, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9,
+	 9, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,
+	11,10, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,
+	10,10,10, 0, 0, 0, 6, 6, 8, 8, 9, 9, 9, 9,10,10,
+	11,11,11,11, 0, 0, 0, 7, 6, 8, 8, 9, 9, 9, 9,10,
+	10,11,11,11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,10,
+	11,11,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,
+	10,11,11,11,11,12,12, 0, 0, 0, 7, 8, 8, 8, 9, 9,
+	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 8, 8, 9,
+	 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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 const static_codebook _16c2_s_p4_0 = {
-        2, 289,
-        (long *)_vq_lengthlist__16c2_s_p4_0,
-        1, -529530880, 1611661312, 5, 0,
-        (long *)_vq_quantlist__16c2_s_p4_0,
-        0
+	2, 289,
+	(long *)_vq_lengthlist__16c2_s_p4_0,
+	1, -529530880, 1611661312, 5, 0,
+	(long *)_vq_quantlist__16c2_s_p4_0,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p5_0[] = {
-        1,
-        0,
-        2,
+	1,
+	0,
+	2,
 };
 
 static const long _vq_lengthlist__16c2_s_p5_0[] = {
-         1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6,10,10,10,10,
-        10,10, 4, 7, 6,10,10,10,10,10,10, 5, 9, 9, 9,12,
-        11,10,11,12, 7,10,10,12,12,12,12,12,12, 7,10,10,
-        11,12,12,12,12,13, 6,10,10,10,12,12,10,12,12, 7,
-        10,10,11,13,12,12,12,12, 7,10,10,11,12,12,12,12,
-        12,
+	 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6,10,11,10,10,
+	10,11, 4, 6, 6,10,10,11,10,11,10, 5,10,10, 9,12,
+	11,10,12,12, 7,10,10,12,12,12,12,13,13, 7,11,10,
+	11,12,12,12,13,13, 6,11,10,10,12,12,11,12,12, 7,
+	11,10,12,13,13,12,12,12, 7,10,11,12,13,13,12,12,
+	12,
 };
 
 static const static_codebook _16c2_s_p5_0 = {
-        4, 81,
-        (long *)_vq_lengthlist__16c2_s_p5_0,
-        1, -529137664, 1618345984, 2, 0,
-        (long *)_vq_quantlist__16c2_s_p5_0,
-        0
+	4, 81,
+	(long *)_vq_lengthlist__16c2_s_p5_0,
+	1, -529137664, 1618345984, 2, 0,
+	(long *)_vq_quantlist__16c2_s_p5_0,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p5_1[] = {
-        5,
-        4,
-        6,
-        3,
-        7,
-        2,
-        8,
-        1,
-        9,
-        0,
-        10,
+	5,
+	4,
+	6,
+	3,
+	7,
+	2,
+	8,
+	1,
+	9,
+	0,
+	10,
 };
 
 static const long _vq_lengthlist__16c2_s_p5_1[] = {
-         2, 3, 3, 6, 6, 7, 7, 7, 7, 8, 8,11,11,11, 6, 6,
-         7, 7, 8, 8, 8, 8,11,11,11, 6, 6, 7, 7, 8, 8, 8,
-         8,11,11,11, 6, 6, 8, 8, 8, 8, 9, 9,11,11,11, 6,
-         6, 8, 8, 8, 8, 9, 9,11,11,11, 7, 7, 8, 8, 8, 8,
-         8, 8,11,11,11, 7, 7, 8, 8, 8, 8, 8, 9,11,11,11,
-         8, 8, 8, 8, 8, 8, 8, 8,11,11,11,11,11, 8, 8, 8,
-         8, 8, 8,11,11,11,11,11, 8, 8, 8, 8, 8, 8,11,11,
-        11,11,11, 7, 7, 8, 8, 8, 8,
+	 2, 3, 3, 6, 6, 6, 6, 7, 7, 7, 7,11,10,10, 6, 6,
+	 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8,
+	 8,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9,11,11,11, 6,
+	 7, 8, 8, 8, 8, 9, 9,11,11,11, 7, 7, 8, 8, 8, 8,
+	 8, 8,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9,11,11,11,
+	 8, 8, 8, 8, 8, 8, 8, 8,11,11,11,11,11, 8, 8, 8,
+	 8, 8, 8,12,11,11,11,11, 8, 8, 8, 8, 8, 8,12,11,
+	11,11,11, 7, 7, 8, 8, 8, 8,
 };
 
 static const static_codebook _16c2_s_p5_1 = {
-        2, 121,
-        (long *)_vq_lengthlist__16c2_s_p5_1,
-        1, -531365888, 1611661312, 4, 0,
-        (long *)_vq_quantlist__16c2_s_p5_1,
-        0
+	2, 121,
+	(long *)_vq_lengthlist__16c2_s_p5_1,
+	1, -531365888, 1611661312, 4, 0,
+	(long *)_vq_quantlist__16c2_s_p5_1,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p6_0[] = {
-        6,
-        5,
-        7,
-        4,
-        8,
-        3,
-        9,
-        2,
-        10,
-        1,
-        11,
-        0,
-        12,
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
+	9,
+	2,
+	10,
+	1,
+	11,
+	0,
+	12,
 };
 
 static const long _vq_lengthlist__16c2_s_p6_0[] = {
-         1, 4, 4, 7, 6, 8, 8, 9, 9,10,10,11,11, 5, 5, 5,
-         7, 7, 9, 9, 9, 9,11,11,12,12, 6, 5, 5, 7, 7, 9,
-         9,10,10,11,11,12,12, 0, 6, 6, 7, 7, 9, 9,10,10,
-        11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10,11,12,12,
-        12, 0,11,11, 8, 8,10,10,11,11,12,12,13,13, 0,11,
-        12, 8, 8,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 1, 4, 4, 6, 6, 8, 7, 8, 8, 9, 9,10,10, 5, 5, 5,
+	 7, 7, 9, 9, 9, 9,11,11,12,12, 6, 5, 5, 7, 7, 9,
+	 9,10, 9,11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10,
+	11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
+	12, 0,11,11, 8, 8,10,10,11,11,12,12,13,13, 0,12,
+	12, 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
 static const static_codebook _16c2_s_p6_0 = {
-        2, 169,
-        (long *)_vq_lengthlist__16c2_s_p6_0,
-        1, -526516224, 1616117760, 4, 0,
-        (long *)_vq_quantlist__16c2_s_p6_0,
-        0
+	2, 169,
+	(long *)_vq_lengthlist__16c2_s_p6_0,
+	1, -526516224, 1616117760, 4, 0,
+	(long *)_vq_quantlist__16c2_s_p6_0,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p6_1[] = {
-        2,
-        1,
-        3,
-        0,
-        4,
+	2,
+	1,
+	3,
+	0,
+	4,
 };
 
 static const long _vq_lengthlist__16c2_s_p6_1[] = {
-         2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6,
-         6, 6, 5, 5, 6, 6, 6, 5, 5,
+	 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6,
+	 6, 6, 5, 5, 6, 6, 6, 5, 5,
 };
 
 static const static_codebook _16c2_s_p6_1 = {
-        2, 25,
-        (long *)_vq_lengthlist__16c2_s_p6_1,
-        1, -533725184, 1611661312, 3, 0,
-        (long *)_vq_quantlist__16c2_s_p6_1,
-        0
+	2, 25,
+	(long *)_vq_lengthlist__16c2_s_p6_1,
+	1, -533725184, 1611661312, 3, 0,
+	(long *)_vq_quantlist__16c2_s_p6_1,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p7_0[] = {
-        6,
-        5,
-        7,
-        4,
-        8,
-        3,
-        9,
-        2,
-        10,
-        1,
-        11,
-        0,
-        12,
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
+	9,
+	2,
+	10,
+	1,
+	11,
+	0,
+	12,
 };
 
 static const long _vq_lengthlist__16c2_s_p7_0[] = {
-         1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 5, 5,
-         8, 8, 9, 9,10,10,11,11,12,12, 6, 5, 5, 8, 8, 9,
-         9,10,10,11,11,12,13,18, 6, 6, 7, 7, 9, 9,10,10,
-        12,12,13,13,18, 6, 6, 7, 7, 9, 9,10,10,12,12,13,
-        13,18,11,10, 8, 8,10,10,11,11,12,12,13,13,18,11,
-        11, 8, 8,10,10,11,11,12,13,13,13,18,18,18,10,11,
-        11,11,12,12,13,13,14,14,18,18,18,11,11,11,11,12,
-        12,13,13,14,14,18,18,18,14,14,12,12,12,12,14,14,
-        15,14,18,18,18,15,15,11,12,12,12,13,13,15,15,18,
-        18,18,18,18,13,13,13,13,13,14,17,16,18,18,18,18,
-        18,13,14,13,13,14,13,15,14,
+	 1, 4, 4, 7, 7, 8, 8, 8, 8,10, 9,10,10, 5, 5, 5,
+	 7, 7, 9, 9,10,10,11,10,12,11, 6, 5, 5, 7, 7, 9,
+	 9,10,10,11,11,12,12,20, 7, 7, 7, 7, 9, 9,10,10,
+	11,11,12,12,20, 7, 7, 7, 7, 9, 9,11,10,12,11,12,
+	12,20,11,11, 8, 8,10,10,11,11,12,12,13,13,20,12,
+	12, 8, 8, 9, 9,11,11,12,12,13,13,20,20,21,10,10,
+	10,10,11,11,12,12,13,13,21,21,21,10,10,10,10,11,
+	11,12,12,13,13,21,21,21,14,14,11,11,12,12,13,13,
+	13,14,21,21,21,16,15,11,11,12,11,13,13,14,14,21,
+	21,21,21,21,13,13,12,12,13,13,14,14,21,21,21,21,
+	21,13,13,12,12,13,13,14,14,
 };
 
 static const static_codebook _16c2_s_p7_0 = {
-        2, 169,
-        (long *)_vq_lengthlist__16c2_s_p7_0,
-        1, -523206656, 1618345984, 4, 0,
-        (long *)_vq_quantlist__16c2_s_p7_0,
-        0
+	2, 169,
+	(long *)_vq_lengthlist__16c2_s_p7_0,
+	1, -523206656, 1618345984, 4, 0,
+	(long *)_vq_quantlist__16c2_s_p7_0,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p7_1[] = {
-        5,
-        4,
-        6,
-        3,
-        7,
-        2,
-        8,
-        1,
-        9,
-        0,
-        10,
+	5,
+	4,
+	6,
+	3,
+	7,
+	2,
+	8,
+	1,
+	9,
+	0,
+	10,
 };
 
 static const long _vq_lengthlist__16c2_s_p7_1[] = {
-         2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 9, 9, 6, 6,
-         7, 7, 8, 8, 8, 8, 9, 9, 9, 6, 6, 7, 7, 8, 8, 8,
-         8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7,
-         7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8,
-         8, 8, 9, 9, 9, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9,
-         7, 7, 8, 8, 7, 7, 8, 8, 9, 9, 9, 9, 9, 7, 7, 7,
-         7, 8, 8, 9, 9, 9, 9, 9, 8, 8, 7, 7, 8, 8, 9, 9,
-         9, 9, 9, 7, 7, 7, 7, 8, 8,
+	 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 9, 9, 6, 7,
+	 7, 7, 7, 7, 8, 8, 9, 9, 9, 6, 6, 7, 7, 7, 7, 8,
+	 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7,
+	 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8,
+	 8, 8, 9, 9, 9, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9,
+	 7, 7, 8, 8, 7, 7, 8, 8, 9, 9, 9, 9, 9, 8, 8, 7,
+	 7, 8, 8, 9, 9, 9, 9, 9, 8, 8, 7, 7, 8, 8, 9, 9,
+	 9, 9, 9, 7, 7, 7, 7, 8, 8,
 };
 
 static const static_codebook _16c2_s_p7_1 = {
-        2, 121,
-        (long *)_vq_lengthlist__16c2_s_p7_1,
-        1, -531365888, 1611661312, 4, 0,
-        (long *)_vq_quantlist__16c2_s_p7_1,
-        0
+	2, 121,
+	(long *)_vq_lengthlist__16c2_s_p7_1,
+	1, -531365888, 1611661312, 4, 0,
+	(long *)_vq_quantlist__16c2_s_p7_1,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p8_0[] = {
-        7,
-        6,
-        8,
-        5,
-        9,
-        4,
-        10,
-        3,
-        11,
-        2,
-        12,
-        1,
-        13,
-        0,
-        14,
+	7,
+	6,
+	8,
+	5,
+	9,
+	4,
+	10,
+	3,
+	11,
+	2,
+	12,
+	1,
+	13,
+	0,
+	14,
 };
 
 static const long _vq_lengthlist__16c2_s_p8_0[] = {
-         1, 4, 4, 7, 6, 7, 7, 6, 6, 8, 8, 9, 9,10,10, 6,
-         6, 6, 8, 8, 9, 8, 8, 8, 9, 9,11,10,11,11, 7, 6,
-         6, 8, 8, 9, 8, 7, 7, 9, 9,10,10,12,11,14, 8, 8,
-         8, 9, 9, 9, 9, 9,10, 9,10,10,11,13,14, 8, 8, 8,
-         8, 9, 9, 8, 8, 9, 9,10,10,11,12,14,13,11, 9, 9,
-         9, 9, 9, 9, 9,10,11,10,13,12,14,11,13, 8, 9, 9,
-         9, 9, 9,10,10,11,10,13,12,14,14,14, 8, 9, 9, 9,
-        11,11,11,11,11,12,13,13,14,14,14, 9, 8, 9, 9,10,
-        10,12,10,11,12,12,14,14,14,14,11,12,10,10,12,12,
-        12,12,13,14,12,12,14,14,14,12,12, 9,10,11,11,12,
-        14,12,14,14,14,14,14,14,14,14,11,11,12,11,12,14,
-        14,14,14,14,14,14,14,14,14,12,11,11,11,11,14,14,
-        14,14,14,14,14,14,14,14,14,14,13,12,14,14,14,14,
-        14,14,14,14,14,14,14,14,14,12,12,12,13,14,14,13,
-        13,
+	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10, 6,
+	 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11, 6, 5,
+	 5, 8, 7, 9, 9, 8, 8, 9, 9,10,10,11,11,20, 8, 8,
+	 8, 8, 9, 9, 9, 9,10,10,11,10,12,11,20, 8, 8, 8,
+	 8, 9, 9, 9, 9,10,10,11,11,12,12,20,12,12, 9, 9,
+	10,10,10,10,11,11,12,12,13,12,20,13,13, 9, 9,10,
+	10,10,10,11,11,12,12,13,13,20,20,20, 9, 9, 9, 9,
+	10,10,11,11,12,12,13,12,20,20,20, 9, 9, 9, 8,10,
+	10,12,11,12,12,13,13,20,20,20,13,13,10,10,11,11,
+	12,12,13,13,13,13,20,20,20,13,13,10,10,11,10,12,
+	11,13,13,14,14,20,20,20,20,20,11,11,11,11,12,12,
+	13,13,14,14,20,20,20,20,20,11,10,11,11,13,11,13,
+	13,14,14,20,20,21,21,21,14,14,11,12,13,13,13,13,
+	14,14,21,21,21,21,21,15,15,12,11,13,12,14,13,15,
+	14,
 };
 
 static const static_codebook _16c2_s_p8_0 = {
-        2, 225,
-        (long *)_vq_lengthlist__16c2_s_p8_0,
-        1, -520986624, 1620377600, 4, 0,
-        (long *)_vq_quantlist__16c2_s_p8_0,
-        0
+	2, 225,
+	(long *)_vq_lengthlist__16c2_s_p8_0,
+	1, -520986624, 1620377600, 4, 0,
+	(long *)_vq_quantlist__16c2_s_p8_0,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p8_1[] = {
-        10,
-        9,
-        11,
-        8,
-        12,
-        7,
-        13,
-        6,
-        14,
-        5,
-        15,
-        4,
-        16,
-        3,
-        17,
-        2,
-        18,
-        1,
-        19,
-        0,
-        20,
+	10,
+	9,
+	11,
+	8,
+	12,
+	7,
+	13,
+	6,
+	14,
+	5,
+	15,
+	4,
+	16,
+	3,
+	17,
+	2,
+	18,
+	1,
+	19,
+	0,
+	20,
 };
 
 static const long _vq_lengthlist__16c2_s_p8_1[] = {
-         2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8,
-         8, 8, 8, 8, 8,11,12,11, 7, 7, 8, 8, 8, 8, 9, 9,
-         9, 9, 9, 9, 9, 9, 9,10, 9, 9,11,11,10, 7, 7, 8,
-         8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,
-        11,11, 8, 7, 8, 8, 9, 9, 9, 9, 9, 9,10,10, 9,10,
-        10, 9,10,10,11,11,12, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-         9, 9, 9,10, 9,10,10,10,10,11,11,11, 8, 8, 9, 9,
-         9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,11,
-        11, 8, 8, 9, 8, 9, 9, 9, 9,10, 9, 9, 9,10,10,10,
-        10, 9,10,11,11,11, 9, 9, 9, 9,10, 9, 9, 9,10,10,
-         9,10, 9,10,10,10,10,10,11,12,11,11,11, 9, 9, 9,
-         9, 9,10,10, 9,10,10,10,10,10,10,10,10,12,11,13,
-        13,11, 9, 9, 9, 9,10,10, 9,10,10,10,10,11,10,10,
-        10,10,11,12,11,12,11, 9, 9, 9,10,10, 9,10,10,10,
-        10,10,10,10,10,10,10,11,11,11,12,11, 9,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,11,12,12,12,
-        11,11,11,10, 9,10,10,10,10,10,10,10,10,11,10,10,
-        10,11,11,11,11,11,11,11,10,10,10,11,10,10,10,10,
-        10,10,10,10,10,10,11,11,11,11,12,12,11,10,10,10,
-        10,10,10,10,10,11,10,10,10,11,10,12,11,11,12,11,
-        11,11,10,10,10,10,10,11,10,10,10,10,10,11,10,10,
-        11,11,11,12,11,12,11,11,12,10,10,10,10,10,10,10,
-        11,10,10,11,10,12,11,11,11,12,11,11,11,11,10,10,
-        10,10,10,10,10,11,11,11,10,11,12,11,11,11,12,11,
-        12,11,12,10,11,10,10,10,10,11,10,10,10,10,10,10,
-        12,11,11,11,11,11,12,12,10,10,10,10,10,11,10,10,
-        11,10,11,11,11,11,11,11,11,11,11,11,11,11,12,11,
-        10,11,10,10,10,10,10,10,10,
+	 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,11,10, 7, 7, 8,
+	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,
+	11,11, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9,11,11,11, 8, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9,10, 9,10,10,10,10,11,11,11, 8, 8, 9, 9,
+	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,11,
+	11, 8, 8, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,
+	10,10,10,11,11,11, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
+	10,10,10,10,10,10,10,10,11,11,11,11,11, 9, 9, 9,
+	 9, 9, 9,10,10,10,10,10,10,10,10,10,10,11,11,11,
+	11,11, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,
+	10,10,11,11,11,11,11, 9, 9, 9, 9,10,10,10,10,10,
+	10,10,10,10,10,10,10,11,11,11,11,11,10, 9,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,
+	11,11,11,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,11,11,11,11,11,11,11,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,11,11,11,11,11,11,11,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,
+	11,11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	11,11,11,11,11,11,11,11,11,10,10,10,10,10,10,10,
+	10,10,10,10,10,11,11,11,11,11,11,11,11,11,10,10,
+	10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
+	11,11,11,10,10,10,10,10,10,10,10,10,10,10,10,11,
+	11,11,11,11,11,11,11,11,10,10,10,10,10,10,10,10,
+	10,10,10,10,11,11,11,11,11,11,11,11,11,11,11,10,
+	10,10,10,10,10,10,10,10,10,
 };
 
 static const static_codebook _16c2_s_p8_1 = {
-        2, 441,
-        (long *)_vq_lengthlist__16c2_s_p8_1,
-        1, -529268736, 1611661312, 5, 0,
-        (long *)_vq_quantlist__16c2_s_p8_1,
-        0
+	2, 441,
+	(long *)_vq_lengthlist__16c2_s_p8_1,
+	1, -529268736, 1611661312, 5, 0,
+	(long *)_vq_quantlist__16c2_s_p8_1,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p9_0[] = {
-        6,
-        5,
-        7,
-        4,
-        8,
-        3,
-        9,
-        2,
-        10,
-        1,
-        11,
-        0,
-        12,
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
 };
 
 static const long _vq_lengthlist__16c2_s_p9_0[] = {
-         1, 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, 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, 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,
+	 1, 4, 3,10, 8,10,10,10,10,10,10,10,10,10,10,10,
+	10, 6,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10, 6,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,
+	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,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,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,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,
 };
 
 static const static_codebook _16c2_s_p9_0 = {
-        2, 169,
-        (long *)_vq_lengthlist__16c2_s_p9_0,
-        1, -510275072, 1631393792, 4, 0,
-        (long *)_vq_quantlist__16c2_s_p9_0,
-        0
+	2, 289,
+	(long *)_vq_lengthlist__16c2_s_p9_0,
+	1, -509798400, 1631393792, 5, 0,
+	(long *)_vq_quantlist__16c2_s_p9_0,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p9_1[] = {
-        8,
-        7,
-        9,
-        6,
-        10,
-        5,
-        11,
-        4,
-        12,
-        3,
-        13,
-        2,
-        14,
-        1,
-        15,
-        0,
-        16,
+	9,
+	8,
+	10,
+	7,
+	11,
+	6,
+	12,
+	5,
+	13,
+	4,
+	14,
+	3,
+	15,
+	2,
+	16,
+	1,
+	17,
+	0,
+	18,
 };
 
 static const long _vq_lengthlist__16c2_s_p9_1[] = {
-         1, 5, 5, 9, 8, 7, 7, 7, 6,10,11,11,11,11,11,11,
-        11, 8, 7, 6, 8, 8,10, 9,10,10,10, 9,11,10,10,10,
-        10,10, 8, 6, 6, 8, 8, 9, 8, 9, 8, 9,10,10,10,10,
-        10,10,10,10, 8,10, 9, 9, 9, 9,10,10,10,10,10,10,
-        10,10,10,10,10, 8, 9, 9, 9,10,10, 9,10,10,10,10,
-        10,10,10,10,10,10,10,10, 9, 8, 9, 9,10,10,10,10,
-        10,10,10,10,10,10,10,10, 9, 8, 8, 9, 9,10,10,10,
-        10,10,10,10,10,10,10,10,10,10, 9,10, 9, 9,10,10,
-        10,10,10,10,10,10,10,10,10,10,10, 9, 8, 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,
-         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,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, 9,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,
+	 1, 4, 4, 7, 7, 7, 7, 7, 7, 8, 8,10, 9,11,10,13,
+	11,14,13, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8,11, 9,
+	13,11,14,12,14,13, 5, 6, 6, 8, 8, 8, 8, 8, 8, 9,
+	 9,11,11,13,11,14,13,15,15,17, 8, 8, 8, 8, 9, 9,
+	 9, 8,11, 9,12,10,13,11,14,12,14,13,17, 8, 8, 8,
+	 8, 9, 9, 9, 9,10,10,11,11,13,13,13,14,16,15,17,
+	12,12, 8, 8, 9, 9,10,10,11,11,12,11,13,12,13,12,
+	14,13,16,12,12, 8, 8, 9, 9,10,10,11,11,12,12,13,
+	13,14,14,15,15,17,17,17, 9, 9, 9, 9,11,11,12,12,
+	12,13,13,13,16,14,14,14,17,17,17, 9, 8, 9, 8,11,
+	10,12,12,13,13,14,14,15,15,16,16,17,17,17,12,12,
+	10,10,11,12,12,13,13,14,13,15,15,14,16,15,17,17,
+	17,12,12,10, 8,12, 9,13,12,14,14,15,14,15,16,16,
+	16,17,17,17,17,17,11,11,12,12,14,14,14,16,15,16,
+	15,16,15,17,17,17,17,17,17,11, 9,12,10,13,11,15,
+	14,16,16,17,16,16,15,17,17,17,17,17,15,15,12,12,
+	14,14,15,16,16,15,16,16,17,17,17,17,17,17,17,14,
+	14,12,10,14,11,15,12,17,16,15,16,17,16,17,17,17,
+	17,17,17,17,13,13,14,14,14,16,17,17,16,17,17,17,
+	17,17,17,17,17,17,17,13, 9,13,12,15,13,16,16,17,
+	17,17,17,17,17,17,17,17,17,17,15,17,14,14,15,16,
+	16,17,16,17,16,17,17,17,17,17,17,17,17,17,17,14,
+	13,15,16,16,17,16,17,17,17,
 };
 
 static const static_codebook _16c2_s_p9_1 = {
-        2, 289,
-        (long *)_vq_lengthlist__16c2_s_p9_1,
-        1, -518488064, 1622704128, 5, 0,
-        (long *)_vq_quantlist__16c2_s_p9_1,
-        0
+	2, 361,
+	(long *)_vq_lengthlist__16c2_s_p9_1,
+	1, -518287360, 1622704128, 5, 0,
+	(long *)_vq_quantlist__16c2_s_p9_1,
+	0
 };
 
 static const long _vq_quantlist__16c2_s_p9_2[] = {
-        13,
-        12,
-        14,
-        11,
-        15,
-        10,
-        16,
-        9,
-        17,
-        8,
-        18,
-        7,
-        19,
-        6,
-        20,
-        5,
-        21,
-        4,
-        22,
-        3,
-        23,
-        2,
-        24,
-        1,
-        25,
-        0,
-        26,
+	24,
+	23,
+	25,
+	22,
+	26,
+	21,
+	27,
+	20,
+	28,
+	19,
+	29,
+	18,
+	30,
+	17,
+	31,
+	16,
+	32,
+	15,
+	33,
+	14,
+	34,
+	13,
+	35,
+	12,
+	36,
+	11,
+	37,
+	10,
+	38,
+	9,
+	39,
+	8,
+	40,
+	7,
+	41,
+	6,
+	42,
+	5,
+	43,
+	4,
+	44,
+	3,
+	45,
+	2,
+	46,
+	1,
+	47,
+	0,
+	48,
 };
 
 static const long _vq_lengthlist__16c2_s_p9_2[] = {
-         1, 4, 4, 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7,
-         7, 7, 7, 7, 8, 7, 8, 7, 7, 4, 4,
+	 2, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6,
+	 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 7,
 };
 
 static const static_codebook _16c2_s_p9_2 = {
-        1, 27,
-        (long *)_vq_lengthlist__16c2_s_p9_2,
-        1, -528875520, 1611661312, 5, 0,
-        (long *)_vq_quantlist__16c2_s_p9_2,
-        0
+	1, 49,
+	(long *)_vq_lengthlist__16c2_s_p9_2,
+	1, -526909440, 1611661312, 6, 0,
+	(long *)_vq_quantlist__16c2_s_p9_2,
+	0
 };
 
 static const long _huff_lengthlist__16c2_s_short[] = {
-         7,10,11,11,11,14,15,15,17,14, 8, 6, 7, 7, 8, 9,
-        11,11,14,17, 9, 6, 6, 6, 7, 7,10,11,15,16, 9, 6,
-         6, 4, 4, 5, 8, 9,12,16,10, 6, 6, 4, 4, 4, 6, 9,
-        13,16,10, 7, 6, 5, 4, 3, 5, 7,13,16,11, 9, 8, 7,
-         6, 5, 5, 6,12,15,10,10,10, 9, 7, 6, 6, 7,11,15,
-        13,13,13,13,11,10,10, 9,12,16,16,16,16,14,16,15,
-        15,12,14,14,
+	 7,10,12,11,12,13,15,16,18,15,10, 8, 8, 8, 9,10,
+	12,13,14,17,10, 7, 7, 7, 7, 8,10,12,15,18,10, 7,
+	 7, 5, 5, 6, 8,10,13,15,10, 7, 6, 5, 4, 4, 6, 9,
+	12,15,11, 7, 7, 5, 4, 3, 4, 7,11,13,12, 9, 8, 7,
+	 5, 4, 4, 5,10,13,11,11,11, 9, 7, 5, 5, 5, 9,12,
+	13,12,13,12,10, 8, 8, 7, 9,13,14,14,14,14,13,11,
+	11,10,10,13,
 };
 
 static const static_codebook _huff_book__16c2_s_short = {
-        2, 100,
-        (long *)_huff_lengthlist__16c2_s_short,
-        0, 0, 0, 0, 0,
-        NULL,
-        0
+	2, 100,
+	(long *)_huff_lengthlist__16c2_s_short,
+	0, 0, 0, 0, 0,
+	NULL,
+	0
 };
 
 static const long _vq_quantlist__8c0_s_p1_0[] = {
diff --git a/vq/16.vqs b/vq/16.vqs
index 25187914..3d15f408 100644
--- a/vq/16.vqs
+++ b/vq/16.vqs
@@ -4,23 +4,23 @@ GO
 >_16c0_s noninterleaved
 haux 16c0_s/resaux_0.vqd _16c0_s_single 0,64,2 10
 	
-:_p1_0 16c0_s/res_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
-:_p2_0 16c0_s/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p3_0 16c0_s/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p4_0 16c0_s/res_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p5_0 16c0_s/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 16c0_s/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p1_0 16c0_s/res_sub0_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
+:_p2_0 16c0_s/res_sub0_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p3_0 16c0_s/res_sub0_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p4_0 16c0_s/res_sub0_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p5_0 16c0_s/res_sub0_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p6_0 16c0_s/res_sub0_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
 
 
-:_p7_0 16c0_s/res_part7_pass0.vqd, 4, nonseq cull, 0 +- 11
-:_p7_1 16c0_s/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
+:_p7_0 16c0_s/res_sub0_part7_pass0.vqd, 4, nonseq cull, 0 +- 11
+:_p7_1 16c0_s/res_sub0_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
 
-:_p8_0 16c0_s/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
-:_p8_1 16c0_s/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
+:_p8_0 16c0_s/res_sub0_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
+:_p8_1 16c0_s/res_sub0_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 16c0_s/res_part9_pass0.vqd, 4, nonseq, 0 +- 315
-:_p9_1 16c0_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 21 42 63 84 105 126 147
-:_p9_2 16c0_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
+:_p9_0 16c0_s/res_sub0_part9_pass0.vqd, 4, nonseq, 0 +- 315
+:_p9_1 16c0_s/res_sub0_part9_pass1.vqd, 2, nonseq, 0 +- 21 42 63 84 105 126 147
+:_p9_2 16c0_s/res_sub0_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
 
 >_16c1s_s noninterleaved
 haux 16c1_s/resaux_0.vqd _16c1_s_short 0,64,2 10
@@ -28,50 +28,47 @@ haux 16c1_s/resaux_0.vqd _16c1_s_short 0,64,2 10
 >_16c1_s noninterleaved
 haux 16c1_s/resaux_1.vqd _16c1_s_long 0,64,2 10
 	
-:_p1_0 16c1_s/res_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
-:_p2_0 16c1_s/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p3_0 16c1_s/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p4_0 16c1_s/res_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p5_0 16c1_s/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 16c1_s/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p1_0 16c1_s/res_sub0_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
+:_p2_0 16c1_s/res_sub0_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p3_0 16c1_s/res_sub0_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p4_0 16c1_s/res_sub0_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p5_0 16c1_s/res_sub0_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p6_0 16c1_s/res_sub0_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
 
 
-:_p7_0 16c1_s/res_part7_pass0.vqd, 4, nonseq cull, 0 +- 11
-:_p7_1 16c1_s/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
+:_p7_0 16c1_s/res_sub0_part7_pass0.vqd, 4, nonseq cull, 0 +- 11
+:_p7_1 16c1_s/res_sub0_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
 
-:_p8_0 16c1_s/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
-:_p8_1 16c1_s/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
+:_p8_0 16c1_s/res_sub0_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
+:_p8_1 16c1_s/res_sub0_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 16c1_s/res_part9_pass0.vqd, 2, nonseq, 0 +- 315 630 945 1260 1575 1890
-:_p9_1 16c1_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 21 42 63 84 105 126 147
-:_p9_2 16c1_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
+:_p9_0 16c1_s/res_sub0_part9_pass0.vqd, 2, nonseq, 0 +- 315 630 945 1260 1575 1890
+:_p9_1 16c1_s/res_sub0_part9_pass1.vqd, 2, nonseq, 0 +- 21 42 63 84 105 126 147
+:_p9_2 16c1_s/res_sub0_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
 
 >_16c2s_s noninterleaved
 haux 16c2_s/resaux_0.vqd _16c2_s_short 0,64,2 10
 >_16c2_s noninterleaved
 haux 16c2_s/resaux_1.vqd _16c2_s_long 0,64,2 10
         
-:_p1_0 16c2_s/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p2_0 16c2_s/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p3_0 16c2_s/res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p4_0 16c2_s/res_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p1_0 16c2_s/res_sub0_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p2_0 16c2_s/res_sub0_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p3_0 16c2_s/res_sub0_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p4_0 16c2_s/res_sub0_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
 
-:_p5_0 16c2_s/res_part5_pass0.vqd, 4, nonseq cull, 0 +- 11
-:_p5_1 16c2_s/res_part5_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
+:_p5_0 16c2_s/res_sub0_part5_pass0.vqd, 4, nonseq cull, 0 +- 11
+:_p5_1 16c2_s/res_sub0_part5_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
 
-:_p6_0 16c2_s/res_part6_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
-:_p6_1 16c2_s/res_part6_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
+:_p6_0 16c2_s/res_sub0_part6_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
+:_p6_1 16c2_s/res_sub0_part6_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p7_0 16c2_s/res_part7_pass0.vqd, 2, nonseq, 0 +- 11 22 33 44 55 66
-:_p7_1 16c2_s/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5
+:_p7_0 16c2_s/res_sub0_part7_pass0.vqd, 2, nonseq, 0 +- 11 22 33 44 55 66
+:_p7_1 16c2_s/res_sub0_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5
 
-:_p8_0 16c2_s/res_part8_pass0.vqd, 2, nonseq, 0 +- 21 42 63 84 105 126 147
-:_p8_1 16c2_s/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8 9 10
+:_p8_0 16c2_s/res_sub0_part8_pass0.vqd, 2, nonseq, 0 +- 21 42 63 84 105 126 147
+:_p8_1 16c2_s/res_sub0_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8 9 10
 
-:_p9_0 16c2_s/res_part9_pass0.vqd, 2, nonseq, 0 +- 931 1862 2793 3724 4655 5586 
-6517 7448 
-:_p9_1 16c2_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 49 98 147 196 245 294 343 392
- 441
-:_p9_2 16c2_s/res_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13
- 14 15 16 17 18 19 20 21 22 23 24 
+:_p9_0 16c2_s/res_sub0_part9_pass0.vqd, 2, nonseq, 0 +- 931 1862 2793 3724 4655 5586 6517 7448 
+:_p9_1 16c2_s/res_sub0_part9_pass1.vqd, 2, nonseq, 0 +- 49 98 147 196 245 294 343 392 441
+:_p9_2 16c2_s/res_sub0_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24