[xiph-cvs] cvs commit: vorbis/vq res_128c.vqs
Monty
xiphmont at xiph.org
Tue Aug 7 21:20:09 PDT 2001
xiphmont 01/08/07 21:20:08
Modified: lib Tag: branch_monty_20010708 psy.c psy.h res0.c
lib/books Tag: branch_monty_20010708 line0_0sub0.vqh
line0_1sub1.vqh line0_1sub2.vqh line0_1sub3.vqh
line0_class1.vqh line1_0sub0.vqh line1_0sub1.vqh
line1_1sub0.vqh line1_1sub1.vqh line1_2sub1.vqh
line1_2sub2.vqh line1_2sub3.vqh line1_3sub2.vqh
line1_3sub3.vqh line1_class0.vqh line1_class1.vqh
line1_class2.vqh line1_class3.vqh
res0_128_1024_1.vqh res0_128_1024_2.vqh
res0_128_1024_3.vqh res0_128_1024_4.vqh
res0_128_1024_5.vqh res0_128_1024_6.vqh
res0_128_1024_7.vqh res0_128_1024_7a.vqh
res0_128_1024_8.vqh res0_128_1024_8a.vqh
res0_128_1024_9.vqh res0_128_1024_9a.vqh
res0_128_1024_9b.vqh res0_128_1024aux.vqh
res0_128_128aux.vqh
lib/modes Tag: branch_monty_20010708 mode_A.h
vq Tag: branch_monty_20010708 res_128c.vqs
Log:
incremental commit; continuing work on 128. Found the missing 12kbps.
Monty
Revision Changes Path
No revision
No revision
1.48.2.8 +5 -20 vorbis/lib/psy.c
Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.48.2.7
retrieving revision 1.48.2.8
diff -u -r1.48.2.7 -r1.48.2.8
--- psy.c 2001/08/07 19:50:00 1.48.2.7
+++ psy.c 2001/08/08 04:19:57 1.48.2.8
@@ -11,7 +11,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.48.2.7 2001/08/07 19:50:00 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.48.2.8 2001/08/08 04:19:57 xiphmont Exp $
********************************************************************/
@@ -1013,15 +1013,6 @@
}
}
-static void couple_Nphase(float A, float B, float Aa, float Ba,
- float *mag, float *ang){
- if(fabs(A)>fabs(B)){
- *mag=A;*ang=(A>0.f?Aa-Ba:Ba-Aa);
- }else{
- *mag=B;*ang=(B>0.f?Aa-Ba:Ba-Aa);
- }
-}
-
static void couple_8phase(float A, float B, float *mag, float *ang){
if(fabs(A)>fabs(B)){
*mag=A; *ang=(A>0?A-B:B-A);
@@ -1101,6 +1092,8 @@
/* perform any requested channel coupling */
for(i=0;i<vi->coupling_steps;i++){
+ float granulem=info->couple_pass[passno].granulem;
+ float igranulem=info->couple_pass[passno].igranulem;
/* make sure coupling a zero and a nonzero channel results in two
nonzero channels. */
@@ -1124,9 +1117,6 @@
/* partition by partition; k is our by-location partition
class counter */
- float granulem=part->granulem;
- float igranulem=part->igranulem;
-
float Am=rint(pcmM[j]*igranulem)*granulem;
float Bm=rint(pcmA[j]*igranulem)*granulem;
float ang,mag,fmag=max(fabs(Am),fabs(Bm));
@@ -1140,16 +1130,11 @@
if(fmag<part->amppost_8phase){
couple_8phase(Am,Bm,&mag,&ang);
}else{
- if(fmag<part->amppost_Nphase){
- float Aa=rint(pcmM[j]*part->igranulea)*part->granulea;
- float Ba=rint(pcmA[j]*part->igranulea)*part->granulea;
- couple_Nphase(Am,Bm,Aa,Ba,&mag,&ang);
- }else{
- couple_lossless(Am,Bm,&mag,&ang);
- }
+ couple_lossless(Am,Bm,&mag,&ang);
}
}
}
+ fmag=rint(fmag);
if(ang>fmag*1.9999f)ang=-fmag*2.f;
qM[j]=mag-sofarM[j];
1.21.2.7 +9 -7 vorbis/lib/psy.h
Index: psy.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.h,v
retrieving revision 1.21.2.6
retrieving revision 1.21.2.7
diff -u -r1.21.2.6 -r1.21.2.7
--- psy.h 2001/08/07 19:50:00 1.21.2.6
+++ psy.h 2001/08/08 04:19:58 1.21.2.7
@@ -11,7 +11,7 @@
********************************************************************
function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.21.2.6 2001/08/07 19:50:00 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.21.2.7 2001/08/08 04:19:58 xiphmont Exp $
********************************************************************/
@@ -39,19 +39,21 @@
typedef struct vp_couple{
int limit; /* sample post */
- float granulem;
- float igranulem;
- float granulea;
- float igranulea;
-
- float amppost_Nphase;
float amppost_8phase;
+ float thresh_8phase;
+
float amppost_6phase;
+ float thresh_6phase;
+
float amppost_point;
+ float thresh_point;
} vp_couple;
typedef struct vp_couple_pass{
+ float granulem;
+ float igranulem;
+
vp_couple couple_pass[8];
} vp_couple_pass;
1.32.2.5 +5 -4 vorbis/lib/res0.c
Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.32.2.4
retrieving revision 1.32.2.5
diff -u -r1.32.2.4 -r1.32.2.5
--- res0.c 2001/08/07 19:50:00 1.32.2.4
+++ res0.c 2001/08/08 04:19:58 1.32.2.5
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.32.2.4 2001/08/07 19:50:00 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.32.2.5 2001/08/08 04:19:58 xiphmont Exp $
********************************************************************/
@@ -491,8 +491,6 @@
long resbits[possible_partitions];
long resvals[possible_partitions];
- memset(resbits,0,sizeof(resbits));
- memset(resvals,0,sizeof(resvals));
#ifdef TRAIN_RES
@@ -509,6 +507,9 @@
fclose(of);
}
#endif
+
+ memset(resbits,0,sizeof(resbits));
+ memset(resvals,0,sizeof(resvals));
/* we code the partition words for each channel, then the residual
words for a partition per channel until we've written all the
@@ -566,7 +567,7 @@
long totalbits=0;
fprintf(stderr,"%d :: ",vb->mode);
for(k=0;k<possible_partitions;k++){
- fprintf(stderr,"%d/%1.2g, ",resvals[k],(float)resbits[k]/resvals[k]);
+ fprintf(stderr,"%ld/%1.2g, ",resvals[k],(float)resbits[k]/resvals[k]);
total+=resvals[k];
totalbits+=resbits[k];
}
No revision
No revision
1.1.2.5 +4 -4 vorbis/lib/books/Attic/line0_0sub0.vqh
Index: line0_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line0_0sub0.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line0_0sub0.vqh 2001/08/07 05:03:13 1.1.2.4
+++ line0_0sub0.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line0_0sub0[] = {
- 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 5, 4, 5, 4, 5, 5,
- 6, 5, 6, 6, 6, 6, 6, 7, 6, 8, 7, 9, 7, 9, 7,10,
- 7,11, 8,11, 8,10, 8, 9, 8, 9, 9,10, 9,10,10,10,
- 12,15,12,14,14,15,15,15,15,15,15,15,15,15,15,15,
+ 4, 4, 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 6, 5,
+ 6, 5, 6, 6, 7, 6, 7, 7, 7, 7, 8, 8, 8, 9, 8,10,
+ 8,11, 8,11, 8,12, 9,14, 9,15,10,14,11,12,11,12,
+ 13,15,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
};
static static_codebook _huff_book_line0_0sub0 = {
1.1.2.5 +1 -1 vorbis/lib/books/Attic/line0_1sub1.vqh
Index: line0_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line0_1sub1.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line0_1sub1.vqh 2001/08/07 05:03:13 1.1.2.4
+++ line0_1sub1.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line0_1sub1[] = {
- 0, 3, 4, 2, 4, 2, 4, 3, 4,
+ 0, 4, 5, 2, 4, 2, 4, 2, 5,
};
static static_codebook _huff_book_line0_1sub1 = {
1.1.2.5 +2 -2 vorbis/lib/books/Attic/line0_1sub2.vqh
Index: line0_1sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line0_1sub2.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line0_1sub2.vqh 2001/08/07 05:03:13 1.1.2.4
+++ line0_1sub2.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -20,8 +20,8 @@
#include "codebook.h"
static long _huff_lengthlist_line0_1sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 5, 2, 6, 3, 8, 4,
- 11, 7,12,10,12,11,11,11,11,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 5, 2, 8, 3, 8, 4,
+ 10, 6,11, 8,11,11,11,11,11,
};
static static_codebook _huff_book_line0_1sub2 = {
1.1.2.4 +4 -4 vorbis/lib/books/Attic/line0_1sub3.vqh
Index: line0_1sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line0_1sub3.vqh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- line0_1sub3.vqh 2001/08/07 03:47:24 1.1.2.3
+++ line0_1sub3.vqh 2001/08/08 04:19:59 1.1.2.4
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line0_1sub3[] = {
- 0, 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, 8, 2,10, 2, 9, 3,
- 11, 4,11, 6,11, 6,11, 8,11,11,11,11,11,11,11,11,
- 11,11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 3, 0, 0, 0, 0, 2, 0, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
};
static static_codebook _huff_book_line0_1sub3 = {
1.1.2.5 +3 -3 vorbis/lib/books/Attic/line0_class1.vqh
Index: line0_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line0_class1.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line0_class1.vqh 2001/08/07 05:03:13 1.1.2.4
+++ line0_class1.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -20,9 +20,9 @@
#include "codebook.h"
static long _huff_lengthlist_line0_class1[] = {
- 1, 2, 3,14, 6, 4, 8,14,11,10,14,14,14,14,14,14,
- 8, 6, 8,14,11, 8,13,14,13,12,13,13,13,13,13,13,
- 11, 8, 8,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 1, 2, 3,14, 7, 4, 9,14,11,11,14,14,13,13,13,13,
+ 7, 5, 9,13,11, 9,12,13,13,13,13,13,13,13,13,13,
+ 11, 9,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,
};
1.1.2.5 +1 -1 vorbis/lib/books/Attic/line1_0sub0.vqh
Index: line1_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_0sub0.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line1_0sub0.vqh 2001/08/07 05:03:13 1.1.2.4
+++ line1_0sub0.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line1_0sub0[] = {
- 4, 4, 4, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 7, 6, 7, 6,
};
1.1.2.5 +5 -5 vorbis/lib/books/Attic/line1_0sub1.vqh
Index: line1_0sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_0sub1.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line1_0sub1.vqh 2001/08/07 05:03:13 1.1.2.4
+++ line1_0sub1.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -22,12 +22,12 @@
static long _huff_lengthlist_line1_0sub1[] = {
0, 0, 0, 0, 0, 0, 0, 0, 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, 4, 5, 4, 6, 4, 6, 4, 6, 4, 7, 4, 7, 4, 8, 4,
- 7, 4, 7, 5, 7, 5, 8, 5, 9, 5, 9, 5,10, 5, 9, 6,
- 11, 6, 9, 7, 9, 7, 9, 7,10, 8,10, 8,10, 9,10,12,
+ 5, 4, 5, 4, 5, 4, 6, 4, 6, 4, 6, 5, 6, 4, 6, 5,
+ 7, 4, 7, 5, 6, 5, 7, 5, 8, 5, 8, 5, 8, 6, 8, 6,
+ 8, 6, 8, 7, 8, 7, 8, 7, 8, 8, 9, 8, 9, 9,11,12,
+ 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,11,
+ 12,12,12,12,12,12,12,12,12,12,12,12,11,11,11,11,
};
static static_codebook _huff_book_line1_0sub1 = {
1.1.2.5 +2 -2 vorbis/lib/books/Attic/line1_1sub0.vqh
Index: line1_1sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_1sub0.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line1_1sub0.vqh 2001/08/07 05:03:13 1.1.2.4
+++ line1_1sub0.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -20,8 +20,8 @@
#include "codebook.h"
static long _huff_lengthlist_line1_1sub0[] = {
- 3, 5, 5, 4, 5, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5,
- 5, 6, 5, 6, 5, 6, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7,
+ 2, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6,
+ 5, 6, 5, 6, 5, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7,
};
static static_codebook _huff_book_line1_1sub0 = {
1.1.2.5 +2 -2 vorbis/lib/books/Attic/line1_1sub1.vqh
Index: line1_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_1sub1.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line1_1sub1.vqh 2001/08/07 05:03:14 1.1.2.4
+++ line1_1sub1.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -22,8 +22,8 @@
static long _huff_lengthlist_line1_1sub1[] = {
0, 0, 0, 0, 0, 0, 0, 0, 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, 3, 5, 4, 5, 4, 7, 4, 8, 3, 7, 3, 9, 4,11, 4,
- 9, 4,12, 5,12, 7,11, 8,11, 7,11, 7,11, 8,11, 8,
+ 4, 4, 4, 4, 5, 4, 5, 4, 6, 3, 6, 3, 7, 4, 7, 4,
+ 9, 5,10, 5,12, 6,12, 7,11, 7,11, 8,11, 8,11, 9,
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,11,11,11,11,
1.1.2.4 +1 -1 vorbis/lib/books/Attic/line1_2sub1.vqh
Index: line1_2sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_2sub1.vqh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- line1_2sub1.vqh 2001/08/07 03:47:24 1.1.2.3
+++ line1_2sub1.vqh 2001/08/08 04:19:59 1.1.2.4
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line1_2sub1[] = {
- 0, 4, 4, 4, 4, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5,
+ 0, 4, 4, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5,
5, 5,
};
1.1.2.5 +3 -3 vorbis/lib/books/Attic/line1_2sub2.vqh
Index: line1_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_2sub2.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line1_2sub2.vqh 2001/08/07 05:03:14 1.1.2.4
+++ line1_2sub2.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line1_2sub2[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 3, 4, 3, 5, 3, 6, 3, 6, 4, 7, 4, 8, 5, 7,
- 5, 8, 5, 9, 5,12, 5,12, 5,11, 6,12, 7,12, 7,12,
- 8,12,
+ 0, 0, 3, 5, 3, 6, 3, 6, 3, 6, 4, 7, 4, 7, 4, 7,
+ 4, 8, 5,10, 5,13, 5,12, 6,13, 6,13, 7,13, 7,13,
+ 9,13,
};
static static_codebook _huff_book_line1_2sub2 = {
1.1.2.5 +3 -3 vorbis/lib/books/Attic/line1_2sub3.vqh
Index: line1_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_2sub3.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line1_2sub3.vqh 2001/08/07 05:03:14 1.1.2.4
+++ line1_2sub3.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -23,11 +23,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, 3, 7, 3, 7, 4, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 0, 0, 3, 7, 4, 7, 4, 7, 6, 7, 6, 7, 6, 7, 7, 7,
+ 5, 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, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 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,
+ 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
};
static static_codebook _huff_book_line1_2sub3 = {
1.1.2.5 +3 -3 vorbis/lib/books/Attic/line1_3sub2.vqh
Index: line1_3sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_3sub2.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line1_3sub2.vqh 2001/08/07 05:03:14 1.1.2.4
+++ line1_3sub2.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line1_3sub2[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 4, 4, 5, 3, 5, 3, 6, 3, 6, 4, 8, 4, 8, 4,
- 9, 5, 9, 5,10, 5,10, 5,11, 6,12, 6,11, 6,11, 6,
- 12, 6,
+ 0, 0, 4, 3, 5, 3, 5, 3, 6, 3, 6, 4, 8, 4, 8, 5,
+ 9, 5, 9, 5,10, 5,10, 6,11, 6,12, 6,11, 6,11, 7,
+ 12, 7,
};
static static_codebook _huff_book_line1_3sub2 = {
1.1.2.4 +1 -1 vorbis/lib/books/Attic/line1_3sub3.vqh
Index: line1_3sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_3sub3.vqh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- line1_3sub3.vqh 2001/08/07 03:47:24 1.1.2.3
+++ line1_3sub3.vqh 2001/08/08 04:19:59 1.1.2.4
@@ -23,7 +23,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, 8, 2, 9, 3, 9, 3, 9, 3, 9, 4, 9, 5, 9, 6,
+ 0, 0, 8, 2, 9, 3, 9, 3, 8, 3, 8, 4, 8, 5, 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, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
1.1.2.4 +1 -1 vorbis/lib/books/Attic/line1_class0.vqh
Index: line1_class0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_class0.vqh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- line1_class0.vqh 2001/08/07 05:03:14 1.1.2.3
+++ line1_class0.vqh 2001/08/08 04:19:59 1.1.2.4
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line1_class0[] = {
- 1, 2, 6, 5, 3, 4, 7, 7,
+ 1, 2, 5, 6, 3, 4, 7, 7,
};
static static_codebook _huff_book_line1_class0 = {
1.1.2.5 +1 -1 vorbis/lib/books/Attic/line1_class1.vqh
Index: line1_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_class1.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line1_class1.vqh 2001/08/07 05:03:14 1.1.2.4
+++ line1_class1.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line1_class1[] = {
- 1, 4, 5,10, 6,10,10,10, 2, 4, 4, 8, 8,10,10, 9,
+ 1, 4, 5,10, 6,10, 9,10, 2, 4, 4, 8, 8,10,10,10,
};
static static_codebook _huff_book_line1_class1 = {
1.1.2.5 +4 -4 vorbis/lib/books/Attic/line1_class2.vqh
Index: line1_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_class2.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line1_class2.vqh 2001/08/07 05:03:14 1.1.2.4
+++ line1_class2.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line1_class2[] = {
- 1, 3, 5,14, 8, 5, 6,15,10, 7, 8,15,15,14,15,15,
- 6, 3, 6,11, 8, 4, 6,12,12, 8,11,15,15,14,15,15,
- 13, 9, 7,15,10, 7, 6,15,14,10,13,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+ 1, 3, 5,16, 8, 5, 6,14,10, 6, 8,14,16,15,16,16,
+ 7, 3, 7,12, 8, 4, 6,13,10, 7, 7,14,16,15,16,16,
+ 13, 9, 8,14,11, 7, 6,14,16,10,10,16,16,16,16,16,
+ 16,16,16,16,16,15,15,15,15,15,15,15,15,15,15,15,
};
static static_codebook _huff_book_line1_class2 = {
1.1.2.5 +4 -4 vorbis/lib/books/Attic/line1_class3.vqh
Index: line1_class3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/line1_class3.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- line1_class3.vqh 2001/08/07 05:03:14 1.1.2.4
+++ line1_class3.vqh 2001/08/08 04:19:59 1.1.2.5
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line1_class3[] = {
- 2, 3, 3, 7, 7, 3, 5,11, 9, 6, 9,15,15,15,15,14,
- 7, 3, 5, 8, 7, 4, 5,10,10, 6, 9,13,14,13,14,14,
- 13,10, 8,11,11, 8, 8,11,12, 9,11,12,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 1, 4, 3, 8, 7, 4, 5,12,10, 7,10,15,15,15,15,15,
+ 7, 4, 6, 9, 7, 4, 6,12,11, 7,10,15,15,14,15,15,
+ 12,11, 9,12,12, 8, 8,12,13,10,12,13,15,15,15,15,
+ 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,14,
};
static static_codebook _huff_book_line1_class3 = {
1.6.6.5 +25 -488 vorbis/lib/books/res0_128_1024_1.vqh
Index: res0_128_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_1.vqh,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- res0_128_1024_1.vqh 2001/08/07 05:03:14 1.6.6.4
+++ res0_128_1024_1.vqh 2001/08/08 04:19:59 1.6.6.5
@@ -19,533 +19,70 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_1[] = {
- 12,
- 11,
- 13,
- 10,
- 14,
- 9,
- 15,
- 8,
- 16,
- 7,
- 17,
- 6,
- 18,
- 5,
- 19,
- 4,
- 20,
- 3,
- 21,
- 2,
- 22,
1,
- 23,
0,
- 24,
+ 2,
};
static long _vq_lengthlist_res0_128_1024_1[] = {
- 2, 4, 4, 6, 6, 8, 8, 9, 9,10,10,10,11,11,12,13,
- 12,13,13,14,13,15,14,15,15, 0, 4, 4, 6, 6, 8, 8,
- 9, 9,10,10,11,11,12,12,13,12,13,14,14,14,14,14,
- 14,15, 0, 4, 4, 6, 6, 8, 8, 9, 9,10,10,11,11,12,
- 12,13,13,13,13,14,14,15,14,15,15, 0, 6, 6, 6, 6,
- 8, 8, 9, 9,10,10,11,11,12,12,13,13,14,14,14,14,
- 15,15,16,15, 0, 0, 0, 6, 6, 8, 8, 9, 9,10,10,11,
- 11,13,12,13,13,14,14,15,15,15,15,15,16, 0, 0, 0,
- 7, 7, 8, 8, 9, 9,10,11,11,11,12,12,13,13,14,14,
- 14,15,14,15,15,16, 0, 0, 0, 7, 7, 8, 8, 9,10,11,
- 11,12,12,12,12,13,13,14,14,15,14,16,15,15,15, 0,
- 0, 0, 8, 9, 9, 9,10,10,11,11,12,12,13,13,13,14,
- 14,14,14,15,15,15,16,17, 0, 0, 0, 0, 0, 9, 9,10,
- 10,11,11,12,12,13,13,14,13,14,14,15,15,15,16,16,
- 15, 0, 0, 0, 0, 0,10,10,10,10,11,11,12,12,13,13,
- 14,13,14,14,15,15,15,16,16,16, 0, 0, 0, 0, 0,10,
- 10,11,10,11,11,12,12,13,13,14,14,14,14,15,15,16,
- 15,16,16, 0, 0, 0, 0, 0,11,11,11,11,12,12,12,12,
- 13,13,14,14,15,15,15,15,15,15,16,16, 0, 0, 0, 0,
- 0, 0, 0,11,11,12,12,12,12,13,13,14,14,15,15,15,
- 15,16,16,16,16, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,
- 13,13,13,14,15,14,15,15,15,15,15,16,16,16, 0, 0,
- 0, 0, 0, 0, 0,12,12,12,12,13,13,14,14,15,14,15,
- 15,15,16,16,17,16,17, 0, 0, 0, 0, 0, 0, 0,12,13,
- 13,13,13,13,14,14,14,15,15,15,16,15,16,17,17,17,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,14,14,14,14,15,
- 15,15,16,16,16,16,16,17,16, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,13,13,13,14,14,14,15,15,16,15,16,16,16,17,
- 18,17, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,14,13,14,
- 15,16,16,16,16,16,17,18,16,17,17, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,14,14,14,14,15,15,15,15,15,16,17,16,
- 17,16,17,17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14,
- 14,14,14,15,15,16,17,16,17,17,17,19,17, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,15,15,15,15,16,15,16,15,
- 16,16,17,17,18,17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,15,15,16,16,16,15,16,17,19,17,16,19,17,19, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15,15,15,15,16,17,
- 16,16,16,17,18,17,17,17, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,15,16,16,15,17,16,17,18,18,17,18,
- 18,
+ 2, 5, 5, 0, 5, 5, 0, 4, 5, 5, 7, 6, 0, 8, 8, 0,
+ 8, 8, 5, 6, 7, 0, 8, 8, 0, 8, 8, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 4, 8, 7, 0, 7, 6, 0, 7, 7, 5, 7, 8,
+ 0, 6, 7, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
+ 8, 7, 0, 7, 7, 0, 7, 6, 5, 7, 8, 0, 7, 7, 0, 6,
+ 7,
};
static float _vq_quantthresh_res0_128_1024_1[] = {
- -11.5, -10.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, 10.5, 11.5,
+ -0.5, 0.5,
};
static long _vq_quantmap_res0_128_1024_1[] = {
- 23, 21, 19, 17, 15, 13, 11, 9,
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8, 10, 12, 14, 16, 18, 20, 22,
- 24,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_1 = {
_vq_quantthresh_res0_128_1024_1,
_vq_quantmap_res0_128_1024_1,
- 25,
- 25
+ 3,
+ 3
};
static long _vq_pigeonmap_res0_128_1024_1[] = {
- 7, 7, 6, 5, 5, 4, 3, 3,
- 2, 1, 1, 0, 0, 0, 1, 2,
- 2, 3, 4, 4, 5, 6, 6, 7,
+ 0, 0,
};
static long _vq_fitlist_res0_128_1024_1[] = {
- 0, 1, 2, 3, 26, 27, 28, 51,
- 76, 4, 29, 52, 77, 6, 31, 54,
- 79, 53, 56, 104, 103, 106, 154, 1,
- 3, 5, 7, 26, 28, 30, 32, 53,
- 55, 78, 80, 0, 51, 76, 2, 4,
- 6, 8, 27, 29, 31, 33, 54, 56,
- 79, 81, 57, 103, 105, 52, 58, 104,
- 106, 107, 153, 155, 108, 154, 156, 3,
- 5, 7, 9, 28, 30, 32, 34, 55,
- 57, 80, 82, 4, 6, 8, 10, 29,
- 31, 33, 35, 56, 58, 81, 83, 12,
- 37, 60, 85, 53, 59, 105, 107, 54,
- 106, 108, 62, 110, 103, 109, 155, 157,
- 104, 156, 158, 112, 160, 7, 9, 11,
- 13, 32, 34, 36, 38, 59, 61, 84,
- 86, 5, 30, 57, 82, 8, 10, 12,
- 14, 33, 35, 37, 39, 60, 62, 85,
- 87, 63, 109, 111, 55, 107, 58, 64,
- 110, 112, 113, 159, 161, 105, 157, 108,
- 114, 160, 162, 9, 11, 13, 15, 34,
- 36, 38, 40, 61, 63, 86, 88, 10,
- 12, 14, 16, 35, 37, 39, 41, 62,
- 64, 87, 89, 18, 43, 66, 91, 59,
- 65, 111, 113, 60, 112, 114, 68, 116,
- 109, 115, 161, 163, 110, 162, 164, 118,
- 166, 13, 15, 17, 19, 38, 40, 42,
- 44, 65, 67, 90, 92, 11, 36, 63,
- 88, 14, 16, 18, 20, 39, 41, 43,
- 45, 66, 68, 91, 93, 69, 115, 117,
- 61, 113, 64, 70, 116, 118, 119, 165,
- 167, 111, 163, 114, 120, 166, 168, 15,
- 17, 19, 21, 40, 42, 44, 46, 67,
- 69, 92, 94, 16, 18, 20, 22, 41,
- 43, 45, 47, 68, 70, 93, 95, 24,
- 49, 72, 97, 65, 71, 117, 119, 66,
- 118, 120, 74, 122, 115, 121, 167, 169,
- 116, 168, 170, 124, 172, 19, 21, 23,
- 44, 46, 48, 71, 73, 96, 98, 17,
- 42, 69, 94, 20, 22, 24, 45, 47,
- 49, 72, 74, 97, 99, 121, 123, 67,
- 119, 70, 122, 124, 171, 173, 117, 169,
- 120, 172, 174, 26, 76, 77, 78, 128,
- 27, 79, 129, 29, 81, 131, 179, 0,
- 1, 28, 2, 4, 31, 51, 52, 53,
- 103, 104, 105, 153, 154, 155, 54, 106,
- 156, 28, 30, 76, 78, 80, 82, 128,
- 130, 132, 178, 180, 26, 29, 31, 77,
- 79, 81, 83, 129, 131, 133, 179, 181,
- 3, 5, 32, 1, 4, 6, 27, 33,
- 53, 55, 103, 105, 107, 153, 155, 157,
- 205, 51, 54, 56, 104, 106, 108, 154,
- 156, 158, 206, 30, 32, 78, 80, 82,
- 84, 128, 130, 132, 134, 180, 182, 31,
- 33, 79, 81, 83, 85, 129, 131, 133,
- 135, 181, 183, 35, 87, 137, 185, 5,
- 7, 28, 34, 6, 8, 29, 10, 37,
- 55, 57, 103, 105, 107, 109, 153, 155,
- 157, 159, 205, 207, 56, 58, 104, 106,
- 108, 110, 154, 156, 158, 160, 206, 208,
- 60, 112, 162, 210, 34, 36, 82, 84,
- 86, 88, 132, 134, 136, 138, 184, 186,
- 32, 80, 130, 182, 35, 37, 83, 85,
- 87, 89, 133, 135, 137, 139, 185, 187,
- 9, 11, 38, 7, 30, 10, 12, 33,
- 39, 59, 61, 107, 109, 111, 113, 157,
- 159, 161, 163, 209, 211, 57, 105, 155,
- 207, 60, 62, 108, 110, 112, 114, 158,
- 160, 162, 164, 210, 212, 36, 38, 84,
- 86, 88, 90, 134, 136, 138, 140, 186,
- 188, 37, 39, 85, 87, 89, 91, 135,
- 137, 139, 141, 187, 189, 41, 93, 143,
- 191, 11, 13, 34, 40, 12, 14, 35,
- 16, 43, 61, 63, 109, 111, 113, 115,
- 159, 161, 163, 165, 211, 213, 62, 64,
- 110, 112, 114, 116, 160, 162, 164, 166,
- 212, 214, 66, 118, 168, 216, 40, 42,
- 88, 90, 92, 94, 138, 140, 142, 144,
- 190, 192, 38, 86, 136, 188, 41, 43,
- 89, 91, 93, 95, 139, 141, 143, 145,
- 191, 193, 15, 17, 44, 13, 36, 16,
- 18, 39, 45, 65, 67, 113, 115, 117,
- 119, 163, 165, 167, 169, 215, 217, 63,
- 111, 161, 213, 66, 68, 114, 116, 118,
- 120, 164, 166, 168, 170, 216, 218, 42,
- 44, 90, 92, 94, 96, 140, 142, 144,
- 146, 192, 194, 43, 45, 91, 93, 95,
- 97, 141, 143, 145, 147, 193, 195, 47,
- 99, 149, 197, 17, 19, 40, 46, 18,
- 20, 41, 22, 49, 67, 69, 115, 117,
- 119, 121, 165, 167, 169, 171, 217, 219,
- 68, 70, 116, 118, 120, 122, 166, 168,
- 170, 172, 218, 220, 72, 124, 174, 222,
- 46, 48, 94, 96, 98, 144, 146, 148,
- 196, 198, 44, 92, 142, 194, 47, 49,
- 95, 97, 99, 145, 147, 149, 197, 199,
- 21, 23, 19, 42, 22, 24, 45, 71,
- 73, 119, 121, 123, 169, 171, 173, 221,
- 223, 69, 117, 167, 219, 72, 74, 120,
- 122, 124, 170, 172, 174, 222, 224, 26,
- 76, 77, 78, 128, 129, 130, 178, 179,
- 180, 27, 79, 131, 181, 51, 103, 153,
- 154, 155, 205, 52, 104, 156, 206, 255,
- 256, 208, 258, 78, 80, 128, 130, 132,
- 178, 180, 182, 230, 76, 79, 81, 129,
- 131, 133, 179, 181, 183, 231, 103, 105,
- 153, 155, 157, 205, 207, 255, 104, 106,
- 154, 156, 158, 206, 208, 256, 257, 258,
- 80, 82, 128, 130, 132, 134, 178, 180,
- 182, 184, 230, 232, 81, 83, 129, 131,
- 133, 135, 179, 181, 183, 185, 231, 233,
- 85, 137, 187, 235, 105, 107, 153, 155,
- 157, 159, 205, 207, 209, 255, 257, 106,
- 108, 154, 156, 158, 160, 206, 208, 210,
- 256, 258, 110, 162, 212, 260, 259, 307,
- 308, 262, 310, 84, 86, 132, 134, 136,
- 138, 182, 184, 186, 188, 234, 236, 82,
- 130, 180, 232, 85, 87, 133, 135, 137,
- 139, 183, 185, 187, 189, 235, 237, 109,
- 111, 157, 159, 161, 163, 207, 209, 211,
- 213, 259, 261, 107, 155, 205, 257, 110,
- 112, 158, 160, 162, 164, 208, 210, 212,
- 214, 260, 262, 263, 309, 311, 255, 307,
- 258, 264, 310, 312, 86, 88, 134, 136,
- 138, 140, 184, 186, 188, 190, 236, 238,
- 87, 89, 135, 137, 139, 141, 185, 187,
- 189, 191, 237, 239, 91, 143, 193, 241,
- 111, 113, 159, 161, 163, 165, 209, 211,
- 213, 215, 261, 263, 112, 114, 160, 162,
- 164, 166, 210, 212, 214, 216, 262, 264,
- 116, 168, 218, 266, 259, 265, 311, 313,
- 260, 312, 314, 268, 316, 90, 92, 138,
- 140, 142, 144, 188, 190, 192, 194, 240,
- 242, 88, 136, 186, 238, 91, 93, 139,
- 141, 143, 145, 189, 191, 193, 195, 241,
- 243, 115, 117, 163, 165, 167, 169, 213,
- 215, 217, 219, 265, 267, 113, 161, 211,
- 263, 116, 118, 164, 166, 168, 170, 214,
- 216, 218, 220, 266, 268, 269, 315, 317,
- 261, 313, 264, 270, 316, 318, 92, 94,
- 140, 142, 144, 146, 190, 192, 194, 196,
- 242, 244, 93, 95, 141, 143, 145, 147,
- 191, 193, 195, 197, 243, 245, 97, 149,
- 199, 247, 117, 119, 165, 167, 169, 171,
- 215, 217, 219, 221, 267, 269, 118, 120,
- 166, 168, 170, 172, 216, 218, 220, 222,
- 268, 270, 122, 174, 224, 272, 265, 271,
- 317, 319, 266, 318, 320, 274, 322, 96,
- 98, 144, 146, 148, 194, 196, 198, 246,
- 248, 94, 142, 192, 244, 97, 99, 145,
- 147, 149, 195, 197, 199, 247, 249, 121,
- 123, 169, 171, 173, 219, 221, 223, 271,
- 273, 119, 167, 217, 269, 122, 124, 170,
- 172, 174, 220, 222, 224, 272, 274, 321,
- 323, 267, 319, 270, 322, 324, 128, 178,
- 179, 180, 230, 280, 129, 181, 231, 281,
- 233, 283, 76, 77, 153, 154, 155, 205,
- 255, 256, 257, 307, 156, 206, 258, 308,
- 178, 180, 230, 232, 280, 282, 128, 179,
- 181, 231, 233, 281, 283, 130, 182, 129,
- 131, 183, 205, 255, 257, 307, 153, 206,
- 256, 258, 308, 180, 182, 230, 232, 234,
- 280, 282, 284, 332, 181, 183, 231, 233,
- 235, 281, 283, 285, 333, 185, 237, 287,
- 335, 130, 132, 178, 184, 131, 133, 179,
- 135, 187, 205, 207, 255, 257, 259, 307,
- 309, 357, 206, 208, 256, 258, 260, 308,
- 310, 358, 210, 262, 312, 360, 184, 186,
- 232, 234, 236, 238, 282, 284, 286, 288,
- 334, 336, 182, 230, 280, 332, 185, 187,
- 233, 235, 237, 239, 283, 285, 287, 289,
- 335, 337, 134, 136, 188, 132, 180, 135,
- 137, 183, 189, 209, 211, 257, 259, 261,
- 263, 307, 309, 311, 313, 359, 361, 207,
- 255, 357, 210, 212, 258, 260, 262, 264,
- 308, 310, 312, 314, 360, 362, 186, 188,
- 234, 236, 238, 240, 284, 286, 288, 290,
- 336, 338, 187, 189, 235, 237, 239, 241,
- 285, 287, 289, 291, 337, 339, 191, 243,
- 293, 341, 136, 138, 184, 190, 137, 139,
- 185, 141, 193, 211, 213, 259, 261, 263,
- 265, 309, 311, 313, 315, 361, 363, 212,
- 214, 260, 262, 264, 266, 310, 312, 314,
- 316, 362, 364, 216, 268, 318, 366, 190,
- 192, 238, 240, 242, 244, 288, 290, 292,
- 294, 340, 342, 188, 236, 286, 338, 191,
- 193, 239, 241, 243, 245, 289, 291, 293,
- 295, 341, 343, 140, 142, 194, 138, 186,
- 141, 143, 189, 195, 215, 217, 263, 265,
- 267, 269, 313, 315, 317, 319, 365, 367,
- 213, 261, 311, 363, 216, 218, 264, 266,
- 268, 270, 314, 316, 318, 320, 366, 368,
- 192, 194, 240, 242, 244, 246, 290, 292,
- 294, 296, 342, 344, 193, 195, 241, 243,
- 245, 247, 291, 293, 295, 297, 343, 345,
- 197, 249, 299, 347, 142, 144, 190, 196,
- 143, 145, 191, 147, 199, 217, 219, 265,
- 267, 269, 271, 315, 317, 319, 321, 367,
- 369, 218, 220, 266, 268, 270, 272, 316,
- 318, 320, 322, 368, 370, 222, 274, 324,
- 372, 196, 198, 244, 246, 248, 294, 296,
- 298, 346, 348, 194, 242, 292, 344, 197,
- 199, 245, 247, 249, 295, 297, 299, 347,
- 349, 146, 148, 144, 192, 147, 149, 195,
- 221, 223, 269, 271, 273, 319, 321, 323,
- 371, 373, 219, 267, 317, 369, 222, 224,
- 270, 272, 274, 320, 322, 324, 372, 374,
- 178, 179, 180, 230, 280, 281, 282, 332,
- 181, 231, 283, 333, 153, 205, 255, 256,
- 257, 307, 357, 154, 206, 258, 308, 358,
- 359, 409, 360, 410, 230, 280, 282, 332,
- 178, 231, 281, 283, 333, 205, 255, 257,
- 307, 309, 357, 359, 206, 256, 258, 308,
- 310, 358, 360, 409, 410, 230, 232, 280,
- 282, 284, 332, 334, 382, 231, 233, 281,
- 283, 285, 333, 335, 383, 235, 287, 337,
- 385, 255, 257, 307, 309, 357, 359, 256,
- 258, 308, 310, 358, 360, 260, 312, 362,
- 410, 409, 412, 460, 234, 236, 282, 284,
- 286, 288, 332, 334, 336, 338, 384, 386,
- 232, 280, 382, 235, 237, 283, 285, 287,
- 289, 333, 335, 337, 339, 385, 387, 259,
- 261, 307, 309, 311, 313, 357, 359, 361,
- 363, 409, 411, 257, 260, 262, 308, 310,
- 312, 314, 358, 360, 362, 364, 410, 412,
- 413, 459, 461, 414, 460, 462, 236, 238,
- 284, 286, 288, 290, 334, 336, 338, 340,
- 386, 388, 237, 239, 285, 287, 289, 291,
- 335, 337, 339, 341, 387, 389, 241, 293,
- 343, 391, 261, 263, 309, 311, 313, 315,
- 359, 361, 363, 365, 411, 413, 262, 264,
- 310, 312, 314, 316, 360, 362, 364, 366,
- 412, 414, 266, 318, 368, 416, 409, 415,
- 461, 463, 410, 462, 464, 418, 466, 240,
- 242, 288, 290, 292, 294, 338, 340, 342,
- 344, 390, 392, 238, 286, 336, 388, 241,
- 243, 289, 291, 293, 295, 339, 341, 343,
- 345, 391, 393, 265, 267, 313, 315, 317,
- 319, 363, 365, 367, 369, 415, 417, 263,
- 311, 361, 413, 266, 268, 314, 316, 318,
- 320, 364, 366, 368, 370, 416, 418, 419,
- 465, 467, 411, 463, 414, 420, 466, 468,
- 242, 244, 290, 292, 294, 296, 340, 342,
- 344, 346, 392, 394, 243, 245, 291, 293,
- 295, 297, 341, 343, 345, 347, 393, 395,
- 247, 299, 349, 397, 267, 269, 315, 317,
- 319, 321, 365, 367, 369, 371, 417, 419,
- 268, 270, 316, 318, 320, 322, 366, 368,
- 370, 372, 418, 420, 272, 324, 374, 422,
- 415, 421, 467, 469, 416, 468, 470, 424,
- 472, 246, 248, 294, 296, 298, 344, 346,
- 348, 396, 398, 244, 292, 342, 394, 247,
- 249, 295, 297, 299, 345, 347, 349, 397,
- 399, 271, 273, 319, 321, 323, 369, 371,
- 373, 421, 423, 269, 317, 367, 419, 272,
- 274, 320, 322, 324, 370, 372, 374, 422,
- 424, 471, 473, 417, 469, 420, 472, 474,
- 230, 280, 281, 282, 332, 382, 383, 384,
- 434, 231, 283, 333, 385, 435, 178, 179,
- 255, 256, 257, 307, 357, 358, 359, 409,
- 459, 258, 308, 360, 410, 460, 280, 332,
- 382, 384, 434, 282, 281, 333, 383, 385,
- 435, 230, 334, 231, 283, 335, 307, 357,
- 359, 409, 459, 255, 308, 358, 360, 410,
- 460, 332, 382, 384, 434, 333, 383, 385,
- 435, 335, 387, 437, 485, 280, 282, 334,
- 281, 283, 285, 337, 307, 357, 359, 409,
- 411, 459, 461, 308, 358, 360, 410, 412,
- 460, 462, 334, 336, 382, 384, 386, 388,
- 434, 436, 438, 484, 486, 332, 335, 337,
- 383, 385, 387, 389, 435, 437, 439, 485,
- 487, 284, 286, 338, 282, 285, 287, 333,
- 339, 359, 361, 409, 411, 413, 459, 461,
- 463, 511, 357, 360, 362, 410, 412, 414,
- 460, 462, 464, 512, 336, 338, 384, 386,
- 388, 390, 434, 436, 438, 440, 486, 488,
- 337, 339, 385, 387, 389, 391, 435, 437,
- 439, 441, 487, 489, 341, 393, 443, 491,
- 286, 288, 334, 340, 287, 289, 335, 291,
- 343, 361, 363, 409, 411, 413, 415, 459,
- 461, 463, 465, 511, 513, 362, 364, 410,
- 412, 414, 416, 460, 462, 464, 466, 512,
- 514, 366, 418, 468, 516, 340, 342, 388,
- 390, 392, 394, 438, 440, 442, 444, 490,
- 492, 338, 386, 436, 488, 341, 343, 389,
- 391, 393, 395, 439, 441, 443, 445, 491,
- 493, 290, 292, 344, 288, 336, 291, 293,
- 339, 345, 365, 367, 413, 415, 417, 419,
- 463, 465, 467, 469, 515, 517, 363, 411,
- 461, 513, 366, 368, 414, 416, 418, 420,
- 464, 466, 468, 470, 516, 518, 342, 344,
- 390, 392, 394, 396, 440, 442, 444, 446,
- 492, 494, 343, 345, 391, 393, 395, 397,
- 441, 443, 445, 447, 493, 495, 347, 399,
- 449, 497, 292, 294, 340, 346, 293, 295,
- 341, 297, 349, 367, 369, 415, 417, 419,
- 421, 465, 467, 469, 471, 517, 519, 368,
- 370, 416, 418, 420, 422, 466, 468, 470,
- 472, 518, 520, 372, 424, 474, 522, 346,
- 348, 394, 396, 398, 444, 446, 448, 496,
- 498, 344, 392, 442, 494, 347, 349, 395,
- 397, 399, 445, 447, 449, 497, 499, 296,
- 298, 294, 342, 297, 299, 345, 371, 373,
- 419, 421, 423, 469, 471, 473, 521, 523,
- 369, 417, 467, 519, 372, 374, 420, 422,
- 424, 470, 472, 474, 522, 524, 280, 281,
- 282, 332, 382, 383, 384, 434, 484, 283,
- 333, 385, 435, 485, 255, 307, 357, 358,
- 359, 409, 459, 256, 308, 360, 410, 460,
- 462, 512, 461, 511, 561, 562, 332, 382,
- 384, 434, 436, 484, 486, 333, 383, 385,
- 435, 437, 485, 487, 357, 409, 459, 461,
- 511, 358, 410, 460, 462, 512, 561, 562,
- 514, 564, 384, 386, 434, 436, 438, 484,
- 486, 488, 536, 382, 385, 387, 435, 437,
- 439, 485, 487, 489, 537, 409, 411, 459,
- 461, 463, 511, 513, 561, 410, 412, 460,
- 462, 464, 512, 514, 562, 563, 564, 386,
- 388, 434, 436, 438, 440, 484, 486, 488,
- 490, 536, 538, 387, 389, 435, 437, 439,
- 441, 485, 487, 489, 491, 537, 539, 391,
- 443, 493, 541, 411, 413, 459, 461, 463,
- 465, 511, 513, 515, 561, 563, 412, 414,
- 460, 462, 464, 466, 512, 514, 516, 562,
- 564, 416, 468, 518, 566, 565, 613, 614,
- 568, 616, 390, 392, 438, 440, 442, 444,
- 488, 490, 492, 494, 540, 542, 388, 436,
- 486, 538, 391, 393, 439, 441, 443, 445,
- 489, 491, 493, 495, 541, 543, 415, 417,
- 463, 465, 467, 469, 513, 515, 517, 519,
- 565, 567, 413, 461, 511, 563, 416, 418,
- 464, 466, 468, 470, 514, 516, 518, 520,
- 566, 568, 569, 615, 617, 561, 613, 564,
- 570, 616, 618, 392, 394, 440, 442, 444,
- 446, 490, 492, 494, 496, 542, 544, 393,
- 395, 441, 443, 445, 447, 491, 493, 495,
- 497, 543, 545, 397, 449, 499, 547, 417,
- 419, 465, 467, 469, 471, 515, 517, 519,
- 521, 567, 569, 418, 420, 466, 468, 470,
- 472, 516, 518, 520, 522, 568, 570, 422,
- 474, 524, 572, 565, 571, 617, 619, 566,
- 618, 620, 574, 622, 396, 398, 444, 446,
- 448, 494, 496, 498, 546, 548, 394, 442,
- 492, 544, 397, 399, 445, 447, 449, 495,
- 497, 499, 547, 549, 421, 423, 469, 471,
- 473, 519, 521, 523, 571, 573, 419, 467,
- 517, 569, 422, 424, 470, 472, 474, 520,
- 522, 524, 572, 574, 621, 623, 567, 619,
- 570, 622, 624, 332, 382, 383, 384, 434,
- 484, 485, 486, 536, 586, 333, 385, 435,
- 487, 537, 587, 280, 281, 357, 358, 359,
- 409, 459, 460, 461, 511, 561, 360, 410,
- 462, 512, 562, 382, 434, 484, 486, 536,
- 586, 384, 383, 435, 485, 487, 537, 587,
- 332, 385, 409, 459, 461, 511, 561, 563,
- 613, 357, 410, 460, 462, 512, 562, 564,
- 614, 434, 484, 486, 536, 586, 435, 485,
- 487, 537, 587, 539, 589, 382, 383, 459,
- 461, 511, 561, 563, 613, 460, 462, 512,
- 562, 564, 614, 484, 486, 536, 538, 586,
- 588, 434, 485, 487, 537, 539, 587, 589,
- 436, 488, 435, 437, 489, 511, 561, 563,
- 613, 459, 512, 562, 564, 614, 486, 488,
- 536, 538, 540, 586, 588, 590, 487, 489,
- 537, 539, 541, 587, 589, 591, 491, 543,
- 593, 436, 438, 484, 490, 437, 439, 485,
- 441, 493, 511, 513, 561, 563, 565, 613,
- 615, 512, 514, 562, 564, 566, 614, 616,
- 516, 568, 618, 490, 492, 538, 540, 542,
- 544, 588, 590, 592, 594, 488, 536, 586,
- 491, 493, 539, 541, 543, 545, 589, 591,
- 593, 595, 440, 442, 494, 438, 486, 441,
- 443, 489, 495, 515, 517, 563, 565, 567,
- 569, 613, 615, 617, 619, 513, 561, 516,
- 518, 564, 566, 568, 570, 614, 616, 618,
- 620, 492, 494, 540, 542, 544, 546, 590,
- 592, 594, 596, 493, 495, 541, 543, 545,
- 547, 591, 593, 595, 597, 497, 549, 599,
- 442, 444, 490, 496, 443, 445, 491, 447,
- 499, 517, 519, 565, 567, 569, 571, 615,
- 617, 619, 621, 518, 520, 566, 568, 570,
- 572, 616, 618, 620, 622, 522, 574, 624,
- 496, 498, 544, 546, 548, 594, 596, 598,
- 494, 542, 592, 497, 499, 545, 547, 549,
- 595, 597, 599, 446, 448, 444, 492, 447,
- 449, 495, 521, 523, 569, 571, 573, 619,
- 621, 623, 519, 567, 617, 522, 524, 570,
- 572, 574, 620, 622, 624,
+ 0, 1, 2, 4, 5, 7, 8, 9,
+ 10, 11, 13, 14, 16, 17, 18, 19,
+ 20, 22, 23, 25, 26, 36, 37, 38,
+ 40, 41, 43, 44, 45, 46, 47, 49,
+ 50, 52, 53, 63, 64, 65, 67, 68,
+ 70, 71, 72, 73, 74, 76, 77, 79,
+ 80,
};
static long _vq_fitmap_res0_128_1024_1[] = {
- 0, 23, 63, 109, 155, 201, 247, 293,
- 331, 331, 361, 411, 476, 541, 606, 671,
- 736, 791, 791, 819, 856, 915, 980, 1045,
- 1110, 1175, 1230, 1230, 1256, 1283, 1334, 1398,
- 1463, 1528, 1593, 1648, 1648, 1676, 1701, 1740,
- 1798, 1863, 1928, 1993, 2048, 2048, 2078, 2105,
- 2138, 2188, 2253, 2318, 2383, 2438, 2438, 2438,
- 2470, 2498, 2535, 2594, 2659, 2724, 2779, 2779,
- 2811, 2841, 2867, 2894, 2939, 2993, 3048, 3093,
- 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093,
- 3093,
+ 0,
};
static long _vq_fitlength_res0_128_1024_1[] = {
- 23, 40, 46, 46, 46, 46, 46, 38,
- 0, 30, 50, 65, 65, 65, 65, 65,
- 55, 0, 28, 37, 59, 65, 65, 65,
- 65, 55, 0, 26, 27, 51, 64, 65,
- 65, 65, 55, 0, 28, 25, 39, 58,
- 65, 65, 65, 55, 0, 30, 27, 33,
- 50, 65, 65, 65, 55, 0, 32, 32,
- 28, 37, 59, 65, 65, 55, 0, 32,
- 30, 26, 27, 45, 54, 55, 45, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
+ 49,
};
static encode_aux_pigeonhole _vq_auxp_res0_128_1024_1 = {
- -12, 1, 24, 9,
+ -1, 1, 2, 1,
_vq_pigeonmap_res0_128_1024_1,
- 3093,
+ 49,
_vq_fitlist_res0_128_1024_1,
_vq_fitmap_res0_128_1024_1,
_vq_fitlength_res0_128_1024_1
};
static static_codebook _vq_book_res0_128_1024_1 = {
- 2, 625,
+ 4, 81,
_vq_lengthlist_res0_128_1024_1,
- 1, -529006592, 1611661312, 5, 0,
+ 1, -535822336, 1611661312, 2, 0,
_vq_quantlist_res0_128_1024_1,
NULL,
&_vq_auxt_res0_128_1024_1,
1.5.6.6 +10 -15 vorbis/lib/books/res0_128_1024_2.vqh
Index: res0_128_1024_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_2.vqh,v
retrieving revision 1.5.6.5
retrieving revision 1.5.6.6
diff -u -r1.5.6.5 -r1.5.6.6
--- res0_128_1024_2.vqh 2001/08/07 05:03:14 1.5.6.5
+++ res0_128_1024_2.vqh 2001/08/08 04:19:59 1.5.6.6
@@ -25,12 +25,12 @@
};
static long _vq_lengthlist_res0_128_1024_2[] = {
- 1, 5, 5, 0, 5, 5, 0, 4, 5, 5, 8, 7, 0,10, 9, 0,
- 10, 9, 5, 7, 8, 0, 9,10, 0, 9, 9, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 5,10, 9, 0, 9, 8, 0, 8, 9, 5, 9,10,
- 0, 8, 9, 0, 9, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
- 10, 9, 0, 9, 8, 0, 9, 8, 5, 9, 9, 0, 9, 9, 0, 8,
- 9,
+ 1, 3, 4, 0, 0, 0, 0, 0, 0, 4, 5, 4, 0, 0, 0, 0,
+ 0, 0, 4, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res0_128_1024_2[] = {
@@ -53,13 +53,8 @@
};
static long _vq_fitlist_res0_128_1024_2[] = {
- 0, 1, 2, 4, 5, 7, 8, 9,
- 10, 11, 13, 14, 16, 17, 18, 19,
- 20, 22, 23, 25, 26, 36, 37, 38,
- 40, 41, 43, 44, 45, 46, 47, 49,
- 50, 52, 53, 63, 64, 65, 67, 68,
- 70, 71, 72, 73, 74, 76, 77, 79,
- 80,
+ 0, 1, 2, 9, 10, 11, 18, 19,
+ 20,
};
static long _vq_fitmap_res0_128_1024_2[] = {
@@ -67,13 +62,13 @@
};
static long _vq_fitlength_res0_128_1024_2[] = {
- 49,
+ 9,
};
static encode_aux_pigeonhole _vq_auxp_res0_128_1024_2 = {
-1, 1, 2, 1,
_vq_pigeonmap_res0_128_1024_2,
- 49,
+ 9,
_vq_fitlist_res0_128_1024_2,
_vq_fitmap_res0_128_1024_2,
_vq_fitlength_res0_128_1024_2
1.6.6.5 +231 -25 vorbis/lib/books/res0_128_1024_3.vqh
Index: res0_128_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_3.vqh,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- res0_128_1024_3.vqh 2001/08/07 03:47:24 1.6.6.4
+++ res0_128_1024_3.vqh 2001/08/08 04:19:59 1.6.6.5
@@ -19,70 +19,276 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_3[] = {
+ 2,
1,
+ 3,
0,
- 2,
+ 4,
};
static long _vq_lengthlist_res0_128_1024_3[] = {
- 3, 6, 6, 0, 4, 5, 0, 4, 4, 6, 8, 7, 0, 7, 7, 0,
- 8, 7, 6, 7, 8, 0, 7, 7, 0, 7, 8, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 5, 8, 7, 0, 7, 6, 0, 6, 6, 4, 7, 8,
- 0, 6, 6, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
- 7, 7, 0, 6, 6, 0, 6, 6, 4, 7, 7, 0, 6, 6, 0, 6,
- 6,
+ 3, 5, 6, 8, 8, 0, 6, 5, 9, 9, 0, 6, 5, 8, 8, 0,
+ 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 6,10, 9, 0, 8,
+ 7,10, 9, 0, 7, 7,10, 9, 0,10, 9,10,10, 0, 0, 0,
+ 11,10, 6, 6, 7, 9,10, 0, 7, 8, 9,10, 0, 7, 7, 9,
+ 10, 0, 9, 9,10,10, 0, 0, 0,10,10, 8, 9, 9,11,11,
+ 0,11,10,13,11, 0,10,11,11,12, 0,12,13,14,13, 0,
+ 0, 0,14,13, 8, 9,10,10,11, 0,10,11,11,13, 0,11,
+ 11,12,12, 0,13,13,13,14, 0, 0, 0,12,13, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 6, 7, 7,11,11, 0, 7, 7,10, 9,
+ 0, 7, 7,10,10, 0, 9, 8,10, 9, 0, 0, 0, 9,10, 6,
+ 7, 7,11,11, 0, 7, 7, 9,10, 0, 7, 7,10,10, 0, 8,
+ 9, 9,10, 0, 0, 0,10,10, 9,10, 9,12,12, 0,10,10,
+ 11,10, 0,10, 9,12,12, 0,11,11,12,12, 0, 0, 0,12,
+ 12, 8, 9,10,12,12, 0, 9,10,11,12, 0,10,10,11,12,
+ 0,11,11,11,13, 0, 0, 0,13,12, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 6, 8, 7,11,10, 0, 7, 7,10,10, 0, 7, 7,
+ 10, 9, 0, 8, 8,10,10, 0, 0, 0,10,10, 6, 7, 8,11,
+ 11, 0, 7, 7, 9,10, 0, 7, 7, 9,10, 0, 8, 8,10,10,
+ 0, 0, 0,10,10, 8,10, 9,12,12, 0,10, 9,12,11, 0,
+ 10, 9,12,10, 0,11,11,12,12, 0, 0, 0,12,11, 9, 9,
+ 10,11,13, 0, 9,10,12,12, 0,10,10,10,13, 0,11,11,
+ 12,13, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 7, 9, 9,12,12, 0, 8, 8,11,11, 0, 8, 9,11,11, 0,
+ 10, 9,11,11, 0, 0, 0,10,11, 7, 9, 9,14,12, 0, 8,
+ 8,11,11, 0, 9, 8,11,11, 0, 9,10,11,11, 0, 0, 0,
+ 11,11, 9,10,10,13,13, 0,10,10,13,11, 0,10,10,12,
+ 12, 0,11,11,13,11, 0, 0, 0,12,12, 9,10,10,13,13,
+ 0,10,10,11,13, 0,10,10,12,12, 0,10,12,11,13, 0,
+ 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+ 10,10,13,13, 0,10,10,13,11, 0,10,10,12,11, 0,11,
+ 11,13,12, 0, 0, 0,13,12, 9,10,11,13,13, 0,10,10,
+ 12,12, 0, 9,10,12,12, 0,11,11,12,12, 0, 0, 0,12,
+ 12,
};
static float _vq_quantthresh_res0_128_1024_3[] = {
- -0.5, 0.5,
+ -1.5, -0.5, 0.5, 1.5,
};
static long _vq_quantmap_res0_128_1024_3[] = {
- 1, 0, 2,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_3 = {
_vq_quantthresh_res0_128_1024_3,
_vq_quantmap_res0_128_1024_3,
- 3,
- 3
+ 5,
+ 5
};
static long _vq_pigeonmap_res0_128_1024_3[] = {
- 0, 0,
+ 1, 0, 0, 0,
};
static long _vq_fitlist_res0_128_1024_3[] = {
- 0, 1, 2, 4, 5, 7, 8, 9,
- 10, 11, 13, 14, 16, 17, 18, 19,
- 20, 22, 23, 25, 26, 36, 37, 38,
- 40, 41, 43, 44, 45, 46, 47, 49,
- 50, 52, 53, 63, 64, 65, 67, 68,
- 70, 71, 72, 73, 74, 76, 77, 79,
- 80,
+ 0, 1, 2, 3, 6, 7, 8, 11,
+ 12, 13, 16, 17, 18, 25, 26, 27,
+ 28, 31, 32, 33, 36, 37, 38, 41,
+ 42, 43, 50, 51, 52, 53, 56, 57,
+ 58, 61, 62, 63, 66, 67, 68, 75,
+ 76, 77, 78, 81, 82, 83, 86, 87,
+ 88, 91, 92, 93, 150, 151, 152, 153,
+ 156, 157, 158, 161, 162, 163, 166, 167,
+ 168, 175, 176, 177, 178, 181, 182, 183,
+ 186, 187, 188, 191, 192, 193, 200, 201,
+ 202, 203, 206, 207, 208, 211, 212, 213,
+ 216, 217, 218, 275, 276, 277, 278, 281,
+ 282, 283, 286, 287, 288, 291, 292, 293,
+ 300, 301, 302, 303, 306, 307, 308, 311,
+ 316, 325, 326, 327, 328, 331, 332, 333,
+ 336, 341, 400, 401, 402, 403, 406, 407,
+ 408, 411, 412, 413, 416, 417, 418, 425,
+ 426, 427, 428, 431, 432, 433, 436, 441,
+ 450, 451, 452, 453, 456, 457, 458, 461,
+ 466, 4, 9, 14, 19, 29, 34, 39,
+ 44, 54, 59, 64, 69, 79, 84, 89,
+ 94, 154, 159, 164, 169, 179, 184, 189,
+ 194, 204, 209, 214, 219, 279, 284, 289,
+ 294, 304, 309, 312, 317, 329, 334, 337,
+ 342, 404, 409, 414, 419, 429, 434, 437,
+ 442, 454, 459, 462, 467, 314, 319, 339,
+ 344, 439, 444, 464, 469, 23, 48, 73,
+ 98, 173, 198, 223, 298, 313, 338, 423,
+ 438, 463, 24, 49, 74, 99, 174, 199,
+ 224, 299, 424, 324, 349, 449, 474, 323,
+ 348, 448, 473, 100, 101, 102, 103, 106,
+ 107, 108, 111, 112, 113, 116, 117, 118,
+ 225, 226, 227, 228, 231, 232, 233, 236,
+ 237, 238, 241, 242, 243, 318, 350, 351,
+ 352, 353, 356, 357, 358, 361, 366, 443,
+ 475, 476, 477, 478, 481, 482, 483, 486,
+ 491, 104, 109, 114, 119, 229, 234, 239,
+ 244, 354, 359, 362, 367, 479, 484, 487,
+ 492, 364, 369, 489, 494, 123, 248, 363,
+ 488, 124, 249, 374, 499, 373, 498, 368,
+ 493, 343, 575, 576, 577, 578, 581, 582,
+ 583, 586, 591, 579, 584, 587, 592, 589,
+ 594, 588, 599, 598, 600, 601, 602, 603,
+ 606, 607, 608, 611, 616, 604, 609, 612,
+ 617, 614, 619, 613, 624, 623, 618, 593,
+ 0, 1, 3, 6, 8, 11, 13, 16,
+ 18, 25, 26, 28, 31, 33, 36, 38,
+ 41, 43, 50, 51, 53, 56, 58, 61,
+ 63, 66, 68, 75, 76, 78, 81, 83,
+ 86, 88, 91, 93, 150, 151, 153, 156,
+ 158, 161, 163, 166, 168, 175, 176, 178,
+ 181, 183, 186, 188, 191, 193, 200, 201,
+ 203, 206, 208, 211, 213, 216, 218, 275,
+ 276, 278, 281, 283, 286, 288, 291, 293,
+ 300, 301, 303, 306, 308, 311, 313, 316,
+ 318, 325, 326, 328, 331, 333, 336, 338,
+ 341, 343, 400, 401, 403, 406, 408, 411,
+ 413, 416, 418, 425, 426, 428, 431, 433,
+ 436, 438, 441, 443, 450, 451, 453, 456,
+ 458, 461, 463, 466, 468, 23, 48, 73,
+ 98, 173, 198, 223, 298, 323, 348, 423,
+ 448, 473, 100, 101, 103, 106, 108, 111,
+ 113, 116, 118, 225, 226, 228, 231, 233,
+ 236, 238, 241, 243, 350, 351, 353, 356,
+ 358, 361, 363, 366, 368, 475, 476, 478,
+ 481, 483, 486, 488, 491, 493, 123, 248,
+ 373, 498, 575, 576, 578, 581, 583, 586,
+ 588, 591, 593, 598, 600, 601, 603, 606,
+ 608, 611, 613, 616, 618, 623, 0, 1,
+ 2, 3, 6, 7, 8, 16, 17, 18,
+ 25, 26, 27, 28, 31, 32, 33, 41,
+ 42, 43, 50, 51, 52, 53, 56, 57,
+ 58, 66, 67, 68, 75, 76, 77, 78,
+ 81, 82, 83, 91, 92, 93, 150, 151,
+ 152, 153, 156, 157, 158, 166, 167, 168,
+ 175, 176, 177, 178, 181, 182, 183, 191,
+ 192, 193, 200, 201, 202, 203, 206, 207,
+ 208, 216, 217, 218, 275, 276, 277, 278,
+ 281, 282, 283, 291, 292, 293, 300, 301,
+ 306, 307, 308, 316, 317, 318, 325, 326,
+ 331, 332, 333, 341, 342, 343, 400, 401,
+ 402, 403, 406, 407, 408, 416, 417, 418,
+ 425, 426, 431, 432, 433, 441, 442, 443,
+ 450, 451, 456, 457, 458, 466, 467, 468,
+ 4, 9, 19, 29, 34, 44, 54, 59,
+ 69, 79, 84, 94, 154, 159, 169, 179,
+ 184, 194, 204, 209, 219, 279, 284, 294,
+ 302, 309, 319, 327, 334, 344, 404, 409,
+ 419, 427, 434, 444, 452, 459, 469, 304,
+ 329, 429, 454, 100, 101, 102, 103, 106,
+ 107, 108, 116, 117, 118, 225, 226, 227,
+ 228, 231, 232, 233, 241, 242, 243, 303,
+ 350, 351, 356, 357, 358, 366, 367, 368,
+ 428, 475, 476, 481, 482, 483, 491, 492,
+ 493, 104, 109, 119, 229, 234, 244, 352,
+ 359, 369, 477, 484, 494, 354, 479, 353,
+ 478, 328, 575, 576, 581, 582, 583, 591,
+ 592, 593, 577, 584, 594, 579, 600, 601,
+ 606, 607, 608, 616, 617, 618, 602, 609,
+ 619, 604, 603, 578, 0, 1, 2, 3,
+ 6, 7, 8, 11, 12, 13, 16, 17,
+ 18, 25, 26, 27, 28, 31, 32, 33,
+ 36, 37, 38, 41, 42, 43, 75, 76,
+ 77, 78, 81, 82, 83, 86, 87, 88,
+ 91, 92, 93, 150, 151, 152, 153, 156,
+ 157, 158, 161, 162, 163, 166, 167, 168,
+ 200, 201, 202, 203, 206, 207, 208, 211,
+ 212, 213, 216, 217, 218, 275, 276, 277,
+ 278, 281, 282, 283, 286, 287, 288, 291,
+ 292, 293, 325, 326, 327, 328, 331, 332,
+ 333, 336, 337, 338, 341, 342, 343, 400,
+ 401, 402, 403, 406, 407, 408, 411, 412,
+ 413, 416, 417, 418, 450, 451, 452, 453,
+ 456, 457, 458, 461, 462, 463, 466, 467,
+ 468, 4, 9, 14, 19, 29, 34, 39,
+ 44, 79, 84, 89, 94, 154, 159, 164,
+ 169, 204, 209, 214, 219, 279, 284, 289,
+ 294, 329, 334, 339, 344, 404, 409, 414,
+ 419, 454, 459, 464, 469, 23, 48, 98,
+ 173, 223, 298, 348, 423, 473, 24, 49,
+ 99, 174, 224, 299, 349, 424, 474, 575,
+ 576, 577, 578, 581, 582, 583, 586, 587,
+ 588, 591, 592, 593, 579, 584, 589, 594,
+ 598, 599, 0, 1, 2, 3, 6, 7,
+ 8, 11, 12, 13, 16, 17, 18, 25,
+ 26, 27, 28, 31, 32, 33, 36, 37,
+ 38, 41, 42, 43, 50, 51, 52, 53,
+ 56, 57, 58, 61, 66, 75, 76, 77,
+ 78, 81, 82, 83, 86, 91, 150, 151,
+ 152, 153, 156, 157, 158, 161, 162, 163,
+ 166, 167, 168, 175, 176, 177, 178, 181,
+ 182, 183, 186, 187, 188, 191, 192, 193,
+ 200, 201, 202, 203, 206, 207, 208, 211,
+ 212, 213, 216, 217, 218, 400, 401, 402,
+ 403, 406, 407, 408, 411, 412, 413, 416,
+ 417, 418, 425, 426, 427, 428, 431, 432,
+ 433, 436, 437, 438, 441, 442, 443, 450,
+ 451, 452, 453, 456, 457, 458, 461, 462,
+ 463, 466, 467, 468, 4, 9, 14, 19,
+ 29, 34, 39, 44, 54, 59, 62, 67,
+ 79, 84, 87, 92, 154, 159, 164, 169,
+ 179, 184, 189, 194, 204, 209, 214, 219,
+ 404, 409, 414, 419, 429, 434, 439, 444,
+ 454, 459, 464, 469, 64, 69, 89, 94,
+ 23, 48, 63, 88, 173, 198, 223, 423,
+ 448, 473, 24, 49, 174, 199, 224, 424,
+ 449, 474, 74, 99, 73, 98, 68, 100,
+ 101, 102, 103, 106, 107, 108, 111, 116,
+ 225, 226, 227, 228, 231, 232, 233, 236,
+ 237, 238, 241, 242, 243, 475, 476, 477,
+ 478, 481, 482, 483, 486, 487, 488, 491,
+ 492, 493, 104, 109, 112, 117, 229, 234,
+ 239, 244, 479, 484, 489, 494, 114, 119,
+ 113, 248, 498, 249, 499, 124, 123, 118,
+ 0, 1, 2, 3, 6, 7, 8, 16,
+ 17, 18, 25, 26, 27, 28, 31, 32,
+ 33, 41, 42, 43, 50, 51, 56, 57,
+ 58, 66, 67, 68, 75, 76, 81, 82,
+ 83, 91, 92, 93, 150, 151, 152, 153,
+ 156, 157, 158, 166, 167, 168, 175, 176,
+ 177, 178, 181, 182, 183, 191, 192, 193,
+ 200, 201, 202, 203, 206, 207, 208, 216,
+ 217, 218, 400, 401, 402, 403, 406, 407,
+ 408, 416, 417, 418, 425, 426, 427, 428,
+ 431, 432, 433, 441, 442, 443, 450, 451,
+ 452, 453, 456, 457, 458, 466, 467, 468,
+ 4, 9, 19, 29, 34, 44, 52, 59,
+ 69, 77, 84, 94, 154, 159, 169, 179,
+ 184, 194, 204, 209, 219, 404, 409, 419,
+ 429, 434, 444, 454, 459, 469, 54, 79,
+ 53, 100, 101, 106, 107, 108, 116, 117,
+ 118, 225, 226, 227, 228, 231, 232, 233,
+ 241, 242, 243, 475, 476, 477, 478, 481,
+ 482, 483, 491, 492, 493, 102, 109, 119,
+ 229, 234, 244, 479, 484, 494, 104, 103,
};
static long _vq_fitmap_res0_128_1024_3[] = {
- 0,
+ 0, 360, 550, 360, 796, 360, 796, 360,
+ 986, 360, 1232, 360, 796, 360, 796, 360,
};
static long _vq_fitlength_res0_128_1024_3[] = {
- 49,
+ 360, 190, 246, 190, 190, 190, 190, 190,
+ 246, 190, 168, 190, 190, 190, 190, 190,
};
static encode_aux_pigeonhole _vq_auxp_res0_128_1024_3 = {
- -1, 1, 2, 1,
+ -2, 1, 4, 2,
_vq_pigeonmap_res0_128_1024_3,
- 49,
+ 1400,
_vq_fitlist_res0_128_1024_3,
_vq_fitmap_res0_128_1024_3,
_vq_fitlength_res0_128_1024_3
};
static static_codebook _vq_book_res0_128_1024_3 = {
- 4, 81,
+ 4, 625,
_vq_lengthlist_res0_128_1024_3,
- 1, -535822336, 1611661312, 2, 0,
+ 1, -533725184, 1611661312, 3, 0,
_vq_quantlist_res0_128_1024_3,
NULL,
&_vq_auxt_res0_128_1024_3,
1.6.6.5 +120 -173 vorbis/lib/books/res0_128_1024_4.vqh
Index: res0_128_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_4.vqh,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- res0_128_1024_4.vqh 2001/08/07 05:03:14 1.6.6.4
+++ res0_128_1024_4.vqh 2001/08/08 04:19:59 1.6.6.5
@@ -27,46 +27,46 @@
};
static long _vq_lengthlist_res0_128_1024_4[] = {
- 2, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0,
- 0, 0, 8, 8, 0, 0, 0, 8, 8, 5, 7, 6,10, 8, 0, 8,
- 8,10,10, 0, 8, 8,10, 9, 0, 0, 0,11,11, 0, 0, 0,
- 12,11, 5, 6, 7, 9,10, 0, 8, 8, 9,10, 0, 7, 8, 9,
- 10, 0, 0, 0,11,12, 0, 0, 0,11,12, 8,10, 8,12,10,
- 0,11,11,13,12, 0,11,10,13,12, 0, 0, 0,16,15, 0,
- 0, 0,17,14, 8, 8,10,10,12, 0,11,11,12,13, 0,11,
- 12,12,13, 0, 0, 0,16,16, 0, 0, 0,16,16, 0, 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, 8, 8,11,11, 0, 8, 7,11,10,
- 0, 8, 8,11,10, 0, 0, 0,11,10, 0, 0, 0,10,11, 5,
- 8, 8,11,12, 0, 7, 8,10,11, 0, 8, 8,10,11, 0, 0,
- 0,10,11, 0, 0, 0,11,11, 8,10, 9,13,12, 0,10,10,
- 14,12, 0,11,10,15,13, 0, 0, 0,17,14, 0, 0, 0,15,
- 14, 8, 9,10,12,13, 0,10,10,12,13, 0,10,11,13,14,
- 0, 0, 0,14,15, 0, 0, 0,14,15, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5, 8, 8,11,11, 0, 8, 8,10,11, 0, 8, 8,
- 11,10, 0, 0, 0,11,11, 0, 0, 0,11,10, 5, 8, 8,11,
- 11, 0, 8, 8,10,10, 0, 7, 8,10,10, 0, 0, 0,11,11,
- 0, 0, 0,10,11, 8,10, 9,13,12, 0,11,11,14,13, 0,
- 11,10,13,12, 0, 0, 0,16,14, 0, 0, 0,15,13, 8, 9,
- 10,12,14, 0,11,10,13,13, 0,10,11,12,14, 0, 0, 0,
- 15,15, 0, 0, 0,13,17, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 3, 5, 5, 7, 7, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
+ 0, 0, 8, 8, 0, 0, 0, 8, 8, 5, 7, 7, 9, 8, 0, 7,
+ 7, 0, 0, 0, 8, 7, 0, 0, 0, 0, 0,11,10, 0, 0, 0,
+ 11,10, 5, 7, 7, 8, 9, 0, 7, 7, 0, 0, 0, 7, 7, 0,
+ 0, 0, 0, 0,10,11, 0, 0, 0,10,10, 7, 9, 8,10, 8,
+ 0, 9, 8, 0, 0, 0, 9, 8, 0, 0, 0, 0, 0,12,11, 0,
+ 0, 0,12,11, 7, 8, 9, 8,10, 0, 8, 9, 0, 0, 0, 8,
+ 9, 0, 0, 0, 0, 0,11,12, 0, 0, 0,11,12, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 5, 8, 7, 9, 8, 0, 7, 6, 0, 0,
+ 0, 7, 7, 0, 0, 0, 0, 0,10, 9, 0, 0, 0,10,10, 5,
+ 7, 7, 8, 9, 0, 6, 7, 0, 0, 0, 7, 7, 0, 0, 0, 0,
+ 0, 9,10, 0, 0, 0,10, 9, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 8,12,11,15,14, 0,11,10,15,14, 0,11,11,14,
- 14, 0, 0, 0,17,14, 0, 0, 0,14,15, 8,11,11,17,15,
- 0,10,11,13,17, 0,11,11,14,15, 0, 0, 0,14,16, 0,
- 0, 0,16,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 5, 8, 7, 9, 8, 0, 7, 7, 0, 0, 0, 7, 7,
+ 0, 0, 0, 0, 0,10,10, 0, 0, 0,10, 9, 5, 7, 7, 8,
+ 9, 0, 7, 7, 0, 0, 0, 6, 7, 0, 0, 0, 0, 0,10,10,
+ 0, 0, 0, 9,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, 8,11,10,12,11, 0,10, 9, 0, 0, 0, 9,10, 0,
+ 0, 0, 0, 0,14,11, 0, 0, 0,12,12, 8,10,11,11,12,
+ 0, 9,10, 0, 0, 0,10,10, 0, 0, 0, 0, 0,11,13, 0,
+ 0, 0,13,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,
- 12,11, 0,14, 0,11,11,14,14, 0,11,10,15,15, 0, 0,
- 0,15,14, 0, 0, 0,14,14, 8,11,11,15,15, 0,11,11,
- 15,15, 0,10,11,14, 0, 0, 0, 0,16,15, 0, 0, 0,14,
- 15,
+ 11,10,12,11, 0,10, 9, 0, 0, 0,10, 9, 0, 0, 0, 0,
+ 0,13,12, 0, 0, 0,14,11, 8,10,10,11,12, 0,10,10,
+ 0, 0, 0, 9,10, 0, 0, 0, 0, 0,12,13, 0, 0, 0,11,
+ 13,
};
static float _vq_quantthresh_res0_128_1024_4[] = {
@@ -89,158 +89,105 @@
};
static long _vq_fitlist_res0_128_1024_4[] = {
- 0, 1, 2, 3, 6, 7, 8, 11,
- 12, 13, 18, 25, 26, 27, 28, 31,
- 32, 33, 36, 37, 38, 43, 50, 51,
- 52, 53, 56, 57, 58, 61, 62, 63,
- 68, 75, 76, 77, 78, 81, 82, 83,
- 86, 87, 88, 93, 150, 151, 152, 153,
- 156, 157, 158, 161, 162, 163, 168, 175,
- 176, 177, 178, 181, 182, 183, 186, 187,
- 188, 193, 200, 201, 202, 203, 206, 207,
- 208, 211, 212, 213, 218, 275, 276, 277,
- 278, 281, 282, 283, 286, 287, 288, 293,
- 300, 301, 302, 303, 306, 307, 308, 311,
- 325, 326, 327, 328, 331, 332, 333, 336,
- 450, 451, 452, 453, 456, 457, 458, 461,
- 4, 9, 14, 19, 29, 34, 39, 44,
- 54, 59, 64, 69, 79, 84, 89, 94,
- 154, 159, 164, 169, 179, 184, 189, 194,
- 204, 209, 214, 219, 279, 284, 289, 294,
- 304, 309, 312, 329, 334, 337, 454, 459,
- 462, 314, 319, 339, 344, 464, 469, 23,
- 48, 73, 98, 173, 198, 223, 298, 313,
- 338, 463, 24, 49, 74, 99, 174, 199,
- 224, 299, 324, 349, 474, 323, 348, 473,
- 100, 101, 102, 103, 106, 107, 108, 111,
- 112, 113, 118, 225, 226, 227, 228, 231,
- 232, 233, 236, 237, 238, 243, 318, 350,
- 351, 352, 353, 356, 357, 358, 361, 475,
- 476, 477, 478, 481, 482, 483, 486, 104,
- 109, 114, 119, 229, 234, 239, 244, 354,
- 359, 362, 479, 484, 487, 364, 369, 489,
- 494, 123, 248, 363, 488, 124, 249, 374,
- 499, 373, 498, 368, 493, 343, 575, 576,
- 577, 581, 582, 583, 586, 579, 584, 587,
- 589, 594, 588, 599, 598, 600, 601, 602,
- 603, 606, 607, 608, 611, 604, 609, 612,
- 619, 613, 624, 623, 618, 593, 0, 1,
- 3, 6, 8, 11, 13, 18, 25, 26,
- 28, 31, 33, 36, 38, 43, 50, 51,
- 53, 56, 58, 61, 63, 68, 75, 76,
- 78, 81, 83, 86, 88, 93, 150, 151,
- 153, 156, 158, 161, 163, 168, 175, 176,
- 178, 181, 183, 186, 188, 193, 200, 201,
- 203, 206, 208, 211, 213, 218, 275, 276,
- 278, 281, 283, 286, 288, 293, 300, 301,
- 303, 306, 308, 311, 313, 318, 325, 326,
- 328, 331, 333, 336, 338, 343, 450, 451,
- 453, 456, 458, 461, 463, 468, 23, 48,
- 73, 98, 173, 198, 223, 298, 323, 348,
- 473, 100, 101, 103, 106, 108, 111, 113,
- 118, 225, 226, 228, 231, 233, 236, 238,
- 243, 350, 351, 353, 356, 358, 361, 363,
- 368, 475, 476, 478, 481, 483, 486, 488,
- 493, 123, 248, 373, 498, 575, 576, 581,
- 583, 586, 588, 593, 598, 600, 601, 603,
- 606, 608, 611, 613, 618, 623, 0, 1,
- 2, 3, 6, 7, 8, 18, 25, 26,
- 27, 28, 31, 32, 33, 43, 50, 51,
- 52, 53, 56, 57, 58, 68, 75, 76,
- 77, 78, 81, 82, 83, 93, 150, 151,
- 152, 153, 156, 157, 158, 168, 175, 176,
- 177, 178, 181, 182, 183, 193, 200, 201,
- 202, 203, 206, 207, 208, 218, 275, 276,
- 277, 278, 281, 282, 283, 293, 300, 301,
- 306, 307, 308, 318, 325, 326, 331, 332,
- 333, 343, 450, 451, 456, 457, 458, 468,
- 4, 9, 19, 29, 34, 44, 54, 59,
- 69, 79, 84, 94, 154, 159, 169, 179,
- 184, 194, 204, 209, 219, 279, 284, 294,
- 302, 309, 319, 327, 334, 344, 452, 459,
- 469, 304, 329, 454, 100, 101, 102, 103,
- 106, 107, 108, 118, 225, 226, 227, 228,
- 231, 232, 233, 243, 303, 350, 351, 356,
- 357, 358, 368, 475, 476, 481, 482, 483,
- 493, 104, 109, 119, 229, 234, 244, 352,
- 359, 369, 477, 484, 494, 354, 479, 353,
- 478, 328, 575, 576, 581, 582, 583, 593,
- 577, 584, 594, 579, 600, 601, 606, 607,
- 608, 618, 602, 609, 619, 604, 603, 0,
- 1, 2, 3, 6, 7, 8, 11, 12,
- 13, 18, 25, 26, 27, 28, 31, 32,
- 33, 36, 37, 38, 43, 75, 76, 77,
- 78, 81, 82, 83, 86, 87, 88, 93,
- 150, 151, 152, 153, 156, 157, 158, 161,
- 162, 163, 168, 200, 201, 202, 203, 206,
- 207, 208, 211, 212, 213, 218, 275, 276,
- 277, 278, 281, 282, 283, 286, 287, 288,
- 293, 325, 326, 327, 328, 331, 332, 333,
- 336, 337, 338, 343, 450, 451, 452, 453,
- 456, 457, 458, 461, 462, 463, 468, 4,
- 9, 14, 19, 29, 34, 39, 44, 79,
- 84, 89, 94, 154, 159, 164, 169, 204,
- 209, 214, 219, 279, 284, 289, 294, 329,
- 334, 339, 344, 454, 459, 464, 469, 23,
- 48, 98, 173, 223, 298, 348, 473, 24,
- 49, 99, 174, 224, 299, 349, 474, 575,
- 576, 577, 581, 582, 583, 586, 587, 588,
- 593, 579, 584, 589, 594, 598, 599, 0,
- 1, 2, 3, 6, 7, 8, 11, 12,
- 13, 18, 25, 26, 27, 28, 31, 32,
- 33, 36, 37, 38, 43, 50, 51, 52,
- 53, 56, 57, 58, 61, 75, 76, 77,
- 78, 81, 82, 83, 86, 150, 151, 152,
- 153, 156, 157, 158, 161, 162, 163, 168,
- 175, 176, 177, 178, 181, 182, 183, 186,
- 187, 188, 193, 200, 201, 202, 203, 206,
- 207, 208, 211, 212, 213, 218, 450, 451,
- 452, 453, 456, 457, 458, 461, 462, 463,
- 468, 4, 9, 14, 19, 29, 34, 39,
- 44, 54, 59, 62, 79, 84, 87, 154,
- 159, 164, 169, 179, 184, 189, 194, 204,
- 209, 214, 219, 454, 459, 464, 469, 64,
- 69, 89, 94, 23, 48, 63, 88, 173,
- 198, 223, 473, 24, 49, 174, 199, 224,
- 474, 74, 99, 73, 98, 68, 100, 101,
- 102, 103, 106, 107, 108, 111, 225, 226,
- 227, 228, 231, 232, 233, 236, 237, 238,
- 243, 475, 476, 477, 478, 481, 482, 483,
- 486, 487, 488, 493, 104, 109, 112, 229,
- 234, 239, 244, 479, 484, 489, 494, 114,
- 119, 113, 248, 498, 249, 499, 124, 123,
- 118, 0, 1, 2, 3, 6, 7, 8,
- 18, 25, 26, 27, 28, 31, 32, 33,
- 43, 50, 51, 56, 57, 58, 68, 75,
- 76, 81, 82, 83, 93, 150, 151, 152,
- 153, 156, 157, 158, 168, 175, 176, 177,
- 178, 181, 182, 183, 193, 200, 201, 202,
- 203, 206, 207, 208, 218, 450, 451, 452,
- 453, 456, 457, 458, 468, 4, 9, 19,
- 29, 34, 44, 52, 59, 69, 77, 84,
- 94, 154, 159, 169, 179, 184, 194, 204,
- 209, 219, 454, 459, 469, 54, 79, 53,
- 100, 101, 106, 107, 108, 118, 225, 226,
- 227, 228, 231, 232, 233, 243, 475, 476,
- 477, 478, 481, 482, 483, 493, 102, 109,
- 119, 229, 234, 244, 479, 484, 494, 104,
- 103,
+ 0, 1, 2, 3, 6, 7, 11, 12,
+ 18, 25, 26, 27, 28, 31, 32, 36,
+ 37, 43, 50, 51, 52, 53, 56, 57,
+ 61, 62, 68, 75, 76, 77, 78, 81,
+ 82, 86, 87, 93, 150, 151, 152, 153,
+ 156, 157, 161, 162, 168, 175, 176, 177,
+ 178, 181, 182, 186, 187, 193, 275, 276,
+ 277, 278, 281, 282, 286, 287, 293, 300,
+ 301, 302, 303, 306, 307, 311, 450, 451,
+ 452, 453, 456, 457, 461, 4, 19, 29,
+ 44, 54, 69, 79, 94, 154, 169, 179,
+ 194, 279, 294, 304, 312, 454, 462, 319,
+ 469, 23, 48, 73, 98, 173, 198, 298,
+ 24, 49, 74, 99, 174, 199, 299, 324,
+ 474, 323, 473, 100, 101, 102, 103, 106,
+ 107, 111, 112, 118, 318, 475, 476, 477,
+ 478, 481, 482, 486, 104, 119, 479, 487,
+ 494, 123, 124, 499, 498, 493, 575, 576,
+ 577, 578, 581, 582, 586, 579, 587, 594,
+ 599, 598, 600, 601, 602, 603, 606, 607,
+ 611, 604, 612, 619, 624, 623, 618, 593,
+ 0, 1, 3, 6, 11, 18, 25, 26,
+ 28, 31, 36, 43, 50, 51, 53, 56,
+ 61, 68, 75, 76, 78, 81, 86, 93,
+ 150, 151, 153, 156, 161, 168, 175, 176,
+ 178, 181, 186, 193, 275, 276, 278, 281,
+ 286, 293, 300, 301, 303, 306, 311, 318,
+ 450, 451, 453, 456, 461, 468, 23, 48,
+ 73, 98, 173, 198, 298, 323, 473, 100,
+ 101, 103, 106, 111, 118, 475, 476, 478,
+ 481, 486, 493, 123, 498, 575, 576, 578,
+ 581, 586, 593, 598, 600, 601, 603, 606,
+ 611, 618, 623, 0, 1, 2, 3, 6,
+ 7, 18, 25, 26, 27, 28, 31, 32,
+ 43, 50, 51, 52, 53, 56, 57, 68,
+ 75, 76, 77, 78, 81, 82, 93, 150,
+ 151, 152, 153, 156, 157, 168, 175, 176,
+ 177, 178, 181, 182, 193, 275, 276, 277,
+ 278, 281, 282, 293, 300, 301, 306, 307,
+ 318, 450, 451, 456, 457, 468, 4, 19,
+ 29, 44, 54, 69, 79, 94, 154, 169,
+ 179, 194, 279, 294, 302, 319, 452, 469,
+ 304, 454, 100, 101, 102, 103, 106, 107,
+ 118, 303, 475, 476, 481, 482, 493, 104,
+ 119, 477, 494, 479, 478, 575, 576, 581,
+ 582, 593, 577, 594, 579, 600, 601, 606,
+ 607, 618, 602, 619, 604, 603, 578, 0,
+ 1, 2, 3, 6, 7, 11, 12, 18,
+ 25, 26, 27, 28, 31, 32, 36, 37,
+ 43, 75, 76, 77, 78, 81, 82, 86,
+ 87, 93, 150, 151, 152, 153, 156, 157,
+ 161, 162, 168, 275, 276, 277, 278, 281,
+ 282, 286, 287, 293, 450, 451, 452, 453,
+ 456, 457, 461, 462, 468, 4, 19, 29,
+ 44, 79, 94, 154, 169, 279, 294, 454,
+ 469, 23, 48, 98, 173, 298, 473, 24,
+ 49, 99, 174, 299, 474, 575, 576, 577,
+ 578, 581, 582, 586, 587, 593, 579, 594,
+ 598, 599, 0, 1, 2, 3, 6, 7,
+ 11, 12, 18, 25, 26, 27, 28, 31,
+ 32, 36, 37, 43, 50, 51, 52, 53,
+ 56, 57, 61, 75, 76, 77, 78, 81,
+ 82, 86, 150, 151, 152, 153, 156, 157,
+ 161, 162, 168, 175, 176, 177, 178, 181,
+ 182, 186, 187, 193, 450, 451, 452, 453,
+ 456, 457, 461, 462, 468, 4, 19, 29,
+ 44, 54, 62, 79, 87, 154, 169, 179,
+ 194, 454, 469, 69, 94, 23, 48, 173,
+ 198, 473, 24, 49, 174, 199, 474, 74,
+ 99, 73, 98, 68, 100, 101, 102, 103,
+ 106, 107, 111, 475, 476, 477, 478, 481,
+ 482, 486, 487, 493, 104, 112, 479, 494,
+ 119, 498, 499, 124, 123, 118, 0, 1,
+ 2, 3, 6, 7, 18, 25, 26, 27,
+ 28, 31, 32, 43, 50, 51, 56, 57,
+ 68, 75, 76, 81, 82, 93, 150, 151,
+ 152, 153, 156, 157, 168, 175, 176, 177,
+ 178, 181, 182, 193, 450, 451, 452, 453,
+ 456, 457, 468, 4, 19, 29, 44, 52,
+ 69, 77, 94, 154, 169, 179, 194, 454,
+ 469, 54, 79, 53, 100, 101, 106, 107,
+ 118, 475, 476, 477, 478, 481, 482, 493,
+ 102, 119, 479, 494, 104, 103,
};
static long _vq_fitmap_res0_128_1024_4[] = {
- 0, 286, 438, 286, 623, 286, 623, 286,
- 775, 286, 961, 286, 623, 286, 623, 286,
+ 0, 168, 259, 168, 375, 168, 375, 168,
+ 466, 168, 582, 168, 375, 168, 375, 168,
};
static long _vq_fitlength_res0_128_1024_4[] = {
- 286, 152, 185, 152, 152, 152, 152, 152,
- 186, 152, 120, 152, 152, 152, 152, 152,
+ 168, 91, 116, 91, 91, 91, 91, 91,
+ 116, 91, 80, 91, 91, 91, 91, 91,
};
static encode_aux_pigeonhole _vq_auxp_res0_128_1024_4 = {
-2, 1, 4, 2,
_vq_pigeonmap_res0_128_1024_4,
- 1081,
+ 662,
_vq_fitlist_res0_128_1024_4,
_vq_fitmap_res0_128_1024_4,
_vq_fitlength_res0_128_1024_4
1.6.6.5 +42 -174 vorbis/lib/books/res0_128_1024_5.vqh
Index: res0_128_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_5.vqh,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- res0_128_1024_5.vqh 2001/08/07 05:03:14 1.6.6.4
+++ res0_128_1024_5.vqh 2001/08/08 04:19:59 1.6.6.5
@@ -27,46 +27,46 @@
};
static long _vq_lengthlist_res0_128_1024_5[] = {
- 3, 6, 6,10,10, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0,
- 0, 0, 8, 8, 0, 0, 0, 8, 8, 6, 8, 7,11,11, 0, 7,
- 7,10, 9, 0, 7, 7,10, 9, 0, 0, 0,10,10, 0, 0, 0,
- 11,10, 6, 7, 8,11,11, 0, 7, 7, 9,10, 0, 7, 7, 9,
- 10, 0, 0, 0,10,10, 0, 0, 0,10,10,10,11,11,12,11,
- 0,11,11,13,13, 0,11,11,13,12, 0, 0, 0,15,14, 0,
- 0, 0,14,14,10,10,11,12,13, 0,11,11,12,12, 0,11,
- 11,12,13, 0, 0, 0,13,15, 0, 0, 0,13,14, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 5, 7, 7,11,11, 0, 7, 6,10, 9,
- 0, 7, 6,10, 9, 0, 0, 0,10, 9, 0, 0, 0, 9,10, 5,
- 7, 7,11,12, 0, 6, 7, 9,10, 0, 7, 7, 9,10, 0, 0,
- 0, 9,10, 0, 0, 0, 9, 9, 8,10, 9,13,12, 0,10, 9,
- 12,10, 0,10, 9,12,11, 0, 0, 0,12,11, 0, 0, 0,12,
- 12, 8, 9,10,12,14, 0, 9,10,10,12, 0, 9,10,11,12,
- 0, 0, 0,11,12, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5, 7, 7,11,11, 0, 7, 7, 9, 9, 0, 7, 6,
- 10, 9, 0, 0, 0,10, 9, 0, 0, 0,10, 9, 5, 7, 7,11,
- 11, 0, 6, 7, 9, 9, 0, 6, 7, 9,10, 0, 0, 0, 9, 9,
- 0, 0, 0, 9,10, 8,10, 9,12,12, 0,10, 9,12,12, 0,
- 10, 9,12,10, 0, 0, 0,12,12, 0, 0, 0,13,11, 8, 9,
- 10,12,13, 0, 9,10,11,12, 0, 9,10,11,12, 0, 0, 0,
- 12,13, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 3, 3, 3, 6, 6, 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, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 9, 7,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 6, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 8,10,10,14,13, 0,10, 9,13,11, 0, 9, 9,12,
- 12, 0, 0, 0,13,11, 0, 0, 0,12,12, 8,10,10,13,14,
- 0, 9,10,11,13, 0,10, 9,12,12, 0, 0, 0,11,12, 0,
- 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,
- 10,10,14,14, 0,10, 9,12,12, 0,10, 9,13,11, 0, 0,
- 0,12,11, 0, 0, 0,13,11, 8,10,10,14,14, 0, 9, 9,
- 12,12, 0, 9,10,12,13, 0, 0, 0,12,12, 0, 0, 0,11,
- 12,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 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_res0_128_1024_5[] = {
@@ -89,158 +89,26 @@
};
static long _vq_fitlist_res0_128_1024_5[] = {
- 0, 1, 2, 3, 6, 7, 8, 11,
- 12, 13, 18, 25, 26, 27, 28, 31,
- 32, 33, 36, 37, 38, 43, 50, 51,
- 52, 53, 56, 57, 58, 61, 62, 63,
- 68, 75, 76, 77, 78, 81, 82, 83,
- 86, 87, 88, 93, 150, 151, 152, 153,
- 156, 157, 158, 161, 162, 163, 168, 175,
- 176, 177, 178, 181, 182, 183, 186, 187,
- 188, 193, 200, 201, 202, 203, 206, 207,
- 208, 211, 212, 213, 218, 275, 276, 277,
- 278, 281, 282, 283, 286, 287, 288, 293,
- 300, 301, 302, 303, 306, 307, 308, 311,
- 325, 326, 327, 328, 331, 332, 333, 336,
- 450, 451, 452, 453, 456, 457, 458, 461,
- 4, 9, 14, 19, 29, 34, 39, 44,
- 54, 59, 64, 69, 79, 84, 89, 94,
- 154, 159, 164, 169, 179, 184, 189, 194,
- 204, 209, 214, 219, 279, 284, 289, 294,
- 304, 309, 312, 329, 334, 337, 454, 459,
- 462, 314, 319, 339, 344, 464, 469, 23,
- 48, 73, 98, 173, 198, 223, 298, 313,
- 338, 463, 24, 49, 74, 99, 174, 199,
- 224, 299, 324, 349, 474, 323, 348, 473,
- 100, 101, 102, 103, 106, 107, 108, 111,
- 112, 113, 118, 225, 226, 227, 228, 231,
- 232, 233, 236, 237, 238, 243, 318, 350,
- 351, 352, 353, 356, 357, 358, 361, 475,
- 476, 477, 478, 481, 482, 483, 486, 104,
- 109, 114, 119, 229, 234, 239, 244, 354,
- 359, 362, 479, 484, 487, 364, 369, 489,
- 494, 123, 248, 363, 488, 124, 249, 374,
- 499, 373, 498, 368, 493, 343, 575, 576,
- 577, 578, 581, 582, 583, 586, 579, 584,
- 587, 589, 594, 588, 599, 598, 600, 601,
- 602, 603, 606, 607, 608, 611, 604, 609,
- 612, 614, 619, 613, 624, 623, 618, 593,
- 0, 1, 3, 6, 8, 11, 13, 18,
- 25, 26, 28, 31, 33, 36, 38, 43,
- 50, 51, 53, 56, 58, 61, 63, 68,
- 75, 76, 78, 81, 83, 86, 88, 93,
- 150, 151, 153, 156, 158, 161, 163, 168,
- 175, 176, 178, 181, 183, 186, 188, 193,
- 200, 201, 203, 206, 208, 211, 213, 218,
- 275, 276, 278, 281, 283, 286, 288, 293,
- 300, 301, 303, 306, 308, 311, 313, 318,
- 325, 326, 328, 331, 333, 336, 338, 343,
- 450, 451, 453, 456, 458, 461, 463, 468,
- 23, 48, 73, 98, 173, 198, 223, 298,
- 323, 348, 473, 100, 101, 103, 106, 108,
- 111, 113, 118, 225, 226, 228, 231, 233,
- 236, 238, 243, 350, 351, 353, 356, 358,
- 361, 363, 368, 475, 476, 478, 481, 483,
- 486, 488, 493, 123, 248, 373, 498, 575,
- 576, 578, 581, 583, 586, 588, 593, 598,
- 600, 601, 603, 606, 608, 611, 613, 618,
- 623, 0, 1, 2, 3, 6, 7, 8,
- 18, 25, 26, 27, 28, 31, 32, 33,
- 43, 50, 51, 52, 53, 56, 57, 58,
- 68, 75, 76, 77, 78, 81, 82, 83,
- 93, 150, 151, 152, 153, 156, 157, 158,
- 168, 175, 176, 177, 178, 181, 182, 183,
- 193, 200, 201, 202, 203, 206, 207, 208,
- 218, 275, 276, 277, 278, 281, 282, 283,
- 293, 300, 301, 306, 307, 308, 318, 325,
- 326, 331, 332, 333, 343, 450, 451, 456,
- 457, 458, 468, 4, 9, 19, 29, 34,
- 44, 54, 59, 69, 79, 84, 94, 154,
- 159, 169, 179, 184, 194, 204, 209, 219,
- 279, 284, 294, 302, 309, 319, 327, 334,
- 344, 452, 459, 469, 304, 329, 454, 100,
- 101, 102, 103, 106, 107, 108, 118, 225,
- 226, 227, 228, 231, 232, 233, 243, 303,
- 350, 351, 356, 357, 358, 368, 475, 476,
- 481, 482, 483, 493, 104, 109, 119, 229,
- 234, 244, 352, 359, 369, 477, 484, 494,
- 354, 479, 353, 478, 328, 575, 576, 581,
- 582, 583, 593, 577, 584, 594, 579, 600,
- 601, 606, 607, 608, 618, 602, 609, 619,
- 604, 603, 578, 0, 1, 2, 3, 6,
- 7, 8, 11, 12, 13, 18, 25, 26,
- 27, 28, 31, 32, 33, 36, 37, 38,
- 43, 75, 76, 77, 78, 81, 82, 83,
- 86, 87, 88, 93, 150, 151, 152, 153,
- 156, 157, 158, 161, 162, 163, 168, 200,
- 201, 202, 203, 206, 207, 208, 211, 212,
- 213, 218, 275, 276, 277, 278, 281, 282,
- 283, 286, 287, 288, 293, 325, 326, 327,
- 328, 331, 332, 333, 336, 337, 338, 343,
- 450, 451, 452, 453, 456, 457, 458, 461,
- 462, 463, 468, 4, 9, 14, 19, 29,
- 34, 39, 44, 79, 84, 89, 94, 154,
- 159, 164, 169, 204, 209, 214, 219, 279,
- 284, 289, 294, 329, 334, 339, 344, 454,
- 459, 464, 469, 23, 48, 98, 173, 223,
- 298, 348, 473, 24, 49, 99, 174, 224,
- 299, 349, 474, 575, 576, 577, 578, 581,
- 582, 583, 586, 587, 588, 593, 579, 584,
- 589, 594, 598, 599, 0, 1, 2, 3,
- 6, 7, 8, 11, 12, 13, 18, 25,
- 26, 27, 28, 31, 32, 33, 36, 37,
- 38, 43, 50, 51, 52, 53, 56, 57,
- 58, 61, 75, 76, 77, 78, 81, 82,
- 83, 86, 150, 151, 152, 153, 156, 157,
- 158, 161, 162, 163, 168, 175, 176, 177,
- 178, 181, 182, 183, 186, 187, 188, 193,
- 200, 201, 202, 203, 206, 207, 208, 211,
- 212, 213, 218, 450, 451, 452, 453, 456,
- 457, 458, 461, 462, 463, 468, 4, 9,
- 14, 19, 29, 34, 39, 44, 54, 59,
- 62, 79, 84, 87, 154, 159, 164, 169,
- 179, 184, 189, 194, 204, 209, 214, 219,
- 454, 459, 464, 469, 64, 69, 89, 94,
- 23, 48, 63, 88, 173, 198, 223, 473,
- 24, 49, 174, 199, 224, 474, 74, 99,
- 73, 98, 68, 100, 101, 102, 103, 106,
- 107, 108, 111, 225, 226, 227, 228, 231,
- 232, 233, 236, 237, 238, 243, 475, 476,
- 477, 478, 481, 482, 483, 486, 487, 488,
- 493, 104, 109, 112, 229, 234, 239, 244,
- 479, 484, 489, 494, 114, 119, 113, 248,
- 498, 249, 499, 124, 123, 118, 0, 1,
- 2, 3, 6, 7, 8, 18, 25, 26,
- 27, 28, 31, 32, 33, 43, 50, 51,
- 56, 57, 58, 68, 75, 76, 81, 82,
- 83, 93, 150, 151, 152, 153, 156, 157,
- 158, 168, 175, 176, 177, 178, 181, 182,
- 183, 193, 200, 201, 202, 203, 206, 207,
- 208, 218, 450, 451, 452, 453, 456, 457,
- 458, 468, 4, 9, 19, 29, 34, 44,
- 52, 59, 69, 77, 84, 94, 154, 159,
- 169, 179, 184, 194, 204, 209, 219, 454,
- 459, 469, 54, 79, 53, 100, 101, 106,
- 107, 108, 118, 225, 226, 227, 228, 231,
- 232, 233, 243, 475, 476, 477, 478, 481,
- 482, 483, 493, 102, 109, 119, 229, 234,
- 244, 479, 484, 494, 104, 103,
+ 0, 1, 2, 3, 25, 26, 27, 28,
+ 50, 51, 52, 53, 75, 76, 77, 78,
+ 4, 29, 54, 79, 100, 101, 102, 103,
+ 104,
};
static long _vq_fitmap_res0_128_1024_5[] = {
- 0, 288, 441, 288, 627, 288, 627, 288,
- 780, 288, 966, 288, 627, 288, 627, 288,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
};
static long _vq_fitlength_res0_128_1024_5[] = {
- 288, 153, 186, 153, 153, 153, 153, 153,
- 186, 153, 120, 153, 153, 153, 153, 153,
+ 25, 25, 25, 25, 25, 25, 25, 25,
+ 25, 25, 25, 25, 25, 25, 25, 25,
};
static encode_aux_pigeonhole _vq_auxp_res0_128_1024_5 = {
-2, 1, 4, 2,
_vq_pigeonmap_res0_128_1024_5,
- 1086,
+ 25,
_vq_fitlist_res0_128_1024_5,
_vq_fitmap_res0_128_1024_5,
_vq_fitlength_res0_128_1024_5
1.6.6.5 +65 -67 vorbis/lib/books/res0_128_1024_6.vqh
Index: res0_128_1024_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_6.vqh,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- res0_128_1024_6.vqh 2001/08/07 05:03:14 1.6.6.4
+++ res0_128_1024_6.vqh 2001/08/08 04:19:59 1.6.6.5
@@ -19,113 +19,111 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_6[] = {
+ 4,
+ 3,
+ 5,
2,
+ 6,
1,
- 3,
+ 7,
0,
- 4,
+ 8,
};
static long _vq_lengthlist_res0_128_1024_6[] = {
- 1, 4, 5,12,11, 0, 5, 5,14,15, 0, 5, 5, 0, 0, 0,
- 0, 0,15,14, 0, 0, 0,13,15, 4, 9, 8,15,13, 0,11,
- 11, 0, 0, 0,11,10, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 4, 8, 9,14,14, 0,11,11, 0, 0, 0,11,11, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,15,13,15, 0,
- 0, 0, 0, 0, 0, 0, 0,14, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,11,14,15, 0, 0, 0, 0, 0, 0, 0, 0,14,
- 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 5,11,10, 0, 0, 0,11,11, 0, 0,
- 0,11,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
- 11,12,15, 0, 0,11,12, 0, 0, 0,11,11, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0,15,13, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0,14, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5,11,11, 0, 0, 0,11,10, 0, 0, 0,13,10,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,11,11,15,
- 0, 0,11,12,15, 0, 0,11,12, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,15, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0,
- 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,14,15, 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, 7, 7, 9, 9, 0, 4, 4, 6, 6, 8, 8,
+ 10,10, 0, 4, 4, 6, 6, 8, 8,10,10, 0, 5, 5, 6, 6,
+ 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0,
+ 7, 7, 7, 7,10,10, 0, 0, 0, 7, 7, 7, 7,10,10, 0,
+ 0, 0, 9, 9, 9, 9,10,10, 0, 0, 0, 0, 0, 9, 9,10,
+ 10,
};
static float _vq_quantthresh_res0_128_1024_6[] = {
- -7.5, -2.5, 2.5, 7.5,
+ -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
};
static long _vq_quantmap_res0_128_1024_6[] = {
- 3, 1, 0, 2, 4,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_6 = {
_vq_quantthresh_res0_128_1024_6,
_vq_quantmap_res0_128_1024_6,
- 5,
- 5
+ 9,
+ 9
};
static long _vq_pigeonmap_res0_128_1024_6[] = {
- 1, 0, 0, 0,
+ 2, 1, 1, 0, 0, 0, 1, 2,
};
static long _vq_fitlist_res0_128_1024_6[] = {
- 0, 1, 2, 3, 6, 7, 8, 11,
- 12, 18, 25, 26, 27, 28, 31, 32,
- 36, 37, 50, 51, 52, 53, 56, 57,
- 61, 62, 75, 76, 77, 78, 87, 150,
- 151, 152, 156, 157, 161, 162, 175, 176,
- 177, 178, 181, 182, 186, 187, 200, 275,
- 276, 277, 281, 282, 286, 287, 300, 301,
- 302, 303, 306, 307, 308, 311, 326, 336,
- 450, 4, 9, 19, 29, 39, 54, 312,
- 23, 24, 199, 324, 100, 101, 102, 111,
- 112, 225, 226, 236, 350, 352, 475, 600,
- 601,
+ 0, 1, 2, 3, 10, 11, 12, 19,
+ 28, 4, 13, 20, 29, 6, 15, 22,
+ 31, 21, 24, 40, 39, 42, 58, 1,
+ 3, 5, 7, 10, 12, 14, 16, 21,
+ 23, 30, 32, 0, 19, 28, 2, 4,
+ 6, 8, 11, 13, 15, 17, 22, 24,
+ 31, 33, 25, 39, 41, 20, 26, 40,
+ 42, 43, 57, 59, 44, 58, 60, 3,
+ 5, 7, 12, 14, 16, 23, 25, 32,
+ 34, 4, 6, 8, 13, 15, 17, 24,
+ 26, 33, 35, 21, 41, 43, 22, 42,
+ 44, 39, 59, 61, 40, 60, 62, 10,
+ 28, 29, 30, 48, 11, 31, 49, 13,
+ 33, 51, 67, 0, 1, 12, 2, 4,
+ 15, 19, 20, 21, 39, 40, 41, 57,
+ 58, 59, 22, 42, 60, 12, 14, 28,
+ 30, 32, 34, 48, 50, 52, 66, 68,
+ 10, 13, 15, 29, 31, 33, 35, 49,
+ 51, 53, 67, 69, 3, 5, 16, 1,
+ 4, 6, 11, 17, 21, 23, 39, 41,
+ 43, 57, 59, 61, 77, 19, 22, 24,
+ 40, 42, 44, 58, 60, 62, 78, 14,
+ 16, 30, 32, 34, 48, 50, 52, 68,
+ 70, 15, 17, 31, 33, 35, 49, 51,
+ 53, 69, 71, 5, 7, 12, 6, 8,
+ 13, 23, 25, 39, 41, 43, 57, 59,
+ 61, 77, 79, 24, 26, 40, 42, 44,
+ 58, 60, 62, 78, 80, 10, 28, 29,
+ 30, 48, 49, 50, 66, 67, 68, 11,
+ 31, 51, 69, 19, 39, 57, 58, 59,
+ 77, 20, 40, 60, 78, 30, 32, 48,
+ 50, 52, 66, 68, 70, 28, 31, 33,
+ 49, 51, 53, 67, 69, 71, 39, 41,
+ 57, 59, 61, 77, 79, 40, 42, 58,
+ 60, 62, 78, 80, 32, 34, 48, 50,
+ 52, 66, 68, 70, 33, 35, 49, 51,
+ 53, 67, 69, 71, 41, 43, 57, 59,
+ 61, 77, 79, 42, 44, 58, 60, 62,
+ 78, 80,
};
static long _vq_fitmap_res0_128_1024_6[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 23, 63, 95, 125, 175, 221, 245,
+ 276,
};
static long _vq_fitlength_res0_128_1024_6[] = {
- 89, 89, 89, 89, 89, 89, 89, 89,
- 89, 89, 89, 89, 89, 89, 89, 89,
+ 23, 40, 32, 30, 50, 46, 24, 31,
+ 30,
};
static encode_aux_pigeonhole _vq_auxp_res0_128_1024_6 = {
- -10, 5, 4, 2,
+ -4, 1, 8, 3,
_vq_pigeonmap_res0_128_1024_6,
- 89,
+ 306,
_vq_fitlist_res0_128_1024_6,
_vq_fitmap_res0_128_1024_6,
_vq_fitlength_res0_128_1024_6
};
static static_codebook _vq_book_res0_128_1024_6 = {
- 4, 625,
+ 2, 81,
_vq_lengthlist_res0_128_1024_6,
- 1, -529268736, 1616117760, 3, 0,
+ 1, -531628032, 1611661312, 4, 0,
_vq_quantlist_res0_128_1024_6,
NULL,
&_vq_auxt_res0_128_1024_6,
1.6.6.5 +42 -68 vorbis/lib/books/res0_128_1024_7.vqh
Index: res0_128_1024_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_7.vqh,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- res0_128_1024_7.vqh 2001/08/07 05:03:14 1.6.6.4
+++ res0_128_1024_7.vqh 2001/08/08 04:20:00 1.6.6.5
@@ -19,116 +19,90 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_7[] = {
+ 4,
+ 3,
+ 5,
2,
+ 6,
1,
- 3,
+ 7,
0,
- 4,
+ 8,
};
static long _vq_lengthlist_res0_128_1024_7[] = {
- 1, 5, 5, 0,13, 0, 5, 4, 0,14, 0, 5, 5, 0, 0, 0,
- 0, 0,13,11, 0, 0, 0,12,14, 5, 9, 7, 0,13, 0,10,
- 9, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0,14,14, 0, 0, 0,
- 14,14, 5, 8,10,13, 0, 0, 9, 9, 0, 0, 0, 9,10, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,14,14, 0, 0,
- 0,14, 0, 0, 0, 0, 0,13, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,14, 0,14,14, 0, 0,14,14, 0, 0, 0,14,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 5, 9, 9, 0, 0, 0, 9, 8, 0,13,
- 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14, 0, 5,
- 9,10, 0, 0, 0, 8, 9, 0, 0, 0, 9, 8, 0, 0, 0, 0,
- 0,14, 0, 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0,14, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5,10, 9, 0, 0, 0, 9, 8, 0, 0, 0, 9, 8,
- 14, 0, 0, 0, 0,14, 0, 0, 0, 0,14, 0, 5, 9,10, 0,
- 0, 0, 8, 9,13, 0, 0, 8,10, 0, 0, 0, 0, 0, 0,12,
- 0, 0, 0, 0,14,12,14,14, 0, 0, 0, 0,14, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0,14, 0, 0, 0, 0, 0, 0,13, 0,
- 14, 0, 0, 0, 0,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 3, 3, 7, 7,10,10, 0, 0, 5, 5, 5, 8, 8,10,10,
+ 0, 0, 5, 5, 5, 8, 8,11,11, 0, 0, 0, 8, 8, 9, 9,
+ 11,11, 0, 0, 0, 9, 8, 9, 9,11,12, 0, 0, 0,13,13,
+ 11,11,12,12, 0, 0, 0,13,13,11,11,13,13, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,13,13,14, 0, 0, 0,13, 0, 0, 0, 0, 0,13, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14,14, 0,14, 0,
- 0,12, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,
- 0,14, 0, 0, 0,14,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,14,14, 0, 0, 0, 0, 0,11,13, 0, 0, 0, 0,13, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
};
static float _vq_quantthresh_res0_128_1024_7[] = {
- -7.5, -2.5, 2.5, 7.5,
+ -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 12.5, 17.5,
};
static long _vq_quantmap_res0_128_1024_7[] = {
- 3, 1, 0, 2, 4,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_7 = {
_vq_quantthresh_res0_128_1024_7,
_vq_quantmap_res0_128_1024_7,
- 5,
- 5
+ 9,
+ 9
};
static long _vq_pigeonmap_res0_128_1024_7[] = {
- 1, 0, 0, 0,
+ 2, 1, 1, 0, 0, 0, 1, 2,
};
static long _vq_fitlist_res0_128_1024_7[] = {
- 0, 1, 2, 6, 7, 11, 12, 18,
- 25, 26, 27, 31, 32, 36, 37, 43,
- 50, 51, 52, 53, 56, 57, 61, 62,
- 75, 76, 77, 81, 87, 150, 151, 152,
- 156, 157, 161, 162, 175, 176, 177, 181,
- 182, 186, 187, 193, 200, 275, 276, 277,
- 281, 282, 286, 287, 288, 293, 300, 301,
- 302, 306, 307, 308, 311, 325, 326, 327,
- 332, 450, 451, 452, 456, 4, 9, 19,
- 29, 44, 159, 312, 462, 319, 23, 48,
- 173, 298, 24, 49, 199, 324, 100, 102,
- 103, 106, 107, 111, 225, 226, 236, 350,
- 352, 357, 475, 476, 478, 481, 486, 487,
- 343, 575, 577, 581, 582, 594, 600, 601,
- 606, 593,
+ 0, 1, 2, 3, 9, 10, 11, 12,
+ 18, 19, 28, 4, 13, 20, 29, 6,
+ 15, 22, 31, 21, 37, 38, 24, 40,
+ 39, 55, 56, 42, 58, 1, 3, 5,
+ 10, 12, 14, 21, 23, 30, 32, 0,
+ 9, 19, 28, 2, 4, 6, 11, 13,
+ 15, 22, 24, 31, 33, 39, 41, 18,
+ 37, 20, 40, 42, 57, 59, 55, 38,
+ 58, 60, 9, 10, 28, 29, 30, 46,
+ 47, 48, 11, 31, 49, 13, 33, 51,
+ 0, 1, 12, 2, 4, 15, 18, 19,
+ 37, 38, 39, 55, 56, 57, 20, 40,
+ 58, 22, 42, 60, 12, 14, 28, 30,
+ 32, 46, 48, 50, 10, 13, 15, 29,
+ 31, 33, 47, 49, 51, 3, 5, 1,
+ 9, 4, 6, 11, 21, 23, 37, 39,
+ 41, 55, 57, 59, 19, 22, 24, 38,
+ 40, 42, 56, 58, 60,
};
static long _vq_fitmap_res0_128_1024_7[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 29, 29, 66, 100, 100, 66, 100,
+ 100,
};
static long _vq_fitlength_res0_128_1024_7[] = {
- 114, 114, 114, 114, 114, 114, 114, 114,
- 114, 114, 114, 114, 114, 114, 114, 114,
+ 29, 37, 37, 34, 41, 41, 34, 41,
+ 41,
};
static encode_aux_pigeonhole _vq_auxp_res0_128_1024_7 = {
- -10, 5, 4, 2,
+ -20, 5, 8, 3,
_vq_pigeonmap_res0_128_1024_7,
- 114,
+ 141,
_vq_fitlist_res0_128_1024_7,
_vq_fitmap_res0_128_1024_7,
_vq_fitlength_res0_128_1024_7
};
static static_codebook _vq_book_res0_128_1024_7 = {
- 4, 625,
+ 2, 81,
_vq_lengthlist_res0_128_1024_7,
- 1, -529268736, 1616117760, 3, 0,
+ 1, -527171584, 1616117760, 4, 0,
_vq_quantlist_res0_128_1024_7,
NULL,
&_vq_auxt_res0_128_1024_7,
1.1.2.5 +40 -40 vorbis/lib/books/Attic/res0_128_1024_7a.vqh
Index: res0_128_1024_7a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res0_128_1024_7a.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- res0_128_1024_7a.vqh 2001/08/07 05:03:14 1.1.2.4
+++ res0_128_1024_7a.vqh 2001/08/08 04:20:00 1.1.2.5
@@ -27,46 +27,46 @@
};
static long _vq_lengthlist_res0_128_1024_7a[] = {
- 4, 7, 7, 9, 9,13, 5, 5, 8, 8,15, 5, 6, 8, 8,13,
- 11,11, 7, 7,14,12,12, 7, 7, 6, 9, 8,11,10,14, 8,
- 8,10, 9,15, 8, 8,10, 9,15,13,14, 9, 9,14,13,13,
- 9, 9, 7, 8, 9,10,11,15, 8, 8, 9,10,15, 8, 8, 9,
- 10,15,13,13, 9, 9,15,13,14, 9, 9, 9,11,10,12,10,
- 15,10,10,11,11,15,11,11,10,10,15,13,15,11,10,15,
- 15,13,10,11, 9,10,11,10,12,14,10,11,11,10,14,10,
- 10,10,11,14,14,14,12,11,13,14,13,11,11,13,15,13,
- 15,15,15,15,14,15,15,15,13,14,13,15,15,15,15,14,
- 14,14,15,15,15,14, 6, 8, 8,10,10,13, 7, 7, 9, 9,
- 13, 7, 7, 9, 9,13,12,13, 8, 8,15,13,13, 8, 8, 6,
- 8, 8,11,11,14, 6, 7, 9, 9,15, 7, 7, 9, 9,13,14,
- 13, 8, 9,14,14,12, 8, 8, 8,10, 9,11,11,15, 9, 9,
- 10, 9,14, 9, 9,10,11,15,12,12,10, 9,14,14,15, 9,
- 10, 8, 9,10,10,12,14, 8, 9, 9,10,15, 9, 9,10,11,
- 15,13,13, 9,10,13,14,13,10,10,13,14,14,14,14,15,
- 15,14,15,14,15,15,13,15,14,15,15,15,15,14,14,15,
- 15,13,15, 6, 8, 8,11,10,14, 7, 7, 9, 9,14, 7, 7,
- 10, 9,15,15,13, 8, 8,14,15,12, 8, 8, 5, 8, 8,10,
- 10,14, 7, 7, 9,10,15, 7, 7, 9, 9,14,15,14, 8, 9,
- 15,12,13, 8, 8, 8,10, 9,11,11,13,10, 9,11,10,15,
- 9, 9,11, 9,15,13,15,10,10,13,15,15,10,10, 8, 9,
- 10,10,11,15, 9, 9,11,10,15, 9, 9, 9,10,15,14,15,
- 10, 9,15,13,14,10,10,12,15,14,14,14,15,13,13,15,
- 14,15,15,13,14,15,15,14,14,14,15,15,15,15,15,13,
- 12,13,14,14,15,15,13,13,14,14,15,13,13,14,13,15,
- 15,13,13,13,15,15,15,13,13,13,15,15,14,14,15,13,
- 13,13,13,15,13,14,13,14,15,15,15,14,13,15,14,14,
- 14,13, 7, 9, 9,11,11,13, 9, 8,10,10,13, 8, 8,10,
- 10,14,13,13, 9, 8,13,14,13, 8, 9, 7, 9, 9,10,10,
- 14, 8, 8,10, 9,15, 9, 8,10,10,14,14,13, 8,10,15,
- 14,14, 9, 8,13,15,14,15,15,15,13,14,15,15,15,15,
- 15,14,14,15,15,15,14,14,15,15,15,13,14,11,13,15,
- 13,15,15,13,13,13,14,15,14,12,14,15,15,15,15,14,
- 12,15,15,15,12,13,12,14,13,14,15,15,13,13,13,14,
- 15,13,11,13,13,15,14,15,13,13,15,15,14,13,12, 7,
- 9, 9,11,11,13, 8, 8, 9,10,15, 8, 8,10,10,14,13,
- 14, 8, 9,13,13,14, 9, 8, 7, 9, 9,11,11,15, 8, 8,
- 10,10,14, 8, 8, 9,10,13,13,15, 9, 8,13,13,13, 8,
- 9,
+ 3, 6, 6, 8, 8,11, 6, 6, 9, 9,10, 6, 6, 8, 8,11,
+ 8, 8, 8, 8,11,11,11, 8, 8, 6, 8, 7, 9, 9,11, 8,
+ 8, 9, 9,11, 8, 8, 9, 9,12,10, 9, 9, 9,12,12,12,
+ 10,10, 6, 7, 8, 9, 9,11, 8, 8, 9,10,11, 8, 8, 9,
+ 9,12,10,10, 9, 9,12,12,12, 9, 9, 8, 9, 9,10, 9,
+ 11,10,10,10,10,12,10,10,10,10,12,11,11,10,10,12,
+ 12,12,10,10, 8, 9, 9, 9,10,11,10,10,10,10,11,10,
+ 10,10,10,12,11,11,10,10,12,12,12,10,11,11,11,11,
+ 12,12,13,11,11,12,12,13,12,11,12,12,13,12,12,12,
+ 12,13,13,13,12,12, 6, 8, 8,10,10,11, 8, 8,10, 9,
+ 12, 8, 8,10, 9,11,10, 9, 9, 9,11,11,11, 9, 9, 6,
+ 8, 8,10,10,11, 8, 8,10,10,12, 8, 8, 9,10,11, 9,
+ 9, 9, 9,12,12,11, 9, 9, 8, 9, 9,10,10,12,10, 9,
+ 10,10,12,10,10,10,10,12,11,10,10,10,12,12,12,10,
+ 10, 8, 9, 9,10,10,12, 9, 9,10,11,12,10, 9,10,10,
+ 12,10,11,10,10,12,12,12,10,10,10,11,11,12,12,14,
+ 12,11,12,12,13,11,12,12,12,14,12,12,12,12,13,13,
+ 13,11,12, 6, 8, 8,10,10,12, 8, 8,10, 9,11, 8, 8,
+ 9, 9,12, 9, 9, 9, 9,12,12,11, 9, 9, 6, 8, 8,10,
+ 10,11, 8, 8,10,10,12, 8, 8, 9, 9,12, 9,10, 9, 9,
+ 11,12,11, 9, 9, 8, 9, 9,10,10,12,10, 9,10,10,12,
+ 9, 9,10,10,12,10,10,10,10,11,12,12,10,10, 8, 9,
+ 9,10,10,12, 9,10,10,10,12,10, 9,10,10,12,10,10,
+ 10,10,12,12,12,10,10,11,12,12,12,12,13,11,12,12,
+ 12,13,11,11,12,12,13,12,12,12,11,13,13,13,12,12,
+ 8, 9,10,11,11,12, 9, 9,10,10,12, 9,10,10,10,12,
+ 10,10,10,10,13,12,12,10,10, 8,10, 9,11,11,12, 9,
+ 9,10,10,12, 9, 9,10,10,12,10,10,10,10,12,12,12,
+ 10,10, 8,10, 9,10,10,12, 9, 9,10,10,12, 9, 9,10,
+ 10,12,10,10,10,10,12,12,12,10,10, 8, 9, 9,10,10,
+ 12, 9, 9,10,10,12, 9, 9,10,10,12,10,10,10,10,11,
+ 12,12,10,10,11,11,11,12,12,13,12,11,12,12,13,11,
+ 11,11,12,13,12,12,12,12,13,13,12,12,12,11,12,12,
+ 12,12,13,11,12,12,12,13,12,11,12,12,13,12,12,12,
+ 12,13,13,13,12,12,11,12,11,12,12,13,11,11,12,12,
+ 13,12,12,12,12,12,12,12,12,12,13,13,13,12,12, 8,
+ 10,10,10,10,12, 9, 9,10,10,12, 9, 9,10,10,12,10,
+ 10,10,10,12,12,12,10,10, 8, 9, 9,11,10,12, 9, 9,
+ 10,10,12, 9, 9,10,10,11,10,10,10,10,12,12,12,10,
+ 10,
};
static float _vq_quantthresh_res0_128_1024_7a[] = {
1.6.6.5 +128 -64 vorbis/lib/books/res0_128_1024_8.vqh
Index: res0_128_1024_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_8.vqh,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- res0_128_1024_8.vqh 2001/08/07 05:03:14 1.6.6.4
+++ res0_128_1024_8.vqh 2001/08/08 04:20:00 1.6.6.5
@@ -19,112 +19,176 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_8[] = {
+ 6,
+ 5,
+ 7,
4,
+ 8,
3,
- 5,
+ 9,
2,
- 6,
+ 10,
1,
- 7,
+ 11,
0,
- 8,
+ 12,
};
static long _vq_lengthlist_res0_128_1024_8[] = {
- 1, 4, 4, 7, 6, 7, 7, 8, 9, 6, 5, 5, 7, 7, 7, 7,
- 9, 9, 6, 5, 5, 7, 7, 8, 7,10,10, 0, 7, 7, 7, 8,
- 8, 8,10,10, 0, 8, 7, 8, 8, 9, 9,10,10, 0,10,10,
- 7, 7, 9, 9,10,11, 0,11,11, 8, 7,10,10,12,12, 0,
- 0, 0,10,10,10,10,11,11, 0, 0, 0,10,10,11,10,12,
- 12,
+ 1, 4, 4, 6, 5, 7, 7, 8, 8, 9, 9,11,10, 6, 5, 5,
+ 7, 7, 8, 8, 9, 9,10,10,12,11, 6, 5, 5, 7, 7, 8,
+ 8, 9, 9,10,10,11,13, 0, 8, 7, 8, 8, 9, 9,10, 9,
+ 12,11,13,13, 0, 8, 8, 8, 8, 9,10,10,11,11,11,13,
+ 14, 0,13,13, 9, 9,10,10,11,11,11,11,13,13, 0,12,
+ 13,10, 9,10,10,11,11,11,12,14,13, 0, 0, 0,10,11,
+ 11,10,11,11,12,11,14,13, 0, 0, 0,11,10,11, 9,12,
+ 11,14,13,15,15, 0, 0, 0,15,15,10,11,12,11,13,13,
+ 13,15, 0, 0, 0, 0, 0,11, 8,12,12,13,13,15, 0, 0,
+ 0, 0, 0, 0,12,13,15,13,13,13, 0, 0, 0, 0, 0, 0,
+ 0,14,11,15,13,13, 0,14, 0,
};
static float _vq_quantthresh_res0_128_1024_8[] = {
- -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 12.5, 17.5,
+ -71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5,
+ 32.5, 45.5, 58.5, 71.5,
};
static long _vq_quantmap_res0_128_1024_8[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
+ 11, 9, 7, 5, 3, 1, 0, 2,
+ 4, 6, 8, 10, 12,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_8 = {
_vq_quantthresh_res0_128_1024_8,
_vq_quantmap_res0_128_1024_8,
- 9,
- 9
+ 13,
+ 13
};
static long _vq_pigeonmap_res0_128_1024_8[] = {
- 2, 1, 1, 0, 0, 0, 1, 2,
+ 3, 3, 2, 1, 1, 0, 0, 0,
+ 1, 2, 2, 3,
};
static long _vq_fitlist_res0_128_1024_8[] = {
- 0, 1, 2, 3, 9, 10, 11, 12,
- 18, 19, 28, 4, 13, 20, 29, 6,
- 15, 22, 31, 21, 37, 38, 24, 40,
- 39, 55, 56, 42, 58, 1, 3, 5,
- 7, 10, 12, 14, 16, 21, 23, 30,
- 32, 0, 9, 19, 28, 2, 4, 6,
- 8, 11, 13, 15, 17, 22, 24, 31,
- 33, 25, 39, 41, 18, 37, 20, 26,
- 40, 42, 43, 57, 59, 55, 38, 44,
- 58, 60, 3, 5, 7, 12, 14, 16,
- 23, 25, 32, 34, 4, 6, 8, 13,
- 15, 17, 24, 26, 33, 35, 21, 41,
- 43, 22, 42, 44, 39, 59, 61, 40,
- 60, 62, 9, 10, 28, 29, 30, 46,
- 47, 48, 11, 31, 49, 13, 33, 51,
- 67, 0, 1, 12, 2, 4, 15, 18,
- 19, 37, 38, 39, 55, 56, 57, 20,
- 40, 58, 22, 42, 60, 76, 12, 14,
- 28, 30, 32, 34, 46, 48, 50, 52,
- 66, 68, 10, 13, 15, 29, 31, 33,
- 35, 47, 49, 51, 53, 67, 69, 3,
- 5, 16, 1, 9, 4, 6, 11, 17,
- 21, 23, 37, 39, 41, 43, 55, 57,
- 59, 61, 75, 77, 19, 22, 24, 38,
- 40, 42, 44, 56, 58, 60, 62, 76,
- 78, 14, 16, 30, 32, 34, 48, 50,
- 52, 68, 70, 15, 17, 31, 33, 35,
- 49, 51, 53, 69, 71, 5, 7, 12,
- 6, 8, 13, 23, 25, 39, 41, 43,
- 57, 59, 61, 77, 79, 24, 26, 40,
- 42, 44, 58, 60, 62, 78, 80, 30,
- 32, 46, 48, 50, 52, 66, 68, 70,
- 28, 31, 33, 47, 49, 51, 53, 67,
- 69, 71, 39, 41, 55, 57, 59, 61,
- 75, 77, 79, 37, 40, 42, 56, 58,
- 60, 62, 76, 78, 80, 32, 34, 48,
- 50, 52, 66, 68, 70, 33, 35, 49,
- 51, 53, 67, 69, 71, 41, 43, 57,
- 59, 61, 75, 77, 79, 42, 44, 58,
- 60, 62, 76, 78, 80,
+ 0, 1, 2, 3, 13, 14, 15, 16,
+ 26, 27, 40, 4, 17, 28, 41, 6,
+ 19, 30, 43, 29, 53, 54, 32, 56,
+ 55, 79, 80, 58, 82, 1, 3, 5,
+ 7, 14, 16, 18, 20, 29, 31, 42,
+ 44, 0, 13, 27, 40, 2, 4, 6,
+ 8, 15, 17, 19, 21, 30, 32, 43,
+ 45, 33, 55, 57, 26, 53, 28, 34,
+ 56, 58, 59, 81, 83, 79, 54, 60,
+ 82, 84, 3, 5, 7, 9, 16, 18,
+ 20, 22, 31, 33, 44, 46, 4, 6,
+ 8, 10, 17, 19, 21, 23, 32, 34,
+ 45, 47, 12, 25, 36, 49, 29, 35,
+ 57, 59, 30, 58, 60, 38, 62, 55,
+ 61, 83, 85, 56, 84, 86, 64, 88,
+ 7, 9, 11, 20, 22, 24, 35, 37,
+ 48, 50, 5, 18, 33, 46, 8, 10,
+ 12, 21, 23, 25, 36, 38, 49, 51,
+ 61, 63, 31, 59, 34, 62, 64, 87,
+ 89, 57, 85, 60, 88, 90, 13, 14,
+ 40, 41, 42, 66, 67, 68, 15, 43,
+ 69, 17, 45, 71, 95, 0, 1, 16,
+ 2, 4, 19, 26, 27, 53, 54, 55,
+ 79, 80, 81, 28, 56, 82, 30, 58,
+ 84, 108, 16, 18, 40, 42, 44, 46,
+ 66, 68, 70, 72, 94, 96, 14, 17,
+ 19, 41, 43, 45, 47, 67, 69, 71,
+ 73, 95, 97, 3, 5, 20, 1, 13,
+ 4, 6, 15, 21, 29, 31, 53, 55,
+ 57, 59, 79, 81, 83, 85, 107, 109,
+ 27, 30, 32, 54, 56, 58, 60, 80,
+ 82, 84, 86, 108, 110, 18, 20, 42,
+ 44, 46, 48, 68, 70, 72, 74, 96,
+ 98, 19, 21, 43, 45, 47, 49, 69,
+ 71, 73, 75, 97, 99, 23, 51, 77,
+ 101, 5, 7, 16, 22, 6, 8, 17,
+ 10, 25, 31, 33, 55, 57, 59, 61,
+ 81, 83, 85, 87, 109, 111, 32, 34,
+ 56, 58, 60, 62, 82, 84, 86, 88,
+ 110, 112, 36, 64, 90, 114, 22, 24,
+ 46, 48, 50, 72, 74, 76, 100, 102,
+ 20, 44, 70, 98, 23, 25, 47, 49,
+ 51, 73, 75, 77, 101, 103, 9, 11,
+ 7, 18, 10, 12, 21, 35, 37, 59,
+ 61, 63, 85, 87, 89, 113, 115, 33,
+ 57, 83, 111, 36, 38, 60, 62, 64,
+ 86, 88, 90, 114, 116, 40, 66, 67,
+ 68, 94, 41, 69, 95, 43, 71, 97,
+ 121, 53, 79, 80, 81, 107, 54, 82,
+ 108, 56, 84, 110, 109, 135, 136, 42,
+ 44, 66, 68, 70, 72, 94, 96, 98,
+ 120, 122, 40, 43, 45, 67, 69, 71,
+ 73, 95, 97, 99, 121, 123, 55, 57,
+ 79, 81, 83, 85, 107, 109, 111, 135,
+ 53, 56, 58, 80, 82, 84, 86, 108,
+ 110, 112, 136, 137, 161, 138, 162, 44,
+ 46, 68, 70, 72, 74, 94, 96, 98,
+ 100, 122, 124, 45, 47, 69, 71, 73,
+ 75, 95, 97, 99, 101, 123, 125, 49,
+ 77, 103, 127, 57, 59, 81, 83, 85,
+ 87, 107, 109, 111, 113, 135, 137, 58,
+ 60, 82, 84, 86, 88, 108, 110, 112,
+ 114, 136, 138, 62, 90, 116, 140, 139,
+ 161, 163, 162, 164, 48, 50, 72, 74,
+ 76, 98, 100, 102, 126, 128, 46, 70,
+ 96, 124, 49, 51, 73, 75, 77, 99,
+ 101, 103, 127, 129, 61, 63, 85, 87,
+ 89, 111, 113, 115, 139, 141, 59, 83,
+ 109, 137, 62, 64, 86, 88, 90, 112,
+ 114, 116, 140, 165, 167, 135, 163, 138,
+ 66, 94, 120, 121, 122, 148, 67, 95,
+ 123, 149, 40, 68, 96, 41, 69, 97,
+ 79, 80, 81, 107, 108, 109, 135, 161,
+ 82, 110, 136, 162, 138, 164, 94, 96,
+ 120, 122, 124, 148, 150, 95, 97, 121,
+ 123, 125, 149, 151, 68, 70, 98, 66,
+ 69, 71, 99, 107, 109, 135, 137, 161,
+ 163, 79, 81, 108, 110, 136, 138, 162,
+ 164, 96, 98, 120, 122, 124, 126, 148,
+ 150, 152, 97, 99, 121, 123, 125, 127,
+ 149, 151, 153, 101, 129, 70, 72, 94,
+ 100, 71, 73, 95, 75, 103, 109, 111,
+ 135, 137, 139, 161, 163, 165, 110, 112,
+ 136, 138, 140, 162, 164, 114, 100, 102,
+ 124, 126, 128, 150, 152, 98, 122, 148,
+ 101, 103, 125, 127, 129, 151, 153, 74,
+ 76, 72, 96, 75, 77, 99, 113, 115,
+ 137, 139, 141, 163, 165, 167, 111, 135,
+ 161, 114, 116, 138, 140, 164,
};
static long _vq_fitmap_res0_128_1024_8[] = {
- 0, 29, 74, 106, 142, 201, 142, 247,
- 285,
+ 0, 29, 74, 120, 158, 158, 194, 253,
+ 318, 373, 373, 399, 447, 508, 560, 560,
+ 590, 625, 670, 710, 710, 710, 710, 710,
+ 710,
};
static long _vq_fitlength_res0_128_1024_8[] = {
- 29, 45, 32, 36, 59, 46, 59, 38,
- 32,
+ 29, 45, 46, 38, 0, 36, 59, 65,
+ 55, 0, 26, 48, 61, 52, 0, 30,
+ 35, 45, 40, 0, 0, 0, 0, 0,
+ 0,
};
static encode_aux_pigeonhole _vq_auxp_res0_128_1024_8 = {
- -20, 5, 8, 3,
+ -78, 13, 12, 5,
_vq_pigeonmap_res0_128_1024_8,
- 317,
+ 710,
_vq_fitlist_res0_128_1024_8,
_vq_fitmap_res0_128_1024_8,
_vq_fitlength_res0_128_1024_8
};
static static_codebook _vq_book_res0_128_1024_8 = {
- 2, 81,
+ 2, 169,
_vq_lengthlist_res0_128_1024_8,
- 1, -527171584, 1616117760, 4, 0,
+ 1, -523010048, 1618608128, 4, 0,
_vq_quantlist_res0_128_1024_8,
NULL,
&_vq_auxt_res0_128_1024_8,
1.1.2.5 +29 -10 vorbis/lib/books/Attic/res0_128_1024_8a.vqh
Index: res0_128_1024_8a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res0_128_1024_8a.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- res0_128_1024_8a.vqh 2001/08/07 05:03:14 1.1.2.4
+++ res0_128_1024_8a.vqh 2001/08/08 04:20:00 1.1.2.5
@@ -19,37 +19,56 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_8a[] = {
+ 6,
+ 5,
+ 7,
+ 4,
+ 8,
+ 3,
+ 9,
2,
+ 10,
1,
- 3,
+ 11,
0,
- 4,
+ 12,
};
static long _vq_lengthlist_res0_128_1024_8a[] = {
- 2, 4, 4, 5, 5, 7, 5, 4, 5, 5, 7, 4, 4, 5, 5, 7,
- 6, 6, 5, 5, 7, 6, 6, 5, 5,
+ 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 5, 5,
+ 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 6, 5, 7, 7, 8,
+ 8, 8, 8, 8, 8, 8, 8, 9, 7, 7, 7, 7, 8, 8, 8, 8,
+ 8, 8, 8, 8, 9, 9, 9, 8, 7, 8, 8, 8, 8, 8, 8, 8,
+ 8, 9, 9, 9, 8, 8, 8, 8, 8, 8, 9, 8, 8, 8, 9, 9,
+ 9, 8, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 9, 9, 9, 8,
+ 8, 9, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 8,
+ 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8,
+ 9, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 9, 8, 9, 8, 9,
+ 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 8, 8, 9, 9, 9, 9,
};
static float _vq_quantthresh_res0_128_1024_8a[] = {
- -1.5, -0.5, 0.5, 1.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,
};
static long _vq_quantmap_res0_128_1024_8a[] = {
- 3, 1, 0, 2, 4,
+ 11, 9, 7, 5, 3, 1, 0, 2,
+ 4, 6, 8, 10, 12,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_8a = {
_vq_quantthresh_res0_128_1024_8a,
_vq_quantmap_res0_128_1024_8a,
- 5,
- 5
+ 13,
+ 13
};
static static_codebook _vq_book_res0_128_1024_8a = {
- 2, 25,
+ 2, 169,
_vq_lengthlist_res0_128_1024_8a,
- 1, -533725184, 1611661312, 3, 0,
+ 1, -531103744, 1611661312, 4, 0,
_vq_quantlist_res0_128_1024_8a,
NULL,
&_vq_auxt_res0_128_1024_8a,
1.6.6.5 +3 -41 vorbis/lib/books/res0_128_1024_9.vqh
Index: res0_128_1024_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_9.vqh,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- res0_128_1024_9.vqh 2001/08/07 05:03:14 1.6.6.4
+++ res0_128_1024_9.vqh 2001/08/08 04:20:00 1.6.6.5
@@ -27,46 +27,8 @@
};
static long _vq_lengthlist_res0_128_1024_9[] = {
- 1, 6, 6,11,11, 4, 5,10,11,11, 6,11, 6,11,11,11,
- 10,11,11,11,11,11,11,11,11, 6,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11, 7,11,10,11,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,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, 8,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,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,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, 8,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11, 9,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,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,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,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,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,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,
+ 1, 3, 3,10,10, 4, 4, 6,10,10, 4, 6, 6,10,10,10,
+ 10,10,10,10,10,10,10,10,10,
};
static float _vq_quantthresh_res0_128_1024_9[] = {
@@ -85,7 +47,7 @@
};
static static_codebook _vq_book_res0_128_1024_9 = {
- 4, 625,
+ 2, 25,
_vq_lengthlist_res0_128_1024_9,
1, -518709248, 1626677248, 3, 0,
_vq_quantlist_res0_128_1024_9,
1.1.2.5 +11 -11 vorbis/lib/books/Attic/res0_128_1024_9a.vqh
Index: res0_128_1024_9a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res0_128_1024_9a.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- res0_128_1024_9a.vqh 2001/08/07 05:03:14 1.1.2.4
+++ res0_128_1024_9a.vqh 2001/08/08 04:20:00 1.1.2.5
@@ -35,17 +35,17 @@
};
static long _vq_lengthlist_res0_128_1024_9a[] = {
- 1, 4, 4, 6, 5, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
- 7, 7, 9, 8,10,10,10,10,11,11, 6, 5, 5, 7, 7, 8,
- 9, 9,10,10,11,11,11,16, 8, 8, 8, 8, 9, 9,11,11,
- 12,12,13,11,15, 8, 7, 8, 8, 9,10,11,11,12,13,11,
- 12,16,12,12, 9, 9,10,10,11,11,12,13,15,12,15,12,
- 14, 8, 8,10,10,11,11,11,13,10,13,15,15,15,10,11,
- 11,11,11,12,12,12,13,13,15,15,14,10,10, 9, 9,11,
- 13,12,13,14,12,15,15,15,14,13,11,12,13,12,12,13,
- 13,13,15,15,15,15,15,11, 8,11,11,12,14,15,14,15,
- 15,15,15,15,12,15,12,12,13,14,13,15,15,15,15,15,
- 15,13,11,12,11,12,13,14,14,
+ 3, 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 7, 6, 5, 5,
+ 7, 6, 7, 7, 8, 8, 9, 9, 9, 9, 6, 5, 4, 6, 6, 8,
+ 7, 8, 8, 9, 8, 8, 8,14, 7, 7, 7, 7, 8, 9, 9, 9,
+ 10, 9, 9, 9,14, 7, 6, 6, 6, 8, 8, 9, 9, 9,10, 8,
+ 9,13,11,11, 8, 8, 8, 8, 9, 9,10, 9,10, 9,13,11,
+ 10, 6, 7, 8, 7, 9,10, 9, 9, 9,10,14,14,13,10, 9,
+ 9, 9,10, 9,10, 9,10, 9,13,14,14, 8, 8, 8, 7, 9,
+ 8, 9,10,11,10,13,14,13,14,11,10, 9,10, 9, 9,10,
+ 10,10,14,14,14,13,14,10, 9, 7, 8, 9, 9,11,10,13,
+ 13,14,14,13,10,10, 9, 9,10, 8, 9,10,14,14,14,14,
+ 13,11,10, 9, 8, 8, 8, 9,10,
};
static float _vq_quantthresh_res0_128_1024_9a[] = {
1.1.2.5 +11 -11 vorbis/lib/books/Attic/res0_128_1024_9b.vqh
Index: res0_128_1024_9b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res0_128_1024_9b.vqh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- res0_128_1024_9b.vqh 2001/08/07 05:03:14 1.1.2.4
+++ res0_128_1024_9b.vqh 2001/08/08 04:20:00 1.1.2.5
@@ -35,17 +35,17 @@
};
static long _vq_lengthlist_res0_128_1024_9b[] = {
- 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 6, 5,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8,
- 8, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
- 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
- 8, 8, 8, 8, 8, 9, 9, 9, 8, 9, 8, 8, 8, 8, 8, 8,
- 8, 8, 9, 9, 9, 9, 9, 8, 8, 7, 8, 8, 8, 8, 8, 8,
- 9, 8, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 8, 8,
- 9, 9, 9, 8, 8, 8, 8, 8, 8,
+ 6, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 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, 8, 7, 7, 7, 8, 7, 8, 7, 7,
+ 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, 7, 8, 7, 7, 7, 7,
+ 7, 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8,
+ 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 8, 8, 8, 7, 7,
+ 8, 7, 8, 8, 8, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8,
+ 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7,
+ 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 8, 8, 8, 8,
+ 7, 8, 8, 8, 7, 8, 7, 8, 8,
};
static float _vq_quantthresh_res0_128_1024_9b[] = {
1.6.6.5 +7 -7 vorbis/lib/books/res0_128_1024aux.vqh
Index: res0_128_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024aux.vqh,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- res0_128_1024aux.vqh 2001/08/07 05:03:14 1.6.6.4
+++ res0_128_1024aux.vqh 2001/08/08 04:20:00 1.6.6.5
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res0_128_1024aux[] = {
- 6,16, 7,13,10,13, 9,17,15,17,14, 2,17,17,17,17,
- 17,17, 7,10, 6,17, 4, 5, 6, 6, 6,10,17,17,11,17,
- 5, 4, 6, 5, 7, 9,17,17,10,17, 6, 6, 5, 5, 6, 9,
- 15,17,14,17, 6, 5, 5, 4, 6, 8,17,17,10,17, 6, 7,
- 6, 6, 6, 8,14,17,15,17, 9, 8, 8, 7, 8, 9,17,17,
- 15, 6,14,17,16,17,15,17,10,11,17, 7,16,16,16,16,
- 16,16, 9, 7,
+ 5, 9, 7,15,11,11, 9,11,17,17, 9, 4,16, 9, 4,16,
+ 6, 8,16,16, 6,16, 3,16,16, 5, 7,11,16,16,14, 8,
+ 16, 5,16,16, 5, 7,14,16,12, 5,16,16, 4,16, 6,10,
+ 16,16,10,16, 4,16,16, 5, 8,13,16,16,10, 6, 7, 5,
+ 6, 8, 4, 5,11,16,12, 8,12, 6,10,14, 4, 4, 8,16,
+ 15,12,16,10,16,16, 8, 7, 8,11,16,16,16,15,16,16,
+ 14,10, 8,10,
};
static static_codebook _huff_book_res0_128_1024aux = {
1.6.6.5 +7 -7 vorbis/lib/books/res0_128_128aux.vqh
Index: res0_128_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128aux.vqh,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- res0_128_128aux.vqh 2001/08/07 05:03:14 1.6.6.4
+++ res0_128_128aux.vqh 2001/08/08 04:20:00 1.6.6.5
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res0_128_128aux[] = {
- 6,13, 6, 7, 9,10,13,13,13,15,13, 3,15,15,15,15,
- 15,15, 8,11, 5,15, 2, 4, 5, 6,10,11,15,15, 7,15,
- 3, 4, 7, 6,11,13,15,15, 7,15, 5, 7, 7, 8,11,13,
- 15,15, 9,15, 5, 6, 7, 7,11,12,15,15,11,15, 8, 9,
- 10,10,13,13,15,15,11,15, 8, 9,11,10,13,14,15,15,
- 15,13,15,15,15,15,15,15,15,15,14, 4,15,15,15,15,
- 15,15, 7, 8,
+ 6, 7, 6,16, 9,10,12,12,16,16, 7, 2,16, 8, 4,16,
+ 7, 7,10,16, 5,16, 2,16,16, 7,13,16,16,16,16, 8,
+ 16, 6,16,16, 6, 7,12,16, 8, 4,16,16, 6,16,10,15,
+ 16,16, 7,16, 6,16,16,10,14,15,16,16,10, 6,12, 5,
+ 8,15, 5, 7,13,16,13, 8,16, 7,13,16, 7, 8,16,16,
+ 13, 8,15, 6,15,15, 6, 6, 9,15,15,14,15,13,15,15,
+ 12, 8, 8,15,
};
static static_codebook _huff_book_res0_128_128aux = {
No revision
No revision
1.14.4.5.2.6 +36 -34 vorbis/lib/modes/mode_A.h
Index: mode_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_A.h,v
retrieving revision 1.14.4.5.2.5
retrieving revision 1.14.4.5.2.6
diff -u -r1.14.4.5.2.5 -r1.14.4.5.2.6
--- mode_A.h 2001/08/07 19:50:02 1.14.4.5.2.5
+++ mode_A.h 2001/08/08 04:20:06 1.14.4.5.2.6
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.14.4.5.2.5 2001/08/07 19:50:02 xiphmont Exp $
+ last mod: $Id: mode_A.h,v 1.14.4.5.2.6 2001/08/08 04:20:06 xiphmont Exp $
********************************************************************/
@@ -57,7 +57,6 @@
#include "books/res0_128_1024_4.vqh"
#include "books/res0_128_1024_5.vqh"
#include "books/res0_128_1024_6.vqh"
-#include "books/res0_128_1024_6a.vqh"
#include "books/res0_128_1024_7.vqh"
#include "books/res0_128_1024_7a.vqh"
#include "books/res0_128_1024_8.vqh"
@@ -79,18 +78,18 @@
};
static struct vp_couple_pass _psy_passA0[]={
- {
- {{24, 1.f,1.f, 1.f,1.f, 0, 0, 0, 0},
- {128, 1.f,1.f, 2.f,.5f, 22.f, 0.0f, 4.5f, 0.0f},
- {9999, 1.f,1.f, 2.f,.5f, 22.f, 0.0f, 4.5f, 2.5f}}
+ {1.f,1.f,
+ {{24, 0,0, 0,0, 0,0},
+ {64, 0,0, 12.5f,12, 0,0},
+ {9999, 0,0, 12.5f,12, 2.5f,0}}
},
};
static vp_couple_pass _psy_passA[]={
- {
- {{288, 1.f,1.f, 1.f,1.f, 0, 0, 0, 0},
- {512, 1.f,1.f, 2.f,.5f, 22.f, 0.0f, 4.5f, 0.0f},
- {9999, 1.f,1.f, 2.f,.5f, 22.f, 0.0f, 4.5f, 2.5f}}
+ {1.f,1.f,
+ {{288, 0,0, 0,0, 0,0},
+ {512, 0,0, 12.5f,12, 0,0},
+ {9999, 0,0, 12.5f,12, 2.5f,0}}
}
};
@@ -180,7 +179,7 @@
5, 5, 10,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-30,-30,-30,-30,-30,-30,-20,-10, 0, 0, 0, 0, 0, 1, 1, 2, 3},
+ {-20,-20,-20,-20,-20,-20,-20,-10, 0, 0, 0, 0, 0, 1, 1, 2, 3},
{.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.7f,.8f,.9f,.9f,.9f},
95.f, /* even decade + 5 is important; saves an rint() later in a
@@ -207,8 +206,8 @@
10,10,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-10,-10,-10,-10,-10,-10,-10, 0, 0, 0, -3, -3, 0, 0, 0, 0, 0},
- {.3f,.3f,.3f,.3f,.3f,.3f,.3f,.3f,.5f,.5f,.5f,.5f,.7f,.75f,.8f,.8f,.8f},
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.7f,.75f,.8f,.8f,.85f},
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
@@ -233,8 +232,8 @@
10,10,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-20,-20,-20,-20,-20,-20,-20,-10, 0, 0, -3, -3, 0, 0, 0, 0, 0},
- {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.7f,.75f,.8f,.8f,.8f},
+ {-30,-30,-30,-30,-30,-30,-30,-20, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.7f,.75f,.8f,.8f,.85f},
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
@@ -300,41 +299,45 @@
768};
static vorbis_info_residue0 _residue_set0A={0,192,8,10,23,
- {0,1,1,1,1,1,3,3,3,7},
- {25,26,
+ {0,1,1,1,1,1,1,3,3,7},
+ {25,
+ 26,
27,
28,
29,
30,
31,32,
33,34,
- 35,36,
- 37,38},
- {9999,9999,4,9999,6,9999,10,
- 9999,9999,9999},
- {.7f,12.5f,1.5f,1.5f,2.5f,2.5f,
- 12.5f,12.5f,22.5f},
+ 35,36,37},
+ {9999,9999,9999,9999,9999,9999,
+ 9999,9999,9999,9999},
+ {.5f,
+ 1.5f,1.5f,
+ 2.5f,2.5f,2.5f,
+ 4.5f,17.5f,80.5f},
{0},
- {99,6,99,99,99,99,99,99,99,99},
+ {99,16,99,6,16,99,99,99,99,99},
{3}};
static vorbis_info_residue0 _residue_set1A={0,1536, 32,10,24,
- {0,1,1,1,1,1,3,3,3,7},
- {25,26,
+ {0,1,1,1,1,1,1,3,3,7},
+ {25,
+ 26,
27,
28,
29,
30,
31,32,
33,34,
- 35,36,
- 37,38},
- {9999,9999,12,9999,18,9999,30,
- 9999,9999,9999},
- {.7f,12.5f,1.5f,1.5f,2.5f,2.5f,
- 12.5f,12.5f,22.5f},
+ 35,36,37},
+ {9999,9999,9999,9999,9999,9999,
+ 9999,9999,9999,9999},
+ {.5f,
+ 1.5f,1.5f,
+ 2.5f,2.5f,2.5f,
+ 4.5f,17.5f,80.f},
{0},
- {99,12,99,99,99,99,99,99,99,99},
+ {99,32,99,18,32,99,99,99,99,99},
{3}};
static vorbis_info_mapping0 _mapping_set0A={1, {0,0}, {0}, {0}, {0}, {0,0},
@@ -350,7 +353,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 39, 3,
+ 2, 2, 1, 2, 2, 38, 3,
/* modes */
{&_mode_set0A,&_mode_set1A},
/* maps */
@@ -400,7 +403,6 @@
&_vq_book_res0_128_1024_4,
&_vq_book_res0_128_1024_5,
&_vq_book_res0_128_1024_6,
- &_vq_book_res0_128_1024_6a,
&_vq_book_res0_128_1024_7,
&_vq_book_res0_128_1024_7a,
&_vq_book_res0_128_1024_8,
No revision
No revision
1.1.2.4 +12 -12 vorbis/vq/res_128c.vqs
Index: res_128c.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/res_128c.vqs,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- res_128c.vqs 2001/08/07 05:03:21 1.1.2.3
+++ res_128c.vqs 2001/08/08 04:20:07 1.1.2.4
@@ -27,11 +27,10 @@
huffbuild line1_3sub2.vqd 18-50
huffbuild line1_3sub3.vqd 50-128
-residuesplit residue_0#0.vqd 0,192,8 res0_128_128 ,.7, ,12.5,6 4,1.5, ,1.5, 6,2.5, ,2.5, 10,12.5, ,12.5, ,22.5,
+residuesplit residue_0#0.vqd 0,192,8 res0_128_128 ,.7, ,1.5,16 ,1.5 ,2.5,6 ,2.5,16 ,2.5 ,4.5 ,17.5 ,80.5
-residuesplit residue_1#0.vqd 0,1536,32 res0_128_1024 ,.7, ,12.5,12 12,1.5, ,1.5, 18,2.5, ,2.5, 30,12.5, ,12.5, ,22.5,
+residuesplit residue_1#0.vqd 0,1536,32 res0_128_1024 ,.7, ,1.5,32 ,1.5 ,2.5,18 ,2.5,32 ,2.5 ,4.5 ,17.5 ,80.5
-
GO
>res0_128_128 noninterleaved
@@ -40,18 +39,19 @@
>res0_128_1024 noninterleaved
haux res0_128_1024aux.vqd 0,48,2
-:_1 res0_128_1024_1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12
+:_1 res0_128_1024_1.vqd, 4, nonseq cull, 0 +- 1
:_2 res0_128_1024_2.vqd, 4, nonseq cull, 0 +- 1
-:_3 res0_128_1024_3.vqd, 4, nonseq cull, 0 +- 1
+:_3 res0_128_1024_3.vqd, 4, nonseq cull, 0 +- 1 2
:_4 res0_128_1024_4.vqd, 4, nonseq cull, 0 +- 1 2
:_5 res0_128_1024_5.vqd, 4, nonseq cull, 0 +- 1 2
-:_6 res0_128_1024_6.vqd, 4, nonseq cull, 0 +- 5 10
-+_6a, 4, nonseq, 0 +- 1 2
-:_7 res0_128_1024_7.vqd, 4, nonseq cull, 0 +- 5 10
-+_7a, 4, nonseq, 0 +- 1 2
-:_8 res0_128_1024_8.vqd, 2, nonseq cull, 0 +- 5 10 15 20
-+_8a, 2, nonseq, 0 +- 1 2
-:_9 res0_128_1024_9.vqd, 4, nonseq, 0 +- 169 338
+:_6 res0_128_1024_6.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_7 res0_128_1024_7.vqd, 2, nonseq cull, 0 +- 5 10 15 20
++_7a, 4, nonseq cull, 0 +- 1 2
+
+:_8 res0_128_1024_8.vqd, 2, nonseq cull, 0 +- 13 26 39 52 65 78
++_8a, 2, nonseq cull, 0 +- 1 2 3 4 5 6
+
+:_9 res0_128_1024_9.vqd, 2, nonseq, 0 +- 169 338
+_9a, 2, nonseq, 0 +- 13 26 39 52 65 78
+_9b, 2, nonseq, 0 +- 1 2 3 4 5 6
--- >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