[xiph-cvs] cvs commit: vorbis/lib/books res_Ac_1b.vqh res_Ac_7c.vqh res_Ac_8d.vqh res_Ac_9c.vqh res_Ac_9d.vqh temp18987.vqh temp24731.vqh line_1024x31_0sub1.vqh line_1024x31_1sub1.vqh line_1024x31_3sub3.vqh line_1024x31_class1.vqh line_1024x31_class3.vqh line_128x19_0sub0.vqh line_128x19_2sub2.vqh line_128x19_2sub3.vqh line_128x19_class1.vqh line_128x19_class2.vqh res_44c_A_1024aux.vqh res_44c_A_128aux.vqh res_Ac_0.vqh res_Ac_0a.vqh res_Ac_1.vqh res_Ac_1a.vqh res_Ac_2.vqh res_Ac_2a.vqh res_Ac_2b.vqh res_Ac_2c.vqh res_Ac_3.vqh res_Ac_3a.vqh res_Ac_3b.vqh res_Ac_4.vqh res_Ac_4a.vqh res_Ac_4b.vqh res_Ac_5.vqh res_Ac_5a.vqh res_Ac_5b.vqh res_Ac_6.vqh res_Ac_6a.vqh res_Ac_6b.vqh res_Ac_7.vqh res_Ac_7a.vqh res_Ac_7b.vqh res_Ac_8a.vqh res_Ac_8b.vqh res_Ac_8c.vqh
Monty
xiphmont at xiph.org
Sun Oct 21 18:36:52 PDT 2001
xiphmont 01/10/21 18:36:51
Modified: lib/books Tag: branch_monty_20011009 line_1024x31_0sub1.vqh
line_1024x31_1sub1.vqh line_1024x31_3sub3.vqh
line_1024x31_class1.vqh line_1024x31_class3.vqh
line_128x19_0sub0.vqh line_128x19_2sub2.vqh
line_128x19_2sub3.vqh line_128x19_class1.vqh
line_128x19_class2.vqh res_44c_A_1024aux.vqh
res_44c_A_128aux.vqh res_Ac_0.vqh res_Ac_0a.vqh
res_Ac_1.vqh res_Ac_1a.vqh res_Ac_2.vqh
res_Ac_2a.vqh res_Ac_2b.vqh res_Ac_2c.vqh
res_Ac_3.vqh res_Ac_3a.vqh res_Ac_3b.vqh
res_Ac_4.vqh res_Ac_4a.vqh res_Ac_4b.vqh
res_Ac_5.vqh res_Ac_5a.vqh res_Ac_5b.vqh
res_Ac_6.vqh res_Ac_6a.vqh res_Ac_6b.vqh
res_Ac_7.vqh res_Ac_7a.vqh res_Ac_7b.vqh
res_Ac_8a.vqh res_Ac_8b.vqh res_Ac_8c.vqh
Added: lib/books Tag: branch_monty_20011009 res_Ac_1b.vqh
res_Ac_7c.vqh res_Ac_8d.vqh res_Ac_9c.vqh
res_Ac_9d.vqh temp18987.vqh temp24731.vqh
Log:
Pending any last minute bugs, welcome to 1.0's bitrate management
Revision Changes Path
No revision
No revision
1.3.4.5 +2 -2 vorbis/lib/books/line_1024x31_0sub1.vqh
Index: line_1024x31_0sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_0sub1.vqh,v
retrieving revision 1.3.4.4
retrieving revision 1.3.4.5
diff -u -r1.3.4.4 -r1.3.4.5
--- line_1024x31_0sub1.vqh 2001/10/16 20:10:13 1.3.4.4
+++ line_1024x31_0sub1.vqh 2001/10/22 01:36:42 1.3.4.5
@@ -21,8 +21,8 @@
static long _huff_lengthlist_line_1024x31_0sub1[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 5, 7, 6, 7,
- 6, 7, 6, 7, 8, 7, 6, 6, 8, 9, 9, 9, 9, 9, 5, 6,
+ 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7,
+ 6, 6, 6, 7, 8, 7, 6, 6, 8, 9, 9, 9, 9, 9, 5, 6,
8,10,10, 9, 9,12,10,11,12,10, 8, 8,12,12,12,12,
};
1.3.4.5 +3 -3 vorbis/lib/books/line_1024x31_1sub1.vqh
Index: line_1024x31_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_1sub1.vqh,v
retrieving revision 1.3.4.4
retrieving revision 1.3.4.5
diff -u -r1.3.4.4 -r1.3.4.5
--- line_1024x31_1sub1.vqh 2001/10/16 20:10:13 1.3.4.4
+++ line_1024x31_1sub1.vqh 2001/10/22 01:36:42 1.3.4.5
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_1024x31_1sub1[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 3, 3, 3, 3, 4, 3, 5, 4, 5, 4, 6, 6, 7, 7, 7,10,
- 7,10, 8,10, 8,10, 9, 9, 9,11, 8, 8, 8, 8, 8, 9,
- 7, 8, 8, 9,10, 9,12,12,12,12,12,12,12,12,12,12,
+ 3, 3, 3, 3, 4, 3, 5, 4, 5, 4, 6, 6, 7, 7, 7, 9,
+ 7,10, 8,11, 8,10, 9, 9, 9,11, 8, 8, 8, 8, 8, 9,
+ 7, 8, 8, 9,11, 9,12,12,12,12,12,12,12,12,12,12,
};
static static_codebook _huff_book_line_1024x31_1sub1 = {
1.3.4.5 +2 -2 vorbis/lib/books/line_1024x31_3sub3.vqh
Index: line_1024x31_3sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_3sub3.vqh,v
retrieving revision 1.3.4.4
retrieving revision 1.3.4.5
diff -u -r1.3.4.4 -r1.3.4.5
--- line_1024x31_3sub3.vqh 2001/10/16 20:10:13 1.3.4.4
+++ line_1024x31_3sub3.vqh 2001/10/22 01:36:42 1.3.4.5
@@ -21,8 +21,8 @@
static long _huff_lengthlist_line_1024x31_3sub3[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 5, 5, 5,
- 4, 7, 5, 7, 6, 8, 5, 8, 5, 8, 5, 8, 7, 8, 5, 8,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 5, 6, 5,
+ 4, 6, 5, 6, 6, 8, 5, 8, 5, 8, 5, 8, 7, 8, 5, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
};
1.3.4.5 +1 -1 vorbis/lib/books/line_1024x31_class1.vqh
Index: line_1024x31_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class1.vqh,v
retrieving revision 1.3.4.4
retrieving revision 1.3.4.5
diff -u -r1.3.4.4 -r1.3.4.5
--- line_1024x31_class1.vqh 2001/10/16 20:10:13 1.3.4.4
+++ line_1024x31_class1.vqh 2001/10/22 01:36:42 1.3.4.5
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class1[] = {
- 1, 3, 4, 8, 7, 7, 7,11, 3, 4, 4, 5,10,11,10,10,
+ 1, 3, 4, 7, 7, 8, 7,11, 3, 4, 4, 5,10,11,10,10,
};
static static_codebook _huff_book_line_1024x31_class1 = {
1.3.4.5 +4 -4 vorbis/lib/books/line_1024x31_class3.vqh
Index: line_1024x31_class3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class3.vqh,v
retrieving revision 1.3.4.4
retrieving revision 1.3.4.5
diff -u -r1.3.4.4 -r1.3.4.5
--- line_1024x31_class3.vqh 2001/10/16 20:10:13 1.3.4.4
+++ line_1024x31_class3.vqh 2001/10/22 01:36:42 1.3.4.5
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class3[] = {
- 1, 3, 3,10, 7, 5, 5,11,10, 8,10,11,12,12,11,12,
- 7, 4, 5,10, 8, 5, 7,13,12, 9,11,15,15,15,15,15,
- 11, 9, 7, 9,11, 9, 9,12,12,11,12,15,14,14,14,14,
- 14,10,10,10,14,13,13,12,14,13,14,14,14,14,14,14,
+ 1, 4, 3,10, 7, 4, 5,11,10, 7,10,10,12,12,11,12,
+ 7, 4, 5,10, 7, 5, 6,12,11, 8,11,14,14,14,14,14,
+ 11, 8, 6, 9,11, 9, 8,11,12,10,12,14,14,14,14,14,
+ 14,10,10,10,14,13,12,13,14,12,14,13,14,14,14,14,
};
static static_codebook _huff_book_line_1024x31_class3 = {
1.3.2.4 +3 -3 vorbis/lib/books/line_128x19_0sub0.vqh
Index: line_128x19_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_0sub0.vqh,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- line_128x19_0sub0.vqh 2001/10/16 20:10:13 1.3.2.3
+++ line_128x19_0sub0.vqh 2001/10/22 01:36:42 1.3.2.4
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_128x19_0sub0[] = {
3, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 6, 5, 6, 5,
- 6, 5, 6, 6, 7, 6, 7, 7, 7, 8, 7, 8, 8, 9, 8,10,
- 8,11, 8,11, 8,13, 8,12, 8,10, 8,10, 9,11, 9,11,
- 9,11,10,11,12,14,14,14,14,16,16,16,16,16,16,15,
+ 6, 5, 7, 6, 7, 6, 7, 7, 7, 7, 7, 8, 8, 9, 8, 9,
+ 8,10, 8,11, 8,12, 8,12, 8,10, 8,10, 9,11, 9,10,
+ 9,10, 9,11,11,14,14,13,14,16,16,15,15,15,15,15,
};
static static_codebook _huff_book_line_128x19_0sub0 = {
1.3.2.4 +1 -1 vorbis/lib/books/line_128x19_2sub2.vqh
Index: line_128x19_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_2sub2.vqh,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- line_128x19_2sub2.vqh 2001/10/16 20:10:13 1.3.2.3
+++ line_128x19_2sub2.vqh 2001/10/22 01:36:42 1.3.2.4
@@ -21,7 +21,7 @@
static long _huff_lengthlist_line_128x19_2sub2[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2, 5, 3, 6, 4,
- 7, 4, 8, 5, 9, 6,10, 6,10,
+ 7, 4, 8, 5,10, 6, 9, 6,10,
};
static static_codebook _huff_book_line_128x19_2sub2 = {
1.3.2.4 +3 -3 vorbis/lib/books/line_128x19_2sub3.vqh
Index: line_128x19_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_2sub3.vqh,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- line_128x19_2sub3.vqh 2001/10/16 20:10:13 1.3.2.3
+++ line_128x19_2sub3.vqh 2001/10/22 01:36:42 1.3.2.4
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_128x19_2sub3[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 3, 8, 3, 7, 4,
- 7, 6, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 6, 2, 7, 3, 6, 4,
+ 6, 6, 7, 7, 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,
};
static static_codebook _huff_book_line_128x19_2sub3 = {
1.3.2.4 +4 -4 vorbis/lib/books/line_128x19_class1.vqh
Index: line_128x19_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_class1.vqh,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- line_128x19_class1.vqh 2001/10/16 20:10:14 1.3.2.3
+++ line_128x19_class1.vqh 2001/10/22 01:36:42 1.3.2.4
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_class1[] = {
- 3, 3, 4,11, 6, 4, 5,11, 8, 5, 6,12,14,13,14,15,
- 5, 3, 4, 9, 7, 5, 6,11, 8, 5, 7,12,14,14,14,15,
- 7, 4, 5,11, 8, 5, 6,10, 9, 6, 6,11,14,12,13,15,
- 13,11,10,13,11, 8, 8,13,11, 8, 8,15,15,15,15,15,
+ 3, 3, 4,11, 6, 4, 5,12, 7, 5, 6,12,14,13,13,15,
+ 5, 3, 4,10, 7, 5, 6,12, 8, 5, 7,12,14,14,14,15,
+ 7, 4, 5,11, 8, 5, 6,11, 9, 6, 6,11,14,12,13,15,
+ 14,11,10,13,11, 8, 8,13,11, 8, 9,15,15,15,15,15,
};
static static_codebook _huff_book_line_128x19_class1 = {
1.3.2.4 +4 -4 vorbis/lib/books/line_128x19_class2.vqh
Index: line_128x19_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_class2.vqh,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- line_128x19_class2.vqh 2001/10/16 20:10:14 1.3.2.3
+++ line_128x19_class2.vqh 2001/10/22 01:36:42 1.3.2.4
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_class2[] = {
- 1, 3, 4,13, 6, 4, 5,15, 9, 6, 8,14,15,15,15,15,
- 7, 4, 6,13, 7, 5, 6,13,10, 7, 9,15,15,15,15,15,
- 10, 7, 7,10,12, 8, 8,11,13,11,11,13,15,15,15,15,
- 15,15,10,12,15,14,12,13,15,15,13,15,15,15,15,15,
+ 1, 3, 4,14, 6, 4, 5,15, 9, 6, 8,14,15,15,15,15,
+ 7, 4, 6,13, 7, 5, 6,14,10, 7, 9,15,15,15,15,15,
+ 11, 7, 7,10,11, 8, 8,11,14,11,10,13,15,15,15,15,
+ 15,15,10,12,15,14,12,14,15,15,13,15,15,15,15,15,
};
static static_codebook _huff_book_line_128x19_class2 = {
1.3.2.5 +7 -7 vorbis/lib/books/res_44c_A_1024aux.vqh
Index: res_44c_A_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_44c_A_1024aux.vqh,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- res_44c_A_1024aux.vqh 2001/10/20 01:04:01 1.3.2.4
+++ res_44c_A_1024aux.vqh 2001/10/22 01:36:42 1.3.2.5
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_A_1024aux[] = {
- 3, 6,18,18,17,17,17,17,11,17, 5, 5,17,17,17,17,
- 17,17, 9,17,17,17, 3,17, 5,17, 7,10,13,17,17,17,
- 17, 1,17, 7, 9,11,15,17,17,17, 5,17, 6,17, 8,10,
- 17,17,17,17,17, 6,17, 8, 9,14,17,17,17,17, 8, 9,
- 8, 9, 8,11,16,17,17,17,10,12,11,15,10,12,15,17,
- 9, 6,14,15,16,17,16,14, 7,17,13,12,17,17,17,17,
- 17,17,12,17,
+ 2, 9,12,10, 6,12,11,10,10,17, 9, 3, 6,17,17,17,
+ 17,17,11,17,12, 5, 5,17,17,17,17,17, 8,17,10,17,
+ 17, 3,17, 5,17, 7, 9,17, 5,17,17,17, 3,17, 6, 8,
+ 10,17,11,17,17, 5,17, 5,16, 7, 9,16,10,16,16,16,
+ 6,16, 7, 8,13,16,11,16,16, 7, 8, 7, 8, 7, 9,16,
+ 9,10, 6,10,12,10,13, 9, 6,16,12,15,11,16,16,16,
+ 16,16,11,16,
};
static static_codebook _huff_book_res_44c_A_1024aux = {
1.3.2.6 +6 -6 vorbis/lib/books/res_44c_A_128aux.vqh
Index: res_44c_A_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_44c_A_128aux.vqh,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- res_44c_A_128aux.vqh 2001/10/20 01:04:01 1.3.2.5
+++ res_44c_A_128aux.vqh 2001/10/22 01:36:42 1.3.2.6
@@ -20,12 +20,12 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_A_128aux[] = {
- 15,15, 4,15, 5,15, 8,12,15,15, 7,12,11,15,12,15,
- 12,15,15,15,15,15, 3,15, 6,15, 9,13,15,15,15,15,
- 15, 1,15, 7, 8,12,15,15,15,15, 4,15, 7,15,10,13,
- 15,15,15,15,15, 7,15,10,13,15,15,15,15,15, 7, 9,
- 9,13,11,15,15,15,15,15,12,13,12,14,13,15,15,15,
- 3, 9,15,15,15,15,15,15,15,15, 6,11,15,15,15,15,
+ 4,15,15,14, 6,14,10,11,15,15,15,14,15, 4,15, 4,
+ 15, 6,10,15,15, 7,12,12,15,10,15,11,14,15,11,15,
+ 15, 3,15, 5,15, 9,14,15, 4,15,15,15, 2,15, 6, 7,
+ 12,15,12,15,15, 4,15, 6,15, 9,13,15, 9,15,15,15,
+ 6,15, 9,13,15,15,11,15,15, 6,10, 7,13,10,14,15,
+ 14, 3, 8,11,14,11,15,13,15,15,15, 6,11,15,15,15,
15,15,15,15,
};
1.1.2.2 +10 -42 vorbis/lib/books/Attic/res_Ac_0.vqh
Index: res_Ac_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_0.vqh 2001/10/20 01:04:01 1.1.2.1
+++ res_Ac_0.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -19,69 +19,37 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_0[] = {
- 8,
- 7,
- 9,
- 6,
- 10,
- 5,
- 11,
- 4,
- 12,
- 3,
- 13,
2,
- 14,
1,
- 15,
+ 3,
0,
- 16,
+ 4,
};
static long _vq_lengthlist_res_Ac_0[] = {
- 1, 4, 4, 8, 8,10,10,11,11, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 4, 4, 7, 7,10,10,11,11, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 4, 4, 7, 7,10,10,11,11, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 7, 7, 8, 8,10,10,11,11, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 7, 7, 8, 7,10,10,12,11, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,10,10,11,11, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,10,10,12,12, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11,12,12,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11,12,
- 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,
- 12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
- 12,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 14,14,14,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,14,14,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 0,
- 0,
+ 1, 3, 2, 0, 0, 0, 5, 5, 0, 0, 0, 5, 6, 0, 0, 0,
+ 8, 8, 0, 0, 0, 8, 8, 0, 0,
};
static float _vq_quantthresh_res_Ac_0[] = {
- -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5,
- 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
+ -0.5, -0.16667, 0.16667, 0.5,
};
static long _vq_quantmap_res_Ac_0[] = {
- 15, 13, 11, 9, 7, 5, 3, 1,
- 0, 2, 4, 6, 8, 10, 12, 14,
- 16,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_0 = {
_vq_quantthresh_res_Ac_0,
_vq_quantmap_res_Ac_0,
- 17,
- 17
+ 5,
+ 5
};
static static_codebook _vq_book_res_Ac_0 = {
- 2, 289,
+ 2, 25,
_vq_lengthlist_res_Ac_0,
- 1, -529530880, 1611661312, 5, 0,
+ 1, -537569962, 1607816532, 3, 0,
_vq_quantlist_res_Ac_0,
NULL,
&_vq_auxt_res_Ac_0,
1.1.2.5 +4 -4 vorbis/lib/books/Attic/res_Ac_0a.vqh
Index: res_Ac_0a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_0a.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- res_Ac_0a.vqh 2001/10/20 01:04:01 1.1.2.4
+++ res_Ac_0a.vqh 2001/10/22 01:36:42 1.1.2.5
@@ -27,12 +27,12 @@
};
static long _vq_lengthlist_res_Ac_0a[] = {
- 2, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
- 5, 5, 0, 0, 0, 5, 5, 0, 0,
+ 1, 2, 3, 0, 0, 7, 6, 6, 0, 0, 7, 5, 5, 0, 0, 0,
+ 8, 8, 0, 0, 0, 8, 8, 0, 0,
};
static float _vq_quantthresh_res_Ac_0a[] = {
- -0.5, -0.16667, 0.16667, 0.5,
+ -0.16667, -0.055555, 0.055555, 0.16667,
};
static long _vq_quantmap_res_Ac_0a[] = {
@@ -49,7 +49,7 @@
static static_codebook _vq_book_res_Ac_0a = {
2, 25,
_vq_lengthlist_res_Ac_0a,
- 1, -537569962, 1607816532, 3, 0,
+ 1, -541298235, 1604088261, 3, 0,
_vq_quantlist_res_Ac_0a,
NULL,
&_vq_auxt_res_Ac_0a,
1.3.2.5 +40 -17 vorbis/lib/books/res_Ac_1.vqh
Index: res_Ac_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_1.vqh,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- res_Ac_1.vqh 2001/10/20 01:04:01 1.3.2.4
+++ res_Ac_1.vqh 2001/10/22 01:36:42 1.3.2.5
@@ -19,46 +19,69 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_1[] = {
+ 8,
+ 7,
+ 9,
+ 6,
+ 10,
+ 5,
+ 11,
4,
+ 12,
3,
- 5,
+ 13,
2,
- 6,
+ 14,
1,
- 7,
+ 15,
0,
- 8,
+ 16,
};
static long _vq_lengthlist_res_Ac_1[] = {
- 1, 3, 3, 7, 7,17,17,17,17, 5, 5, 5, 7, 8,17,17,
- 17,17, 5, 5, 5, 8, 8,17,17,17,17,17, 8, 8, 9, 9,
- 17,17,17,17,17, 8, 8, 9,10,17,17,17,17,17,13,13,
- 10,10,17,17,17,17,17,12,13,11,10,17,17,17,17,17,
- 17,17,13,13,17,17,17,17,17,17,17,13,13,17,17,16,
- 16,
+ 2, 4, 4, 7, 7, 9, 9,11,11, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 4, 3, 7, 7, 9, 9,11,11, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 3, 3, 7, 7, 9, 9,11,11, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 6, 7, 7, 7, 9, 9,11,11, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 6, 6, 7, 7, 9, 9,11,11, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8,10,10,11,11, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8,10,10,11,11, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,10,12,11,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,11,12,
+ 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,
+ 12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
+ 12,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 14,13,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,13,14,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res_Ac_1[] = {
- -31.5, -22.5, -13.5, -4.5, 4.5, 13.5, 22.5, 31.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,
};
static long _vq_quantmap_res_Ac_1[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
+ 15, 13, 11, 9, 7, 5, 3, 1,
+ 0, 2, 4, 6, 8, 10, 12, 14,
+ 16,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_1 = {
_vq_quantthresh_res_Ac_1,
_vq_quantmap_res_Ac_1,
- 9,
- 9
+ 17,
+ 17
};
static static_codebook _vq_book_res_Ac_1 = {
- 2, 81,
+ 2, 289,
_vq_lengthlist_res_Ac_1,
- 1, -525205504, 1618083840, 4, 0,
+ 1, -529530880, 1611661312, 5, 0,
_vq_quantlist_res_Ac_1,
NULL,
&_vq_auxt_res_Ac_1,
1.1.2.2 +10 -19 vorbis/lib/books/Attic/res_Ac_1a.vqh
Index: res_Ac_1a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_1a.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_1a.vqh 2001/10/20 01:04:01 1.1.2.1
+++ res_Ac_1a.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -19,46 +19,37 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_1a[] = {
- 4,
- 3,
- 5,
2,
- 6,
1,
- 7,
+ 3,
0,
- 8,
+ 4,
};
static long _vq_lengthlist_res_Ac_1a[] = {
- 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 4, 4, 6, 6, 7, 7,
- 8, 8, 9, 4, 4, 6, 6, 7, 7, 8, 8, 9, 7, 7, 7, 7,
- 8, 8, 8, 8, 9, 7, 7, 7, 7, 8, 8, 8, 8,10,10, 9,
- 7, 8, 8, 8, 8, 8,10,10,10, 8, 7, 8, 8, 8, 8,10,
- 10,10, 9, 9, 8, 8, 8, 8,10,10, 9, 8, 9, 8, 8, 8,
- 8,
+ 3, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
+ 4, 4, 0, 0, 0, 4, 4, 0, 0,
};
static float _vq_quantthresh_res_Ac_1a[] = {
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
+ -0.5, -0.16667, 0.16667, 0.5,
};
static long _vq_quantmap_res_Ac_1a[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_1a = {
_vq_quantthresh_res_Ac_1a,
_vq_quantmap_res_Ac_1a,
- 9,
- 9
+ 5,
+ 5
};
static static_codebook _vq_book_res_Ac_1a = {
- 2, 81,
+ 2, 25,
_vq_lengthlist_res_Ac_1a,
- 1, -531628032, 1611661312, 4, 0,
+ 1, -537569962, 1607816532, 3, 0,
_vq_quantlist_res_Ac_1a,
NULL,
&_vq_auxt_res_Ac_1a,
1.3.2.3 +20 -13 vorbis/lib/books/res_Ac_2.vqh
Index: res_Ac_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_2.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_2.vqh 2001/10/12 00:08:07 1.3.2.2
+++ res_Ac_2.vqh 2001/10/22 01:36:42 1.3.2.3
@@ -19,39 +19,46 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_2[] = {
+ 4,
+ 3,
+ 5,
+ 2,
+ 6,
1,
+ 7,
0,
- 2,
+ 8,
};
static long _vq_lengthlist_res_Ac_2[] = {
- 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, 7, 7,17,17,17,17, 5, 5, 5, 7, 8,17,17,
+ 17,17, 5, 5, 5, 8, 8,17,17,17,17,17, 8, 8, 9, 9,
+ 17,17,17,17,17, 8, 8, 9,10,17,17,17,17,17,13,13,
+ 10,10,17,17,17,17,17,12,13,11,10,17,17,17,17,17,
+ 17,17,13,13,17,17,17,17,17,17,17,13,13,17,17,16,
+ 16,
};
static float _vq_quantthresh_res_Ac_2[] = {
- -0.5, 0.5,
+ -31.5, -22.5, -13.5, -4.5, 4.5, 13.5, 22.5, 31.5,
};
static long _vq_quantmap_res_Ac_2[] = {
- 1, 0, 2,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_2 = {
_vq_quantthresh_res_Ac_2,
_vq_quantmap_res_Ac_2,
- 3,
- 3
+ 9,
+ 9
};
static static_codebook _vq_book_res_Ac_2 = {
- 4, 81,
+ 2, 81,
_vq_lengthlist_res_Ac_2,
- 1, -535822336, 1611661312, 2, 0,
+ 1, -525205504, 1618083840, 4, 0,
_vq_quantlist_res_Ac_2,
NULL,
&_vq_auxt_res_Ac_2,
1.1.2.5 +19 -48 vorbis/lib/books/Attic/res_Ac_2a.vqh
Index: res_Ac_2a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_2a.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- res_Ac_2a.vqh 2001/10/20 01:04:01 1.1.2.4
+++ res_Ac_2a.vqh 2001/10/22 01:36:42 1.1.2.5
@@ -19,75 +19,46 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_2a[] = {
+ 4,
+ 3,
+ 5,
2,
+ 6,
1,
- 3,
+ 7,
0,
- 4,
+ 8,
};
static long _vq_lengthlist_res_Ac_2a[] = {
- 1, 0, 0, 0, 0, 4, 6, 6, 0, 0, 4, 6, 6, 0, 0, 7,
- 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0,
- 0, 0, 7, 9, 9, 0, 0, 7, 8, 8, 0, 0, 9, 0, 0, 0,
- 0, 9, 0, 0, 0, 0, 6, 0, 0, 0, 0, 8,10, 9, 0, 0,
- 9,10,10, 0, 0,11, 0, 0, 0, 0,11, 0, 0, 0, 0, 6,
- 0, 0, 0, 0, 9,10,10, 0, 0, 8,10,10, 0, 0,11, 0,
- 0, 0, 0,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 7,
- 9, 9, 0, 0, 7, 8, 8, 0, 0, 9, 0, 0, 0, 0, 9, 0,
- 0, 0, 0, 6, 0, 0, 0, 0, 8,10,10, 0, 0, 9,10, 9,
- 0, 0,11, 0, 0, 0, 0,11, 0, 0, 0, 0, 6, 0, 0, 0,
- 0, 8,10,10, 0, 0, 8, 9,10, 0, 0,11, 0, 0, 0, 0,
- 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 9,11,11, 0,
- 0, 9,11,11, 0, 0,11, 0, 0, 0, 0,10, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 7, 0, 0, 0, 0, 9,11,11, 0, 0, 9,11,
- 11, 0, 0,10, 0, 0, 0, 0,11, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
+ 2, 4, 4, 6, 6, 7, 7, 7, 8, 9, 4, 4, 6, 6, 7, 7,
+ 8, 8, 9, 4, 4, 6, 6, 7, 7, 8, 8, 9, 7, 7, 7, 7,
+ 8, 8, 8, 8, 9, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10,
+ 7, 8, 8, 8, 8, 8,10,10,10, 8, 7, 8, 8, 8, 8,10,
+ 10,10, 9, 9, 8, 8, 8, 8,10,10,10, 9, 9, 8, 8, 8,
+ 8,
};
static float _vq_quantthresh_res_Ac_2a[] = {
- -1.5, -0.5, 0.5, 1.5,
+ -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
};
static long _vq_quantmap_res_Ac_2a[] = {
- 3, 1, 0, 2, 4,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_2a = {
_vq_quantthresh_res_Ac_2a,
_vq_quantmap_res_Ac_2a,
- 5,
- 5
+ 9,
+ 9
};
static static_codebook _vq_book_res_Ac_2a = {
- 4, 625,
+ 2, 81,
_vq_lengthlist_res_Ac_2a,
- 1, -533725184, 1611661312, 3, 0,
+ 1, -531628032, 1611661312, 4, 0,
_vq_quantlist_res_Ac_2a,
NULL,
&_vq_auxt_res_Ac_2a,
1.1.2.2 +2 -2 vorbis/lib/books/Attic/res_Ac_2b.vqh
Index: res_Ac_2b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_2b.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_2b.vqh 2001/10/20 01:04:01 1.1.2.1
+++ res_Ac_2b.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -27,8 +27,8 @@
};
static long _vq_lengthlist_res_Ac_2b[] = {
- 2, 3, 3, 0, 0, 5, 4, 4, 0, 0, 5, 4, 4, 0, 0, 0,
- 5, 4, 0, 0, 0, 5, 4, 0, 0,
+ 3, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
+ 4, 4, 0, 0, 0, 4, 4, 0, 0,
};
static float _vq_quantthresh_res_Ac_2b[] = {
1.1.2.2 +1 -1 vorbis/lib/books/Attic/res_Ac_2c.vqh
Index: res_Ac_2c.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_2c.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_2c.vqh 2001/10/20 01:04:01 1.1.2.1
+++ res_Ac_2c.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -27,7 +27,7 @@
};
static long _vq_lengthlist_res_Ac_2c[] = {
- 2, 4, 4, 0, 0, 4, 4, 3, 0, 0, 4, 4, 3, 0, 0, 0,
+ 2, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
5, 5, 0, 0, 0, 5, 5, 0, 0,
};
1.3.2.4 +2 -2 vorbis/lib/books/res_Ac_3.vqh
Index: res_Ac_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_3.vqh,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_3.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_3.vqh 2001/10/22 01:36:42 1.3.2.4
@@ -25,8 +25,8 @@
};
static long _vq_lengthlist_res_Ac_3[] = {
- 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 0,
- 0, 0, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 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,
1.1.2.2 +49 -8 vorbis/lib/books/Attic/res_Ac_3a.vqh
Index: res_Ac_3a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_3a.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_3a.vqh 2001/10/20 01:04:01 1.1.2.1
+++ res_Ac_3a.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -19,34 +19,75 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_3a[] = {
+ 2,
1,
+ 3,
0,
- 2,
+ 4,
};
static long _vq_lengthlist_res_Ac_3a[] = {
- 1, 2, 2, 0, 0, 0, 0, 0, 0,
+ 1, 0, 0, 0, 0, 4, 6, 6, 0, 0, 4, 6, 6, 0, 0, 7,
+ 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0,
+ 0, 0, 6, 8, 8, 0, 0, 7, 8, 8, 0, 0, 9, 0, 0, 0,
+ 0, 9, 0, 0, 0, 0, 6, 0, 0, 0, 0, 8,10, 9, 0, 0,
+ 9,10,10, 0, 0,11, 0, 0, 0, 0,11, 0, 0, 0, 0, 6,
+ 0, 0, 0, 0, 8, 9,10, 0, 0, 8,10,10, 0, 0,11, 0,
+ 0, 0, 0,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 7,
+ 8, 8, 0, 0, 6, 8, 8, 0, 0, 9, 0, 0, 0, 0, 9, 0,
+ 0, 0, 0, 6, 0, 0, 0, 0, 8,10,10, 0, 0, 8,10, 9,
+ 0, 0,11, 0, 0, 0, 0,10, 0, 0, 0, 0, 6, 0, 0, 0,
+ 0, 8,10,10, 0, 0, 8, 9, 9, 0, 0,11, 0, 0, 0, 0,
+ 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 9,11,11, 0,
+ 0, 9,11,11, 0, 0,10, 0, 0, 0, 0,10, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7, 0, 0, 0, 0, 9,11,11, 0, 0, 9,10,
+ 11, 0, 0,10, 0, 0, 0, 0,10, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res_Ac_3a[] = {
- -0.16667, 0.16667,
+ -1.5, -0.5, 0.5, 1.5,
};
static long _vq_quantmap_res_Ac_3a[] = {
- 1, 0, 2,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_3a = {
_vq_quantthresh_res_Ac_3a,
_vq_quantmap_res_Ac_3a,
- 3,
- 3
+ 5,
+ 5
};
static static_codebook _vq_book_res_Ac_3a = {
- 2, 9,
+ 4, 625,
_vq_lengthlist_res_Ac_3a,
- 1, -539667116, 1607816532, 2, 0,
+ 1, -533725184, 1611661312, 3, 0,
_vq_quantlist_res_Ac_3a,
NULL,
&_vq_auxt_res_Ac_3a,
1.1.2.2 +11 -8 vorbis/lib/books/Attic/res_Ac_3b.vqh
Index: res_Ac_3b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_3b.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_3b.vqh 2001/10/20 01:04:01 1.1.2.1
+++ res_Ac_3b.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -19,34 +19,37 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_3b[] = {
+ 2,
1,
+ 3,
0,
- 2,
+ 4,
};
static long _vq_lengthlist_res_Ac_3b[] = {
- 1, 2, 2, 0, 0, 0, 0, 0, 0,
+ 2, 4, 4, 0, 0, 4, 4, 4, 0, 0, 4, 3, 3, 0, 0, 0,
+ 5, 5, 0, 0, 0, 5, 5, 0, 0,
};
static float _vq_quantthresh_res_Ac_3b[] = {
- -0.055555, 0.055555,
+ -0.16667, -0.055555, 0.055555, 0.16667,
};
static long _vq_quantmap_res_Ac_3b[] = {
- 1, 0, 2,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_3b = {
_vq_quantthresh_res_Ac_3b,
_vq_quantmap_res_Ac_3b,
- 3,
- 3
+ 5,
+ 5
};
static static_codebook _vq_book_res_Ac_3b = {
- 2, 9,
+ 2, 25,
_vq_lengthlist_res_Ac_3b,
- 1, -543395387, 1604088261, 2, 0,
+ 1, -541298235, 1604088261, 3, 0,
_vq_quantlist_res_Ac_3b,
NULL,
&_vq_auxt_res_Ac_3b,
1.3.2.5 +9 -45 vorbis/lib/books/res_Ac_4.vqh
Index: res_Ac_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_4.vqh,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- res_Ac_4.vqh 2001/10/20 01:04:02 1.3.2.4
+++ res_Ac_4.vqh 2001/10/22 01:36:42 1.3.2.5
@@ -19,75 +19,39 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_4[] = {
- 2,
1,
- 3,
0,
- 4,
+ 2,
};
static long _vq_lengthlist_res_Ac_4[] = {
- 2, 3, 3, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 4, 8, 8, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 3, 4, 5, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 7,10,10,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 8, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 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, 6, 6, 0, 0, 0, 0,
+ 0, 0, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
};
static float _vq_quantthresh_res_Ac_4[] = {
- -1.5, -0.5, 0.5, 1.5,
+ -0.5, 0.5,
};
static long _vq_quantmap_res_Ac_4[] = {
- 3, 1, 0, 2, 4,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_4 = {
_vq_quantthresh_res_Ac_4,
_vq_quantmap_res_Ac_4,
- 5,
- 5
+ 3,
+ 3
};
static static_codebook _vq_book_res_Ac_4 = {
- 4, 625,
+ 4, 81,
_vq_lengthlist_res_Ac_4,
- 1, -533725184, 1611661312, 3, 0,
+ 1, -535822336, 1611661312, 2, 0,
_vq_quantlist_res_Ac_4,
NULL,
&_vq_auxt_res_Ac_4,
1.1.2.2 +8 -20 vorbis/lib/books/Attic/res_Ac_4a.vqh
Index: res_Ac_4a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_4a.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_4a.vqh 2001/10/20 01:04:02 1.1.2.1
+++ res_Ac_4a.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -19,46 +19,34 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_4a[] = {
- 4,
- 3,
- 5,
- 2,
- 6,
1,
- 7,
0,
- 8,
+ 2,
};
static long _vq_lengthlist_res_Ac_4a[] = {
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 5, 0, 0, 0, 0,
- 0, 0, 3, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0,
- 0, 0, 0, 0, 5, 7, 7,11,11, 0, 0, 0, 0, 8, 8, 8,
- 0, 0, 0, 0, 0, 0, 8, 7, 8, 0, 0, 0, 0, 0, 0,10,
- 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0,
- 0,
+ 2, 1, 2, 0, 0, 0, 0, 0, 0,
};
static float _vq_quantthresh_res_Ac_4a[] = {
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
+ -0.16667, 0.16667,
};
static long _vq_quantmap_res_Ac_4a[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_4a = {
_vq_quantthresh_res_Ac_4a,
_vq_quantmap_res_Ac_4a,
- 9,
- 9
+ 3,
+ 3
};
static static_codebook _vq_book_res_Ac_4a = {
- 2, 81,
+ 2, 9,
_vq_lengthlist_res_Ac_4a,
- 1, -531628032, 1611661312, 4, 0,
+ 1, -539667116, 1607816532, 2, 0,
_vq_quantlist_res_Ac_4a,
NULL,
&_vq_auxt_res_Ac_4a,
1.1.2.2 +8 -11 vorbis/lib/books/Attic/res_Ac_4b.vqh
Index: res_Ac_4b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_4b.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_4b.vqh 2001/10/20 01:04:02 1.1.2.1
+++ res_Ac_4b.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -19,37 +19,34 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_4b[] = {
- 2,
1,
- 3,
0,
- 4,
+ 2,
};
static long _vq_lengthlist_res_Ac_4b[] = {
- 3, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
- 4, 4, 0, 0, 0, 4, 4, 0, 0,
+ 1, 2, 2, 0, 0, 0, 0, 0, 0,
};
static float _vq_quantthresh_res_Ac_4b[] = {
- -0.5, -0.16667, 0.16667, 0.5,
+ -0.055555, 0.055555,
};
static long _vq_quantmap_res_Ac_4b[] = {
- 3, 1, 0, 2, 4,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_4b = {
_vq_quantthresh_res_Ac_4b,
_vq_quantmap_res_Ac_4b,
- 5,
- 5
+ 3,
+ 3
};
static static_codebook _vq_book_res_Ac_4b = {
- 2, 25,
+ 2, 9,
_vq_lengthlist_res_Ac_4b,
- 1, -537569962, 1607816532, 3, 0,
+ 1, -543395387, 1604088261, 2, 0,
_vq_quantlist_res_Ac_4b,
NULL,
&_vq_auxt_res_Ac_4b,
1.3.2.5 +3 -3 vorbis/lib/books/res_Ac_5.vqh
Index: res_Ac_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_5.vqh,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- res_Ac_5.vqh 2001/10/20 01:04:02 1.3.2.4
+++ res_Ac_5.vqh 2001/10/22 01:36:42 1.3.2.5
@@ -27,10 +27,10 @@
};
static long _vq_lengthlist_res_Ac_5[] = {
- 1, 4, 4, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 4, 8, 8, 0, 0,
+ 2, 3, 3, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 8, 8, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 4, 4, 5, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 3, 4, 4, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 7,11,10,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 8, 7, 8, 9,11, 0, 0, 0, 0, 0, 0, 0,
1.1.2.5 +20 -8 vorbis/lib/books/Attic/res_Ac_5a.vqh
Index: res_Ac_5a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_5a.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- res_Ac_5a.vqh 2001/10/20 01:04:02 1.1.2.4
+++ res_Ac_5a.vqh 2001/10/22 01:36:42 1.1.2.5
@@ -19,34 +19,46 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_5a[] = {
+ 4,
+ 3,
+ 5,
+ 2,
+ 6,
1,
+ 7,
0,
- 2,
+ 8,
};
static long _vq_lengthlist_res_Ac_5a[] = {
- 2, 1, 2, 0, 0, 0, 0, 0, 0,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 5, 0, 0, 0, 0,
+ 0, 0, 3, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0,
+ 0, 0, 0, 0, 5, 7, 7,11,11, 0, 0, 0, 0, 8, 8, 8,
+ 0, 0, 0, 0, 0, 0, 8, 7, 8, 0, 0, 0, 0, 0, 0,10,
+ 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res_Ac_5a[] = {
- -0.16667, 0.16667,
+ -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
};
static long _vq_quantmap_res_Ac_5a[] = {
- 1, 0, 2,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_5a = {
_vq_quantthresh_res_Ac_5a,
_vq_quantmap_res_Ac_5a,
- 3,
- 3
+ 9,
+ 9
};
static static_codebook _vq_book_res_Ac_5a = {
- 2, 9,
+ 2, 81,
_vq_lengthlist_res_Ac_5a,
- 1, -539667116, 1607816532, 2, 0,
+ 1, -531628032, 1611661312, 4, 0,
_vq_quantlist_res_Ac_5a,
NULL,
&_vq_auxt_res_Ac_5a,
1.1.2.2 +11 -8 vorbis/lib/books/Attic/res_Ac_5b.vqh
Index: res_Ac_5b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_5b.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_5b.vqh 2001/10/20 01:04:02 1.1.2.1
+++ res_Ac_5b.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -19,34 +19,37 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_5b[] = {
+ 2,
1,
+ 3,
0,
- 2,
+ 4,
};
static long _vq_lengthlist_res_Ac_5b[] = {
- 1, 2, 2, 0, 0, 0, 0, 0, 0,
+ 2, 4, 4, 0, 0, 4, 4, 4, 0, 0, 4, 3, 3, 0, 0, 0,
+ 5, 5, 0, 0, 0, 5, 5, 0, 0,
};
static float _vq_quantthresh_res_Ac_5b[] = {
- -0.055555, 0.055555,
+ -0.16667, -0.055555, 0.055555, 0.16667,
};
static long _vq_quantmap_res_Ac_5b[] = {
- 1, 0, 2,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_5b = {
_vq_quantthresh_res_Ac_5b,
_vq_quantmap_res_Ac_5b,
- 3,
- 3
+ 5,
+ 5
};
static static_codebook _vq_book_res_Ac_5b = {
- 2, 9,
+ 2, 25,
_vq_lengthlist_res_Ac_5b,
- 1, -543395387, 1604088261, 2, 0,
+ 1, -541298235, 1604088261, 3, 0,
_vq_quantlist_res_Ac_5b,
NULL,
&_vq_auxt_res_Ac_5b,
1.3.2.5 +43 -14 vorbis/lib/books/res_Ac_6.vqh
Index: res_Ac_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_6.vqh,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- res_Ac_6.vqh 2001/10/20 01:04:02 1.3.2.4
+++ res_Ac_6.vqh 2001/10/22 01:36:42 1.3.2.5
@@ -19,46 +19,75 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_6[] = {
- 4,
- 3,
- 5,
2,
- 6,
1,
- 7,
+ 3,
0,
- 8,
+ 4,
};
static long _vq_lengthlist_res_Ac_6[] = {
- 1, 2, 3, 5, 4, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+ 2, 3, 3, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 4, 8, 8, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 3, 4, 5, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 7,11,10,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7, 8, 8, 9,11, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
};
static float _vq_quantthresh_res_Ac_6[] = {
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
+ -1.5, -0.5, 0.5, 1.5,
};
static long _vq_quantmap_res_Ac_6[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_6 = {
_vq_quantthresh_res_Ac_6,
_vq_quantmap_res_Ac_6,
- 9,
- 9
+ 5,
+ 5
};
static static_codebook _vq_book_res_Ac_6 = {
- 2, 81,
+ 4, 625,
_vq_lengthlist_res_Ac_6,
- 1, -531628032, 1611661312, 4, 0,
+ 1, -533725184, 1611661312, 3, 0,
_vq_quantlist_res_Ac_6,
NULL,
&_vq_auxt_res_Ac_6,
1.1.2.2 +8 -43 vorbis/lib/books/Attic/res_Ac_6a.vqh
Index: res_Ac_6a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_6a.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_6a.vqh 2001/10/20 01:04:02 1.1.2.1
+++ res_Ac_6a.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -19,69 +19,34 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_6a[] = {
- 8,
- 7,
- 9,
- 6,
- 10,
- 5,
- 11,
- 4,
- 12,
- 3,
- 13,
- 2,
- 14,
1,
- 15,
0,
- 16,
+ 2,
};
static long _vq_lengthlist_res_Ac_6a[] = {
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 3, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5, 7, 7,13,14, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 5, 7, 6,12,12, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 7, 7, 7,11,11, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 8, 7, 7,10,11, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 8, 9, 8,12,12, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9,12,11,16, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9,14,13, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9,12,13, 0,
- 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,11,11, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,11,11,15,
- 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,
- 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
+ 2, 1, 2, 0, 0, 0, 0, 0, 0,
};
static float _vq_quantthresh_res_Ac_6a[] = {
- -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5,
- 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
+ -0.16667, 0.16667,
};
static long _vq_quantmap_res_Ac_6a[] = {
- 15, 13, 11, 9, 7, 5, 3, 1,
- 0, 2, 4, 6, 8, 10, 12, 14,
- 16,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_6a = {
_vq_quantthresh_res_Ac_6a,
_vq_quantmap_res_Ac_6a,
- 17,
- 17
+ 3,
+ 3
};
static static_codebook _vq_book_res_Ac_6a = {
- 2, 289,
+ 2, 9,
_vq_lengthlist_res_Ac_6a,
- 1, -529530880, 1611661312, 5, 0,
+ 1, -539667116, 1607816532, 2, 0,
_vq_quantlist_res_Ac_6a,
NULL,
&_vq_auxt_res_Ac_6a,
1.1.2.2 +8 -20 vorbis/lib/books/Attic/res_Ac_6b.vqh
Index: res_Ac_6b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_6b.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_6b.vqh 2001/10/20 01:04:02 1.1.2.1
+++ res_Ac_6b.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -19,46 +19,34 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_6b[] = {
- 4,
- 3,
- 5,
- 2,
- 6,
1,
- 7,
0,
- 8,
+ 2,
};
static long _vq_lengthlist_res_Ac_6b[] = {
- 1,14,14,14,14,14,14,14,14, 3, 5, 5,14,14,14,14,
- 14,14, 3, 5, 5,14,14,14,14,14,14, 5, 7, 8, 6, 6,
- 14,14,14,14, 8, 8, 8,14,14,14,14,14,14, 8, 9, 8,
- 14,14,14,14,14,14, 7, 8, 8,14,14,14,14,14,14, 8,
- 14,14,14,14,14,14, 8, 9,14,14,13,13,13,13,13,13,
- 13,
+ 1, 2, 2, 0, 0, 0, 0, 0, 0,
};
static float _vq_quantthresh_res_Ac_6b[] = {
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
+ -0.055555, 0.055555,
};
static long _vq_quantmap_res_Ac_6b[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_6b = {
_vq_quantthresh_res_Ac_6b,
_vq_quantmap_res_Ac_6b,
- 9,
- 9
+ 3,
+ 3
};
static static_codebook _vq_book_res_Ac_6b = {
- 2, 81,
+ 2, 9,
_vq_lengthlist_res_Ac_6b,
- 1, -531628032, 1611661312, 4, 0,
+ 1, -543395387, 1604088261, 2, 0,
_vq_quantlist_res_Ac_6b,
NULL,
&_vq_auxt_res_Ac_6b,
1.3.2.5 +8 -8 vorbis/lib/books/res_Ac_7.vqh
Index: res_Ac_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_7.vqh,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- res_Ac_7.vqh 2001/10/20 01:04:02 1.3.2.4
+++ res_Ac_7.vqh 2001/10/22 01:36:42 1.3.2.5
@@ -31,16 +31,16 @@
};
static long _vq_lengthlist_res_Ac_7[] = {
- 1, 2, 3, 7, 7,12,12,12,12,12, 6, 6,10,10,12,12,
- 12,12,12, 6, 5,12,10,12,12,12,12,12,11,12,12,12,
- 12,12,12,12,12,11,10,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,
+ 1, 2, 3, 4, 5, 7, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res_Ac_7[] = {
- -31.5, -22.5, -13.5, -4.5, 4.5, 13.5, 22.5, 31.5,
+ -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
};
static long _vq_quantmap_res_Ac_7[] = {
@@ -58,7 +58,7 @@
static static_codebook _vq_book_res_Ac_7 = {
2, 81,
_vq_lengthlist_res_Ac_7,
- 1, -525205504, 1618083840, 4, 0,
+ 1, -531628032, 1611661312, 4, 0,
_vq_quantlist_res_Ac_7,
NULL,
&_vq_auxt_res_Ac_7,
1.3.2.5 +40 -17 vorbis/lib/books/res_Ac_7a.vqh
Index: res_Ac_7a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_7a.vqh,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- res_Ac_7a.vqh 2001/10/20 01:04:02 1.3.2.4
+++ res_Ac_7a.vqh 2001/10/22 01:36:42 1.3.2.5
@@ -19,46 +19,69 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_7a[] = {
+ 8,
+ 7,
+ 9,
+ 6,
+ 10,
+ 5,
+ 11,
4,
+ 12,
3,
- 5,
+ 13,
2,
- 6,
+ 14,
1,
- 7,
+ 15,
0,
- 8,
+ 16,
};
static long _vq_lengthlist_res_Ac_7a[] = {
- 1, 3, 3, 4, 5, 6, 6, 6, 6,10,10,11,10,10, 9, 9,
- 8, 8,10,10,10,10,10,10,10, 8, 8,10,11,11,10,11,
- 9,10, 8, 8,10,11,11,10,11,10,10, 8, 9,12,10,11,
- 11,10,10,10, 9, 8,11,11,11,11,10,10,10, 9, 9,11,
- 11,11,11,12,10,11, 9, 8,10,11,11,11,11,11,10, 9,
- 9,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 3, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 5, 7, 7,12,14, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 5, 6, 7,12,12, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 7, 7, 7,11,11, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 8, 7, 7,10,10,16, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 8, 9, 8,11,12, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9,11,11,15, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9,13,13, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9,13,13, 0,
+ 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,11,12,16,16,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,11,11,15,
+ 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,
+ 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res_Ac_7a[] = {
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.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,
};
static long _vq_quantmap_res_Ac_7a[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
+ 15, 13, 11, 9, 7, 5, 3, 1,
+ 0, 2, 4, 6, 8, 10, 12, 14,
+ 16,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_7a = {
_vq_quantthresh_res_Ac_7a,
_vq_quantmap_res_Ac_7a,
- 9,
- 9
+ 17,
+ 17
};
static static_codebook _vq_book_res_Ac_7a = {
- 2, 81,
+ 2, 289,
_vq_lengthlist_res_Ac_7a,
- 1, -531628032, 1611661312, 4, 0,
+ 1, -529530880, 1611661312, 5, 0,
_vq_quantlist_res_Ac_7a,
NULL,
&_vq_auxt_res_Ac_7a,
1.1.2.3 +10 -29 vorbis/lib/books/Attic/res_Ac_7b.vqh
Index: res_Ac_7b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_7b.vqh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- res_Ac_7b.vqh 2001/10/12 00:08:08 1.1.2.2
+++ res_Ac_7b.vqh 2001/10/22 01:36:42 1.1.2.3
@@ -19,56 +19,37 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_7b[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
2,
- 10,
1,
- 11,
+ 3,
0,
- 12,
+ 4,
};
static long _vq_lengthlist_res_Ac_7b[] = {
- 2, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9, 8, 8,17, 4, 4,
- 7, 7, 8, 8, 9, 9, 9, 9, 8, 8,17, 4, 4, 6, 7, 8,
- 8, 9, 9, 9, 9, 8, 8,17, 6, 6, 7, 7, 8, 8, 9, 9,
- 10,10, 9, 9,17,17,17, 7, 7, 8, 8, 9, 9,10,10, 9,
- 9,17,17,17, 8, 8, 9, 9,10,10, 9,10, 9, 9,17,17,
- 17, 8, 8, 9, 9,10,10,10,10, 9, 9,17,17,17, 8, 8,
- 9, 9,10,10,10,10, 9, 9,17,17,17,17,17, 9, 9,10,
- 10,10,10, 9, 9,16,16,16,16,16, 9, 9,10,10,10,11,
- 9, 9,16,16,16,16,16, 9, 9,10,10,10,10, 9, 9,16,
- 16,16,16,16,10, 9, 9, 9, 9, 9, 7, 7,16,16,16,16,
- 16,16,16, 9, 9, 9, 9, 8, 8,
+ 2, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
+ 5, 5, 0, 0, 0, 5, 5, 0, 0,
};
static float _vq_quantthresh_res_Ac_7b[] = {
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5,
+ -0.5, -0.16667, 0.16667, 0.5,
};
static long _vq_quantmap_res_Ac_7b[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_7b = {
_vq_quantthresh_res_Ac_7b,
_vq_quantmap_res_Ac_7b,
- 13,
- 13
+ 5,
+ 5
};
static static_codebook _vq_book_res_Ac_7b = {
- 2, 169,
+ 2, 25,
_vq_lengthlist_res_Ac_7b,
- 1, -531103744, 1611661312, 4, 0,
+ 1, -537569962, 1607816532, 3, 0,
_vq_quantlist_res_Ac_7b,
NULL,
&_vq_auxt_res_Ac_7b,
1.3.2.5 +4 -4 vorbis/lib/books/res_Ac_8a.vqh
Index: res_Ac_8a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_8a.vqh,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- res_Ac_8a.vqh 2001/10/20 01:04:02 1.3.2.4
+++ res_Ac_8a.vqh 2001/10/22 01:36:42 1.3.2.5
@@ -29,10 +29,10 @@
};
static long _vq_lengthlist_res_Ac_8a[] = {
- 1, 4, 4, 6, 6, 7, 7, 6, 5, 5, 6, 6, 8, 7, 6, 5,
- 5, 7, 7, 8, 8,10, 7, 7, 7, 7, 8, 8,11, 7, 7, 7,
- 7, 8, 8,12,11,11, 8, 8, 9, 9,12,10,10, 8, 8,10,
- 9,
+ 1, 4, 3, 6, 6, 7, 7, 7, 5, 5, 7, 7, 8, 8, 7, 5,
+ 5, 7, 7, 8, 8,11, 8, 8, 8, 8, 8, 8,11, 7, 7, 8,
+ 7, 9, 9,13,11,12, 8, 8, 9,10,13,11,11, 8, 8,10,
+ 10,
};
static float _vq_quantthresh_res_Ac_8a[] = {
1.1.2.2 +6 -6 vorbis/lib/books/Attic/res_Ac_8b.vqh
Index: res_Ac_8b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_8b.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_8b.vqh 2001/10/20 01:04:02 1.1.2.1
+++ res_Ac_8b.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -31,12 +31,12 @@
};
static long _vq_lengthlist_res_Ac_8b[] = {
- 4, 5, 5, 6, 6, 6, 6, 6, 6, 7, 6, 6, 6, 6, 6, 6,
- 6, 6, 7, 6, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 6, 6,
- 6, 7, 6, 7, 7, 7, 7, 6, 6, 6, 7, 6, 6, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 6,
+ 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 6, 6, 6, 6, 7, 7,
+ 7, 7, 7, 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, 8, 8,
+ 7, 7, 7, 7, 7, 7, 8, 7, 8, 7, 7, 7, 7, 7, 7, 7,
+ 8, 8, 7, 7, 7, 7, 7, 7, 7, 8, 8, 7, 7, 7, 7, 7,
+ 7,
};
static float _vq_quantthresh_res_Ac_8b[] = {
1.1.2.2 +10 -49 vorbis/lib/books/Attic/res_Ac_8c.vqh
Index: res_Ac_8c.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_8c.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_Ac_8c.vqh 2001/10/20 01:04:02 1.1.2.1
+++ res_Ac_8c.vqh 2001/10/22 01:36:42 1.1.2.2
@@ -19,76 +19,37 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_8c[] = {
- 9,
- 8,
- 10,
- 7,
- 11,
- 6,
- 12,
- 5,
- 13,
- 4,
- 14,
- 3,
- 15,
2,
- 16,
1,
- 17,
+ 3,
0,
- 18,
+ 4,
};
static long _vq_lengthlist_res_Ac_8c[] = {
- 1,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10, 6, 7, 6,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10, 5, 7, 7,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10, 9, 7, 8,10, 8,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10, 8,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 8, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10, 9, 8,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10, 8, 9, 9,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10, 8,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10, 9,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,
- 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 3, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
+ 4, 4, 0, 0, 0, 4, 4, 0, 0,
};
static float _vq_quantthresh_res_Ac_8c[] = {
- -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5,
- -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5,
- 7.5, 8.5,
+ -0.5, -0.16667, 0.16667, 0.5,
};
static long _vq_quantmap_res_Ac_8c[] = {
- 17, 15, 13, 11, 9, 7, 5, 3,
- 1, 0, 2, 4, 6, 8, 10, 12,
- 14, 16, 18,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_8c = {
_vq_quantthresh_res_Ac_8c,
_vq_quantmap_res_Ac_8c,
- 19,
- 19
+ 5,
+ 5
};
static static_codebook _vq_book_res_Ac_8c = {
- 2, 361,
+ 2, 25,
_vq_lengthlist_res_Ac_8c,
- 1, -529399808, 1611661312, 5, 0,
+ 1, -537569962, 1607816532, 3, 0,
_vq_quantlist_res_Ac_8c,
NULL,
&_vq_auxt_res_Ac_8c,
No revision
No revision
1.1.2.1 +61 -0 vorbis/lib/books/Attic/res_Ac_1b.vqh
1.1.2.1 +61 -0 vorbis/lib/books/Attic/res_Ac_7c.vqh
1.1.2.1 +61 -0 vorbis/lib/books/Attic/res_Ac_8d.vqh
1.1.2.1 +61 -0 vorbis/lib/books/Attic/res_Ac_9c.vqh
1.1.2.1 +61 -0 vorbis/lib/books/Attic/res_Ac_9d.vqh
1.1.2.1 +65 -0 vorbis/lib/books/Attic/temp18987.vqh
1.1.2.1 +107 -0 vorbis/lib/books/Attic/temp24731.vqh
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list