Initial beta 4 merge

Monty

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

1 files changed, 58 insertions, 38 deletions

diff --git a/lib/books/res0_256_1024_3.vqh b/lib/books/res0_256_1024_3.vqh
index 8554294f..da960e46 100644
--- a/lib/books/res0_256_1024_3.vqh
+++ b/lib/books/res0_256_1024_3.vqh
@@ -1,13 +1,12 @@
 /********************************************************************
  *                                                                  *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
  * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
- * PLEASE READ THESE TERMS DISTRIBUTING.                            *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
- * http://www.xiph.org/                                             *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/                 *
  *                                                                  *
  ********************************************************************
 
@@ -20,62 +19,83 @@
 #include "codebook.h"
 
 static long _vq_quantlist_res0_256_1024_3[] = {
+	10,
+	9,
+	11,
+	8,
+	12,
+	7,
+	13,
+	6,
 	14,
+	5,
 	15,
+	4,
 	16,
+	3,
 	17,
+	2,
+	18,
+	1,
 	19,
-	22,
-	25,
-	28,
-	13,
-	12,
-	11,
-	9,
-	6,
-	3,
 	0,
+	20,
 };
 
 static long _vq_lengthlist_res0_256_1024_3[] = {
-	 4, 6, 6, 6, 7, 8, 9,11, 6, 6, 6, 7, 8, 9,11, 6,
-	 6, 7, 7, 7, 8,10,11, 6, 7, 7, 7, 8,10,11, 6, 7,
-	 7, 7, 7, 8,10,12, 7, 7, 7, 7, 8,10,12, 7, 7, 7,
-	 7, 7, 8,10,12, 7, 7, 7, 7, 8,10,12, 7, 7, 7, 7,
-	 7, 8,10,12, 7, 7, 7, 7, 8,10,12, 8, 8, 8, 8, 8,
-	 9,11,13, 8, 8, 8, 8,10,11,13, 9,10,10,10,10,11,
-	13,14,10,10,10,10,11,13,14,11,12,12,12,12,13,15,
-	16,12,12,12,12,13,15,16, 6, 6, 7, 7, 7, 8,10,11,
-	 6, 7, 7, 7, 8,10,11, 6, 7, 7, 7, 7, 8,10,12, 7,
-	 7, 7, 7, 8,10,12, 7, 7, 7, 7, 7, 8,10,12, 7, 7,
-	 7, 7, 8,10,12, 7, 7, 7, 7, 7, 8,10,12, 7, 7, 7,
-	 7, 8,10,12, 8, 8, 8, 8, 8, 9,11,13, 8, 8, 8, 8,
-	 9,11,13, 9,10,10,10,10,11,13,14,10,10,10,10,11,
-	13,14,11,12,12,12,12,13,14,16,12,12,12,12,13,14,
-	16,
+	 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
+	11,11,11,12,12, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,
+	10,10,11,11,12,12,13,13,13,13, 4, 5, 5, 6, 6, 7,
+	 7, 8, 8, 9, 9,10,10,11,11,12,12,13,13,13,13, 6,
+	 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,12,12,13,13,
+	14,14,15,15, 6, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,
+	11,12,12,13,13,14,14,15,15, 7, 7, 7, 8, 8, 9, 9,
+	11,10,11,11,12,12,14,13,15,15,16,15,16,16, 7, 7,
+	 7, 8, 8, 9, 9,10,10,11,11,12,12,13,14,15,15,16,
+	15,16,16, 8, 9, 9,10, 9,11,11,12,12,12,12,13,14,
+	15,15,16,16,16,16,17,17, 8, 9, 9,10, 9,11,11,12,
+	12,12,12,13,13,15,14,16,16,16,17,17,17, 8, 9, 9,
+	10,10,11,11,12,12,13,13,15,15,16,16,16,17,17,17,
+	17,17, 8, 9, 9,10,10,11,11,12,12,14,13,15,15,16,
+	16,17,16,17,17,18,18, 9,10,10,11,11,12,12,13,14,
+	15,15,16,15,17,17,17,18,18,17,18,18, 9,10,10,11,
+	11,12,12,13,14,15,15,16,16,16,17,17,17,17,18,18,
+	18,10,11,11,13,12,14,14,15,15,16,16,17,16,17,17,
+	18,18,19,18,18,18,10,11,11,13,13,14,14,15,15,16,
+	16,17,17,17,17,18,18,18,18,18,18,11,12,12,14,14,
+	15,15,16,16,16,16,17,18,18,18,19,18,19,19,19,19,
+	11,12,12,14,14,15,15,16,16,17,17,17,17,18,18,18,
+	19,18,18,19,19,11,13,13,15,15,16,16,17,17,17,17,
+	18,17,18,18,18,19,19,19,19,19,12,13,13,15,15,16,
+	16,16,17,17,17,18,18,18,18,19,19,18,19,18,20,12,
+	14,14,15,15,16,17,17,17,18,18,18,18,19,19,20,19,
+	19,19,20,20,12,14,14,15,15,17,16,17,18,18,18,18,
+	18,18,19,19,19,19,20,20,19,
 };
 
 static float _vq_quantthresh_res0_256_1024_3[] = {
-	-12.5, -9.5, -6.5, -4, -2.5, -1.5, -0.5, 0.5, 
-	1.5, 2.5, 4, 6.5, 9.5, 12.5, 
+	-9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, 
+	-1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 
+	6.5, 7.5, 8.5, 9.5, 
 };
 
 static long _vq_quantmap_res0_256_1024_3[] = {
-	   14,   13,   12,   11,   10,    9,    8,    0,
-	    1,    2,    3,    4,    5,    6,    7,
+	   19,   17,   15,   13,   11,    9,    7,    5,
+	    3,    1,    0,    2,    4,    6,    8,   10,
+	   12,   14,   16,   18,   20,
 };
 
 static encode_aux_threshmatch _vq_auxt_res0_256_1024_3 = {
 	_vq_quantthresh_res0_256_1024_3,
 	_vq_quantmap_res0_256_1024_3,
-	15,
-	15
+	21,
+	21
 };
 
 static static_codebook _vq_book_res0_256_1024_3 = {
-	2, 225,
+	2, 441,
 	_vq_lengthlist_res0_256_1024_3,
-	1, -528744448, 1611661312, 5, 0,
+	1, -529268736, 1611661312, 5, 0,
 	_vq_quantlist_res0_256_1024_3,
 	NULL,
 	&_vq_auxt_res0_256_1024_3,