second half of mono fix

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

diff --git a/lib/books/coupled/res_books_stereo.h b/lib/books/coupled/res_books_stereo.h
index 35dc78abe0bd9cabb8d84d92a33668907bc07428..908f3a69996334671c9295a45e813d884c3cdb06 100644 (file)
--- a/lib/books/coupled/res_books_stereo.h
+++ b/lib/books/coupled/res_books_stereo.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: res_books_stereo.h,v 1.1 2002/07/11 06:40:59 xiphmont Exp $
+ last modified: $Id: res_books_stereo.h,v 1.2 2002/07/11 10:27:51 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/books/uncoupled/res_books_uncoupled.h b/lib/books/uncoupled/res_books_uncoupled.h
index d7df489c3574e6b7471092e4d71b500fdb902707..61ca837ade6d34b3b704d53728cb39e4b8e8e53e 100644 (file)
--- a/lib/books/uncoupled/res_books_uncoupled.h
+++ b/lib/books/uncoupled/res_books_uncoupled.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: res_books_uncoupled.h,v 1.1 2002/07/11 06:41:02 xiphmont Exp $
+ last modified: $Id: res_books_uncoupled.h,v 1.2 2002/07/11 10:27:53 xiphmont Exp $
 
  ********************************************************************/
 
@@ -23,12 +23,12 @@ static long _vq_quantlist__16u0__p1_0[] = {
 };
 
 static long _vq_lengthlist__16u0__p1_0[] = {
-        1, 5, 5, 5, 5, 9, 5, 9, 5, 5, 8, 8, 9, 9,11, 8,
-       11, 9, 5, 8, 8, 8, 9,11, 9,11, 9, 5, 9, 9, 8, 9,
-       11, 8,10, 9, 5, 9, 9, 9, 7,12, 9,12, 8, 9,11,11,
-       11,12,12,11,12,12, 5, 9, 9, 8, 9,10, 8,11, 9, 9,
-       11,11,11,12,12,11,12,12, 5, 9, 9, 9, 8,12, 9,12,
-        7,
+        1, 4, 4, 5, 7, 7, 5, 7, 8, 5, 8, 8, 8,10,10, 8,
+       10,11, 5, 8, 8, 8,10,10, 8,10,10, 4, 9, 9, 9,12,
+       11, 8,11,11, 8,12,11,10,12,14,10,13,13, 7,11,11,
+       10,14,12,11,14,14, 4, 9, 9, 8,11,11, 9,11,12, 7,
+       11,11,10,13,14,10,12,14, 8,11,12,10,14,14,10,13,
+       12,
 };
 
 static float _vq_quantthresh__16u0__p1_0[] = {
@@ -64,12 +64,12 @@ static long _vq_quantlist__16u0__p2_0[] = {
 };
 
 static long _vq_lengthlist__16u0__p2_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 9, 7,
+        8, 9, 5, 7, 7, 7, 9, 8, 7, 9, 7, 4, 7, 7, 7, 9,
+        9, 7, 8, 8, 6, 9, 8, 7, 8,11, 9,11,10, 6, 8, 9,
+        8,11, 8, 9,10,11, 4, 7, 7, 7, 8, 8, 7, 9, 9, 6,
+        9, 8, 9,11,10, 8, 8,11, 6, 8, 9, 9,10,11, 8,11,
+        8,
 };
 
 static float _vq_quantthresh__16u0__p2_0[] = {
@@ -107,46 +107,46 @@ static long _vq_quantlist__16u0__p3_0[] = {
 };
 
 static long _vq_lengthlist__16u0__p3_0[] = {
-        1, 6, 6, 9, 9, 6, 6, 9, 8,10, 6, 9, 6,10, 8,10,
-        9,11, 8,11,10,11, 9,11, 8, 6, 8, 8,10,10, 9, 9,
-       10,10,12, 9,10, 9,12,10,12,12,13,10,13,12,13,12,
-       13,10, 6, 8, 8,11,11, 9, 9,11,10,12, 9,11, 9,12,
-       10,12,11,13,10,13,12,13,11,13,10, 9,11,10,13,13,
-       11,11,12,14,14,11,12,11,14,13,13,13,14,13,14,13,
-       14,13,15,13, 9,11,11,14,13,11,11,12,13,14,11,12,
-       11,15,13,13,13,14,13,15,13,13,12,15,13, 6, 9, 9,
-       11,11, 9, 9,10,10,12, 9,11, 9,12,10,12,12,13,10,
-       12,12,13,12,13,10, 6, 9, 9,11,11, 9, 7,12,10,12,
-        9,11, 8,13,10,12,11,14, 9,13,12,13,11,14, 9, 9,
-       10,11,12,12,11,12,11,12,12,11,12,12,12,12,14,13,
-       14,12,13,13,14,13,13,12, 8,10,10,13,13,10,10,12,
-       12,14,10,12,10,14,12,13,12,14,12,15,13,14,12,15,
-       12,10,12,12,14,15,12,12,13,14,14,12,13,13,14,14,
-       13,14,15,14,15,14,14,14,15,14, 6, 9, 9,11,11, 8,
-        9,11,10,11, 9,11, 9,12,10,12,11,13,10,13,12,13,
-       12,13,10, 9,10,10,12,12,11,12,12,12,12,11,12,12,
-       13,12,13,13,14,12,13,13,14,13,13,13, 6, 9, 9,11,
-       11, 9, 7,11,10,13, 9,11, 7,12,10,12,11,13, 9,14,
-       13,13,11,13, 9,10,12,12,14,14,12,13,13,14,14,12,
-       12,13,15,14,13,13,14,14,14,14,14,14,15,15, 8,10,
-       10,13,13,10,10,12,12,14,10,12,10,14,12,13,12,14,
-       11,15,13,14,12,14,12,10,12,12,13,13,12,13,13,13,
-       14,12,13,12,14,13,14,14,15,13,14,14,15,14,14,13,
-        9,12,12,13,13,12,11,14,12,13,11,13,11,14,12,13,
-       13,15,12,14,13,16,13,14,11,11,13,13,14,13,13,14,
-       14,14,14,13,14,14,14,14,15,15,15,14,15,14,15,15,
-       15,14, 8,10,10,13,13,10, 9,12,12,14,10,13, 9,14,
-       12,13,12,14,10,14,13,14,11,15,10,11,13,12,14,14,
-       13,13,13,14,15,13,14,13,15,14,14,14,15,15,15,14,
-       14,14,16,15,10,12,12,13,13,12,12,14,13,14,12,13,
-       13,14,13,14,14,15,13,14,14,14,14,15,13,11,13,13,
-       13,14,13,14,14,14,14,13,13,13,14,14,15,15,15,14,
-       14,15,15,15,15,14, 9,11,12,13,13,11,11,13,12,13,
-       12,13,11,14,12,14,13,15,12,15,14,15,13,15,11,11,
-       13,13,14,15,13,13,14,14,15,13,14,13,15,15,14,14,
-       14,15,15,15,14,15,15,15, 8,10,10,13,13,10, 9,12,
-       12,14,10,13, 9,14,12,13,12,14,10,15,13,14,11,14,
-       10,
+        1, 5, 5, 7, 7, 6, 7, 7, 8, 8, 6, 7, 8, 8, 8, 8,
+        9, 9,11,11, 8, 9, 9,11,11, 6, 9, 8,10,10, 8,10,
+       10,11,11, 8,10,10,11,11,10,11,10,13,12, 9,11,10,
+       13,13, 6, 8, 9,10,10, 8,10,10,11,11, 8,10,10,11,
+       11, 9,10,11,13,12,10,10,11,12,12, 8,11,11,14,13,
+       10,12,11,15,13, 9,12,11,15,14,12,14,13,16,14,12,
+       13,13,17,14, 8,11,11,13,14, 9,11,12,14,15,10,11,
+       12,13,15,11,13,13,14,16,12,13,14,14,16, 5, 9, 9,
+       11,11, 9,11,11,12,12, 8,11,11,12,12,11,12,12,15,
+       14,10,12,12,15,15, 8,11,11,13,12,10,12,12,13,13,
+       10,12,12,14,13,12,12,13,14,15,11,13,13,17,16, 7,
+       11,11,13,13,10,12,12,14,13,10,12,12,13,14,12,13,
+       12,15,14,11,13,13,15,14, 9,12,12,16,15,11,13,13,
+       17,16,10,13,13,16,16,13,14,15,15,16,13,15,14,19,
+       17, 9,12,12,14,16,11,13,13,15,16,10,13,13,17,16,
+       13,14,13,17,15,12,15,15,16,17, 5, 9, 9,11,11, 8,
+       11,11,13,12, 9,11,11,12,12,10,12,12,14,15,11,12,
+       12,14,14, 7,11,10,13,12,10,12,12,14,13,10,11,12,
+       13,13,11,13,13,15,16,12,12,13,15,15, 7,11,11,13,
+       13,10,13,13,14,14,10,12,12,13,13,11,13,13,16,15,
+       12,13,13,15,14, 9,12,12,15,15,10,13,13,17,16,11,
+       12,13,15,15,12,15,14,18,18,13,14,14,16,17, 9,12,
+       12,15,16,10,13,13,15,16,11,13,13,15,16,13,15,15,
+       17,17,13,15,14,16,15, 7,11,11,15,16,10,13,12,16,
+       17,10,12,13,15,17,15,16,16,18,17,13,15,15,17,18,
+        8,12,12,16,16,11,13,14,17,18,11,13,13,18,16,15,
+       17,16,17,19,14,15,15,17,16, 8,12,12,16,15,11,14,
+       13,18,17,11,13,14,18,17,15,16,16,18,17,13,16,16,
+       18,18,11,15,14,18,17,13,14,15,18, 0,12,15,15, 0,
+       17,17,16,17,17,18,14,16,18,18, 0,11,14,14,17, 0,
+       12,15,14,17,19,12,15,14,18, 0,15,18,16, 0,17,14,
+       18,16,18, 0, 7,11,11,16,15,10,12,12,18,16,10,13,
+       13,16,15,13,15,14,17,17,14,16,16,19,18, 8,12,12,
+       16,16,11,13,13,18,16,11,13,14,17,16,14,15,15,19,
+       18,15,16,16, 0,19, 8,12,12,16,17,11,13,13,17,17,
+       11,14,13,17,17,13,15,15,17,19,15,17,17,19, 0,11,
+       14,15,19,17,12,15,16,18,18,12,14,15,19,17,14,16,
+       17, 0,18,16,16,19,17, 0,11,14,14,18,19,12,15,14,
+       17,17,13,16,14,17,16,14,17,16,18,18,15,18,15, 0,
+       18,
 };
 
 static float _vq_quantthresh__16u0__p3_0[] = {
@@ -184,46 +184,46 @@ static long _vq_quantlist__16u0__p4_0[] = {
 };
 
 static long _vq_lengthlist__16u0__p4_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0,
+        3, 5, 5, 8, 8, 6, 6, 6, 9, 9, 6, 6, 6, 9, 9, 9,
+       10, 9,11,11, 9, 9, 9,11,11, 6, 7, 7,10,10, 7, 7,
+        8,10,10, 7, 7, 8,10,10,10,10,10,11,12, 9,10,10,
+       11,12, 6, 7, 7,10,10, 7, 8, 7,10,10, 7, 8, 7,10,
+       10,10,11,10,12,11,10,10,10,13,10, 9,10,10,12,12,
+       10,11,10,14,12, 9,11,11,13,13,11,12,13,13,13,11,
+       12,12,15,13, 9,10,10,12,13, 9,11,10,12,13,10,10,
+       11,12,13,11,12,12,12,13,11,12,12,13,13, 5, 7, 7,
+       10,10, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,10,12,
+       13,10,10,11,12,12, 6, 8, 8,11,10, 7, 8, 9,10,12,
+        8, 9, 9,11,11,11,10,11,11,12,10,11,11,13,12, 7,
+        8, 8,10,11, 8, 9, 8,11,10, 8, 9, 9,11,11,10,12,
+       10,13,11,10,11,11,13,13,10,11,10,14,13,10,10,11,
+       13,13,10,12,11,14,13,12,11,13,12,13,13,12,13,14,
+       14,10,11,11,13,13,10,11,10,12,13,10,12,12,12,14,
+       12,12,12,14,12,12,13,12,17,15, 5, 7, 7,10,10, 7,
+        8, 8,10,10, 7, 8, 8,11,10,10,10,11,12,12,10,11,
+       11,12,13, 6, 8, 8,11,10, 8, 9, 9,11,11, 7, 8, 9,
+       10,11,11,11,11,12,12,10,10,11,12,13, 6, 8, 8,10,
+       11, 8, 9, 9,11,11, 7, 9, 7,11,10,10,12,12,13,13,
+       11,11,10,13,11, 9,11,10,14,13,11,11,11,15,13,10,
+       10,11,13,13,12,13,13,14,14,12,11,12,12,13,10,11,
+       11,12,13,10,11,12,13,13,10,11,10,13,12,12,12,13,
+       14, 0,12,13,11,13,11, 8,10,10,13,13,10,11,11,14,
+       13,10,11,11,13,12,13,14,14,14,15,12,12,12,15,14,
+        9,11,10,13,12,10,10,11,13,14,11,11,11,15,12,13,
+       12,14,15,16,13,13,13,14,13, 9,11,11,12,12,10,12,
+       11,13,13,10,11,11,13,14,13,13,13,15,15,13,13,14,
+       17,15,11,12,12,14,14,10,11,12,13,15,12,13,13, 0,
+       15,13,11,14,12,16,14,16,14, 0,15,11,12,12,14,16,
+       11,13,12,16,15,12,13,13,14,15,12,14,12,15,13,15,
+       14,14,16,16, 8,10,10,13,13,10,11,10,13,14,10,11,
+       11,13,13,13,13,12,14,14,14,13,13,16,17, 9,10,10,
+       12,14,10,12,11,14,13,10,11,12,13,14,12,12,12,15,
+       15,13,13,13,14,14, 9,10,10,13,13,10,11,12,12,14,
+       10,11,10,13,13,13,13,13,14,16,13,13,13,14,14,11,
+       12,13,15,13,12,14,13,14,16,12,12,13,13,14,13,14,
+       14,17,15,13,12,17,13,16,11,12,13,14,15,12,13,14,
+       14,17,11,12,11,14,14,13,16,14,16, 0,14,15,11,15,
+       11,
 };
 
 static float _vq_quantthresh__16u0__p4_0[] = {
@@ -265,12 +265,12 @@ static long _vq_quantlist__16u0__p5_0[] = {
 };
 
 static long _vq_lengthlist__16u0__p5_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8,
+        9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9,
+        9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,11, 7, 8, 8,
+        9, 9,10,10,11,11, 7, 8, 8, 9, 9,10,10,11,11, 9,
+        9, 9,10,10,11,11,12,12, 9, 9, 9,10,10,11,11,12,
+       12,
 };
 
 static float _vq_quantthresh__16u0__p5_0[] = {
@@ -317,17 +317,17 @@ static long _vq_quantlist__16u0__p6_0[] = {
 };
 
 static long _vq_lengthlist__16u0__p6_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 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, 7, 7,10,10,12,12,13,13,18,17, 3, 6, 6,
+        9, 9,11,11,13,13,14,14,18,17, 3, 6, 6, 9, 9,11,
+       11,13,13,14,14,17,18, 7, 9, 9,11,11,13,13,14,14,
+       15,15, 0, 0, 7, 9, 9,11,11,13,13,14,14,15,16,19,
+       18,10,11,11,13,13,14,14,16,15,17,18, 0, 0,10,11,
+       11,13,13,14,14,15,15,16,18, 0, 0,11,13,13,14,14,
+       15,15,17,17, 0,19, 0, 0,11,13,13,14,14,14,15,16,
+       18, 0,19, 0, 0,13,14,14,15,15,18,17,18,18, 0,19,
+        0, 0,13,14,14,15,16,16,16,18,18,19, 0, 0, 0,16,
+       17,17, 0,17,19,19, 0,19, 0, 0, 0, 0,16,19,16,17,
+       18, 0,19, 0, 0, 0, 0, 0, 0,
 };
 
 static float _vq_quantthresh__16u0__p6_0[] = {
@@ -367,8 +367,8 @@ static long _vq_quantlist__16u0__p6_1[] = {
 };
 
 static long _vq_lengthlist__16u0__p6_1[] = {
-        0, 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, 5, 6, 6, 4, 6, 6, 6, 6, 4, 6, 6, 6, 6, 6,
+        6, 6, 7, 7, 6, 6, 6, 7, 7,
 };
 
 static float _vq_quantthresh__16u0__p6_1[] = {
@@ -457,21 +457,21 @@ static long _vq_quantlist__16u0__p7_1[] = {
 };
 
 static long _vq_lengthlist__16u0__p7_1[] = {
-        1, 4, 5,14,12,14,14,14,14,14,14,14,14,14,14, 4,
-        3, 8, 9,14,14,14,14,14,14,14,14,14,14,14, 4, 8,
-        3,14, 9,14,13,14,14,14,14,14,14,14,14,11, 9,14,
-       11,14,14,14,14,14,14,14,14,14,14,14,11,14, 9,14,
-       10,14,13,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       12,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,
+        1, 5, 5, 6, 5, 9,10,11,11,10,10,10,10,10,10, 5,
+        8, 8, 8,10,10,10,10,10,10,10,10,10,10,10, 5, 8,
+        9, 9, 9,10,10,10,10,10,10,10,10,10,10, 5,10, 8,
+       10,10,10,10,10,10,10,10,10,10,10,10, 4, 8, 9,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, 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,
 };
 
 static float _vq_quantthresh__16u0__p7_1[] = {
@@ -527,34 +527,34 @@ static long _vq_quantlist__16u0__p7_2[] = {
 };
 
 static long _vq_lengthlist__16u0__p7_2[] = {
-        1, 5, 5, 8, 8, 9, 9,10,10,12,12,13,13,14,14,15,
-       15,15,15,15,16, 5, 4, 7, 7, 9, 8, 9,10,11,11,12,
-       13,13,14,14,15,15,16,15,16,16, 5, 7, 4, 9, 7, 9,
-        8,11,10,12,11,13,13,14,14,15,15,16,15,16,16, 7,
-        7, 9, 6,10, 8,10, 9,11,11,13,12,14,13,14,14,15,
-       15,16,15,16, 8, 9, 7,10, 6,10, 8,11, 9,13,11,14,
-       12,15,13,15,14,15,15,15,16, 9, 9,10, 8,11, 7,11,
-        9,12,10,13,12,14,13,14,14,15,15,16,16,16, 9,10,
-        9,11, 8,11, 7,12, 9,13,10,14,12,15,13,15,14,16,
-       15,16,15,11,10,11,10,12, 9,12, 8,13,10,13,11,14,
-       12,14,14,15,15,15,15,15,11,11,10,12,10,12, 9,13,
-        8,13,10,14,11,15,12,16,14,16,15,15,15,12,11,12,
-       11,13,10,13,10,13, 9,14,11,14,12,15,13,15,14,15,
-       15,15,12,12,11,13,11,13,10,13,10,14, 9,15,11,15,
-       12,15,13,16,14,15,15,13,13,13,12,14,12,14,11,14,
-       11,14,10,15,11,15,13,15,14,16,14,15,13,13,13,14,
-       12,14,12,14,11,14,11,15,10,15,11,16,13,15,14,15,
-       14,14,14,14,13,15,13,15,12,15,12,15,11,15,11,15,
-       12,15,13,15,14,14,14,14,14,15,13,14,13,15,12,15,
-       12,15,11,15,11,16,12,15,13,15,14,15,15,15,14,15,
-       14,15,14,15,13,15,12,15,12,15,11,15,13,15,14,14,
-       15,15,15,16,14,15,14,15,13,16,13,15,13,15,12,15,
-       12,15,13,14,14,15,15,15,15,16,15,15,14,16,14,15,
-       14,15,13,15,13,14,12,14,13,14,15,15,15,15,15,15,
-       15,15,14,15,14,15,13,15,13,15,13,14,12,14,13,16,
-       15,16,16,16,15,15,15,16,15,15,14,15,14,15,13,14,
-       13,14,12,13,15,16,16,15,16,16,15,15,15,15,15,15,
-       15,14,14,14,13,14,13,13,12,
+        1, 6, 6, 7, 8, 7, 7,10, 9,10, 9,11,10, 9,11,10,
+        9, 9, 9, 9,10, 6, 8, 7, 9, 9, 8, 8,10,10, 9,11,
+       11,12,12,10, 9,11, 9,12,10, 9, 6, 9, 8, 9,12, 8,
+        8,11, 9,11,11,12,11,12,12,10,11,11,10,10,11, 7,
+       10, 9, 9, 9, 9, 9,10, 9,10, 9,10,10,12,10,10,10,
+       11,12,10,10, 7, 9, 9, 9,10, 9, 9,10,10, 9, 9, 9,
+       11,11,10,10,10,10, 9, 9,12, 7, 9,10, 9,11, 9,10,
+        9,10,11,11,11,10,11,12, 9,12,11,10,10,10, 7, 9,
+        9, 9, 9,10,12,10, 9,11,12,10,11,12,12,11, 9,10,
+       11,10,11, 7, 9,10,10,11,10, 9,10,11,11,11,10,12,
+       12,12,11,11,10,11,11,12, 8, 9,10,12,11,10,10,12,
+       12,12,12,12,10,11,11, 9,11,10,12,11,11, 8, 9,10,
+       10,11,12,11,11,10,10,10,12,12,12, 9,10,12,12,12,
+       12,12, 8,10,11,10,10,12, 9,11,12,12,11,12,12,12,
+       12,10,12,10,10,10,10, 8,12,11,11,11,10,10,11,12,
+       12,12,12,11,12,12,12,11,11,11,12,10, 9,10,10,12,
+       10,12,10,12,12,10,10,10,11,12,12,12,11,12,12,12,
+       11,10,11,12,12,12,11,12,12,11,12,12,11,12,12,12,
+       12,11,12,12,10,10,10,10,11,11,12,11,12,12,12,12,
+       12,12,12,11,12,11,10,11,11,12,11,11, 9,10,10,10,
+       12,10,10,11, 9,11,12,11,12,11,12,12,10,11,10,12,
+        9, 9, 9,12,11,10,11,10,12,10,12,10,12,12,12,11,
+       11,11,11,11,10, 9,10,10,11,10,11,11,12,11,10,11,
+       12,12,12,11,11, 9,12,10,12, 9,10,12,10,10,11,10,
+       11,11,12,11,10,11,10,11,11,11,11,12,11,11,10, 9,
+       10,10,10, 9,11,11,10, 9,12,10,11,12,11,12,12,11,
+       12,11,12,11,10,11,10,12,11,12,11,12,11,12,10,11,
+       10,10,12,11,10,11,11,11,10,
 };
 
 static float _vq_quantthresh__16u0__p7_2[] = {
@@ -588,10 +588,10 @@ static static_codebook _16u0__p7_2 = {
 };
 
 static long _huff_lengthlist__16u0__single[] = {
-       12,12,12,12,12,12,12,12,12, 1,12, 4,12,12,12, 5,
-       12,12,12,12,12,12,12,12,12, 3,12, 5,12,12,12, 6,
-       12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-       12,12,12,12,11,11,11,11,11, 4,11, 5,11,11,11, 3,
+        3, 5, 8, 7,14, 8, 9,19, 5, 2, 5, 5, 9, 6, 9,19,
+        8, 4, 5, 7, 8, 9,13,19, 7, 4, 6, 5, 9, 6, 9,19,
+       12, 8, 7, 9,10,11,13,19, 8, 5, 8, 6, 9, 6, 7,19,
+        8, 8,10, 7, 7, 4, 5,19,12,17,19,15,18,13,11,18,
 };
 
 static static_codebook _huff_book__16u0__single = {
@@ -606,13 +606,13 @@ static static_codebook _huff_book__16u0__single = {
 };
 
 static long _huff_lengthlist__16u1__long[] = {
-       15,15,15,15,15,15,15,15,15,15,15, 1,15, 4,15, 5,
-       15,15,15, 6,15,15,15,15,15,15,15,15,15,15,15, 4,
-       15, 4,15, 5,15,15,15, 8,15,15,15,15,15,15,15,15,
-       14,14,14, 5,14, 5,14, 5,14,14,14, 6,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14, 6,14, 7,14, 5,
-       14,14,14, 4,
+        3, 6,10, 8,12, 8,14, 8,14,19, 5, 3, 5, 5, 7, 6,
+       11, 7,16,19, 7, 5, 6, 7, 7, 9,11,12,19,19, 6, 4,
+        7, 5, 7, 6,10, 7,18,18, 8, 6, 7, 7, 7, 7, 8, 9,
+       18,18, 7, 5, 8, 5, 7, 5, 8, 6,18,18,12, 9,10, 9,
+        9, 9, 8, 9,18,18, 8, 7,10, 6, 8, 5, 6, 4,11,18,
+       11,15,16,12,11, 8, 8, 6, 9,18,14,18,18,18,16,16,
+       16,13,16,18,
 };
 
 static static_codebook _huff_book__16u1__long = {
@@ -633,12 +633,12 @@ static long _vq_quantlist__16u1__p1_0[] = {
 };
 
 static long _vq_lengthlist__16u1__p1_0[] = {
-        1, 6, 5, 5, 5, 8, 5, 8, 5, 6, 8, 8, 8, 9,10, 8,
-       10, 9, 6, 8, 8, 8, 9,10, 8,10, 9, 5, 8, 8, 8, 9,
-       10, 8,10, 8, 5, 9, 8, 9, 7,11, 8,11, 7, 8,10,10,
-       10,11,11,10,11,11, 5, 8, 8, 8, 8,10, 8,10, 9, 8,
-       10,10,10,11,11,10,11,11, 5, 9, 9, 8, 7,11, 9,11,
-        7,
+        1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 7, 7,10,10, 7,
+        9,10, 5, 7, 8, 7,10, 9, 7,10,10, 5, 8, 8, 8,10,
+       10, 8,10,10, 7,10,10,10,11,12,10,12,13, 7,10,10,
+        9,13,11,10,12,13, 5, 8, 8, 8,10,10, 8,10,10, 7,
+       10,10,10,12,12, 9,11,12, 7,10,11,10,12,12,10,13,
+       11,
 };
 
 static float _vq_quantthresh__16u1__p1_0[] = {
@@ -674,12 +674,12 @@ static long _vq_quantlist__16u1__p2_0[] = {
 };
 
 static long _vq_lengthlist__16u1__p2_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0,
+        3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 7, 8, 6,
+        7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 6, 8,
+        8, 6, 8, 8, 6, 8, 8, 7, 7,10, 8, 9, 9, 6, 8, 8,
+        7, 9, 8, 8, 9,10, 5, 6, 6, 6, 8, 8, 7, 8, 8, 6,
+        8, 8, 8,10, 9, 7, 8, 9, 6, 8, 8, 8, 9, 9, 7,10,
+        8,
 };
 
 static float _vq_quantthresh__16u1__p2_0[] = {
@@ -717,46 +717,46 @@ static long _vq_quantlist__16u1__p3_0[] = {
 };
 
 static long _vq_lengthlist__16u1__p3_0[] = {
-        2, 6, 6, 9, 9, 6, 5, 8, 8,10, 6, 8, 5,10, 8,10,
-        9,11, 7,11,10,11, 9,11, 7, 6, 8, 8,10,10, 8, 8,
-       10,10,11, 8,10, 8,11,10,11,11,12,10,13,11,12,11,
-       13,10, 6, 8, 8,10,10, 8, 8,10,10,11, 8,10, 8,11,
-       10,11,11,12,10,13,11,12,11,13,10, 9,10,10,12,12,
-       11,11,11,13,14,10,11,11,13,13,13,12,13,13,14,13,
-       13,13,14,13, 9,10,10,13,12,10,11,11,12,14,11,12,
-       11,13,12,12,12,13,13,14,13,13,12,15,13, 6, 8, 8,
-       10,11, 8, 8,10,10,12, 8,10, 8,11,10,11,11,12,10,
-       13,11,12,10,12,10, 5, 8, 8,11,11, 8, 6,11, 9,12,
-        8,11, 6,12, 9,12,10,13, 8,14,12,13,10,13, 8, 8,
-        9,10,11,12,10,11,10,12,12,10,10,11,12,12,12,13,
-       13,12,13,12,13,12,13,12, 8,10,10,13,13,10, 9,12,
-       11,14,10,12, 9,14,11,13,12,13,11,14,13,14,11,15,
-       11,10,11,11,13,14,11,12,12,14,13,11,12,12,14,14,
-       13,13,13,14,15,13,14,13,14,14, 6, 8, 8,10,10, 8,
-        8,10,10,11, 8,10, 8,12,10,11,11,12,10,13,11,12,
-       11,13,10, 8,10,10,12,11,10,11,10,12,12,10,10,11,
-       12,12,12,12,13,12,13,12,13,12,13,12, 5, 8, 8,11,
-       11, 8, 6,11, 9,12, 8,11, 6,12, 9,12,10,13, 8,13,
-       12,13,10,14, 8,10,11,11,13,13,11,12,12,14,14,11,
-       12,12,13,13,14,14,14,14,15,13,13,14,14,14, 8,10,
-       10,13,12,10, 9,12,11,14,10,12, 9,14,11,12,12,14,
-       11,15,13,14,12,15,11,10,11,11,12,13,11,12,12,13,
-       13,11,12,12,13,12,13,13,14,13,14,13,13,13,14,12,
-        9,11,11,12,12,11,10,12,12,13,11,12,10,13,11,13,
-       11,14,11,14,12,13,12,14,11,11,12,12,13,14,12,13,
-       13,14,14,12,13,13,13,14,13,14,14,14,14,14,14,14,
-       13,13, 7,10,10,13,13,10, 8,12,11,14,10,12, 8,14,
-       11,13,11,13, 9,15,13,14,11,14, 9,11,12,13,14,15,
-       13,13,13,15,14,13,13,14,14,15,14,14,14,15,14,14,
-       14,14,14,14,10,11,11,13,12,11,12,12,13,13,11,12,
-       12,13,12,13,13,14,12,14,12,14,13,14,12,11,12,12,
-       13,13,12,13,13,14,13,12,13,13,14,14,14,14,14,14,
-       14,13,13,14,14,14, 9,11,11,12,12,10,10,12,12,13,
-       11,12,10,13,12,13,12,14,11,14,13,14,11,14,11,11,
-       13,13,14,14,13,13,13,15,14,13,13,14,14,14,14,14,
-       14,15,14,14,14,14,14,15, 7,10,10,13,13,10, 8,12,
-       11,14,10,12, 8,14,11,13,11,14, 9,14,13,14,11,14,
-        9,
+        1, 5, 5, 8, 8, 6, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9,
+       10, 9,11,11, 9, 9,10,11,11, 6, 8, 8,10,10, 8, 9,
+       10,11,11, 8, 9,10,11,11,10,11,11,12,13,10,11,11,
+       13,13, 6, 8, 8,10,10, 8,10, 9,11,11, 8,10, 9,11,
+       11,10,11,11,13,13,10,11,11,13,12, 9,11,11,14,13,
+       10,12,12,15,14,10,12,11,14,13,12,13,13,15,15,12,
+       13,13,16,14, 9,11,11,13,14,10,11,12,14,14,10,12,
+       12,14,15,12,13,13,14,15,12,13,14,15,16, 5, 8, 8,
+       11,11, 8,10,10,12,12, 8,10,10,12,12,11,12,12,14,
+       14,11,12,12,14,14, 8,10,10,12,12, 9,11,12,12,13,
+       10,12,12,13,13,12,12,13,14,15,11,13,13,15,15, 7,
+       10,10,12,12, 9,12,11,13,12,10,11,12,13,13,12,13,
+       12,15,14,11,12,13,15,15,10,12,12,15,14,11,13,13,
+       16,15,11,13,13,16,15,14,13,14,15,16,13,15,15,17,
+       17,10,12,12,14,15,11,12,12,15,15,11,13,13,15,16,
+       13,15,13,16,15,13,15,15,16,17, 5, 8, 8,11,11, 8,
+       10,10,12,12, 8,10,10,12,12,11,12,12,14,14,11,12,
+       12,14,14, 7,10,10,12,12,10,12,12,14,13, 9,11,12,
+       12,13,12,13,13,15,15,12,12,13,13,15, 7,10,10,12,
+       13,10,11,12,13,13,10,12,11,13,13,11,13,13,15,15,
+       12,13,12,15,14, 9,12,12,15,14,11,13,13,15,15,11,
+       12,13,15,15,13,14,14,17,19,13,13,14,16,16,10,12,
+       12,14,15,11,13,13,15,16,11,13,12,16,15,13,15,15,
+       17,18,14,15,13,16,15, 8,11,11,15,14,10,12,12,16,
+       15,10,12,12,16,16,14,15,15,18,17,13,14,15,16,18,
+        9,12,12,15,15,11,12,14,16,17,11,13,13,16,15,15,
+       15,15,17,18,14,15,16,17,17, 9,12,12,15,15,11,14,
+       13,16,16,11,13,13,16,16,15,16,15,17,18,14,16,15,
+       17,16,12,14,14,17,16,12,14,15,18,17,13,15,15,17,
+       17,15,15,18,16,20,15,16,17,18,18,11,14,14,16,17,
+       13,15,14,18,17,13,15,15,17,17,15,17,15,18,17,15,
+       17,16,19,18, 8,11,11,14,15,10,12,12,15,15,10,12,
+       12,16,16,13,14,14,17,16,14,15,15,17,17, 9,12,12,
+       15,16,11,13,13,16,16,11,12,13,16,16,14,16,15,20,
+       17,14,16,16,17,17, 9,12,12,15,16,11,13,13,16,17,
+       11,13,13,17,16,14,15,15,17,18,15,15,15,18,18,11,
+       14,14,17,16,13,15,15,17,17,13,14,14,18,17,15,16,
+       16,18,19,15,15,17,17,19,11,14,14,16,17,13,15,14,
+       17,19,13,15,14,18,17,15,17,16,18,18,15,17,15,18,
+       16,
 };
 
 static float _vq_quantthresh__16u1__p3_0[] = {
@@ -794,46 +794,46 @@ static long _vq_quantlist__16u1__p4_0[] = {
 };
 
 static long _vq_lengthlist__16u1__p4_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 5, 5, 8, 8, 6, 6, 7, 9, 9, 6, 6, 6, 9, 9, 9,
+       10, 9,11,11, 9, 9,10,11,11, 6, 7, 7,10, 9, 7, 7,
+        8, 9,10, 7, 7, 8,10,10,10,10,10,10,12, 9, 9,10,
+       11,12, 6, 7, 7, 9, 9, 7, 8, 7,10,10, 7, 8, 7,10,
+       10, 9,10, 9,12,11,10,10, 9,12,10, 9,10,10,12,11,
+       10,10,10,12,12, 9,10,10,12,12,12,11,12,13,13,11,
+       11,12,12,13, 9,10,10,11,12, 9,10,10,12,12,10,10,
+       10,12,12,11,12,11,14,13,11,12,12,14,13, 5, 7, 7,
+       10,10, 7, 8, 8,10,10, 7, 8, 7,10,10,10,10,10,12,
+       12,10,10,10,12,12, 6, 8, 7,10,10, 7, 7, 9,10,11,
+        8, 9, 9,11,10,10,10,11,11,13,10,10,11,12,13, 6,
+        8, 8,10,10, 7, 9, 8,11,10, 8, 9, 9,10,11,10,11,
+       10,13,11,10,11,10,12,12,10,11,10,12,11,10,10,10,
+       12,13,10,11,11,13,12,11,11,13,11,14,12,12,13,14,
+       14, 9,10,10,12,13,10,11,10,13,12,10,11,11,12,13,
+       11,12,11,14,12,12,13,13,15,14, 5, 7, 7,10,10, 7,
+        7, 8,10,10, 7, 8, 8,10,10,10,10,10,11,12,10,10,
+       10,12,12, 7, 8, 8,10,10, 8, 9, 8,11,10, 7, 8, 9,
+       10,11,10,11,11,12,12,10,10,11,11,13, 7, 7, 8,10,
+       10, 8, 8, 9,10,11, 7, 9, 7,11,10,10,11,11,13,12,
+       11,11,10,13,11, 9,10,10,12,12,10,11,11,13,12,10,
+       10,11,12,12,12,13,13,14,14,11,11,12,12,14,10,10,
+       11,12,12,10,11,11,12,13,10,10,10,13,12,12,13,13,
+       15,14,12,13,10,14,11, 8,10,10,12,12,10,11,10,13,
+       13, 9,10,10,12,12,12,13,13,15,14,11,12,12,13,13,
+        9,10,10,13,12,10,10,11,13,13,10,11,10,13,12,12,
+       12,13,14,15,12,13,12,15,13, 9,10,10,12,13,10,11,
+       10,13,12,10,10,11,12,13,12,14,12,15,13,12,12,13,
+       14,15,11,12,11,14,13,11,11,12,14,15,12,13,12,15,
+       14,13,11,15,11,16,13,14,14,16,15,11,12,12,14,14,
+       11,12,11,14,13,12,12,13,14,15,13,14,12,16,12,14,
+       14,14,15,15, 8,10,10,12,12, 9,10,10,12,12,10,10,
+       11,13,13,11,12,12,13,13,12,13,13,14,15, 9,10,10,
+       13,12,10,11,11,13,12,10,10,11,13,13,12,13,12,15,
+       14,12,12,13,13,16, 9, 9,10,12,13,10,10,11,12,13,
+       10,11,10,13,13,12,12,13,13,15,13,13,12,15,13,11,
+       12,12,14,14,12,13,12,15,14,11,11,12,13,14,14,14,
+       14,16,15,13,12,15,12,16,11,11,12,13,14,12,13,13,
+       14,15,10,12,11,14,13,14,15,14,16,16,13,14,11,15,
+       11,
 };
 
 static float _vq_quantthresh__16u1__p4_0[] = {
@@ -875,12 +875,12 @@ static long _vq_quantlist__16u1__p5_0[] = {
 };
 
 static long _vq_lengthlist__16u1__p5_0[] = {
-        1, 5, 5, 7, 7, 8, 8,10,10, 5, 4, 6, 7, 8, 8, 9,
-       10,10, 5, 6, 4, 8, 7, 9, 8,11,10, 8, 7, 8, 6, 9,
-        7,10, 9,11, 8, 8, 7, 9, 6,10, 7,11, 9,10, 9,10,
-        8,11, 7,11, 9,12, 9,10, 9,11, 8,11, 7,12, 9,10,
-       10,11, 9,11, 8,11, 8,11,10,11,10,11, 9,11, 8,11,
-        8,
+        1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8,
+       10,10, 4, 5, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9,
+        9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8,
+       10, 9,11,11,12,11, 7, 8, 8, 9, 9,11,11,12,12, 9,
+       10,10,11,11,12,12,13,12, 9,10,10,11,11,12,12,12,
+       13,
 };
 
 static float _vq_quantthresh__16u1__p5_0[] = {
@@ -923,12 +923,12 @@ static long _vq_quantlist__16u1__p6_0[] = {
 };
 
 static long _vq_lengthlist__16u1__p6_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0,
+        3, 4, 4, 6, 6, 7, 7, 9, 9, 4, 4, 4, 6, 6, 8, 8,
+        9, 9, 4, 4, 4, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7,
+        8, 8,10, 9, 6, 6, 6, 7, 7, 8, 8, 9,10, 7, 8, 7,
+        8, 8, 9, 9,10,10, 7, 8, 8, 8, 8, 9, 9,10,10, 9,
+        9, 9,10,10,10,10,11,11, 9, 9, 9,10,10,10,10,11,
+       11,
 };
 
 static float _vq_quantthresh__16u1__p6_0[] = {
@@ -965,12 +965,12 @@ static long _vq_quantlist__16u1__p7_0[] = {
 };
 
 static long _vq_lengthlist__16u1__p7_0[] = {
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-        6,
+        1, 4, 4, 4, 8, 8, 4, 8, 8, 5,11, 9, 8,12,11, 8,
+       12,11, 5,10,11, 8,11,12, 8,11,12, 4,11,11,11,14,
+       13,10,13,13, 8,14,13,12,14,16,12,16,15, 8,14,14,
+       13,16,14,12,15,16, 4,11,11,10,14,13,11,14,14, 8,
+       15,14,12,15,15,12,14,16, 8,14,14,11,16,15,12,15,
+       13,
 };
 
 static float _vq_quantthresh__16u1__p7_0[] = {
@@ -1014,14 +1014,14 @@ static long _vq_quantlist__16u1__p7_1[] = {
 };
 
 static long _vq_lengthlist__16u1__p7_1[] = {
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 6, 6, 6, 6, 6, 6, 6,
+        2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 6, 5, 7, 7,
+        8, 8, 8, 8, 8, 8, 4, 5, 6, 7, 7, 8, 8, 8, 8, 8,
+        8, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8,
+        8, 8, 8, 9, 9, 9, 9, 7, 8, 8, 8, 8, 9, 9, 9,10,
+        9,10, 7, 8, 8, 8, 8, 9, 9, 9, 9,10, 9, 8, 8, 8,
+        9, 9,10,10,10,10,10,10, 8, 8, 8, 9, 9, 9, 9,10,
+       10,10,10, 8, 8, 8, 9, 9, 9,10,10,10,10,10, 8, 8,
+        8, 9, 9,10,10,10,10,10,10,
 };
 
 static float _vq_quantthresh__16u1__p7_1[] = {
@@ -1067,14 +1067,14 @@ static long _vq_quantlist__16u1__p8_0[] = {
 };
 
 static long _vq_lengthlist__16u1__p8_0[] = {
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 6, 6, 6, 6, 6, 6, 6,
+        1, 4, 4, 5, 5, 8, 8,10,10,12,12, 4, 7, 7, 8, 8,
+        9, 9,12,11,14,13, 4, 7, 7, 7, 8, 9,10,11,11,13,
+       12, 5, 8, 8, 9, 9,11,11,12,13,15,14, 5, 7, 8, 9,
+        9,11,11,13,13,17,15, 8, 9,10,11,11,12,13,17,14,
+       17,16, 8,10, 9,11,11,12,12,13,15,15,17,10,11,11,
+       12,13,14,15,15,16,16,17, 9,11,11,12,12,14,15,17,
+       15,15,16,11,14,12,14,15,16,15,16,16,16,15,11,13,
+       13,14,14,15,15,16,16,15,16,
 };
 
 static float _vq_quantthresh__16u1__p8_0[] = {
@@ -1120,14 +1120,14 @@ static long _vq_quantlist__16u1__p8_1[] = {
 };
 
 static long _vq_lengthlist__16u1__p8_1[] = {
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 6, 6, 6, 6, 6, 6, 6,
+        2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 4, 6, 6, 7, 7,
+        8, 7, 8, 8, 8, 8, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8,
+        8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 6, 7, 7, 7,
+        7, 8, 8, 8, 8, 9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9,
+        9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 8, 8, 8,
+        8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9,
+        9, 9, 9, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 8, 8,
+        8, 9, 9, 9, 9, 9, 9, 9, 9,
 };
 
 static float _vq_quantthresh__16u1__p8_1[] = {
@@ -1241,21 +1241,21 @@ static long _vq_quantlist__16u1__p9_1[] = {
 };
 
 static long _vq_lengthlist__16u1__p9_1[] = {
-        1, 4, 4,10,10,14,14,17,17,17,17,17,17,17,17, 4,
-        3, 7, 8,12,12,16,16,17,17,17,17,17,17,17, 4, 7,
-        4,11, 8,16,12,17,16,16,16,16,16,16,16,10, 8,12,
-        7,13,10,15,16,16,16,16,16,16,16,16,10,11, 8,14,
-        7,16,10,16,14,16,16,16,16,16,16,14,12,15,11,16,
-       10,15,14,16,16,16,16,16,16,16,14,15,12,15,10,16,
-       10,16,14,16,16,16,16,16,16,16,14,16,15,16,14,16,
-       13,16,15,16,16,16,16,16,16,16,15,16,14,16,13,15,
-       13,16,15,16,16,16,16,16,16,16,16,16,16,16,16,16,
-       16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,16,
-       16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-       16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-       16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-       16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-       16,
+        1, 6, 5, 9, 9,10,10, 6, 7, 9, 9,10,10,10,10, 5,
+       10, 8,10, 8,10,10, 8, 8,10, 9,10,10,10,10, 5, 8,
+        9,10,10,10,10, 8,10,10,10,10,10,10,10, 9,10,10,
+       10,10,10,10, 9, 9,10,10,10,10,10,10, 9, 9, 8, 9,
+       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, 8,10,10,10,10,
+       10,10,10,10,10,10,10,10,10, 6, 8, 8,10,10,10, 8,
+       10,10,10,10,10,10,10,10, 5, 8, 8,10,10,10, 9, 9,
+       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, 9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9, 9, 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__16u1__p9_1[] = {
@@ -1307,25 +1307,25 @@ static long _vq_quantlist__16u1__p9_2[] = {
 };
 
 static long _vq_lengthlist__16u1__p9_2[] = {
-        2, 5, 5, 7, 7, 8, 8,10,10,10,10,11,11,11,11,12,
-       12, 5, 4, 6, 6, 8, 8, 9, 9,10, 9,10,10,11,11,11,
-       12,12, 5, 6, 4, 8, 6, 9, 8,10, 9,10, 9,11,10,11,
-       11,12,12, 7, 6, 8, 6, 9, 7, 9, 9,10, 9,10,10,11,
-       11,11,11,12, 7, 8, 6, 8, 6, 9, 7,10, 8,10, 9,11,
-       10,11,11,11,11, 8, 8, 9, 7, 9, 7,10, 8,11, 9,11,
-       10,11,10,11,11,11, 8, 9, 8, 9, 7,10, 7,11, 8,11,
-        9,11,10,11,10,11,11, 9, 9,10, 9,10, 8,11, 8,11,
-        8,11, 9,11,10,11,11,11, 9,10, 9,10, 9,11, 8,11,
-        7,11, 8,11, 9,12,10,11,11,10,10,11,10,11, 9,11,
-        9,12, 8,11, 9,11,10,11,11,11,10,11,10,11,10,11,
-        9,12, 9,11, 8,11, 9,11,10,11,11,11,11,11,10,12,
-       10,12,10,12, 9,11, 8,11, 9,11,10,11,11,11,11,12,
-       11,12,10,12,10,12, 9,11, 8,11, 9,11,10,12,11,12,
-       11,12,11,12,11,12,10,11,10,11, 9,11,10,11,12,12,
-       12,12,11,12,11,12,11,11,10,11,10,11, 9,11,10,12,
-       12,12,12,12,11,12,11,12,11,11,10,11,10,11, 9,10,
-       12,12,12,12,12,12,11,12,11,11,11,11,10,11,10,10,
-        9,
+        1, 6, 6, 7, 8, 8,11,10, 9, 9,11, 9,10, 9,11,11,
+        9, 6, 7, 6,11, 8,11, 9,10,10,11, 9,11,10,10,10,
+       11, 9, 5, 7, 7, 8, 8,10,11, 8, 8,11, 9, 9,10,11,
+        9,10,11, 8, 9, 6, 8, 8, 9, 9,10,10,11,11,11, 9,
+       11,10, 9,11, 8, 8, 8, 9, 8, 9,10,11, 9, 9,11,11,
+       10, 9, 9,11,10, 8,11, 8, 9, 8,11, 9,10, 9,10,11,
+       11,10,10, 9,10,10, 8, 8, 9,10,10,10, 9,11, 9,10,
+       11,11,11,11,10, 9,11, 9, 9,11,11,10, 8,11,11,11,
+        9,10,10,11,10,11,11, 9,11,10, 9,11,10,10,10,10,
+        9,11,10,11,10, 9, 9,10,11, 9, 8,10,11,11,10,10,
+       11, 9,11,10,11,11,10,11, 9, 9, 8,10, 8, 9,11, 9,
+        8,10,10, 9,11,10,11,10,11, 9,11, 8,10,11,11,11,
+       11,10,10,11,11,11,11,10,11,11,10, 9, 8,10,10, 9,
+       11,10,11,11,11, 9, 9, 9,11,11,11,10,10, 9, 9,10,
+        9,11,11,11,11, 8,10,11,10,11,11,10,11,11, 9, 9,
+        9,10, 9,11, 9,11,11,11,11,11,10,11,11,10,11,10,
+       11,11, 9,11,10,11,10, 9,10, 9,10,10,11,11,11,11,
+        9,10, 9,10,11,11,10,11,11,11,11,11,11,10,11,11,
+       10,
 };
 
 static float _vq_quantthresh__16u1__p9_2[] = {
@@ -1358,13 +1358,13 @@ static static_codebook _16u1__p9_2 = {
 };
 
 static long _huff_lengthlist__16u1__short[] = {
-       14,14,14,14,14,14,14,14,14,14,14, 2,14, 3,14, 5,
-       14,14,14, 7,14,14,14,14,14,14,14,14,14,14,14, 3,
-       14, 4,14, 5,14,14,14, 6,14,14,14,14,14,14,14,14,
-       13,13,13, 4,13, 5,13, 4,13,13,13, 6,13,13,13,13,
-       13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-       13,13,13,13,13,13,13,13,13,13,13, 6,13, 5,13, 4,
-       13,13,13, 4,
+        5, 7,10, 9,11,10,15,11,13,16, 6, 4, 6, 6, 7, 7,
+       10, 9,12,16,10, 6, 5, 6, 6, 7,10,11,16,16, 9, 6,
+        7, 6, 7, 7,10, 8,14,16,11, 6, 5, 4, 5, 6, 8, 9,
+       15,16, 9, 6, 6, 5, 6, 6, 9, 8,14,16,12, 7, 6, 6,
+        5, 6, 6, 7,13,16, 8, 6, 7, 6, 5, 5, 4, 4,11,16,
+        9, 8, 9, 9, 7, 7, 6, 5,13,16,14,14,16,15,16,15,
+       16,16,16,16,
 };
 
 static static_codebook _huff_book__16u1__short = {
@@ -1379,13 +1379,13 @@ static static_codebook _huff_book__16u1__short = {
 };
 
 static long _huff_lengthlist__16u2__long[] = {
-        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, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 1,
+        5, 7,10,10,10,11,11,13,18,19, 6, 5, 5, 6, 7, 8,
+        9,12,19,19, 8, 5, 4, 4, 6, 7, 9,13,19,19, 8, 5,
+        4, 4, 5, 6, 8,12,17,19, 7, 5, 5, 4, 4, 5, 7,12,
+       18,18, 8, 7, 7, 6, 5, 5, 6,10,18,18, 9, 9, 9, 8,
+        6, 5, 6, 9,18,18,11,13,13,13, 8, 7, 7, 9,16,18,
+       13,17,18,16,11, 9, 9, 9,17,18,15,18,18,18,15,13,
+       13,14,18,18,
 };
 
 static static_codebook _huff_book__16u2__long = {
@@ -1400,13 +1400,13 @@ static static_codebook _huff_book__16u2__long = {
 };
 
 static long _huff_lengthlist__16u2__short[] = {
-        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, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 1,
+        8,11,12,12,14,15,16,16,16,16, 9, 7, 7, 8, 9,11,
+       13,14,16,16,13, 7, 6, 6, 7, 9,12,13,15,16,15, 7,
+        6, 5, 4, 6,10,11,14,16,12, 8, 7, 4, 2, 4, 7,10,
+       14,16,11, 9, 7, 5, 3, 4, 6, 9,14,16,11,10, 9, 7,
+        5, 5, 6, 9,16,16,10,10, 9, 8, 6, 6, 7,10,16,16,
+       11,11,11,10,10,10,11,14,16,16,16,14,14,13,14,16,
+       16,16,16,16,
 };
 
 static static_codebook _huff_book__16u2__short = {
@@ -1427,12 +1427,12 @@ static long _vq_quantlist__16u2_p1_0[] = {
 };
 
 static long _vq_lengthlist__16u2_p1_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0,
+        1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7,
+        9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 8, 9,
+        9, 7, 9, 9, 7, 9, 9, 9,10,10, 9,10,10, 7, 9, 9,
+        9,10,10, 9,10,11, 5, 7, 8, 8, 9, 9, 8, 9, 9, 7,
+        9, 9, 9,10,10, 9, 9,10, 7, 9, 9, 9,10,10, 9,11,
+       10,
 };
 
 static float _vq_quantthresh__16u2_p1_0[] = {
@@ -1470,46 +1470,46 @@ static long _vq_quantlist__16u2_p2_0[] = {
 };
 
 static long _vq_lengthlist__16u2_p2_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0,
+        3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9,
+       10, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
+        8,10,10, 7, 8, 8,10,10,10,10,10,12,12, 9,10,10,
+       11,12, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,
+       10, 9,10,10,12,11,10,10,10,12,12, 9,10,10,12,12,
+       10,11,10,13,12, 9,10,10,12,12,12,12,12,14,14,11,
+       12,12,13,14, 9,10,10,12,12, 9,10,10,12,12,10,10,
+       10,12,12,11,12,12,14,13,12,13,12,14,14, 5, 7, 7,
+        9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,10,12,
+       12,10,10,11,12,12, 7, 8, 8,10,10, 8, 9, 9,11,11,
+        8, 9, 9,11,11,11,11,11,12,13,10,11,11,12,13, 7,
+        8, 8,10,10, 8, 9, 8,11,10, 8, 9, 9,11,11,10,11,
+       10,13,12,10,11,11,13,13, 9,11,10,13,13,10,11,11,
+       13,13,10,11,11,13,13,12,12,13,13,15,12,12,13,14,
+       15, 9,10,10,12,12,10,11,10,13,12,10,11,11,13,13,
+       11,13,11,14,13,12,13,13,15,15, 5, 7, 7, 9, 9, 7,
+        8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,12,10,10,
+       11,12,12, 7, 8, 8,10,10, 8, 9, 9,11,11, 8, 8, 9,
+       10,11,10,11,11,13,13,10,10,11,12,13, 7, 8, 8,10,
+       11, 8, 9, 9,11,11, 8, 9, 9,11,11,10,11,11,13,12,
+       11,11,11,13,12, 9,10,10,12,12,10,11,11,13,13,10,
+       10,11,12,13,12,13,13,15,14,11,11,13,12,14,10,10,
+       11,13,13,10,11,11,13,13,10,11,11,13,13,12,13,13,
+       14,14,12,13,12,14,13, 8,10, 9,12,12, 9,11,10,13,
+       13, 9,10,10,12,13,12,13,13,14,14,12,12,13,14,14,
+        9,11,10,13,13,10,11,11,13,13,10,11,11,13,13,12,
+       13,13,15,15,13,13,13,14,15, 9,10,10,12,13,10,11,
+       10,13,12,10,11,11,13,13,12,13,12,15,14,13,13,13,
+       14,15,11,12,12,15,14,12,12,13,15,15,12,13,13,15,
+       14,14,13,15,14,16,13,14,15,16,16,11,12,12,14,14,
+       11,12,12,15,14,12,13,13,15,15,13,14,13,16,14,14,
+       14,14,16,16, 8, 9, 9,12,12, 9,10,10,13,12, 9,10,
+       10,13,13,12,12,12,14,14,12,12,13,15,15, 9,10,10,
+       13,12,10,11,11,13,13,10,10,11,13,14,12,13,13,15,
+       15,12,12,13,14,15, 9,10,10,13,13,10,11,11,13,13,
+       10,11,11,13,13,12,13,13,14,14,13,14,13,15,14,11,
+       12,12,14,14,12,13,13,15,14,11,12,12,14,15,14,14,
+       14,16,15,13,12,14,14,16,11,12,13,14,15,12,13,13,
+       14,16,12,13,12,15,14,13,15,14,16,16,14,15,13,16,
+       13,
 };
 
 static float _vq_quantthresh__16u2_p2_0[] = {
@@ -1551,12 +1551,12 @@ static long _vq_quantlist__16u2_p3_0[] = {
 };
 
 static long _vq_lengthlist__16u2_p3_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 8, 7,
+        9, 9, 4, 5, 5, 6, 6, 7, 8, 9, 9, 6, 6, 6, 7, 7,
+        8, 8,10,10, 6, 6, 6, 7, 7, 8, 8, 9,10, 7, 8, 7,
+        8, 8, 9, 9,10,10, 7, 8, 8, 8, 8, 9, 9,10,10, 9,
+        9, 9,10, 9,10,10,11,11, 9, 9, 9,10,10,10,10,11,
+       11,
 };
 
 static float _vq_quantthresh__16u2_p3_0[] = {
@@ -1607,25 +1607,25 @@ static long _vq_quantlist__16u2_p4_0[] = {
 };
 
 static long _vq_lengthlist__16u2_p4_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,11,
+       11, 5, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,
+       12,11, 5, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,
+       11,12,12, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,
+       11,11,12,12, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,
+       10,11,11,12,12, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,
+       11,11,12,12,12,12, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,
+       10,11,11,11,12,12,12, 9, 9, 9, 9, 9, 9,10,10,10,
+       10,10,11,11,12,12,13,13, 8, 9, 9, 9, 9,10, 9,10,
+       10,10,10,11,11,12,12,13,13, 9, 9, 9, 9, 9,10,10,
+       10,10,11,11,11,12,12,12,13,13, 9, 9, 9, 9, 9,10,
+       10,10,10,11,11,12,11,12,12,13,13,10,10,10,10,10,
+       11,11,11,11,11,12,12,12,12,13,13,14,10,10,10,10,
+       10,11,11,11,11,12,11,12,12,13,12,13,13,11,11,11,
+       11,11,12,12,12,12,12,12,13,13,13,13,14,14,11,11,
+       11,11,11,12,12,12,12,12,12,13,12,13,13,14,14,11,
+       12,12,12,12,12,12,13,13,13,13,13,13,14,14,14,14,
+       11,12,12,12,12,12,12,13,13,13,13,14,13,14,14,14,
+       14,
 };
 
 static float _vq_quantthresh__16u2_p4_0[] = {
@@ -1664,12 +1664,12 @@ static long _vq_quantlist__16u2_p5_0[] = {
 };
 
 static long _vq_lengthlist__16u2_p5_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 5, 7, 7, 5, 7, 7, 5, 9, 8, 7,10, 9, 7,
+       10, 9, 5, 8, 9, 7, 9,10, 7, 9,10, 4, 9, 9, 9,11,
+       11, 8,11,11, 7,11,11,10,10,13,10,14,13, 7,11,11,
+       10,13,11,10,13,14, 5, 9, 9, 8,11,11, 9,11,11, 7,
+       11,11,10,14,13,10,12,14, 7,11,11,10,13,13,10,13,
+       10,
 };
 
 static float _vq_quantthresh__16u2_p5_0[] = {
@@ -1713,14 +1713,14 @@ static long _vq_quantlist__16u2_p5_1[] = {
 };
 
 static long _vq_lengthlist__16u2_p5_1[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 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, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 5, 5, 5, 7, 7,
+        7, 7, 8, 8, 8, 8, 5, 5, 6, 7, 7, 7, 7, 8, 8, 8,
+        8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7,
+        7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 9, 9,
+        9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 8, 8, 8,
+        8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9,
+        9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8,
+        8, 8, 8, 9, 9, 9, 9, 9, 9,
 };
 
 static float _vq_quantthresh__16u2_p5_1[] = {
@@ -1768,17 +1768,17 @@ static long _vq_quantlist__16u2_p6_0[] = {
 };
 
 static long _vq_lengthlist__16u2_p6_0[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 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, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6,
+        8, 8, 9, 9, 9, 9,10,10,12,11, 4, 6, 6, 8, 8, 9,
+        9, 9, 9,10,10,11,12, 7, 8, 8, 9, 9,10,10,10,10,
+       12,12,13,12, 7, 8, 8, 9, 9,10,10,10,10,11,12,12,
+       12, 8, 9, 9,10,10,11,11,11,11,12,12,13,13, 8, 9,
+        9,10,10,11,11,11,11,12,13,13,13, 8, 9, 9,10,10,
+       11,11,12,12,13,13,14,14, 8, 9, 9,10,10,11,11,12,
+       12,13,13,14,14, 9,10,10,11,12,13,12,13,14,14,14,
+       14,14, 9,10,10,11,12,12,13,13,13,14,14,14,14,10,
+       11,11,12,12,13,13,14,14,15,15,15,15,10,11,11,12,
+       12,13,13,14,14,14,14,15,15,
 };
 
 static float _vq_quantthresh__16u2_p6_0[] = {
@@ -1818,8 +1818,8 @@ static long _vq_quantlist__16u2_p6_1[] = {
 };
 
 static long _vq_lengthlist__16u2_p6_1[] = {
-        0, 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, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+        5, 5, 6, 6, 5, 5, 5, 6, 6,
 };
 
 static float _vq_quantthresh__16u2_p6_1[] = {
@@ -1865,17 +1865,17 @@ static long _vq_quantlist__16u2_p7_0[] = {
 };
 
 static long _vq_lengthlist__16u2_p7_0[] = {
-        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, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7,
+        1, 4, 4, 7, 7, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 6,
+        9, 9, 9, 9, 9, 9,10,10,11,11, 4, 6, 6, 8, 9, 9,
+        9, 9, 9,10,11,12,11, 7, 8, 9,10,10,10,10,11,10,
+       11,12,12,13, 7, 9, 9,10,10,10,10,10,10,11,12,13,
+       13, 7, 9, 8,10,10,11,11,11,12,12,13,13,14, 7, 9,
+        9,10,10,11,11,11,12,13,13,13,13, 8, 9, 9,10,11,
+       11,12,12,12,13,13,13,13, 8, 9, 9,10,11,11,11,12,
+       12,13,13,14,14, 9,10,10,12,11,12,13,13,13,14,13,
+       13,13, 9,10,10,11,11,12,12,13,14,13,13,14,13,10,
+       11,11,12,13,14,14,14,15,14,14,14,14,10,11,11,12,
+       12,13,13,13,14,14,14,15,14,
 };
 
 static float _vq_quantthresh__16u2_p7_0[] = {
@@ -1921,14 +1921,14 @@ static long _vq_quantlist__16u2_p7_1[] = {
 };
 
 static long _vq_lengthlist__16u2_p7_1[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0,
+        3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7,
+        7, 7, 7, 7, 8, 8, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8,
+        8, 6, 6, 7, 7, 7, 8, 7, 8, 8, 8, 8, 6, 7, 7, 7,
+        7, 7, 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8,
+        8, 8, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7,
+        8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8,
+        8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__16u2_p7_1[] = {
@@ -1978,21 +1978,21 @@ static long _vq_quantlist__16u2_p8_0[] = {
 };
 
 static long _vq_lengthlist__16u2_p8_0[] = {
-        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, 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,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-        8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-        7,
+        1, 5, 5, 7, 7, 8, 8, 7, 7, 8, 8,10, 9,11,11, 4,
+        6, 6, 8, 8,10, 9, 9, 8, 9, 9,10,10,12,14, 4, 6,
+        7, 8, 9, 9,10, 9, 8, 9, 9,10,12,12,11, 7, 8, 8,
+       10,10,10,10, 9, 9,10,10,11,13,13,12, 7, 8, 8, 9,
+       11,11,10, 9, 9,11,10,12,11,11,14, 8, 9, 9,11,10,
+       11,11,10,10,11,11,13,12,14,12, 8, 9, 9,11,12,11,
+       11,10,10,12,11,12,12,12,14, 7, 8, 8, 9, 9,10,10,
+       10,11,12,11,13,13,14,12, 7, 8, 9, 9, 9,10,10,11,
+       11,11,12,12,14,14,14, 8,10, 9,10,11,11,11,11,14,
+       12,12,13,14,14,13, 9, 9, 9,10,11,11,11,12,12,12,
+       14,12,14,13,14,10,10,10,12,11,12,11,14,13,14,13,
+       14,14,13,14, 9,10,10,11,12,11,13,12,13,13,14,14,
+       14,13,14,10,13,13,12,12,11,12,14,13,14,13,14,12,
+       14,13,10,11,11,12,11,12,12,14,14,14,13,14,14,14,
+       14,
 };
 
 static float _vq_quantthresh__16u2_p8_0[] = {
@@ -2048,34 +2048,34 @@ static long _vq_quantlist__16u2_p8_1[] = {
 };
 
 static long _vq_lengthlist__16u2_p8_1[] = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 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, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10, 9,10, 9, 9,
+        9,10,10,10,10, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,
+       10, 9,10,10,10,10,10,10,11,10, 5, 6, 6, 7, 7, 8,
+        8, 8, 9, 9,10,10,10,10,10,10,10,10,10,10,10, 7,
+        7, 7, 8, 8, 9, 8, 9, 9,10, 9,10,10,10,10,10,10,
+       11,10,11,10, 7, 7, 7, 8, 8, 8, 9, 9, 9,10, 9,10,
+       10,10,10,10,10,10,10,10,10, 8, 8, 8, 9, 9, 9, 9,
+       10, 9,10,10,10,10,10,10,10,11,10,10,11,10, 8, 8,
+        8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,
+       11,10,10, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,
+       11,10,11,10,11,10,11,10, 8, 9, 9, 9, 9, 9,10,10,
+       10,10,10,10,10,10,10,10,11,11,10,10,10, 9,10, 9,
+        9,10,10,10,11,10,10,10,10,10,10,10,10,11,11,11,
+       11,11, 9, 9, 9,10, 9,10,10,10,10,10,10,11,10,11,
+       10,11,11,11,11,10,10, 9,10, 9,10,10,10,10,11,10,
+       10,10,10,10,11,10,11,10,11,10,10,11, 9,10,10,10,
+       10,10,10,10,10,10,11,10,10,11,11,10,11,11,11,11,
+       11, 9, 9,10,10,10,10,10,11,10,10,11,10,10,11,10,
+       10,11,11,11,11,11, 9,10,10,10,10,10,10,10,11,10,
+       11,10,11,10,11,11,11,11,11,10,11,10,10,10,10,10,
+       10,10,10,10,11,11,11,11,11,11,11,11,11,10,11,11,
+       10,10,10,10,10,11,10,10,10,11,10,11,11,11,11,10,
+       12,11,11,11,10,10,10,10,10,10,11,10,10,10,11,11,
+       12,11,11,11,11,11,11,11,11,11,10,10,10,11,10,11,
+       11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,10,
+       10,10,11,10,11,10,10,11,11,11,11,11,11,11,11,11,
+       11,11,11,10,10,10,10,10,10,10,11,11,10,11,11,10,
+       11,11,10,11,11,11,10,11,11,
 };
 
 static float _vq_quantthresh__16u2_p8_1[] = {
@@ -2127,21 +2127,21 @@ static long _vq_quantlist__16u2_p9_0[] = {
 };
 
 static long _vq_lengthlist__16u2_p9_0[] = {
-        1,14,14,14,14,14,14,14,14,14,14,14,14, 4, 5,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
-       14,14,14,13,13,13,13,13,13,13,13,13,13,13,13,13,
-       13,13,13, 4,13,13,13,13,13,13,13,13,13,13,13,13,
-        3, 7, 4,13,13,13,13,13,13,13,13,13,13,13,13, 7,
-        3,
+        1,10,10,10,10,10,10,10,10,10,10,10,10, 5, 4,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10, 4,10,10,10,10,10,10,10,10,10,10,10,10,
+        6, 6, 5,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 5,
+        5,
 };
 
 static float _vq_quantthresh__16u2_p9_0[] = {
@@ -2195,29 +2195,29 @@ static long _vq_quantlist__16u2_p9_1[] = {
 };
 
 static long _vq_lengthlist__16u2_p9_1[] = {
-        1,14,14,20,21,21,21,21,21,21,21,21,21,21,21,21,
-       21, 4, 3,14,11,12,17,19,21,20,21,21,21,21,21,21,
-       21,21,21,21,10,11,14,12,11,21,17,21,21,21,21,21,
-       21,21,21,21,21,21,21,11,10,20,17,20,16,19,19,21,
-       21,21,21,21,21,21,21,21,21,21,19,20,20,20,18,21,
-       16,21,18,21,21,21,21,21,21,21,21,21,21,20,18,21,
-       21,21,20,21,18,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21,21,21,20,19,21,18,21,21,21,21,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,20,21,20,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,19,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-       21,21,21, 5,10,11,20,20,21,21,21,21,21,21,21,21,
-       21,21,21,21, 4, 7, 4,11,10,20,20,21,21,21,21,21,
-       21,21,21,21,21,21,21, 6, 3,
+        1,12,10,12,10,12,10,12,11,12,12,12,12,12,12,12,
+       12, 5, 5, 9,10,12,11,11,12,12,12,12,12,12,12,12,
+       12,12,12,12,10, 9, 9,11, 9,11,11,12,11,12,12,12,
+       12,12,12,12,12,12,12, 8, 8,10,11, 9,12,11,12,12,
+       12,12,12,12,12,12,12,12,12,12, 9, 8,10,11,12,11,
+       12,11,12,12,12,12,12,12,12,12,12,12,12, 8, 9,11,
+       11,10,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+        9,10,11,12,11,12,11,12,12,12,12,12,12,12,12,12,
+       12,12,12, 9, 9,11,12,12,12,12,12,12,12,12,12,12,
+       12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+       12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+       12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+       12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+       12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+       12,12,12,12,11,11,11,11,11,11,11,11,11,11,11,11,
+       11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+       11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+       11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+       11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+       11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+       11,11,11, 5, 8, 9, 9, 8,11, 9,11,11,11,11,11,11,
+       11,11,11,11, 5, 5, 4, 8, 8, 8, 8,10, 9,10,10,11,
+       11,11,11,11,11,11,11, 5, 4,
 };
 
 static float _vq_quantthresh__16u2_p9_1[] = {
@@ -2303,10 +2303,10 @@ static long _vq_quantlist__16u2_p9_2[] = {
 };
 
 static long _vq_lengthlist__16u2_p9_2[] = {
-        1, 2, 3, 4, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,
-       10,10,10,10,10,10,10,11,11,11,11,11,11,12,11,12,
-       12,11,11,11,12,12,12,12,12,12,12,12,13,16,15,14,
-       16,
+        1, 3, 3, 4, 7, 7, 7, 8, 7, 7, 7, 7, 8, 8, 8, 8,
+        7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 9, 9, 8, 9, 9,
+        9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,12,12,10,
+       11,
 };
 
 static float _vq_quantthresh__16u2_p9_2[] = {

diff --git a/lib/modes/residue_16.h b/lib/modes/residue_16.h
index c4884f3757e350c756952a93ea1d74654c54bcdd..e9bd25a3c829a613f750cf59eda426976db4fead 100644 (file)
--- a/lib/modes/residue_16.h
+++ b/lib/modes/residue_16.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: toplevel residue templates 16/22kHz
- last mod: $Id: residue_16.h,v 1.2 2002/07/11 06:41:04 xiphmont Exp $
+ last mod: $Id: residue_16.h,v 1.3 2002/07/11 10:27:55 xiphmont Exp $
 
  ********************************************************************/
 
@@ -132,25 +132,25 @@ static static_bookblock _resbook_16u_2={
 };
 
 static vorbis_residue_template _res_16u_0[]={
-  {2,0,  &_residue_44_low_un,
+  {1,0,  &_residue_44_low_un,
    &_huff_book__16u0__single,&_huff_book__16u0__single,
    &_resbook_16u_0,&_resbook_16u_0},
 };
 static vorbis_residue_template _res_16u_1[]={
-  {2,0,  &_residue_44_mid_un,
+  {1,0,  &_residue_44_mid_un,
    &_huff_book__16u1__short,&_huff_book__16u1__short,
    &_resbook_16u_1,&_resbook_16u_1},
   
-  {2,0,  &_residue_44_mid_un,
+  {1,0,  &_residue_44_mid_un,
    &_huff_book__16u1__long,&_huff_book__16u1__long,
    &_resbook_16u_1,&_resbook_16u_1}
 };
 static vorbis_residue_template _res_16u_2[]={
-  {2,0,  &_residue_44_hi_un,
+  {1,0,  &_residue_44_hi_un,
    &_huff_book__16u2__short,&_huff_book__16u2__short,
    &_resbook_16u_2,&_resbook_16u_2},
   
-  {2,0,  &_residue_44_hi_un,
+  {1,0,  &_residue_44_hi_un,
    &_huff_book__16u2__long,&_huff_book__16u2__long,
    &_resbook_16u_2,&_resbook_16u_2}
 };