[xiph-cvs] cvs commit: vorbis/lib/modes mode_A.h mode_AA.h
Monty
xiphmont at xiph.org
Sat Feb 17 02:13:59 PST 2001
xiphmont 01/02/17 02:13:58
Modified: lib envelope.c envelope.h floor0.c lpc.c lsp.c lsp.h
mapping0.c masking.h psy.c
lib/books lsp12_0.vqh lsp12_1.vqh lsp30_0.vqh lsp30_1.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_8.vqh
res0_128_1024_9.vqh res0_128_1024aux.vqh
res0_128_128_1.vqh res0_128_128_2.vqh
res0_128_128_3.vqh res0_128_128_4.vqh
res0_128_128_5.vqh res0_128_128aux.vqh
res0_96_1024_1.vqh res0_96_1024_2.vqh
res0_96_1024_3.vqh res0_96_1024_4.vqh
res0_96_1024_5.vqh res0_96_1024_6.vqh
res0_96_1024_7.vqh res0_96_1024_8.vqh
res0_96_1024_9.vqh res0_96_1024aux.vqh
res0_96_128_1.vqh res0_96_128_2.vqh
res0_96_128_3.vqh res0_96_128_4.vqh
res0_96_128_5.vqh res0_96_128aux.vqh
lib/modes mode_A.h mode_AA.h
Log:
New LSP root finding code; replace Newton-Raphson-Maehly with Laguerre's
method (and use Newton-Raphson only for polish)
Tuning of 96kbps and 128 kbps for beta 4.
Revision Changes Path
1.33 +24 -35 vorbis/lib/envelope.c
Index: envelope.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/envelope.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- envelope.c 2001/02/15 19:05:45 1.32
+++ envelope.c 2001/02/17 10:13:47 1.33
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data envelope analysis and manipulation
- last mod: $Id: envelope.c,v 1.32 2001/02/15 19:05:45 xiphmont Exp $
+ last mod: $Id: envelope.c,v 1.33 2001/02/17 10:13:47 xiphmont Exp $
Preecho calculation.
@@ -32,8 +32,6 @@
/* Digital filter designed by mkfilter/mkshape/gencode A.J. Fisher */
-
-
static int cheb_highpass_stages=6;
static float cheb_highpass_B[]={1.f,-6.f,15.f,-20.f,15.f,-6.f,1.f};
@@ -54,33 +52,32 @@
/* 6kHz-10kHz Chebyshev bandpass */
static float cheb_bandpass6k_gain=113.4643935f;
static float cheb_bandpass6k_A[]={
- -0.5712621337f,
- 1.5626130710f,
- -3.3348854983f,
- 4.0471340821f,
- -4.0051680331f,
- 2.2786325610f};
+ -0.5712621337f,
+ 1.5626130710f,
+ -3.3348854983f,
+ 4.0471340821f,
+ -4.0051680331f,
+ 2.2786325610f};
/* 3kHz-6kHz Chebyshev bandpass */
static float cheb_bandpass3k_gain= 248.8359377f;
static float cheb_bandpass3k_A[]={
- -0.6564230022f,
- 3.3747911257f,
- -8.0098635981f,
- 11.0040876874f,
- -9.2250963484f,
- 4.4760355389f};
+ -0.6564230022f,
+ 3.3747911257f,
+ -8.0098635981f,
+ 11.0040876874f,
+ -9.2250963484f,
+ 4.4760355389f};
/* 1.5kHz-3kHz Chebyshev bandpass */
static float cheb_bandpass1k_gain= 1798.537183f;
static float cheb_bandpass1k_A[]={
- -0.8097527363f,
- 4.7725742682f,
- -11.9800219408f,
- 16.3770336223f,
- -12.8553129536f,
- 5.4948074309f};
-
+ -0.8097527363f,
+ 4.7725742682f,
+ -11.9800219408f,
+ 16.3770336223f,
+ -12.8553129536f,
+ 5.4948074309f};
void _ve_envelope_init(envelope_lookup *e,vorbis_info *vi){
codec_setup_info *ci=vi->codec_setup;
@@ -138,9 +135,6 @@
float A=min*min*n;
float B=A;
- /*_analysis_output("A",granulepos,pre,n,0,0);
- _analysis_output("B",granulepos,post,n,0,0);*/
-
for(i=0;i<n;i++){
A+=pre[i]*pre[i];
B+=post[i]*post[i];
@@ -194,16 +188,6 @@
IIR_reset(iir3);
}
- _analysis_output("pcm",seq,pcm+v->centerW,v->pcm_current-v->centerW,0,0);
- _analysis_output("f0",seq,filtered0+v->centerW,v->pcm_current-v->centerW,
- 0,0);
- _analysis_output("f1",seq,filtered1+v->centerW,v->pcm_current-v->centerW,
- 0,0);
- _analysis_output("f2",seq,filtered2+v->centerW,v->pcm_current-v->centerW,
- 0,0);
- _analysis_output("f3",seq++,filtered3+v->centerW,v->pcm_current-v->centerW,
- 0,0);
-
}
ve->current=v->pcm_current;
@@ -214,6 +198,8 @@
j=v->centerW+ci->blocksizes[1]/4-ci->blocksizes[0]/4;
else
j=v->centerW;
+
+ if(j<ve->lastmark)j=ve->lastmark;
while(j+ve->winlength<=v->pcm_current){
for(i=0;i<ve->ch;i++){
@@ -223,10 +209,12 @@
if(m>ci->preecho_thresh[k]){
/*granulepos++;*/
+ ve->lastmark=j;
return(0);
}
if(m<ci->postecho_thresh[k]){
/*granulepos++;*/
+ ve->lastmark=j;
return(0);
}
/*granulepos++;*/
@@ -249,6 +237,7 @@
memmove(e->filtered[i],e->filtered[i]+shift,(e->current-shift)*
sizeof(float));
e->current-=shift;
+ e->lastmark-=shift;
}
1.14 +2 -2 vorbis/lib/envelope.h
Index: envelope.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/envelope.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- envelope.h 2001/02/15 19:05:45 1.13
+++ envelope.h 2001/02/17 10:13:47 1.14
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data envelope analysis and manipulation
- last mod: $Id: envelope.h,v 1.13 2001/02/15 19:05:45 xiphmont Exp $
+ last mod: $Id: envelope.h,v 1.14 2001/02/17 10:13:47 xiphmont Exp $
********************************************************************/
@@ -34,7 +34,7 @@
long storage;
long current;
-
+ long lastmark;
} envelope_lookup;
extern void _ve_envelope_init(envelope_lookup *e,vorbis_info *vi);
1.38 +18 -23 vorbis/lib/floor0.c
Index: floor0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/floor0.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- floor0.c 2001/02/10 02:06:59 1.37
+++ floor0.c 2001/02/17 10:13:47 1.38
@@ -11,7 +11,7 @@
********************************************************************
function: floor backend 0 implementation
- last mod: $Id: floor0.c,v 1.37 2001/02/10 02:06:59 xiphmont Exp $
+ last mod: $Id: floor0.c,v 1.38 2001/02/17 10:13:47 xiphmont Exp $
********************************************************************/
@@ -260,6 +260,9 @@
#endif
#endif
+ seq++;
+
+
/* our floor comes in on a [-Inf...0] dB scale. The curve has to be
positive, so we offset it. */
@@ -281,7 +284,6 @@
if(val<0)val=0; /* likely */
if(val>maxval)val=maxval; /* not bloody likely */
- oggpack_write(&vb->opb,val,info->ampbits);
if(val>0)
amp=(float)val/maxval*info->ampdB;
else
@@ -289,6 +291,16 @@
}
if(val){
+ /* LSP <-> LPC is orthogonal and LSP quantizes more stably */
+ _analysis_output("lpc",seq-1,flr,look->m,0,0);
+ if(vorbis_lpc_to_lsp(flr,flr,look->m))
+ val=0;
+
+ }
+
+ oggpack_write(&vb->opb,val,info->ampbits);
+
+ if(val){
float *lspwork=alloca(look->m*sizeof(float));
/* the spec supports using one of a number of codebooks. Right
@@ -296,27 +308,8 @@
backend_lookup_state *be=vb->vd->backend_state;
codebook *b;
int booknum;
-
- /* LSP <-> LPC is orthogonal and LSP quantizes more stably */
- _analysis_output("lpc",seq,flr,look->m,0,0);
-
- vorbis_lpc_to_lsp(flr,flr,look->m);
-
- _analysis_output("lsp",seq,flr,look->m,0,0);
-
-#ifdef ANALYSIS
- {
- float *lspwork2=alloca(look->m*sizeof(float));
- memcpy(lspwork2,flr,sizeof(float)*look->m);
- memcpy(lspwork,flr,sizeof(float)*look->m);
- vorbis_lsp_to_curve(flr,look->linearmap,look->n,look->ln,
- lspwork2,look->m,amp,info->ampdB);
- _analysis_output("prefit",seq++,flr,look->n,0,1);
- memcpy(flr,lspwork,sizeof(float)*look->m);
- }
-
-#endif
+ _analysis_output("lsp",seq-1,flr,look->m,0,0);
/* which codebook to use? We do it only by range right now. */
if(info->numbooks>1){
@@ -371,9 +364,12 @@
fclose(ef);
#endif
+ _analysis_output("lsp2",seq-1,lspwork,look->m,0,0);
+
/* take the coefficients back to a spectral envelope curve */
vorbis_lsp_to_curve(flr,look->linearmap,look->n,look->ln,
lspwork,look->m,amp,info->ampdB);
+ _analysis_output("lsp3",seq-1,flr,look->n,0,1);
return(val);
}
@@ -382,7 +378,6 @@
#endif
memset(flr,0,sizeof(float)*look->n);
- seq++;
return(val);
}
1.30 +7 -6 vorbis/lib/lpc.c
Index: lpc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/lpc.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- lpc.c 2001/02/02 03:51:56 1.29
+++ lpc.c 2001/02/17 10:13:47 1.30
@@ -11,7 +11,7 @@
********************************************************************
function: LPC low level routines
- last mod: $Id: lpc.c,v 1.29 2001/02/02 03:51:56 xiphmont Exp $
+ last mod: $Id: lpc.c,v 1.30 2001/02/17 10:13:47 xiphmont Exp $
********************************************************************/
@@ -75,14 +75,15 @@
/* Generate lpc coefficients from autocorr values */
error=aut[0];
- if(error==0){
- memset(lpc,0,m*sizeof(float));
- return 0;
- }
for(i=0;i<m;i++){
float r=-aut[i+1];
+ if(error==0){
+ memset(lpc,0,m*sizeof(float));
+ return 0;
+ }
+
/* Sum up this iteration's reflection coefficient; note that in
Vorbis we don't save it. If anyone wants to recycle this code
and needs reflection coefficients, save the results of 'r' from
@@ -101,7 +102,7 @@
}
if(i%2)lpc[j]+=lpc[j]*r;
- error*=1.0f-r*r;
+ error*=1.f-r*r;
}
/* we need the error value to know how big an impulse to hit the
1.16 +89 -70 vorbis/lib/lsp.c
Index: lsp.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/lsp.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lsp.c 2001/02/02 03:51:56 1.15
+++ lsp.c 2001/02/17 10:13:47 1.16
@@ -11,7 +11,7 @@
********************************************************************
function: LSP (also called LSF) conversion routines
- last mod: $Id: lsp.c,v 1.15 2001/02/02 03:51:56 xiphmont Exp $
+ last mod: $Id: lsp.c,v 1.16 2001/02/17 10:13:47 xiphmont Exp $
The LSP generation code is taken (with minimal modification and a
few bugfixes) from "On the Computation of the LSP Frequencies" by
@@ -194,9 +194,6 @@
pi*=(1<<14)-((wi*wi)>>14);
qi+=pi>>14;
- //q*=ftmp[0]-w;
- //q*=q;
- //p*=p*(1.f-w*w);
}else{
/* even order filter; still symmetric */
@@ -303,94 +300,110 @@
return(-1);
}
-/* This is one of those 'mathemeticians should not write code' kind of
- cases. Newton's method of polishing roots is straightforward
- enough... except in those cases where it just fails in the real
- world. In our case below, we're worried about a local mini/maxima
- shooting a root estimation off to infinity, or the new estimation
- chaotically oscillating about convergence (shouldn't actually be a
- problem in our usage.
-
- Maehly's modification (zero suppression, to prevent two tenative
- roots from collapsing to the same actual root) similarly can
- temporarily shoot a root off toward infinity. It would come
- back... if it were not for the fact that machine representation has
- limited dynamic range and resolution. This too is guarded by
- limiting delta.
-
- Last problem is convergence criteria; we don't know what a 'double'
- is on our hardware/compiler, and the convergence limit is bounded
- by roundoff noise. So, we hack convergence:
-
- Require at most 1e-6 mean squared error for all zeroes. When
- converging, start the clock ticking at 1e-6; limit our polishing to
- as many more iterations as took us to get this far, 100 max.
-
- Past max iters, quit when MSE is no longer decreasing *or* we go
- below ~1e-20 MSE, whichever happens first. */
-
-static void Newton_Raphson_Maehly(float *a,int ord,float *r){
- int i, k, count=0, maxiter=0;
- double error=1.,besterror=1.;
+/* Newton-Raphson-Maehly actually functioned as a decent root finder,
+ but there are root sets for which it gets into limit cycles
+ (exacerbated by zero suppression) and fails. We can't afford to
+ fail, even if the failure is 1 in 100,000,000, so we now use
+ Laguerre and later polish with Newton-Raphson (which can then
+ afford to fail) */
+
+#define EPSILON 10e-7
+static int Laguerre_With_Deflation(float *a,int ord,float *r){
+ int i,m;
+ double lastdelta=0.f;
+ double *defl=alloca(sizeof(double)*(ord+1));
+ for(i=0;i<=ord;i++)defl[i]=a[i];
+
+ for(m=ord;m>0;m--){
+ double new=0.f,delta;
+
+ /* iterate a root */
+ while(1){
+ double p=defl[m],pp=0.f,ppp=0.f,denom;
+
+ /* eval the polynomial and its first two derivatives */
+ for(i=m;i>0;i--){
+ ppp = new*ppp + pp;
+ pp = new*pp + p;
+ p = new*p + defl[i-1];
+ }
+
+ /* Laguerre's method */
+ denom=(m-1) * ((m-1)*pp*pp - m*p*ppp);
+ if(denom<0)
+ return(-1); /* complex root! The LPC generator handed us a bad filter */
+
+ if(pp>0){
+ denom = pp + sqrt(denom);
+ if(denom<EPSILON)denom=EPSILON;
+ }else{
+ denom = pp - sqrt(denom);
+ if(denom>-(EPSILON))denom=-(EPSILON);
+ }
+
+ delta = m*p/denom;
+ new -= delta;
+
+ if(delta<0.f)delta*=-1;
+
+ if(fabs(delta/new)<10e-12)break;
+ lastdelta=delta;
+ }
+
+ r[m-1]=new;
+
+ /* forward deflation */
+
+ for(i=m;i>0;i--)
+ defl[i-1]+=new*defl[i];
+ defl++;
+
+ }
+ return(0);
+}
+
+
+/* for spit-and-polish only */
+static int Newton_Raphson(float *a,int ord,float *r){
+ int i, k, count=0;
+ double error=1.f;
double *root=alloca(ord*sizeof(double));
- for(i=0; i<ord;i++) root[i] = 2.0 * (i+0.5) / ord - 1.0;
+ for(i=0; i<ord;i++) root[i] = r[i];
while(error>1e-20){
error=0;
for(i=0; i<ord; i++) { /* Update each point. */
- double ac=0.,pp=0.,delta;
+ double pp=0.,delta;
double rooti=root[i];
double p=a[ord];
for(k=ord-1; k>= 0; k--) {
pp= pp* rooti + p;
- p = p * rooti+ a[k];
- if (k != i) ac += 1./(rooti - root[k]);
+ p = p * rooti + a[k];
}
- ac=p*ac;
-
- delta = p/(pp-ac);
-
- /* don't allow the correction to scream off into infinity if we
- happened to polish right at a local mini/maximum */
-
- if(delta<-3.)delta=-3.;
- if(delta>3.)delta=3.; /* 3 is not a random choice; it's large
- enough to make sure the first pass
- can't accidentally limit two poles to
- the same value in a fatal nonelastic
- collision. */
+ delta = p/pp;
root[i] -= delta;
- error += delta*delta;
+ error+= delta*delta;
}
- if(maxiter && count>maxiter && error>=besterror)break;
-
- /* anything to help out the polisher; converge using doubles */
- if(!count || error<besterror){
- for(i=0; i<ord; i++) r[i]=root[i];
- besterror=error;
- if(error<1e-6){ /* rough minimum criteria */
- maxiter=count*2+10;
- if(maxiter>100)maxiter=100;
- }
- }
-
+ if(count>40)return(-1);
+
count++;
}
/* Replaced the original bubble sort with a real sort. With your
help, we can eliminate the bubble sort in our lifetime. --Monty */
-
- qsort(r,ord,sizeof(float),comp);
+ for(i=0; i<ord;i++) r[i] = root[i];
+ return(0);
}
+
/* Convert lpc coefficients to lsp coefficients */
-void vorbis_lpc_to_lsp(float *lpc,float *lsp,int m){
+int vorbis_lpc_to_lsp(float *lpc,float *lsp,int m){
int order2=(m+1)>>1;
int g1_order,g2_order;
float *g1=alloca(sizeof(float)*(order2+1));
@@ -425,14 +438,20 @@
cheby(g2,g2_order);
/* Find the roots of the 2 even polynomials.*/
-
- Newton_Raphson_Maehly(g1,g1_order,g1r);
- Newton_Raphson_Maehly(g2,g2_order,g2r);
+ if(Laguerre_With_Deflation(g1,g1_order,g1r) ||
+ Laguerre_With_Deflation(g2,g2_order,g2r))
+ return(-1);
+ Newton_Raphson(g1,g1_order,g1r); /* if it fails, it leaves g1r alone */
+ Newton_Raphson(g2,g2_order,g2r); /* if it fails, it leaves g2r alone */
+
+ qsort(g1r,g1_order,sizeof(float),comp);
+ qsort(g2r,g2_order,sizeof(float),comp);
+
for(i=0;i<g1_order;i++)
lsp[i*2] = acos(g1r[i]);
for(i=0;i<g2_order;i++)
lsp[i*2+1] = acos(g2r[i]);
-
+ return(0);
}
1.8 +2 -2 vorbis/lib/lsp.h
Index: lsp.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/lsp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lsp.h 2001/02/02 03:51:56 1.7
+++ lsp.h 2001/02/17 10:13:47 1.8
@@ -11,7 +11,7 @@
********************************************************************
function: LSP (also called LSF) conversion routines
- last mod: $Id: lsp.h,v 1.7 2001/02/02 03:51:56 xiphmont Exp $
+ last mod: $Id: lsp.h,v 1.8 2001/02/17 10:13:47 xiphmont Exp $
********************************************************************/
@@ -19,7 +19,7 @@
#ifndef _V_LSP_H_
#define _V_LSP_H_
-extern void vorbis_lpc_to_lsp(float *lpc,float *lsp,int m);
+extern int vorbis_lpc_to_lsp(float *lpc,float *lsp,int m);
extern void vorbis_lsp_to_curve(float *curve,int *map,int n,int ln,
float *lsp,int m,
1.25 +11 -7 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mapping0.c 2001/02/02 03:51:56 1.24
+++ mapping0.c 2001/02/17 10:13:47 1.25
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.24 2001/02/02 03:51:56 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.25 2001/02/17 10:13:47 xiphmont Exp $
********************************************************************/
@@ -254,10 +254,10 @@
/* begin masking work */
floor[i]=_vorbis_block_alloc(vb,n*sizeof(float)/2);
- //_analysis_output("fft",seq,additional,n/2,0,1);
- //_analysis_output("mdct",seq,additional+n/2,n/2,0,1);
- //_analysis_output("lfft",seq,additional,n/2,0,0);
- //_analysis_output("lmdct",seq,additional+n/2,n/2,0,0);
+ _analysis_output("fft",seq,additional,n/2,0,1);
+ _analysis_output("mdct",seq,additional+n/2,n/2,0,1);
+ _analysis_output("lfft",seq,additional,n/2,0,0);
+ _analysis_output("lmdct",seq,additional+n/2,n/2,0,0);
/* perform psychoacoustics; do masking */
ret=_vp_compute_mask(look->psy_look+submap,additional,additional+n/2,
@@ -285,15 +285,19 @@
sprintf(buffer,"residue_%d.vqd",vb->mode);
of=fopen(buffer,"a");
- for(i=0;i<n/2;i++)
+ for(i=0;i<n/2;i++){
fprintf(of,"%.2f, ",pcm[i]);
+ if(fabs(pcm[i])>1000){
+ fprintf(stderr," %d ",seq-1);
+ }
+ }
fprintf(of,"\n");
fclose(of);
}
#endif
-
}
+ seq++;
vbi->ampmax=newmax;
/* perform residue encoding with residue mapping; this is
1.12 +1 -2 vorbis/lib/masking.h
Index: masking.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/masking.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- masking.h 2001/02/02 03:51:57 1.11
+++ masking.h 2001/02/17 10:13:48 1.12
@@ -11,7 +11,7 @@
********************************************************************
function: masking curve data for psychoacoustics
- last mod: $Id: masking.h,v 1.11 2001/02/02 03:51:57 xiphmont Exp $
+ last mod: $Id: masking.h,v 1.12 2001/02/17 10:13:48 xiphmont Exp $
********************************************************************/
@@ -187,7 +187,6 @@
80, 60, 35, 25, 15, 5, 5, 5, 25, 30, 35, 43, 50, 55, 60, 65,
70, 75, 80, 85, 90, 95, 100, 100, -900,-900,-900,-900,-900,-900,-900,-900,
-900,-900,-900,-900,-900,-900,-900,-900};
-
#if 0 /* not used for the time being */
float noise_500_60dB_SL[EHMER_MAX]={
1.42 +2 -2 vorbis/lib/psy.c
Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- psy.c 2001/02/02 03:51:57 1.41
+++ psy.c 2001/02/17 10:13:48 1.42
@@ -11,7 +11,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.41 2001/02/02 03:51:57 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.42 2001/02/17 10:13:48 xiphmont Exp $
********************************************************************/
@@ -620,7 +620,7 @@
/* go to dB scale. Also find the highest peak so we know the limits */
for(i=0;i<n;i++){
- fft[i]=todB(fft[i]);
+ fft[i]=todB_nn(fft[i]);
if(fft[i]>localmax)localmax=fft[i];
}
if(specmax<localmax)specmax=localmax;
1.5 +5 -4 vorbis/lib/books/lsp12_0.vqh
Index: lsp12_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/lsp12_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lsp12_0.vqh 2001/02/02 03:52:06 1.4
+++ lsp12_0.vqh 2001/02/17 10:13:50 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -64,9 +65,9 @@
};
static long _vq_lengthlist_lsp12_0[] = {
- 13,14,14,12,13,12,13,13,11,11,10, 9, 8, 6, 6, 6,
- 5, 5, 4, 3, 3, 3, 3, 4, 4, 5, 5, 5, 6, 4, 6, 8,
- 10,11,13,13,14,12,14,12,13,13,12,
+ 16,16,16,14,15,14,15,15,12,11,10, 9, 9, 8, 7, 7,
+ 7, 5, 4, 3, 3, 2, 3, 4, 4, 5, 6, 7, 6, 5, 6, 8,
+ 10,11,13,14,14,14,16,14,16,16,14,
};
static long _vq_pigeonmap_lsp12_0[] = {
1.4 +174 -173 vorbis/lib/books/lsp12_1.vqh
Index: lsp12_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/lsp12_1.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lsp12_1.vqh 2001/02/02 03:52:06 1.3
+++ lsp12_1.vqh 2001/02/17 10:13:50 1.4
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -35,178 +36,178 @@
};
static long _vq_lengthlist_lsp12_1[] = {
- 17,15,15,17,16,16,16,16,16,16,16,15,16,16,16,16,
- 15,15,16,15,16,15,14,15,15,15,16,16,15,16,16,14,
- 14,15,16,14,16,14,16,16,16,16,16,15,14,15,14,14,
- 14,15,14,15,15,16,15,16,15,15,14,14,14,14,15,15,
- 15,16,16,16,15,16,15,16,16,16,15,15,15,14,16,15,
- 14,15,16,16,16,15,16,16,16,16,15,15,15,15,16,16,
- 15,16,16,16,16,16,15,15,15,14,13,15,16,15,16,16,
- 16,16,15,16,16,16,15,14,13,15,16,14,16,16,16,16,
- 16,16,15,16,15,15,14,15,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,15,16,16,16,16,16,16,16,16,16,
- 16,16,16,15,16,15,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,
- 16,16,16,16,15,16,15,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,15,15,15,15,16,16,15,15,16,16,16,16,
- 16,15,15,15,15,15,15,14,15,14,14,15,16,16,16,16,
- 16,16,15,15,14,14,14,15,16,15,15,16,16,16,15,14,
- 13,13,14,14,14,15,16,15,16,15,16,16,15,15,15,13,
- 14,13,14,16,16,16,15,15,16,16,16,14,16,15,13,13,
- 15,14,15,15,16,16,16,16,16,15,15,14,14,12,13,15,
- 14,16,16,16,16,16,16,16,15,14,14,12,13,14,15,14,
- 15,16,16,16,16,16,16,14,15,13,15,14,15,15,15,15,
- 16,16,16,16,15,14,15,16,14,15,15,16,15,16,16,16,
- 16,15,15,15,16,15,15,16,16,16,16,16,16,15,15,16,
- 15,15,16,14,15,14,15,16,16,16,16,16,16,16,15,15,
- 16,16,16,15,16,16,15,16,16,16,14,16,16,16,16,16,
- 15,16,15,16,16,16,16,16,16,15,15,14,15,14,15,16,
- 16,15,16,16,16,16,16,15,15,15,15,13,14,13,14,16,
- 16,16,16,16,16,16,13,13,13,13,14,14,14,15,15,15,
- 16,16,15,14,12,12,12,12,13,14,16,15,14,15,16,16,
- 16,13,13,13,12,12,13,13,14,15,14,16,16,16,16,16,
- 13,13,12,12,12,13,15,15,15,16,16,16,16,16,15,12,
- 12,11,12,13,14,15,15,16,16,16,16,15,14,14,12,12,
- 12,13,14,14,15,16,16,16,16,16,16,15,12,13,13,14,
- 13,14,14,15,16,16,16,16,15,14,14,14,13,13,14,15,
- 15,16,15,16,16,16,14,16,15,14,15,14,14,14,16,16,
- 16,16,16,16,15,15,16,14,14,15,14,15,16,16,16,16,
- 16,15,15,15,15,15,16,15,15,16,16,16,16,16,15,15,
- 15,15,16,15,15,16,16,15,16,16,16,16,16,15,15,15,
- 14,14,14,16,16,15,16,16,16,16,16,15,14,14,13,14,
- 14,15,15,14,14,15,16,16,15,14,13,12,12,12,13,13,
- 15,16,14,16,16,16,16,13,11,11,12,12,12,13,14,13,
- 16,15,16,15,15,13,10,11,10,11,12,12,13,14,14,15,
- 15,16,15,14,11,10,10,11,11,12,12,14,14,15,16,16,
- 16,15,12,11,11,10,11,12,13,14,15,14,16,16,16,15,
- 13,12,11,11,11,12,13,14,14,16,16,16,16,15,14,13,
- 13,12,12,12,13,13,14,15,16,16,15,15,14,13,14,13,
- 12,12,13,14,15,15,16,16,16,15,14,13,14,12,13,14,
- 14,13,14,16,16,15,16,16,16,14,14,14,13,13,15,14,
- 15,16,16,16,15,14,14,14,16,15,14,15,14,15,16,16,
- 16,16,16,16,15,15,14,15,16,15,15,15,16,16,16,16,
- 16,14,14,13,13,14,14,15,15,15,15,15,16,16,15,14,
- 12,12,12,12,13,13,13,13,13,13,16,16,14,12,11,11,
- 11,11,11,11,11,12,12,14,16,16,14,12,10, 9,10,10,
- 10,11,11,12,13,14,16,14,13,13, 9, 8, 9, 9,10,10,
- 10,12,12,13,16,16,15,13,10, 9, 9, 9, 9,10,12,13,
- 13,13,15,15,15,13,11, 9, 9, 9, 9,10,11,12,13,14,
- 16,15,16,14,12,11,10, 9,10,11,12,12,14,16,16,15,
- 14,14,12,12,11,10,11,11,12,12,14,15,15,16,16,14,
- 13,13,11,12,12,12,13,13,13,13,15,15,15,14,14,13,
- 13,13,12,12,13,13,14,16,16,16,15,14,14,13,13,14,
- 13,14,13,13,15,14,16,16,15,14,14,15,14,15,14,14,
- 14,15,16,16,16,16,16,16,16,14,16,15,14,16,15,15,
- 16,15,16,16,15,15,13,13,12,12,13,14,14,15,14,13,
- 16,16,14,12,11,10,10,11,12,12,13,12,12,12,16,15,
- 14,12,10, 9, 9,10,10,10,11,11,11,12,16,15,14,11,
- 9, 8, 8, 9, 9, 9, 9,10,11,12,16,16,14,11, 9, 7,
- 7, 8, 8, 8, 9,10,11,13,16,14,14,11, 9, 7, 7, 7,
- 8, 9,10,11,12,12,16,15,14,12,10, 8, 8, 7, 8, 9,
- 11,12,13,13,14,15,15,13,11,10, 9, 8, 9,10,11,12,
- 13,14,16,16,16,13,11,11,10, 9,10,10,11,13,13,13,
- 16,16,15,14,12,11,11,11,11,11,12,13,13,15,16,15,
- 15,12,13,12,12,12,11,13,13,15,14,15,16,16,15,14,
- 14,13,12,13,12,13,14,14,15,16,16,15,15,14,14,15,
- 13,14,14,14,15,14,15,16,16,16,16,16,15,14,14,13,
- 13,15,15,15,15,16,15,16,15,14,12,11,11,12,12,13,
- 14,15,15,15,16,16,14,11,10,10, 9,10,12,12,13,12,
- 12,13,16,14,13,11, 9, 8, 9,10,10, 9,10,11,11,11,
- 15,15,12,10, 8, 8, 8, 9, 9, 8, 9,10,11,12,14,13,
- 11,10, 8, 7, 6, 7, 7, 8, 8, 9,11,13,15,13,12,10,
- 8, 6, 6, 6, 7, 8, 9,11,11,13,15,15,13,11, 9, 7,
- 6, 7, 8, 9,10,12,12,13,15,15,14,12,10, 9, 8, 8,
- 8, 9,11,11,13,14,15,14,13,13,11,10, 9, 9,10,10,
- 11,12,12,13,15,15,14,12,12,11,10,10,11,11,12,13,
- 14,14,15,15,13,12,12,11,11,12,12,12,13,14,15,15,
- 16,15,14,13,12,13,13,12,13,13,14,14,15,15,16,15,
- 14,13,14,13,13,13,14,14,14,15,15,16,16,16,15,15,
- 14,14,13,13,14,14,15,15,16,16,16,16,15,13,12,11,
- 11,12,13,13,15,14,14,16,15,14,14,11,10,10,11,11,
- 12,13,14,15,14,15,16,14,13,10, 9, 9,10,10,10,11,
- 11,11,12,13,15,13,11, 9, 8, 8, 8, 9, 9, 9, 9,11,
- 12,13,15,13,11, 9, 8, 7, 7, 7, 8, 9,10,11,12,14,
- 14,13,11, 9, 8, 7, 6, 7, 8, 9,10,12,12,14,15,14,
- 11,10, 9, 7, 7, 7, 8, 9,10,12,12,15,16,14,13,11,
- 10, 9, 8, 8, 9,10,10,12,13,13,16,14,13,12,10, 9,
- 9, 9,10,10,11,13,13,14,16,15,14,12,11,11,10,10,
- 10,11,12,13,13,15,16,15,13,12,12,11,12,11,12,12,
- 12,13,14,16,16,14,14,13,12,12,12,12,12,13,14,13,
- 15,15,16,15,14,14,13,12,12,13,13,15,14,15,16,15,
- 16,16,16,15,14,13,14,14,15,16,16,15,16,15,15,16,
- 15,14,13,12,13,13,14,14,15,15,16,16,16,16,15,12,
- 11,11,12,12,13,12,13,14,15,14,15,13,12,10,10,10,
- 10,11,11,12,13,13,14,14,14,12,11,10, 9, 9, 9,10,
- 10,11,11,12,13,14,16,12,11,10, 8, 8, 8, 8, 9,10,
- 11,12,13,14,14,12,11,10, 9, 8, 7, 8, 9,10,12,12,
- 13,13,16,15,11,10, 9, 8, 8, 8, 8,10,11,12,14,15,
- 16,13,13,11,10, 9, 9, 8, 9,10,11,12,13,13,16,15,
- 14,12,11,10,10,10,10,10,11,12,13,15,16,16,13,12,
- 11,10,10,10,10,11,12,13,13,15,14,14,13,12,12,11,
- 11,11,11,12,13,13,14,15,16,15,15,15,12,12,12,12,
- 13,13,14,14,16,15,15,15,15,14,14,13,12,12,13,15,
- 15,14,15,16,16,16,16,15,14,14,16,14,15,15,16,16,
- 16,16,16,15,15,14,12,13,13,14,14,15,15,16,16,16,
- 16,15,14,12,12,12,12,13,14,13,14,15,15,16,16,12,
- 12,11,11,10,11,11,12,12,13,14,14,15,15,12,12,11,
- 10, 9,10,10,10,11,12,13,15,14,14,12,11,10, 9, 9,
- 9, 9,10,11,12,14,15,16,14,12,11,10, 9, 9, 9, 9,
- 9,10,11,12,14,15,15,13,12,11,10, 9, 9, 9,10,10,
- 11,12,14,13,15,15,13,11,11,10, 9, 9, 9,10,11,12,
- 13,14,15,15,13,12,11,10,10,10,10,11,12,13,14,15,
- 15,14,14,13,12,11,10,10,11,11,13,12,14,15,14,15,
- 14,13,12,11,12,11,11,12,13,15,14,15,16,15,14,14,
- 13,12,12,12,12,13,14,14,15,15,16,15,14,13,13,12,
- 13,13,13,13,14,14,15,15,16,16,16,14,14,15,15,15,
- 15,14,16,16,16,16,15,15,16,14,14,14,14,14,14,15,
- 15,16,16,16,16,14,14,13,12,13,12,13,14,14,14,15,
- 15,16,14,13,12,12,12,11,11,11,13,14,13,16,15,15,
- 16,12,12,11,11,10,10,11,11,12,14,14,14,16,14,12,
- 12,11,10, 9,10,10,11,12,12,14,14,15,14,13,12,12,
- 10, 9,10,10,11,11,13,13,13,15,14,13,13,11,11,10,
- 10,10,10,11,12,13,15,15,15,14,14,12,12,11,10,10,
- 10,11,12,13,14,14,16,15,13,12,11,11,11,10,11,11,
- 12,13,13,15,13,14,14,13,11,11,11,11,11,12,13,14,
- 14,15,15,15,14,12,12,11,11,11,12,13,13,15,15,15,
- 15,15,15,14,13,12,13,13,13,12,14,15,16,16,14,15,
- 14,14,14,14,13,12,13,14,14,15,15,16,16,15,15,15,
- 16,15,15,14,15,15,15,16,15,16,16,16,15,15,14,13,
- 14,15,14,16,15,16,15,15,15,15,14,14,14,14,13,14,
- 14,15,16,15,16,16,15,13,14,12,13,12,13,12,13,14,
- 15,15,15,16,15,13,12,12,12,11,12,12,12,12,15,15,
- 14,16,15,13,13,12,11,11,11,11,12,13,13,14,16,16,
- 14,14,12,12,11,10,11,11,11,12,12,14,14,15,14,15,
- 12,12,11,11,11,11,11,12,12,13,14,16,16,14,13,12,
- 12,11,11,11,11,12,13,14,15,15,15,15,14,13,12,12,
- 11,12,12,12,13,14,14,16,14,15,14,13,12,12,12,12,
- 12,14,13,14,16,15,15,14,13,14,12,12,12,13,13,14,
- 14,15,16,16,15,14,13,14,13,13,14,14,14,14,15,16,
- 16,16,14,14,14,13,15,14,14,14,15,16,15,16,16,16,
- 16,15,15,16,16,14,14,15,16,16,15,16,16,16,16,16,
- 14,16,15,15,15,14,16,15,16,16,16,16,16,15,13,14,
- 14,14,14,15,15,15,15,15,15,16,16,15,13,13,13,13,
- 13,13,13,14,15,16,16,16,16,14,14,12,13,13,12,12,
- 13,14,14,14,15,16,16,14,13,13,12,12,12,12,12,12,
- 14,14,16,16,15,15,13,13,12,11,12,12,12,13,14,14,
- 16,16,16,16,13,12,12,12,12,12,11,12,13,14,15,16,
- 15,14,13,13,12,12,12,12,12,12,14,14,14,15,14,16,
- 13,13,14,12,12,12,12,14,14,15,14,16,15,15,13,13,
- 12,12,12,13,13,14,15,16,16,16,15,14,15,13,13,13,
- 14,15,15,16,16,16,16,16,16,15,15,15,14,14,16,15,
- 15,15,16,16,16,16,15,16,15,15,15,15,15,16,16,16,
- 16,16,16,16,15,16,16,15,16,15,14,16,16,15,16,15,
- 16,16,16,15,15,16,14,14,16,15,16,16,16,16,16,16,
- 16,15,14,14,14,14,14,15,15,15,14,15,15,16,15,14,
- 15,13,13,14,14,14,14,15,14,16,16,16,16,14,13,13,
- 14,15,13,12,13,13,15,16,15,15,15,14,13,15,12,12,
- 12,12,13,14,16,15,16,16,15,15,14,13,13,12,12,13,
- 12,13,14,15,15,16,16,15,14,13,13,12,12,12,12,13,
- 16,15,15,15,16,14,14,13,13,14,14,13,14,13,14,16,
- 15,16,16,14,13,14,14,13,14,14,14,15,16,16,16,16,
- 16,15,16,14,13,14,14,15,15,16,16,16,16,16,16,15,
- 14,15,14,15,15,15,15,16,16,16,16,16,15,15,16,16,
- 14,16,16,16,16,16,16,16,16,16,15,14,14,15,15,16,
- 16,16,15,16,16,16,16,16,
+ 17,15,17,17,16,16,17,17,17,17,17,16,17,17,17,17,
+ 16,16,16,16,17,17,14,17,17,17,17,17,16,16,17,16,
+ 15,17,15,15,15,15,17,16,17,17,17,15,14,15,15,15,
+ 15,16,15,15,16,17,17,17,15,15,15,14,15,15,15,14,
+ 15,16,16,17,17,17,17,16,16,17,16,16,15,15,17,16,
+ 16,16,17,17,17,16,17,17,17,15,15,15,17,16,16,17,
+ 17,17,17,17,17,15,14,14,14,15,16,16,17,15,15,17,
+ 17,17,17,17,17,17,14,13,16,14,15,17,17,17,17,17,
+ 17,17,15,14,16,15,15,16,17,17,16,17,17,17,17,16,
+ 15,16,14,17,16,15,15,17,17,17,17,17,17,17,17,17,
+ 16,17,15,17,15,17,17,16,17,17,17,17,17,17,17,16,
+ 17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,16,
+ 17,16,17,17,17,17,15,15,17,16,17,17,16,17,17,17,
+ 17,17,17,17,15,15,15,16,17,17,17,17,17,17,17,17,
+ 17,16,16,15,15,14,15,15,15,15,16,16,17,17,16,16,
+ 15,16,14,15,14,14,15,14,16,17,16,17,17,17,15,15,
+ 14,14,13,14,14,14,17,17,16,15,16,17,15,15,14,14,
+ 14,14,15,15,16,17,16,16,17,17,17,15,13,13,14,13,
+ 14,15,15,16,16,17,17,17,17,15,14,14,13,13,14,14,
+ 15,17,16,16,17,17,17,17,14,14,13,12,13,14,15,15,
+ 15,17,17,17,17,17,15,14,13,12,14,14,16,15,15,16,
+ 17,17,17,15,15,15,14,14,15,14,14,15,17,16,17,17,
+ 17,17,17,16,14,15,14,16,16,17,17,17,16,17,17,17,
+ 17,17,15,14,16,15,17,17,17,17,17,17,17,15,17,17,
+ 17,16,15,15,14,16,16,17,17,16,15,16,15,16,15,15,
+ 16,17,17,17,17,17,17,17,16,14,15,15,15,15,16,17,
+ 17,17,17,17,17,15,15,15,14,14,14,15,15,15,17,17,
+ 17,17,17,17,15,14,13,14,13,14,14,15,15,16,17,16,
+ 17,17,15,15,12,13,13,12,13,14,15,16,16,17,17,17,
+ 16,14,13,13,12,12,13,13,15,16,15,15,17,17,17,14,
+ 12,12,11,11,13,13,14,15,16,15,17,17,17,14,13,11,
+ 11,11,13,13,14,15,15,17,17,17,17,14,14,12,11,11,
+ 13,13,13,14,16,15,17,17,17,15,14,14,12,12,13,13,
+ 14,14,15,15,17,17,17,17,15,14,14,13,13,13,14,15,
+ 15,16,15,17,17,17,15,14,16,14,13,14,14,14,15,16,
+ 17,16,17,17,15,16,15,14,15,16,15,17,17,17,17,17,
+ 17,17,15,15,16,15,15,15,15,15,15,17,17,16,15,14,
+ 16,17,17,15,17,17,17,16,17,17,17,17,16,14,14,14,
+ 15,15,16,17,16,15,17,17,15,17,15,15,14,14,14,14,
+ 15,15,15,16,15,15,17,16,15,14,13,13,13,13,13,15,
+ 15,16,15,17,17,16,15,13,11,12,12,12,12,13,14,14,
+ 16,15,17,17,16,13,11,10,10,11,12,12,13,14,14,17,
+ 17,17,17,14,11,10,10,10,11,12,14,14,15,14,17,17,
+ 14,16,13,10,10,10,11,12,13,15,15,15,16,17,17,15,
+ 13,11,10,10,11,12,13,14,15,17,17,17,17,15,13,12,
+ 11,11,11,12,13,14,14,15,17,17,16,15,15,13,12,12,
+ 12,12,13,15,14,15,17,16,15,16,16,13,13,13,13,13,
+ 14,15,16,16,16,17,17,16,16,14,15,14,14,15,15,15,
+ 16,17,16,16,17,15,16,17,15,15,15,16,14,15,16,17,
+ 16,16,17,15,15,15,15,17,15,17,16,17,16,17,17,17,
+ 16,15,14,13,14,14,16,15,16,15,15,15,17,16,15,13,
+ 13,12,12,13,14,13,14,13,13,13,17,17,15,13,11,11,
+ 12,12,11,12,12,12,13,14,17,17,15,13,10,10,10,10,
+ 10,11,11,12,13,14,17,17,14,13,10, 9, 9,10,10,10,
+ 10,12,12,14,17,16,15,13,11, 9, 9, 9, 9,10,11,13,
+ 15,14,16,15,15,13,11, 9, 8, 9, 9,10,12,13,14,14,
+ 16,15,15,15,12,10, 9, 9, 9,11,12,13,14,15,17,16,
+ 16,15,13,11,10,10,10,11,12,13,15,15,15,17,15,15,
+ 14,13,11,11,12,12,13,13,14,14,17,16,15,17,14,14,
+ 13,12,12,13,13,13,15,15,17,16,15,15,14,14,14,13,
+ 14,14,13,14,15,16,17,17,16,17,15,17,15,14,15,15,
+ 15,15,17,16,17,17,16,15,16,14,17,15,15,15,16,16,
+ 15,16,17,17,16,15,13,13,12,13,14,14,13,14,14,13,
+ 17,17,15,12,11,11,10,11,12,12,12,12,12,11,17,15,
+ 15,12,10,10,10,10,10,10,11,11,11,12,17,16,13,12,
+ 9, 8, 9, 9, 9, 8, 9,10,11,12,16,16,14,12, 9, 7,
+ 7, 8, 7, 8, 9,10,12,13,17,15,13,12, 9, 7, 7, 7,
+ 7, 9,10,11,12,12,15,15,14,13,10, 8, 7, 7, 8, 9,
+ 11,13,13,14,15,15,15,13,11,10, 8, 8, 9,10,11,13,
+ 13,13,15,17,15,14,12,11,10, 9,10,11,12,13,13,14,
+ 15,17,17,14,14,12,11,11,11,11,13,13,14,15,17,15,
+ 16,14,13,13,12,12,12,12,13,15,15,17,17,15,15,14,
+ 13,14,13,13,13,13,15,15,17,17,17,16,16,15,15,15,
+ 15,14,14,15,15,15,16,17,17,16,17,16,16,14,13,13,
+ 13,15,15,16,16,15,17,17,17,15,13,12,12,12,13,14,
+ 13,14,14,14,17,16,15,13,11,10,10,11,12,12,12,12,
+ 11,12,15,15,13,11, 9, 9, 9,10,10, 9,10,10,11,11,
+ 17,15,13,11, 9, 8, 8, 9, 8, 7, 8, 9,11,12,14,14,
+ 12,11, 8, 7, 6, 7, 7, 7, 9,10,11,12,14,14,13,10,
+ 9, 6, 6, 6, 7, 9,10,11,12,13,15,14,14,12,10, 8,
+ 6, 7, 8, 9,10,12,13,15,15,15,14,13,11, 9, 8, 8,
+ 9,10,11,12,13,15,15,15,14,13,11,10, 9, 9,10,11,
+ 11,13,13,14,15,16,14,14,13,11,10,11,11,11,12,13,
+ 14,15,16,17,14,14,12,13,12,11,11,13,13,15,17,15,
+ 17,15,17,14,13,14,12,13,14,14,15,15,16,17,17,17,
+ 14,14,15,15,14,15,14,15,14,16,15,17,17,17,17,17,
+ 15,14,13,14,14,14,15,15,15,14,16,17,17,13,12,12,
+ 11,12,13,13,14,14,13,13,17,15,15,12,10,10,11,11,
+ 12,12,12,13,12,13,17,14,13,11, 9, 9,10,10,11,10,
+ 10,11,12,12,15,14,12,10, 9, 8, 8, 9, 9, 9, 9,10,
+ 12,12,17,14,11, 9, 8, 7, 6, 7, 8, 9,10,11,12,13,
+ 15,14,11,10, 8, 6, 6, 7, 8, 9,10,11,13,13,16,15,
+ 12,11, 9, 8, 7, 7, 8, 9,11,12,13,14,16,14,12,12,
+ 10, 9, 8, 8, 9,10,11,13,13,14,15,15,14,13,12,10,
+ 10, 9,10,10,11,12,13,14,16,15,14,13,12,11,11,11,
+ 11,12,12,14,14,16,17,16,15,14,13,12,12,12,12,13,
+ 13,14,15,17,16,17,16,14,15,13,13,13,12,14,15,15,
+ 16,16,17,17,15,15,15,14,14,14,14,15,14,15,17,16,
+ 17,17,17,17,14,13,14,14,15,13,14,16,14,16,17,17,
+ 16,14,12,13,12,13,13,13,14,15,15,15,16,15,15,13,
+ 11,11,11,12,13,13,13,14,15,14,17,14,13,12,10, 9,
+ 10,11,11,11,12,13,13,13,15,13,12,10, 9, 8, 9, 9,
+ 10,10,11,12,12,13,15,13,11,10, 8, 8, 8, 8, 9,10,
+ 10,11,13,13,16,12,11,10, 9, 8, 8, 8, 9, 9,11,13,
+ 13,14,15,14,12,11, 9, 8, 8, 8, 9,10,11,13,14,14,
+ 16,14,13,12,11, 9, 9, 9, 9,10,11,13,14,14,15,15,
+ 14,14,11,10,10,10,10,11,12,12,14,14,17,15,14,14,
+ 12,11,11,11,11,12,13,13,15,15,17,15,15,14,12,12,
+ 12,12,12,12,14,15,15,15,17,16,15,14,13,14,13,13,
+ 13,15,15,16,15,17,16,17,15,15,15,15,13,13,14,15,
+ 15,15,15,17,17,17,17,17,14,14,16,15,15,16,15,14,
+ 17,16,17,17,16,14,13,13,14,14,15,14,15,17,15,15,
+ 15,15,14,13,12,12,12,12,13,13,13,14,15,15,16,13,
+ 12,12,11,10,11,11,11,11,12,13,13,14,17,13,12,11,
+ 10, 9,10,10,10,10,11,12,13,14,15,13,12,11, 9, 9,
+ 9, 9, 9,10,11,13,13,14,15,13,11,11,10, 9, 9, 9,
+ 9,10,11,13,14,15,15,14,13,11,10,10, 9, 9, 9,10,
+ 12,12,14,15,15,15,13,12,11,10,10, 9,10,11,12,13,
+ 14,16,15,15,14,13,12,11,10,10,11,11,12,13,14,16,
+ 16,16,14,13,12,11,11,11,12,12,13,14,14,15,15,15,
+ 14,13,13,12,12,12,13,13,14,14,14,17,16,16,14,15,
+ 13,13,13,13,13,13,14,14,15,16,17,16,16,15,15,14,
+ 13,13,14,13,14,15,16,16,17,17,17,15,14,15,15,15,
+ 15,15,15,16,17,15,16,16,16,15,14,15,15,15,15,14,
+ 15,16,16,17,17,14,14,13,12,13,13,13,13,13,14,14,
+ 15,17,16,13,13,13,12,11,12,12,12,12,12,13,15,14,
+ 15,13,13,12,11,11,10,11,11,11,11,13,15,14,15,13,
+ 12,11,10,10,10,10,10,11,11,13,13,15,14,13,12,12,
+ 11,10,10, 9,10,11,13,13,14,14,15,13,13,12,11,10,
+ 10,10,10,11,12,12,13,14,16,14,14,13,12,11,10,10,
+ 10,12,12,13,14,15,16,15,14,13,12,11,10,11,11,11,
+ 13,12,14,14,16,15,14,12,12,12,11,11,11,12,12,13,
+ 14,15,16,15,14,14,13,12,12,12,12,12,13,13,15,17,
+ 17,16,15,14,14,13,12,13,12,12,13,15,15,17,15,16,
+ 15,15,14,13,13,13,12,13,14,15,16,17,17,16,15,15,
+ 15,15,15,15,15,16,14,15,17,16,17,17,15,14,14,14,
+ 15,14,15,14,15,14,17,14,17,14,14,13,14,13,13,14,
+ 13,13,13,14,14,15,15,14,14,13,12,12,12,12,12,12,
+ 12,13,14,15,15,14,13,12,12,11,11,11,11,11,13,13,
+ 14,14,17,14,13,12,11,10,10,10,11,11,12,13,13,14,
+ 15,14,13,13,11,10,10,10,10,11,12,12,13,14,16,16,
+ 13,12,11,11,11,10,11,11,12,13,14,14,17,15,14,13,
+ 11,11,10,11,10,11,12,12,13,14,17,15,14,13,12,12,
+ 11,11,11,12,12,13,13,14,15,15,13,14,13,12,11,11,
+ 12,12,13,13,15,16,16,16,15,14,13,13,12,12,12,12,
+ 13,14,16,16,17,16,15,14,15,13,13,13,13,13,14,15,
+ 17,17,16,16,14,14,14,14,13,14,13,14,16,17,17,17,
+ 16,17,16,16,17,15,14,17,16,16,15,16,17,17,17,17,
+ 14,15,15,14,16,16,15,15,15,15,16,17,17,15,14,15,
+ 14,14,13,14,13,13,14,14,15,17,17,14,13,14,14,13,
+ 12,12,12,12,13,13,15,15,16,14,13,13,13,12,11,11,
+ 11,11,12,13,14,14,17,14,13,13,12,11,11,11,11,12,
+ 12,13,13,14,17,16,14,13,12,11,11,11,11,11,12,13,
+ 13,14,16,15,13,13,12,11,11,11,11,11,12,13,14,14,
+ 16,14,15,13,13,12,11,11,11,12,12,12,14,14,16,15,
+ 15,14,13,12,12,11,11,11,12,13,14,14,17,15,15,14,
+ 13,12,11,12,11,12,14,15,14,15,15,16,15,15,13,12,
+ 12,13,14,14,15,17,16,15,17,16,16,15,15,14,12,14,
+ 14,14,15,16,17,17,15,15,14,16,14,14,15,15,16,17,
+ 17,16,16,16,17,17,17,16,15,15,16,15,16,16,17,16,
+ 17,17,17,17,15,17,14,15,14,14,14,15,15,16,17,16,
+ 17,15,15,15,14,14,13,14,13,13,14,16,16,15,16,14,
+ 14,14,15,13,12,12,12,12,13,14,14,17,15,14,13,13,
+ 14,12,12,11,11,12,13,14,15,15,15,14,14,14,13,12,
+ 11,11,11,12,12,13,13,15,16,16,14,14,13,11,11,11,
+ 11,11,12,12,13,14,17,16,14,13,12,12,11,11,11,11,
+ 11,12,14,14,17,15,14,13,12,11,11,10,11,11,12,12,
+ 15,15,17,14,13,13,13,12,11,11,11,11,12,14,15,16,
+ 15,16,15,14,12,12,12,12,12,12,14,14,17,15,16,15,
+ 14,14,14,13,13,13,13,14,14,17,16,16,14,15,14,14,
+ 14,14,14,15,14,15,16,17,17,17,15,16,14,14,14,17,
+ 15,15,15,17,17,17,17,17,
};
static long _vq_pigeonmap_lsp12_1[] = {
1.5 +44 -43 vorbis/lib/books/lsp30_0.vqh
Index: lsp30_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/lsp30_0.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lsp30_0.vqh 2001/02/02 03:52:06 1.4
+++ lsp30_0.vqh 2001/02/17 10:13:50 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -47,49 +48,49 @@
};
static long _vq_lengthlist_lsp30_0[] = {
- 18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,18,
+ 18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,
18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
- 17,18,17,18,18,18,18,18,15,15,14,17,18,18,18,18,
- 18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,16,
- 16,15,13,13,13,13,18,18,18,18,18,18,18,18,18,18,
- 18,18,18,17,17,17,16,15,14,13,13,13,14,13,12,13,
- 15,18,17,18,18,18,18,18,18,18,18,18,18,18,18,16,
- 18,13,12,12,13,15,15,14,12,13,17,16,18,18,18,18,
- 18,18,18,18,18,18,16,18,18,17,16,13,12,13,14,14,
- 13,13,13,13,18,15,18,18,18,18,18,18,18,18,17,16,
- 18,18,16,17,14,11,12,13,14,14,14,13,13,13,14,15,
- 15,15,16,18,18,18,18,17,18,17,17,15,18,15,13,12,
- 12,12,12,13,12,12,12,11,13,13,14,15,14,18,18,18,
- 18,18,17,16,18,15,14,12,11,12,12,12,12,12,12,12,
- 11,10,11,11,13,15,13,18,18,18,18,18,17,17,16,15,
- 15,13,12,12,16,14,14,14,12,11,10,10,10,10,13,14,
- 13,18,18,18,18,18,17,17,16,17,15,16,12,13,13,13,
- 15,14,12,10, 9,10,11,11,14,13,12,18,18,18,17,18,
- 17,16,16,16,16,15,14,14,12,11,11,11,10, 9, 9,11,
- 11,11,12,11,12,18,18,18,18,17,16,18,15,17,15,13,
- 11,11,10,11,10,10, 9, 9, 8,10, 9,11,11,12,13,18,
- 17,18,18,16,18,18,16,15,13,12,10,11,10,10,10, 9,
- 8, 8, 7, 8, 9,10,12,12,14,17,18,18,18,18,17,18,
- 16,14,12,11, 9, 9,10,10, 9, 8, 7, 6, 6, 7, 8,10,
- 11,12,14,18,18,18,18,18,18,16,15,12,11,10,10,10,
- 10, 8, 7, 6, 5, 4, 4, 6, 7, 9,11,11,13,18,18,18,
- 18,16,15,14,13,12,11,11,11,11,10, 9, 8, 7, 5, 4,
- 3, 4, 6, 8,10,10,13,17,18,17,18,13,12,11,12,12,
- 12,12,12,12,11, 9, 9, 8, 7, 5, 4, 5, 6, 8,10,11,
- 16,18,18,18,15,13,12,11,11,10,10,10,11,12,10, 9,
- 9, 9, 8, 6, 6, 6, 7, 9,10,12,16,17,18,18,15,13,
- 13,11,11,10,10,10,12,13,13,12,11,10, 9, 8, 8, 8,
- 9,10,12,14,18,18,18,18,16,14,12,12,12,11,11,11,
- 14,15,14,12,12,12,11,10,10, 9, 9,12,14,16,15,16,
- 16,18,14,14,14,13,13,12,12,12,14,14,14,13,13,12,
- 12,11,11,10,11,12,15,18,16,15,14,18,15,14,16,14,
- 14,14,14,12,11,10, 9, 8, 8, 8, 8, 8, 8,10,12,15,
- 15,16,16,16,16,17,17,16,17,17,16,14,14,13,12,10,
- 9,10, 9, 9, 9,10,14,16,15,16,13,17,16,16,18,18,
- 18,18,18,18,17,16,18,15,14,13,12,13,13,15,18,18,
- 18,17,16,16,18,17,17,17,18,17,18,18,18,18,18,18,
- 18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,
- 17,18,18,18,
+ 18,18,18,18,18,18,18,18,17,15,14,17,18,18,18,18,
+ 18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+ 17,14,14,13,13,15,18,18,18,18,18,18,18,18,18,18,
+ 18,18,18,18,18,18,18,15,14,13,13,14,13,13,12,13,
+ 16,18,16,18,18,18,18,18,18,18,18,18,18,18,18,18,
+ 17,13,12,12,13,15,15,14,12,13,16,15,18,18,18,18,
+ 18,18,18,18,18,18,18,18,18,16,17,13,12,13,14,14,
+ 13,14,13,14,18,14,17,18,15,18,18,18,18,18,18,18,
+ 18,18,18,17,13,11,11,13,15,14,12,12,12,13,13,14,
+ 15,14,16,18,18,18,18,18,18,18,18,18,15,15,13,11,
+ 11,11,12,12,11,11,12,11,12,13,14,14,13,18,18,18,
+ 18,18,18,18,18,18,14,12,11,11,11,12,12,10,10,11,
+ 11,10,11,11,13,15,13,18,18,18,18,18,18,18,17,16,
+ 14,13,12,12,13,14,12,11,11,11,10,10,10,11,14,16,
+ 13,18,18,18,18,18,17,17,16,15,16,15,12,13,13,14,
+ 14,13,11,10, 9,10,11,11,13,13,12,18,18,18,18,18,
+ 18,18,18,15,15,16,15,13,12,11,11,11,10, 9,10,11,
+ 11,11,12,11,13,18,18,18,18,18,16,17,18,15,14,13,
+ 12,11,10,11,10,10, 9, 9, 9,10,10,11,11,11,13,18,
+ 18,18,18,18,17,18,15,16,13,12,10,11,10,10,10, 9,
+ 8, 8, 7, 8, 9,10,12,12,13,18,17,18,18,18,18,17,
+ 12,11,10,11,10, 9,10,10, 9, 8, 7, 6, 6, 7, 9,10,
+ 11,11,13,16,18,18,18,18,18,16,13,12,12,11,10,10,
+ 10, 8, 7, 6, 5, 4, 4, 6, 7, 9,10,11,12,17,18,18,
+ 18,16,15,13,13,12,11,11,11,12, 9, 9, 8, 7, 5, 4,
+ 3, 5, 7, 8, 9,10,13,16,18,17,16,14,12,12,11,12,
+ 11,11,12,11,10, 9, 9, 8, 7, 5, 4, 5, 7, 8, 9,10,
+ 14,18,18,18,15,14,12,12,11,10,10,11,11,12,11,11,
+ 10, 9, 8, 6, 6, 6, 7, 9,10,11,14,17,18,18,15,14,
+ 13,11,11,10,10,10,12,13,12,12,10,10, 9, 8, 7, 7,
+ 7, 9,10,11,16,18,17,18,16,16,13,12,12,11,11,11,
+ 13,13,12,12,12,11,10, 8, 7, 7, 8, 9,10,12,17,18,
+ 14,17,16,15,14,11, 9,10,11,11,12,13,13,13,13,12,
+ 12,10,10, 9, 9, 9,10,14,18,18,13,16,16,15,12,10,
+ 10,10,11,12,11,11,10, 9, 8, 8, 8, 8, 8, 9,12,15,
+ 16,17,17,18,16,18,17,17,18,16,17,15,14,13,12,11,
+ 10,10,10, 9, 9,10,14,16,16,17,13,17,18,16,18,17,
+ 18,18,18,18,18,18,17,15,14,13,12,12,13,14,17,17,
+ 18,17,16,18,17,17,16,15,18,17,18,18,18,18,18,18,
+ 17,18,18,18,18,18,18,18,18,18,18,18,18,18,18,16,
+ 16,18,18,18,
};
static long _vq_pigeonmap_lsp30_0[] = {
1.4 +174 -173 vorbis/lib/books/lsp30_1.vqh
Index: lsp30_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/lsp30_1.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lsp30_1.vqh 2001/02/02 03:52:06 1.3
+++ lsp30_1.vqh 2001/02/17 10:13:50 1.4
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -35,178 +36,178 @@
};
static long _vq_lengthlist_lsp30_1[] = {
- 19,20,20,20,18,18,20,16,17,18,19,19,19,19,19,19,
- 18,18,18,18,17,16,18,19,19,19,19,19,19,19,19,19,
- 19,19,18,17,17,19,19,19,19,19,19,19,19,19,19,19,
- 17,17,15,18,19,19,19,19,19,19,19,19,19,19,19,15,
- 14,16,19,19,19,19,19,19,19,19,19,19,18,14,14,18,
- 18,19,19,19,19,19,19,19,19,19,16,16,16,18,16,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,17,19,18,19,
- 19,19,19,19,19,19,19,19,18,17,17,15,15,16,19,19,
- 19,19,19,19,19,18,17,17,16,16,15,15,19,19,19,19,
- 19,18,18,17,15,16,15,15,14,16,19,19,19,19,19,19,
- 19,18,17,16,16,14,15,19,19,19,19,18,18,18,18,18,
- 15,15,15,15,19,19,18,17,18,17,18,18,17,15,16,16,
- 16,17,19,19,18,19,19,19,19,17,17,16,18,19,19,19,
- 19,19,19,19,19,17,17,17,15,15,17,18,19,19,19,19,
- 19,19,19,19,19,19,15,16,17,19,18,19,19,19,19,19,
- 19,19,19,18,16,17,16,19,19,19,19,19,19,19,19,19,
- 19,19,18,18,17,17,19,19,19,19,19,18,19,19,19,18,
- 18,17,16,17,18,18,19,18,19,19,19,19,19,18,16,19,
- 17,17,19,18,19,18,19,19,19,19,19,19,19,19,17,17,
- 18,18,17,16,19,19,19,19,19,19,19,18,18,17,17,14,
- 14,15,19,19,19,19,19,19,18,17,15,15,15,15,13,14,
- 19,19,19,19,19,18,19,15,15,16,15,14,14,17,19,19,
- 19,18,19,18,19,18,18,15,15,13,15,18,19,18,17,18,
- 17,18,16,15,13,15,15,15,18,18,16,16,16,17,17,16,
- 16,14,15,14,15,16,18,19,19,19,19,19,17,16,17,17,
- 19,19,19,19,19,19,18,19,19,19,19,16,16,16,17,19,
- 19,17,19,19,19,19,19,19,19,19,17,15,17,18,18,18,
- 17,19,19,19,19,19,19,19,19,15,17,17,18,19,17,17,
- 19,19,19,19,18,19,19,17,17,18,18,18,17,18,19,19,
- 19,18,19,19,19,17,16,16,17,19,18,17,19,19,19,18,
- 18,17,17,17,16,16,17,18,16,17,19,19,19,19,18,19,
- 17,19,16,16,16,17,15,15,19,19,19,19,19,19,18,17,
- 16,14,14,14,15,14,19,19,19,18,19,19,18,15,13,14,
- 15,14,14,15,19,19,19,19,19,18,17,16,15,15,14,15,
- 15,16,19,19,19,17,18,18,19,16,15,14,14,14,16,17,
- 18,16,16,16,17,16,17,16,14,13,15,15,17,19,17,17,
- 17,16,16,15,15,15,14,14,14,16,18,19,19,18,19,19,
- 19,17,18,19,18,19,14,19,19,19,19,19,18,19,19,17,
- 17,18,17,15,18,18,15,16,19,19,19,19,19,17,16,17,
- 16,14,13,18,17,17,19,19,19,19,19,19,17,16,17,17,
- 14,16,15,17,19,19,19,19,19,18,17,18,17,15,15,18,
- 17,16,19,19,19,19,18,17,18,17,16,16,15,17,19,17,
- 19,19,19,19,17,16,16,16,15,15,15,17,16,16,19,19,
- 19,19,19,18,16,16,15,13,14,15,14,15,19,19,19,19,
- 19,18,18,16,13,12,13,14,13,16,19,19,19,19,19,17,
- 16,13,13,13,13,14,15,16,19,19,19,19,18,18,16,15,
- 15,13,13,14,17,16,18,17,18,19,17,17,17,16,14,13,
- 13,16,16,18,16,17,17,17,16,16,16,15,14,13,16,16,
- 16,19,19,18,17,16,16,17,16,15,13,14,15,17,19,19,
- 18,18,19,19,19,17,17,17,16,18,17,17,15,16,18,19,
- 19,19,19,19,17,15,15,16,19,15,14,16,19,19,19,19,
- 18,17,15,13,14,18,16,15,16,17,19,18,19,19,18,16,
- 16,14,16,16,15,15,16,17,19,19,19,19,18,18,17,18,
- 16,14,16,16,17,17,19,19,19,19,18,17,16,15,15,14,
- 14,16,17,16,19,19,19,18,18,15,15,15,14,14,14,16,
- 15,14,19,19,18,19,19,17,16,14,13,12,13,14,14,14,
- 18,19,19,19,18,16,14,13,12,11,12,13,13,15,19,19,
- 19,17,17,15,14,12,12,12,12,13,15,18,19,18,18,18,
- 18,17,15,14,13,12,12,15,17,19,17,18,18,17,17,16,
- 17,14,13,12,14,16,18,19,18,18,17,17,16,16,16,14,
- 14,13,16,16,16,19,18,18,17,17,17,16,17,15,12,14,
- 15,16,19,19,18,19,19,19,18,19,19,17,15,18,18,15,
- 14,15,19,19,19,18,17,18,15,13,16,18,16,14,15,16,
- 18,19,18,19,16,15,12,13,16,17,16,15,16,18,19,18,
- 19,19,18,15,15,15,16,16,15,17,17,17,19,19,18,19,
- 18,18,16,16,16,14,15,17,17,17,19,19,19,18,17,16,
- 15,14,14,14,15,16,15,15,19,19,18,17,17,15,14,13,
- 13,13,14,15,14,14,19,18,19,17,17,15,12,11,11,11,
- 12,13,12,15,19,19,18,16,14,14,12,10,10,11,12,12,
- 14,17,19,19,17,16,14,14,12,11,10,11,11,13,17,18,
- 17,18,17,17,16,15,15,12,12,11,12,15,17,19,18,17,
- 18,17,17,15,15,13,13,12,14,17,18,18,17,17,16,16,
- 16,15,16,15,13,13,16,17,17,19,17,16,15,16,16,17,
- 17,14,13,13,16,17,19,18,15,17,19,18,19,19,18,17,
- 17,17,17,15,14,17,13,16,17,19,17,17,12,15,15,17,
- 16,14,14,18,15,15,17,17,15,15,13,15,15,16,16,15,
- 15,17,19,17,16,18,15,15,15,15,15,16,16,16,18,15,
- 17,18,18,18,16,14,15,16,14,14,15,16,15,14,19,18,
- 18,18,15,14,14,13,12,13,14,14,14,14,17,18,19,18,
- 15,14,12,10,10,11,13,12,13,14,16,17,18,15,14,12,
- 10, 9, 8,10,11,12,13,17,17,17,13,12,11,10, 9, 8,
- 7, 9,11,12,15,17,18,18,15,14,12,12,11, 9, 9,10,
- 11,15,16,16,17,16,15,16,15,15,13,11,11,11,13,15,
- 15,16,18,17,16,15,15,15,14,12,12,12,15,17,17,18,
- 16,16,15,15,16,15,15,14,12,14,15,18,18,18,17,15,
- 16,16,16,16,14,13,13,14,16,17,18,18,18,17,19,18,
- 17,15,14,14,14,14,15,17,17,17,19,16,16,15,16,15,
- 14,13,14,15,16,19,17,18,17,16,15,14,14,14,14,13,
- 14,14,15,16,16,15,17,17,14,13,13,14,14,13,14,14,
- 14,15,14,14,17,15,15,15,15,14,14,13,12,13,13,13,
- 13,13,16,16,15,17,16,14,13,11,11,11,12,11,12,14,
- 15,14,15,15,14,12,11, 9, 8, 9,11,10,12,16,13,11,
- 12,13,11,10, 8, 6, 5, 8, 9,11,13,18,15,15,14,12,
- 10, 9, 7, 4, 4, 7, 9,12,14,18,17,19,15,13,12,10,
- 9, 6, 6, 8,10,13,13,15,17,16,13,11,11,12,11,10,
- 9,10,12,13,15,18,16,13,13,13,13,13,13,11,11,12,
- 14,15,17,19,15,14,14,14,14,14,13,13,12,15,15,15,
- 18,19,16,15,16,15,15,15,14,13,13,15,17,17,18,18,
- 19,19,19,19,17,17,16,15,14,15,16,18,18,17,19,19,
- 19,18,18,18,16,13,14,15,18,18,16,16,18,19,19,16,
- 15,15,14,14,14,14,14,15,14,14,18,18,16,16,14,14,
- 13,13,12,13,13,13,12,13,18,16,14,14,14,13,12,12,
- 11,11,11,11,12,14,18,15,14,14,14,12,12,11, 9,10,
- 10,10,12,17,16,15,14,14,12,11,10, 9, 7, 8, 8,10,
- 13,17,15,14,14,13,11,10, 8, 5, 4, 6, 8,11,15,18,
- 15,15,14,13,11, 9, 7, 4, 3, 6, 8,12,16,18,17,16,
- 15,13,12,10, 9, 6, 6, 7, 9,11,14,17,17,15,14,13,
- 12,11,10, 9, 8, 8, 9,11,15,17,13,13,13,13,12,12,
- 11,11,11,11,12,13,17,19,14,14,14,14,14,15,14,12,
- 13,14,14,16,17,19,16,15,15,14,14,13,13,12,13,16,
- 17,17,19,19,19,19,19,18,17,18,19,19,17,18,18,17,
- 18,15,19,19,19,17,17,18,17,16,16,17,17,15,15,14,
- 19,19,19,16,17,16,15,14,14,14,15,14,13,13,19,17,
- 16,17,15,15,15,13,13,12,13,12,12,14,18,16,16,15,
- 14,14,13,13,12,11,11,11,12,16,17,17,15,14,13,13,
- 12,11,10,10,10,11,14,18,18,16,15,13,13,12,11,10,
- 8, 8, 9,12,16,19,18,17,14,13,12,11, 9, 7, 6, 7,
- 10,13,18,19,17,16,15,13,11,10, 9, 6, 5, 7,10,13,
- 16,19,18,18,15,13,12,11, 9, 7, 6, 7, 9,12,16,18,
- 14,14,15,14,13,12,11, 9, 8, 8,10,12,16,19,15,14,
- 14,13,14,13,12,11,11,11,11,14,18,18,15,15,16,15,
- 15,15,14,13,14,14,14,19,19,19,16,16,15,15,13,13,
- 13,14,15,16,17,18,19,19,19,19,18,19,18,19,19,19,
- 18,19,19,19,17,15,19,19,18,18,19,18,17,17,17,19,
- 17,17,15,14,19,19,19,18,19,18,18,16,16,16,16,15,
- 13,15,19,18,18,18,18,18,17,13,15,14,14,14,14,18,
- 18,19,18,17,16,16,15,13,13,13,13,13,15,19,19,19,
- 17,18,15,14,14,12,12,12,12,14,16,19,19,19,17,15,
- 13,13,12,11,10,11,12,15,18,19,18,17,16,14,13,12,
- 11, 9, 8,10,12,16,17,19,16,15,15,14,12,11,10, 8,
- 8, 9,12,15,19,19,16,17,15,14,12,12,10, 9, 8, 9,
- 11,14,17,19,16,17,16,15,14,13,12,11,10,11,12,14,
- 19,19,16,16,15,14,15,14,13,13,13,12,14,19,18,19,
- 15,15,14,16,15,16,14,14,15,15,18,19,19,19,17,16,
- 16,15,14,14,14,14,15,16,18,19,19,19,19,18,18,19,
- 19,19,18,19,19,19,19,19,18,17,19,18,19,19,19,19,
- 19,19,17,18,19,18,16,18,19,19,19,19,18,19,18,16,
- 17,17,18,18,15,18,19,18,19,19,19,19,19,14,16,19,
- 17,16,17,19,19,19,18,18,18,18,16,14,14,15,17,15,
- 17,19,19,19,19,17,17,17,15,13,14,15,16,16,18,19,
- 19,19,17,15,15,15,14,12,13,14,16,16,19,19,18,18,
- 16,15,14,14,13,11,11,13,15,17,18,19,17,15,15,14,
- 13,13,12,11,11,13,14,16,18,19,17,19,17,15,14,13,
- 13,12,12,12,13,15,19,19,18,16,17,15,15,16,14,14,
- 13,12,14,18,19,19,16,17,15,15,17,17,14,15,14,14,
- 17,18,19,19,16,16,16,16,16,15,16,16,17,17,18,19,
- 19,19,18,17,16,15,13,14,14,15,17,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,18,19,19,19,19,19,19,19,19,19,
- 19,19,19,17,19,19,19,19,18,19,19,19,19,19,19,19,
- 19,15,18,18,18,19,19,19,19,19,19,19,19,18,17,15,
- 15,19,19,19,19,19,19,19,19,17,19,17,16,16,15,16,
- 19,19,19,19,18,19,19,19,17,16,15,13,15,16,18,18,
- 19,19,19,19,18,17,15,14,14,13,15,16,16,18,19,19,
- 17,17,17,16,15,14,14,14,15,14,16,17,18,19,17,18,
- 17,17,15,15,14,14,15,13,16,19,19,19,17,18,17,17,
- 17,16,15,16,15,15,19,19,19,19,15,17,18,17,17,17,
- 15,18,17,16,19,18,19,19,18,18,17,17,17,17,17,16,
- 19,18,19,19,19,19,18,16,16,15,15,14,15,15,18,18,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,18,17,18,19,19,19,19,19,19,19,19,
- 19,19,19,18,19,18,19,19,19,19,19,18,19,19,19,18,
- 17,16,18,19,19,19,19,19,19,18,19,19,18,17,15,15,
- 19,17,19,18,19,19,19,19,19,19,17,16,15,15,19,18,
- 19,18,19,19,19,19,18,18,17,16,16,16,17,18,18,19,
- 19,19,19,18,17,18,17,17,17,16,17,17,19,19,19,19,
- 18,17,16,18,18,17,17,19,18,18,19,19,19,19,17,17,
- 19,19,18,19,18,19,17,18,17,19,19,19,18,19,18,19,
- 19,18,18,18,19,19,17,17,19,19,18,17,18,16,15,15,
- 15,17,19,18,19,19,19,19,
+ 19,20,20,19,17,18,20,16,16,19,18,20,19,19,19,19,
+ 18,18,18,18,18,17,17,19,19,19,19,19,19,19,19,19,
+ 19,19,18,17,17,18,19,19,19,19,19,19,19,19,19,19,
+ 17,16,14,19,19,19,19,19,19,19,19,19,19,19,18,13,
+ 15,18,19,19,19,19,19,19,19,19,19,19,17,15,15,18,
+ 19,19,19,19,19,19,19,19,19,19,17,18,17,18,19,19,
+ 19,19,19,19,19,19,19,19,19,19,18,18,19,19,18,18,
+ 19,19,19,19,19,19,19,19,18,18,17,16,15,17,19,19,
+ 19,19,19,19,19,19,18,16,16,15,15,15,19,19,19,19,
+ 19,19,19,18,18,17,16,15,14,16,19,19,19,19,19,19,
+ 19,18,17,16,16,14,16,19,19,19,19,19,19,19,18,19,
+ 14,15,15,16,19,19,19,18,18,19,18,18,18,15,16,16,
+ 16,18,18,19,18,19,19,18,18,17,17,17,18,18,19,19,
+ 19,19,19,19,19,17,18,19,18,17,17,19,19,19,19,19,
+ 19,19,19,19,19,19,17,17,16,19,19,19,19,19,19,19,
+ 19,19,19,19,18,17,16,19,18,19,19,19,19,19,19,19,
+ 19,19,18,17,18,16,19,19,19,19,19,19,19,19,19,19,
+ 17,17,18,17,19,18,19,18,19,19,19,19,19,19,16,18,
+ 18,17,19,18,18,18,19,19,19,19,19,19,18,19,17,16,
+ 18,17,16,16,19,19,19,19,19,19,18,15,15,17,16,14,
+ 15,14,19,19,19,19,19,19,19,17,14,15,16,15,14,14,
+ 19,19,19,19,19,19,19,16,15,15,15,14,14,16,19,19,
+ 19,19,18,18,19,17,17,14,15,14,16,18,19,19,17,18,
+ 17,17,17,16,13,14,15,15,19,18,17,16,16,17,17,16,
+ 16,14,15,14,15,16,18,19,19,19,19,19,18,17,17,17,
+ 18,19,19,19,19,19,19,19,19,19,18,17,18,17,17,19,
+ 19,17,19,19,19,18,19,19,18,18,17,16,16,18,17,18,
+ 17,19,19,19,19,19,19,19,19,16,17,17,17,19,16,18,
+ 19,19,19,19,19,19,19,18,17,17,17,18,17,18,19,19,
+ 19,19,19,18,19,17,17,16,17,17,17,17,19,19,19,19,
+ 19,17,17,18,16,15,17,17,17,17,19,19,19,19,19,19,
+ 17,17,15,15,16,16,15,15,19,19,19,19,19,19,19,16,
+ 16,16,16,14,15,14,19,19,19,19,19,19,18,15,13,14,
+ 15,14,14,15,19,19,19,19,19,17,18,16,15,15,14,14,
+ 14,15,19,19,19,18,17,19,19,16,15,14,14,15,16,17,
+ 18,16,16,16,16,16,18,15,14,13,15,15,16,19,16,17,
+ 17,17,16,16,15,15,14,14,14,16,18,19,19,18,19,19,
+ 19,17,17,19,18,19,19,18,19,19,18,19,19,19,19,18,
+ 17,17,16,18,19,18,16,17,18,19,19,19,17,16,16,17,
+ 16,17,18,17,15,17,19,19,19,19,19,18,17,19,17,16,
+ 16,16,15,19,19,19,19,19,19,19,19,19,17,16,16,16,
+ 18,16,19,19,19,19,18,18,19,18,16,15,15,17,17,16,
+ 19,19,18,18,18,17,17,16,15,15,15,17,16,16,19,19,
+ 19,19,19,19,17,15,15,12,15,15,15,14,19,19,19,19,
+ 19,19,17,15,13,13,14,14,14,15,19,19,19,19,19,17,
+ 15,13,13,14,13,14,15,16,19,19,18,19,18,17,16,15,
+ 14,14,13,15,16,16,18,18,17,17,16,17,18,16,14,13,
+ 13,16,17,17,15,16,17,17,17,16,16,15,14,13,16,17,
+ 17,19,19,19,17,17,16,17,16,15,13,14,15,16,19,19,
+ 19,19,19,19,18,17,17,19,18,17,19,16,15,17,18,19,
+ 19,19,19,18,17,17,17,19,17,15,15,16,19,19,19,19,
+ 19,17,17,17,17,19,16,15,17,17,19,18,19,19,17,16,
+ 17,17,18,17,16,17,17,17,19,19,19,19,17,18,17,19,
+ 17,14,16,16,18,16,19,19,19,19,19,19,16,17,15,14,
+ 14,16,19,16,19,19,19,18,18,16,15,15,14,14,13,15,
+ 16,15,19,19,19,18,18,17,15,14,13,12,13,14,13,14,
+ 18,19,19,19,19,16,14,12,11,11,12,13,13,15,19,19,
+ 18,18,17,15,14,12,12,12,12,13,16,18,19,18,17,16,
+ 18,16,16,14,13,13,12,15,17,18,17,18,17,17,17,18,
+ 16,14,14,12,14,17,18,19,18,17,17,17,17,17,16,15,
+ 14,13,15,17,16,19,19,18,17,17,17,17,17,14,12,14,
+ 14,17,19,19,18,19,19,19,18,19,19,17,18,18,17,14,
+ 13,17,19,19,19,18,17,15,15,15,16,19,16,14,14,17,
+ 18,18,18,18,16,15,14,16,16,17,16,15,15,17,19,18,
+ 19,18,18,17,17,16,16,16,15,17,17,17,19,19,18,19,
+ 17,19,16,16,16,15,15,17,17,16,19,19,19,18,17,17,
+ 15,15,14,14,14,16,16,15,19,19,19,18,17,16,14,13,
+ 13,13,14,14,14,14,19,18,18,17,16,14,12,11,11,11,
+ 12,13,13,14,19,19,18,15,15,14,12,10,10,11,12,12,
+ 13,17,19,19,17,15,14,14,12,11,10,11,11,13,16,18,
+ 17,17,17,16,17,15,14,12,12,12,12,16,17,18,18,17,
+ 16,16,16,16,15,14,13,12,15,17,19,19,17,16,16,16,
+ 16,16,16,15,13,13,15,16,16,19,17,17,15,17,17,16,
+ 17,14,13,14,15,18,19,19,14,17,18,18,19,19,18,17,
+ 17,17,16,15,15,17,14,16,17,18,16,14,14,16,15,18,
+ 17,15,14,18,16,16,17,16,14,16,12,15,15,17,16,15,
+ 16,18,19,18,17,17,17,15,15,16,15,15,16,15,17,15,
+ 17,18,18,16,16,15,15,15,14,14,14,14,15,14,19,19,
+ 18,18,16,14,14,13,13,13,14,14,14,13,17,18,17,17,
+ 16,14,12,11,10,11,13,13,13,13,17,17,17,15,13,12,
+ 10, 9, 8,10,11,12,12,16,18,16,13,12,11,10, 9, 8,
+ 7, 9,10,12,15,17,19,17,16,13,12,12,10, 9, 8,10,
+ 11,14,16,17,16,16,16,16,14,14,13,11,11,11,12,15,
+ 16,19,19,16,16,15,15,15,14,13,12,12,15,16,17,19,
+ 17,16,15,15,15,15,15,14,12,14,15,17,19,19,17,16,
+ 16,16,16,16,15,13,13,14,16,17,19,19,18,18,19,19,
+ 16,16,15,15,14,14,16,17,17,18,19,16,15,15,16,15,
+ 14,13,14,15,15,17,17,19,18,15,15,14,14,14,14,13,
+ 14,14,15,16,16,16,17,18,15,13,13,14,14,14,13,14,
+ 15,15,13,13,17,15,15,15,15,15,14,13,12,13,13,13,
+ 12,13,15,16,16,16,16,15,13,11,11,11,12,11,12,14,
+ 15,14,13,14,14,12,10, 9, 8, 9,10,10,12,16,14,12,
+ 12,13,11,10, 8, 6, 5, 8, 9,11,13,17,16,15,13,12,
+ 10, 9, 7, 4, 4, 7, 9,12,14,16,17,17,15,13,11,10,
+ 9, 6, 6, 9,11,13,15,17,19,16,15,14,14,13,11,10,
+ 9,11,12,14,16,18,17,15,14,14,14,13,13,12,11,12,
+ 15,15,17,19,16,15,14,14,15,15,14,13,12,14,15,15,
+ 19,19,16,15,16,15,15,15,14,13,12,14,16,18,18,18,
+ 19,19,19,19,17,17,16,15,14,15,17,19,18,17,19,19,
+ 18,18,17,18,16,13,14,15,17,16,16,15,18,19,19,17,
+ 14,14,14,14,13,14,14,14,14,14,18,18,17,15,15,14,
+ 14,13,12,12,13,12,12,13,18,16,14,14,14,14,13,12,
+ 11,11,11,11,11,14,17,14,14,14,14,12,11,11,10,10,
+ 10,10,12,16,15,15,14,14,13,11,10, 9, 7, 8, 9,10,
+ 13,17,16,15,14,13,11,10, 8, 5, 4, 6, 8,11,15,17,
+ 15,15,14,13,11, 9, 7, 4, 3, 6, 9,12,14,18,17,15,
+ 15,13,12,10, 9, 6, 6, 8,10,12,16,17,16,15,14,14,
+ 13,12,10, 9, 9,10,13,14,14,18,13,15,14,14,13,12,
+ 11,12,11,13,13,12,15,19,16,15,13,14,13,14,14,13,
+ 13,15,16,17,17,19,15,15,15,14,14,13,13,12,13,16,
+ 16,17,19,17,19,19,19,19,17,18,18,18,17,17,18,17,
+ 18,15,19,19,19,17,17,18,17,15,15,17,16,16,15,14,
+ 19,19,18,17,17,16,16,14,14,14,14,14,12,13,19,17,
+ 16,16,15,15,15,13,13,12,13,12,12,14,17,15,16,15,
+ 15,13,13,12,11,11,11,11,12,16,18,16,15,14,14,13,
+ 12,11,10,10,10,11,14,18,17,17,14,13,13,12,11,10,
+ 8, 9, 9,11,15,19,18,17,14,13,12,11, 9, 7, 6, 7,
+ 10,13,17,18,17,16,14,13,11,10, 9, 6, 6, 7,10,13,
+ 16,19,18,17,15,14,12,11,10, 8, 7, 9,11,14,16,19,
+ 14,15,16,14,14,12,11,10,10,10,12,13,15,18,15,15,
+ 14,14,14,14,13,12,12,12,13,14,18,18,15,15,15,14,
+ 15,15,14,13,14,15,14,18,19,19,15,15,14,14,14,12,
+ 13,14,14,16,16,18,19,19,19,19,18,19,18,19,19,18,
+ 18,19,19,19,17,15,19,19,17,19,18,19,18,17,16,18,
+ 17,16,15,14,19,19,18,18,19,18,17,16,15,16,16,14,
+ 13,15,19,18,19,18,18,18,16,13,14,14,14,13,14,17,
+ 18,19,18,18,17,16,15,13,13,13,12,13,15,18,17,19,
+ 18,18,15,14,14,12,12,12,12,13,18,19,18,19,17,15,
+ 14,13,12,11,10,10,12,14,17,19,17,17,15,13,13,12,
+ 11, 9, 8, 9,12,15,17,19,18,18,15,14,12,11,10, 8,
+ 7, 8,11,14,17,19,18,16,15,14,13,12,11, 9, 8, 9,
+ 10,13,17,19,15,16,16,15,14,13,12,10,10,10,11,13,
+ 19,19,16,16,15,14,14,14,14,13,12,12,12,15,18,19,
+ 15,15,14,15,16,16,14,14,13,13,15,17,19,19,17,15,
+ 16,15,14,13,14,14,15,15,18,18,19,19,19,18,19,19,
+ 19,19,19,18,17,19,19,19,19,17,19,18,19,19,19,19,
+ 19,17,17,19,19,19,15,18,19,19,19,19,19,18,18,15,
+ 17,17,18,18,15,19,18,19,19,19,19,19,18,14,15,16,
+ 16,15,16,19,19,18,19,19,18,18,16,14,14,14,15,15,
+ 16,19,19,18,19,17,17,16,15,13,12,13,15,16,17,19,
+ 18,19,17,16,15,16,13,11,11,11,14,15,18,19,19,18,
+ 16,16,15,13,12,10, 9, 9,13,14,17,19,19,16,15,15,
+ 13,12,11, 9, 7, 8,11,13,17,19,17,16,16,15,14,13,
+ 12, 9, 8, 8,10,13,18,19,16,16,16,15,15,14,13,11,
+ 10, 9,11,14,18,19,16,15,15,15,16,15,14,13,11,11,
+ 12,15,19,19,15,16,16,17,17,15,15,14,13,13,14,19,
+ 19,19,19,17,17,16,14,14,14,14,15,15,18,19,19,19,
+ 19,19,19,19,19,19,19,19,18,19,19,19,19,19,19,19,
+ 19,19,19,19,19,19,19,19,19,19,18,19,19,19,19,19,
+ 19,19,19,17,18,19,19,19,19,19,19,19,19,19,19,19,
+ 19,15,17,18,18,19,19,19,19,19,19,19,19,18,18,15,
+ 14,16,17,18,19,19,19,19,19,18,18,18,16,15,14,15,
+ 17,16,18,19,18,18,19,18,18,15,15,13,12,13,14,16,
+ 18,19,19,19,18,18,15,14,13,11,10,10,13,15,18,19,
+ 18,18,17,16,15,14,13,10, 9, 9,11,14,18,19,18,18,
+ 18,17,15,14,13,10, 9, 9,11,14,17,19,17,17,16,17,
+ 16,16,14,11, 9,10,12,14,19,19,15,16,17,18,17,16,
+ 14,12,11,12,14,16,19,19,16,17,17,17,17,16,16,14,
+ 14,15,16,18,19,19,18,16,16,15,16,14,15,14,15,16,
+ 17,19,19,19,18,19,19,19,19,19,19,19,18,19,19,19,
+ 19,19,19,19,19,19,19,19,17,18,18,19,19,19,19,19,
+ 19,19,19,19,19,18,18,19,19,18,19,18,18,19,19,19,
+ 19,19,19,19,18,19,18,18,19,19,19,19,19,19,19,19,
+ 19,19,18,19,18,18,16,19,17,19,19,19,19,19,19,18,
+ 18,16,16,16,17,19,19,19,19,19,19,19,18,16,16,15,
+ 15,14,16,17,18,18,19,19,19,18,16,15,15,13,13,13,
+ 14,17,19,19,19,18,19,18,16,15,15,12,11,12,14,17,
+ 17,19,19,18,17,17,16,16,14,12,11,12,13,16,18,19,
+ 18,16,17,18,16,15,15,13,12,13,13,16,19,19,16,15,
+ 17,19,17,17,16,15,14,13,14,18,19,19,18,17,18,19,
+ 19,18,16,15,16,15,16,19,18,19,19,18,17,16,15,15,
+ 16,18,17,18,19,19,19,19,
};
static long _vq_pigeonmap_lsp30_1[] = {
1.5 +8 -7 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_1024_1.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_1024_1.vqh 2001/02/17 10:13:50 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -24,12 +25,12 @@
};
static long _vq_lengthlist_res0_128_1024_1[] = {
- 1, 4, 4, 4, 8, 8, 4, 8, 8, 5, 8, 8, 9,12,12, 9,
- 12,12, 5, 8, 8, 8,12,12, 8,12,12, 5, 8, 8, 9,12,
- 12, 8,12,12, 9,12,12,12,16,16,13,16,16, 8,12,12,
- 12,16,16,12,16,16, 4, 8, 8, 8,12,12, 8,12,12, 8,
- 12,12,13,16,16,12,16,16, 8,12,12,12,16,16,12,16,
- 16,
+ 1, 4, 4, 5, 8, 7, 4, 7, 7, 5, 8, 8, 8,11,11, 8,
+ 11,11, 5, 8, 7, 8,11,11, 8,11,11, 5, 8, 8, 8,11,
+ 11, 8,11,11, 8,12,11,11,15,15,12,15,15, 8,11,11,
+ 11,15,15,11,15,15, 4, 8, 8, 8,11,11, 8,11,11, 8,
+ 11,11,11,15,15,11,15,15, 8,11,11,11,15,15,11,15,
+ 15,
};
static float _vq_quantthresh_res0_128_1024_1[] = {
1.4 +2 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_128_1024_2.vqh 2001/02/02 03:52:07 1.3
+++ res0_128_1024_2.vqh 2001/02/17 10:13:50 1.4
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
1.5 +41 -40 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_1024_3.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_1024_3.vqh 2001/02/17 10:13:50 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -26,46 +27,46 @@
};
static long _vq_lengthlist_res0_128_1024_3[] = {
- 2, 5, 4, 7, 7, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 7,
- 9, 9,13,13, 7, 9, 9,13,13, 5, 7, 7, 9, 9, 7, 9,
+ 2, 4, 4, 7, 7, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 7,
+ 10,10,14,13, 7,10,10,14,14, 5, 7, 7, 9, 9, 7, 9,
9,12,12, 7, 9, 9,12,12,10,12,12,16,16,10,12,12,
- 16,15, 4, 7, 7, 9, 9, 7, 9, 9,12,12, 7, 9, 9,12,
- 11, 9,12,12,16,16,10,12,12,16,15, 7, 9, 9,12,12,
- 10,12,12,16,16, 9,12,12,16,16,14,16,16,19,20,14,
- 16,16,20,19, 7, 9, 9,13,13,10,12,12,16,16,10,12,
- 12,16,16,14,16,16,19,21,14,16,16,21,20, 5, 7, 7,
- 9, 9, 7, 9, 9,12,12, 7, 9, 9,12,12, 9,12,12,16,
- 16, 9,12,12,16,16, 7, 9, 9,12,12, 9,11,11,14,14,
- 9,11,11,14,14,12,14,14,17,18,12,14,14,18,18, 7,
- 9, 9,12,12, 9,11,11,14,14, 9,11,11,14,14,12,15,
- 14,18,18,12,14,14,19,19,10,12,12,16,16,12,14,14,
- 18,19,12,14,14,19,18,16,17,20,20,21,16,19,20,20,
- 20,10,12,12,16,16,12,14,14,20,20,12,14,14,19,18,
- 16,18,17,21,19,16,18,19,20,20, 5, 7, 7, 9, 9, 7,
- 9, 9,12,12, 7, 9, 9,12,12, 9,12,12,16,16, 9,12,
- 12,17,16, 7, 9, 9,12,12, 9,11,11,14,14, 9,11,11,
- 14,14,12,14,14,19,19,12,14,14,17,19, 7, 9, 9,12,
- 12, 9,11,11,14,14, 9,11,11,14,14,12,14,14,18,20,
- 12,14,14,18,18, 9,12,12,16,16,12,14,14,19,19,12,
- 14,14,18,20,16,19,19,21,21,16,18,18,21,21, 9,12,
- 12,16,16,12,14,14,19,18,12,14,14,20,19,16,17,18,
- 21,21,16,19,17,21,19, 7,10, 9,13,13, 9,12,12,16,
- 16, 9,12,12,17,16,13,16,16,20,20,13,17,16,21,21,
- 9,12,12,16,16,12,14,14,19,18,12,14,14,19,19,16,
- 18,19,20,20,16,19,18,21,21, 9,12,12,16,16,12,14,
- 14,21,17,12,14,14,18,19,16,18,18,21,21,16,18,18,
- 21,21,14,16,16,19,20,16,18,18,20,21,16,19,18,21,
- 21,20,20,21,21,21,20,20,21,21,21,13,16,16,20,20,
- 16,20,17,21,20,16,18,18,21,21,19,21,21,21,21,20,
- 21,21,21,21, 7, 9, 9,13,13, 9,12,12,16,16, 9,12,
- 12,17,16,13,16,16,19,20,13,16,16,20,20, 9,12,12,
- 16,16,12,14,14,19,18,12,14,14,19,18,16,18,19,21,
- 21,16,19,19,21,21, 9,12,12,16,16,12,14,14,19,21,
- 12,14,14,20,17,16,19,19,21,21,16,20,18,21,20,14,
- 16,16,21,20,16,19,19,20,21,16,17,18,20,20,20,21,
- 21,21,21,18,21,21,21,21,13,16,16,20,21,16,19,19,
- 21,21,16,17,17,20,21,20,21,19,21,21,19,21,20,20,
- 20,
+ 16,17, 4, 7, 7, 9, 9, 7, 9, 9,12,12, 7, 9, 9,12,
+ 12,10,12,12,17,16,10,12,12,16,16, 7,10, 9,13,13,
+ 10,12,12,16,16,10,12,12,17,16,14,17,17,21,21,14,
+ 16,17,21,22, 7,10,10,13,13,10,12,12,16,16,10,12,
+ 12,16,17,14,17,16,19,20,14,16,16,19,21, 5, 7, 7,
+ 10, 9, 7, 9, 9,12,12, 7, 9, 9,12,12,10,12,12,16,
+ 17,10,12,12,17,16, 7, 9, 9,12,12, 9,12,12,14,14,
+ 9,12,11,15,15,12,15,15,17,19,12,14,15,18,18, 7,
+ 9, 9,12,12, 9,12,11,14,14, 9,12,12,14,14,12,15,
+ 14,19,18,12,14,14,18,19,10,12,12,16,17,12,14,15,
+ 18,19,12,15,15,18,19,17,17,19,19,22,17,19,19,20,
+ 20,10,12,12,17,16,12,14,15,18,19,12,15,15,19,18,
+ 16,18,17,21,20,17,19,19,20,21, 5, 7, 7, 9, 9, 7,
+ 9, 9,12,12, 7, 9, 9,12,12,10,12,12,17,17,10,12,
+ 12,17,16, 7, 9, 9,12,12, 9,12,12,14,14, 9,11,12,
+ 14,14,12,14,15,19,19,12,14,14,18,18, 7, 9, 9,12,
+ 12, 9,11,12,14,14, 9,12,11,14,14,12,14,15,18,20,
+ 12,15,14,19,18,10,12,12,16,16,12,15,15,20,18,12,
+ 14,14,19,19,16,19,19,21,20,16,18,20,21,20,10,12,
+ 12,17,17,12,14,15,19,19,12,14,14,19,19,17,19,18,
+ 20,21,16,19,17,20,20, 7,10,10,13,13,10,12,12,17,
+ 17,10,12,12,17,17,13,16,17,21,21,13,16,17,20,20,
+ 10,12,12,17,17,12,15,15,19,18,12,15,15,19,20,16,
+ 19,18,20,21,17,19,18,20,21,10,12,12,17,16,12,15,
+ 15,20,18,12,15,15,19,19,16,19,18,21,21,16,18,18,
+ 21,21,14,17,17,20,19,17,18,18,21,21,17,18,19,21,
+ 20,19,19,20,21,21,20,20,20,21,21,14,17,17,19,21,
+ 16,19,18,21,19,17,19,19,21,20,21,20,19,21,20,20,
+ 21,20,20,21, 7,10,10,13,13,10,12,12,17,17,10,12,
+ 12,17,16,13,17,17,20,20,13,17,17,20,21,10,12,12,
+ 16,17,12,15,15,19,18,12,15,15,21,18,17,19,18,21,
+ 21,17,19,19,20,21,10,12,12,17,16,12,15,14,19,19,
+ 12,15,14,20,19,16,19,18,20,21,17,19,18,21,20,14,
+ 17,16,19,20,17,19,19,20,21,16,18,19,20,21,20,20,
+ 21,21,21,20,21,21,21,21,14,17,17,19,21,17,19,19,
+ 21,21,16,18,17,21,21,20,21,21,21,21,19,21,20,21,
+ 21,
};
static float _vq_quantthresh_res0_128_1024_3[] = {
1.5 +37 -36 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_1024_4.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_1024_4.vqh 2001/02/17 10:13:50 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -27,45 +28,45 @@
static long _vq_lengthlist_res0_128_1024_4[] = {
5, 6, 6, 8, 8, 6, 6, 6, 9, 9, 6, 6, 6, 9, 9, 8,
- 9, 9,12,12, 8, 9, 9,11,11, 6, 7, 6, 9, 9, 6, 7,
- 7,10,10, 6, 7, 7,10,10, 9,10,10,13,12, 9,10,10,
+ 9, 9,11,11, 8, 9, 9,11,11, 6, 6, 6, 9, 9, 6, 7,
+ 7,10,10, 6, 7, 7,10,10, 9,10,10,12,13, 9,10,10,
13,13, 6, 6, 6, 9, 9, 6, 7, 7,10,10, 6, 7, 7,10,
- 10, 9,10,10,13,13, 9,10,10,13,12, 8, 9, 9,12,12,
+ 10, 9,10,10,13,12, 9,10,10,13,12, 8, 9, 9,12,12,
9,10,10,13,13, 9,10,10,13,13,12,13,13,15,15,12,
- 13,13,16,15, 8, 9, 9,12,12, 9,10,10,13,13, 9,10,
- 10,13,13,12,13,13,16,15,12,13,13,16,15, 6, 7, 7,
- 9, 9, 7, 8, 8,10,10, 6, 7, 7,10,10, 9,10,10,13,
+ 13,13,15,15, 8, 9, 9,12,12, 9,10,10,13,13, 9,10,
+ 10,13,13,12,13,13,15,15,12,13,13,15,15, 6, 7, 7,
+ 9, 9, 7, 8, 8,10,10, 6, 7, 8,10,10, 9,10,10,13,
13, 9,10,10,13,13, 6, 8, 7,10,10, 7, 8, 9,11,11,
- 7, 9, 9,11,11,10,11,11,14,14,10,11,11,14,14, 6,
- 7, 8,10,10, 7, 9, 8,11,11, 7, 9, 9,11,11,10,11,
- 11,15,14,10,11,11,14,14, 9,10,10,14,13,10,11,11,
- 14,14,10,12,11,14,14,13,14,14,16,17,13,14,15,18,
- 16, 9,10,10,13,14,10,11,11,15,14,10,11,11,14,15,
- 13,14,14,16,16,13,14,15,16,16, 6, 7, 7, 9, 9, 6,
- 8, 7,10,10, 7, 8, 8,10,10, 9,10,10,13,13, 9,10,
- 10,13,13, 6, 8, 7,10,10, 7, 9, 9,11,11, 7, 8, 9,
- 11,11,10,11,11,14,14,10,11,11,13,14, 6, 8, 7,10,
+ 7, 9, 9,11,11,10,11,11,14,14,10,11,11,14,13, 6,
+ 8, 8,10,10, 7, 9, 8,11,11, 7, 9, 9,11,11,10,11,
+ 11,14,14,10,11,11,14,14, 9,10,10,13,13,10,11,11,
+ 14,14,10,11,11,14,14,13,13,14,15,17,13,14,14,17,
+ 17, 9,10,10,13,14,10,11,11,15,14,10,11,11,14,14,
+ 13,14,14,16,15,13,14,14,17,17, 6, 7, 7, 9, 9, 7,
+ 7, 7,10,10, 7, 8, 7,10,10, 9,10,10,13,13, 9,10,
+ 10,13,13, 6, 8, 7,10,10, 7, 9, 8,11,11, 7, 9, 9,
+ 11,11,10,11,11,14,14,10,11,11,14,14, 6, 7, 8,10,
10, 7, 9, 9,11,11, 7, 9, 8,11,11,10,11,11,14,14,
- 10,12,11,14,13, 9,10,10,13,13,10,12,11,14,14,10,
- 11,11,14,14,13,14,14,17,17,13,14,14,15,16, 9,10,
- 10,14,14,10,11,11,14,15,10,11,11,14,14,13,14,15,
- 17,16,13,14,14,16,15, 8, 9, 9,12,12, 9,11,10,14,
- 14, 9,10,10,13,14,12,14,14,16,16,12,13,14,16,16,
- 9,10,10,13,13,10,11,11,15,14,10,12,12,15,14,14,
- 15,15,17,17,14,15,15,17,16, 9,10,10,13,13,10,12,
- 11,15,14,10,11,12,14,15,13,15,15,16,16,14,14,15,
- 17,17,12,14,13,16,16,13,14,15,17,18,13,15,14,17,
- 17,16,17,17,17,19,16,17,17,18,20,12,13,13,16,16,
- 13,15,14,17,16,13,14,15,16,17,15,17,16,20,17,15,
- 16,18,18,18, 8, 9, 9,12,12, 9,10,10,13,13, 9,11,
- 10,14,13,12,13,14,16,16,13,13,14,16,16, 9,10,10,
- 13,13,10,12,11,14,14,10,11,12,14,15,14,15,14,17,
- 17,14,15,15,17,18, 9,10,10,13,13,10,11,12,14,15,
- 10,12,11,15,14,13,14,15,17,18,14,15,14,16,16,12,
- 13,14,17,16,13,15,14,17,17,13,14,14,17,18,16,17,
- 17,19,18,16,16,17,17,19,12,13,13,16,16,13,15,15,
- 17,17,13,15,14,17,16,16,16,17,18,19,15,17,16,17,
- 19,
+ 10,11,11,14,14, 9,10,10,13,13,10,11,11,14,14,10,
+ 11,11,14,14,13,14,14,16,16,13,14,15,16,16, 9,10,
+ 10,13,13,10,11,11,14,14,10,11,11,14,14,13,14,14,
+ 16,16,13,14,14,17,15, 8, 9,10,12,12, 9,11,11,14,
+ 13, 9,10,10,13,13,12,14,14,16,16,12,14,13,16,16,
+ 9,10,10,13,13,10,11,12,14,14,10,12,12,15,14,14,
+ 14,15,16,17,14,14,15,17,17, 9,10,11,13,14,10,12,
+ 11,14,14,10,11,12,14,14,13,15,15,17,16,13,14,15,
+ 16,17,12,13,13,16,16,13,14,14,17,16,13,15,15,17,
+ 17,15,16,17,18,18,17,17,17,18,20,12,14,13,16,16,
+ 13,15,14,17,16,13,14,14,16,16,15,16,16,19,16,15,
+ 17,17,18,19, 8, 9, 9,12,12, 9,10,10,13,13, 9,11,
+ 10,14,13,12,14,13,16,16,12,13,14,16,15, 9,10,10,
+ 14,13,10,12,11,15,14,10,11,12,15,15,13,14,14,17,
+ 17,14,14,15,16,19, 9,10,10,13,14,10,11,12,14,15,
+ 10,12,11,15,14,13,14,15,17,17,14,15,14,17,16,12,
+ 14,13,16,16,13,15,14,17,17,13,14,14,16,17,16,16,
+ 16,20,18,15,16,16,17,18,12,13,14,16,17,13,15,14,
+ 18,17,13,14,14,16,17,16,17,16,20,19,15,18,16,20,
+ 18,
};
static float _vq_quantthresh_res0_128_1024_4[] = {
1.5 +12 -11 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_1024_5.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_1024_5.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -35,16 +36,16 @@
static long _vq_lengthlist_res0_128_1024_5[] = {
1, 4, 4, 6, 6, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6,
- 8, 8, 9, 9,11,11,12,12,13,13, 4, 6, 6, 8, 8, 9,
- 9,11,11,12,12,13,13, 6, 9, 9,12,11,12,12,13,14,
- 14,14,15,15, 6, 9, 9,12,11,12,12,13,13,14,14,15,
- 16, 7, 9, 9,12,12,14,14,15,15,16,16,17,17, 7, 9,
- 9,12,12,14,14,15,15,16,16,16,17, 8,11,11,14,14,
- 15,15,16,16,17,17,19,18, 8,11,11,14,14,15,15,16,
- 16,17,17,17,18, 9,13,13,15,15,16,16,17,17,18,18,
- 18,18, 9,12,13,15,15,16,16,17,17,18,17,19,18,10,
- 14,14,16,16,18,17,19,20,19,19,19,19,10,14,14,16,
- 16,18,18,18,17,18,19,20,19,
+ 9, 9, 9, 9,11,11,12,12,13,13, 4, 6, 6, 9, 9, 9,
+ 9,11,11,12,12,13,13, 6, 9, 9,12,11,12,12,14,14,
+ 15,14,15,16, 6, 9, 9,12,11,12,12,13,13,14,15,16,
+ 16, 6, 9, 9,12,12,14,14,15,15,16,17,16,17, 7, 9,
+ 9,12,12,14,14,15,15,16,16,16,16, 8,11,11,14,14,
+ 15,15,16,16,17,17,18,18, 8,11,11,14,14,15,15,16,
+ 16,16,18,17,18, 9,12,12,15,15,16,16,17,17,18,17,
+ 19,18, 9,13,13,15,15,16,16,17,16,17,17,19,18,10,
+ 14,14,16,17,17,17,18,18,18,18,19,19,10,14,14,16,
+ 16,17,17,18,18,21,21,20,19,
};
static float _vq_quantthresh_res0_128_1024_5[] = {
1.5 +7 -6 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_1024_6.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_1024_6.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -40,11 +41,11 @@
11,11,12,12, 5, 6, 6, 7, 7, 9, 9,10,10,11,11,12,
12, 7, 7, 7, 9, 9,10,10,11,11,12,12,13,13, 7, 7,
7, 9, 9,10,10,11,11,12,12,13,13, 8, 9, 9,10,10,
- 11,11,12,12,13,13,14,14, 8, 9, 9,10,10,11,11,12,
- 12,13,13,14,14, 9,10,10,11,11,13,12,13,13,14,14,
- 14,15, 9,10,10,11,11,12,12,13,13,14,14,14,15,10,
- 11,11,12,12,13,13,14,14,15,15,15,15,10,11,11,12,
- 12,14,13,14,14,15,15,15,15,
+ 11,11,13,12,13,13,14,14, 8, 9, 9,10,10,11,11,12,
+ 12,13,13,14,14, 9,10,10,11,11,12,13,13,13,14,14,
+ 14,14, 9,10,10,11,11,12,12,13,13,14,14,15,14,10,
+ 11,11,12,12,13,13,14,14,15,14,15,15,10,11,11,12,
+ 12,13,13,14,14,15,15,15,15,
};
static float _vq_quantthresh_res0_128_1024_6[] = {
1.5 +36 -35 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_1024_7.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_1024_7.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -49,43 +50,43 @@
2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
8, 9, 9, 9, 9, 9, 9,10,10, 4, 6, 6, 7, 7, 8, 8,
9, 9, 9, 9,10,10, 9, 9,10,10,10,10,11,11,11,11,
- 11,12, 4, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10, 9,
+ 12,12, 4, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10, 9,
9,10,10,10,10,11,11,11,11,12,12, 6, 7, 7, 9, 9,
9, 9,10,10,11,11,11,11,11,11,11,11,12,12,12,12,
- 13,12,13,13, 6, 7, 7, 9, 8, 9, 9,10,10,11,11,11,
- 11,11,11,11,11,12,12,12,12,13,12,13,13, 7, 8, 8,
- 10, 9,10,10,11,11,11,11,12,12,12,12,12,12,13,13,
- 13,13,13,13,14,14, 7, 8, 8,10, 9,10,10,11,11,11,
- 12,12,12,12,12,13,12,13,13,13,13,14,14,14,14, 8,
- 9, 9,10,10,11,11,12,12,12,12,13,13,13,13,13,13,
- 13,13,14,14,14,14,15,15, 8, 9, 9,10,10,11,11,12,
- 12,12,12,13,13,13,13,13,13,13,13,14,14,14,14,14,
- 14, 8,10,10,11,11,12,12,12,12,13,13,13,13,13,13,
- 14,14,14,14,14,14,14,15,15,15, 8,10,10,11,11,12,
- 12,12,13,13,13,13,13,13,13,14,14,14,14,14,15,15,
- 15,15,15, 9,10,10,12,12,13,13,13,13,14,14,14,14,
- 14,14,14,14,15,15,15,15,15,15,16,16, 9,10,10,12,
- 12,12,12,13,13,13,13,14,14,14,14,14,14,15,14,15,
- 15,15,15,16,15, 8,10,10,12,11,13,13,13,13,14,13,
- 14,14,14,14,15,15,15,15,15,16,16,16,16,16, 8,10,
- 10,12,11,12,12,13,13,13,13,14,14,15,14,15,14,15,
- 15,15,15,15,15,16,16, 9,11,11,12,12,13,13,14,14,
- 14,14,15,14,15,15,15,15,15,15,16,16,16,16,16,17,
- 9,11,11,12,12,13,13,14,13,14,14,14,15,15,15,15,
- 15,15,15,16,16,16,16,17,16, 9,11,11,12,13,13,13,
+ 13,13,13,13, 6, 7, 7, 8, 8, 9, 9,10,10,11,10,11,
+ 11,11,11,11,11,12,12,12,12,13,13,13,13, 7, 8, 8,
+ 9,10,10,10,11,11,11,12,12,12,12,12,12,12,13,13,
+ 13,13,13,13,14,14, 7, 8, 8,10,10,10,10,11,11,11,
+ 12,12,12,12,12,12,12,13,13,13,13,14,13,14,14, 8,
+ 9, 9,10,10,11,11,12,12,13,12,13,13,13,13,13,13,
+ 14,14,14,14,14,14,15,15, 8, 9, 9,10,10,11,11,12,
+ 12,12,12,13,13,13,13,13,13,13,14,14,14,14,14,15,
+ 15, 8,10,10,11,11,12,12,13,13,13,13,13,13,13,14,
+ 14,14,15,14,14,15,15,15,15,15, 8,10,10,11,11,12,
+ 12,13,13,13,13,13,13,13,13,14,14,14,14,14,15,15,
+ 15,16,15, 9,10,10,11,12,12,12,13,13,14,14,14,14,
+ 14,14,14,14,15,15,15,15,15,16,16,16, 9,10,10,12,
+ 11,13,12,13,13,14,14,14,14,14,14,14,14,15,14,15,
+ 15,16,15,16,16, 8,10,10,12,12,12,13,13,13,14,14,
+ 14,14,14,14,15,15,15,15,15,16,16,16,16,17, 8,10,
+ 10,12,11,12,12,13,13,14,14,14,14,14,14,15,15,15,
+ 15,15,15,16,16,16,16, 9,11,11,12,12,13,13,14,13,
14,14,15,14,15,15,15,15,15,16,16,16,16,16,17,16,
- 18,17, 9,11,11,13,13,13,14,14,14,15,15,15,14,15,
- 15,16,16,16,16,16,16,16,16,17,17,10,12,12,13,13,
- 14,14,14,15,15,15,15,15,15,15,16,16,16,17,16,16,
- 17,16,17,17,10,12,12,13,13,14,14,14,14,15,15,15,
- 15,16,16,16,16,16,16,17,16,17,17,17,17,10,12,12,
- 13,13,14,14,15,15,15,15,15,16,17,16,17,16,16,18,
- 17,17,18,17,18,17,10,12,12,13,14,14,14,15,15,15,
- 15,16,15,16,16,16,16,16,17,16,16,19,17,18,17,11,
- 13,12,14,14,15,15,15,15,15,16,16,16,16,17,16,16,
- 18,17,17,17,17,17,17,19,11,13,13,14,14,15,15,15,
- 16,16,16,16,16,17,16,16,16,18,18,17,17,17,17,18,
- 17,
+ 9,11,11,12,12,13,13,14,14,14,14,14,14,15,14,15,
+ 15,15,15,16,16,16,16,17,17, 9,11,11,13,13,14,14,
+ 14,14,15,14,15,15,15,15,15,15,16,16,16,16,16,17,
+ 17,17, 9,11,11,12,13,13,13,14,14,14,15,15,15,15,
+ 15,15,16,17,16,16,17,16,16,17,17,10,12,11,13,13,
+ 14,14,14,15,15,15,15,15,15,16,16,17,16,16,16,17,
+ 17,17,17,18,10,12,12,13,13,14,14,15,14,15,15,15,
+ 15,16,16,17,16,16,16,16,17,17,18,17,17,10,12,12,
+ 14,13,15,15,15,15,16,15,16,16,16,16,17,16,17,16,
+ 16,16,17,17,17,17,10,12,12,14,14,15,15,15,15,16,
+ 15,16,16,17,16,16,17,17,16,17,17,16,17,18,18,11,
+ 12,13,14,14,15,15,15,15,16,15,16,16,17,16,17,17,
+ 18,17,18,18,18,17,18,18,11,13,13,14,14,14,15,15,
+ 16,16,16,16,16,16,16,17,16,17,16,17,17,18,17,17,
+ 18,
};
static float _vq_quantthresh_res0_128_1024_7[] = {
1.5 +6 -118 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_1024_8.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_1024_8.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -64,122 +65,9 @@
};
static long _vq_lengthlist_res0_128_1024_8[] = {
- 3, 5, 5, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8,
- 8, 8, 8, 9, 8, 9, 9, 9, 9, 8, 8, 9, 9, 9, 9, 9,
- 9,10,10,10,10,10,10,11,10,10,10, 5, 6, 6, 7, 7,
- 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
- 10,10,10,10,10,10,10,10,10,10,11,10,11,11,11,11,
- 11,11,12,12,11,11, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8,
- 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,
- 10,10,10,10,10,11,10,11,11,11,11,11,11,12,12,11,
- 11, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10, 9,10,10,
- 10,10,10,10,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,12,11,12,12,12,12,12,12,12,12, 7, 8, 7, 8,
- 8, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,10,11,
- 10,11,11,11,11,11,11,11,11,11,11,11,11,12,12,12,
- 12,12,12,12,12,12,12, 8, 8, 8, 9, 9, 9,10,10,10,
- 10,10,10,10,11,11,11,11,11,11,11,11,11,11,12,11,
- 11,11,12,12,12,12,12,12,12,12,13,13,13,13,13,13,
- 12,12, 8, 8, 8, 9, 9, 9,10,10,10,10,10,10,10,11,
- 10,11,11,11,11,11,11,12,11,12,12,11,11,12,12,12,
- 12,12,12,12,12,13,13,13,13,13,13,12,12, 8, 9, 9,
- 10,10,10,10,10,10,11,11,11,11,11,11,11,11,12,12,
- 12,12,12,12,12,12,12,12,12,12,12,13,13,13,13,13,
- 13,13,13,13,13,13,13,13, 8, 9, 9,10,10,10,10,10,
- 10,11,11,11,11,11,11,11,11,12,11,12,12,12,12,12,
- 12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,14,
- 13,13,13, 9,10,10,10,10,11,11,11,11,11,11,12,11,
- 12,12,12,12,12,12,12,12,12,12,13,13,13,13,13,12,
- 13,13,13,13,14,13,14,14,14,14,14,14,13,13, 9,10,
- 10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,
- 12,12,12,13,12,13,13,13,12,13,13,13,13,13,13,13,
- 13,14,14,14,14,14,14,13,13, 9,10,10,11,11,11,11,
- 12,12,12,12,12,12,12,12,12,12,12,13,13,13,13,13,
- 13,13,13,13,13,13,13,14,14,14,14,14,14,14,14,14,
- 14,15,14,14, 9,10,10,11,11,11,11,12,11,12,12,12,
- 12,12,12,12,12,13,12,13,13,13,13,13,13,13,13,13,
- 13,14,13,13,14,14,14,14,14,14,14,15,14,14,14,10,
- 11,11,11,11,12,12,12,12,12,12,13,12,13,13,13,13,
- 13,13,13,13,13,13,14,13,13,13,13,13,14,15,14,14,
- 14,14,14,14,14,14,15,15,14,14,10,11,11,11,11,12,
- 12,12,12,12,12,12,12,13,12,13,13,13,13,13,13,13,
- 13,14,14,13,14,14,13,14,14,14,14,14,14,14,15,14,
- 14,15,15,14,14,10,11,11,12,12,12,12,13,12,13,12,
- 13,13,13,13,13,13,14,14,14,13,14,14,14,14,14,14,
- 14,14,14,15,14,15,15,15,15,15,15,15,16,15,14,14,
- 10,11,11,12,12,12,12,12,13,13,13,13,13,13,13,13,
- 13,14,13,13,13,13,14,14,14,14,14,14,14,14,14,15,
- 14,15,15,15,15,15,14,15,15,14,14,10,11,11,12,12,
- 12,12,13,13,13,13,13,13,14,13,13,13,14,14,14,14,
- 14,14,14,15,14,14,14,15,15,15,15,15,15,15,15,15,
- 16,15,15,15,15,15,10,11,12,12,12,12,13,13,13,13,
- 13,13,13,14,13,14,14,14,13,14,14,14,14,14,15,14,
- 14,14,15,15,15,15,15,15,15,15,16,15,15,16,16,15,
- 15,11,12,12,12,12,13,13,13,13,13,13,13,13,13,14,
- 14,14,14,14,15,14,15,15,15,14,15,15,15,15,15,15,
- 16,15,15,15,16,15,15,16,16,16,15,16,11,12,12,12,
- 12,13,13,13,13,13,13,14,14,14,14,14,14,14,14,14,
- 14,15,15,15,15,14,15,15,14,15,15,15,15,16,15,16,
- 16,16,16,16,16,16,15,11,12,12,13,13,13,13,14,13,
- 14,14,14,13,14,14,14,14,14,14,15,14,15,15,15,15,
- 15,15,15,15,16,15,15,15,16,16,16,16,16,16,16,15,
- 16,15,11,12,12,13,13,13,13,13,13,14,13,14,14,14,
- 14,14,14,15,14,14,14,15,15,15,15,15,15,15,15,15,
- 15,16,15,15,16,15,16,15,16,16,16,15,15,12,13,13,
- 13,13,14,13,14,14,14,14,14,14,15,14,15,14,15,15,
- 15,15,15,15,15,15,15,15,15,15,16,16,15,16,17,16,
- 17,16,16,17,17,16,16,15,12,12,12,13,13,13,14,14,
- 14,14,14,14,14,14,14,15,15,15,15,15,15,15,15,16,
- 16,15,15,16,15,15,16,16,16,16,16,16,16,17,16,16,
- 16,16,16,10,12,12,13,13,13,13,14,13,14,14,14,14,
- 15,14,15,15,15,15,15,15,16,15,15,15,15,16,15,16,
- 16,15,16,17,16,16,18,17,17,17,18,17,16,16,10,12,
- 12,12,13,13,13,14,14,14,14,14,14,14,14,14,14,15,
- 15,15,15,15,15,15,15,16,16,15,16,16,16,16,17,16,
- 16,17,16,17,16,17,16,16,16,11,12,12,13,13,13,14,
- 14,14,14,14,14,14,14,15,15,15,15,15,16,15,15,16,
- 15,16,16,16,16,18,17,16,17,16,16,17,17,17,16,16,
- 17,16,17,16,11,12,12,13,13,13,13,15,14,15,14,15,
- 14,15,14,15,15,15,15,15,15,15,15,15,15,16,16,16,
- 16,16,16,17,16,16,17,16,16,17,17,17,18,17,17,11,
- 12,12,13,13,14,14,14,15,14,15,15,15,15,15,15,15,
- 15,15,16,15,16,16,16,16,17,16,17,16,17,17,17,17,
- 17,19,17,18,17,18,18,17,17,17,11,12,12,13,13,14,
- 14,14,14,14,15,15,15,16,16,15,15,16,16,15,15,16,
- 15,16,16,16,16,17,17,18,16,17,16,18,16,17,16,18,
- 16,17,17,17,17,12,13,13,14,14,14,14,14,14,15,15,
- 15,15,16,16,16,16,16,16,17,16,16,16,16,16,16,16,
- 18,17,16,17,18,17,17,20,18,19,17,19,18,20,18,17,
- 12,13,13,14,14,14,14,15,14,15,15,16,15,15,15,16,
- 16,15,15,17,16,17,16,17,16,16,16,16,16,17,16,20,
- 17,19,19,18,18,19,19,17,18,19,17,12,13,13,14,14,
- 14,15,15,15,16,15,16,15,15,15,16,15,16,16,17,17,
- 16,16,16,17,16,17,17,18,17,17,18,18,19,18,18,18,
- 17,17,20,19,17,17,12,13,14,14,15,15,15,15,15,15,
- 15,15,16,16,16,16,16,17,16,16,17,18,16,16,16,18,
- 16,18,18,18,17,18,17,18,18,18,19,17,18,18,19,18,
- 17,13,14,14,15,15,15,15,16,15,15,16,15,16,17,17,
- 16,16,17,17,17,17,17,17,16,19,18,19,18,17,17,17,
- 18,20,20,17,18,18,18,18,19,18,18,20,13,14,14,14,
- 15,15,15,15,15,16,16,16,16,16,16,16,16,17,17,17,
- 17,17,17,16,18,19,17,19,17,17,17,18,17,18,17,18,
- 18,19,19,19,18,20,18,13,14,14,15,16,16,15,16,17,
- 16,16,16,17,17,17,17,20,17,17,18,18,17,17,19,18,
- 17,18,19,18,18,17,19,18,17,18,18,19,18,20,20,20,
- 19,19,13,14,14,15,15,15,16,16,16,16,17,16,17,17,
- 17,18,17,17,17,16,17,17,17,17,18,20,18,19,18,19,
- 19,18,18,18,19,17,18,18,18,18,20,18,17,14,15,15,
- 15,16,15,17,16,17,16,18,17,17,17,17,16,18,19,17,
- 18,19,19,17,19,19,18,18,19,18,18,18,18,20,20,20,
- 20,20,19,20,20,18,18,18,14,15,15,16,15,16,16,17,
- 17,17,17,17,16,20,17,17,19,17,19,17,17,19,17,17,
- 20,17,20,18,20,19,19,18,18,19,20,20,20,20,18,18,
- 20,19,18,13,15,15,15,15,15,15,17,16,16,16,16,17,
- 16,16,16,17,17,19,17,18,18,18,19,18,18,19,18,18,
- 17,18,19,19,18,20,18,18,18,20,18,17,17,19,13,15,
- 15,15,15,15,16,16,16,16,17,17,17,17,17,17,17,17,
- 18,17,18,17,17,17,18,17,18,18,17,18,17,19,18,17,
- 18,17,17,19,17,18,18,18,17,
+ 2, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6,
+ 6, 7, 7, 7, 7, 7, 7, 8, 8, 7, 7, 7, 7, 8, 8, 8,
+ 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
};
static float _vq_quantthresh_res0_128_1024_8[] = {
@@ -208,7 +96,7 @@
};
static static_codebook _vq_book_res0_128_1024_8 = {
- 2, 1849,
+ 1, 43,
_vq_lengthlist_res0_128_1024_8,
1, -527106048, 1611661312, 6, 0,
_vq_quantlist_res0_128_1024_8,
1.5 +19 -18 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_1024_9.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_1024_9.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -366,24 +367,24 @@
6, 6, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,12,12,12,12,12,12,12,12,12,12,12,12,
- 12,12,12,12,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,14,13,13,14,14,14,14,13,14,14,
- 14,14,14,14,14,14,14,15,15,14,14,15,14,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,16,15,15,16,15,16,
- 16,16,16,15,16,16,16,16,17,16,16,16,17,16,17,17,
- 16,16,17,17,17,16,16,17,16,17,17,17,17,17,17,17,
- 17,17,17,19,17,17,18,18,18,18,18,18,18,18,18,18,
- 20,18,19,19,19,18,18,17,20,19,19,19,20,17,19,18,
- 19,19,19,18,18,20,19,20,19,20,19,19,20,19,19,19,
- 20,20,20,18,19,18,19,20,20,20,20,20,19,20,20,20,
- 20,19,20,20,20,20,19,20,19,20,20,20,19,20,20,20,
- 20,20,20,20,20,20,20,20,20,20,20,19,20,20,20,20,
+ 10,10,10,10,10,11,10,11,11,11,11,11,11,11,11,11,
+ 11,11,11,12,11,12,12,12,12,12,12,12,12,12,12,12,
+ 12,12,12,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,14,14,13,14,13,14,14,14,14,
+ 14,14,14,14,14,14,14,14,15,15,15,14,15,15,15,15,
+ 15,15,15,15,15,15,15,15,16,15,15,15,15,15,15,15,
+ 15,15,15,16,16,16,16,16,16,16,17,16,16,17,17,16,
+ 16,16,16,16,16,16,16,16,16,16,17,17,17,17,17,18,
+ 17,17,17,17,18,17,18,18,17,17,18,17,17,19,20,18,
+ 19,18,18,17,18,17,18,17,18,18,19,18,18,18,19,19,
+ 18,19,19,20,18,19,19,18,19,19,17,19,19,19,20,19,
+ 20,20,20,20,19,19,19,19,20,20,19,19,20,18,20,19,
+ 20,20,19,19,20,20,19,20,19,20,20,20,19,20,20,19,
+ 20,18,20,20,20,20,20,20,20,20,20,19,20,20,20,19,
+ 20,20,20,20,20,20,19,20,19,20,20,20,20,20,20,20,
+ 19,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
- 19,20,20,20,20,20,19,20,20,20,20,20,20,20,20,20,
- 20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
- 20,20,20,20,20,
+ 20,19,19,20,20,
};
static float _vq_quantthresh_res0_128_1024_9[] = {
1.5 +13 -12 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_1024aux.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_1024aux.vqh 2001/02/17 10:13:51 1.5
@@ -1,12 +1,13 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
* *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
* *
********************************************************************
@@ -19,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res0_128_1024aux[] = {
- 2, 6,11, 9,12, 9,15,13,15,20, 5, 3, 5, 5, 7, 7,
- 11,11,13,15, 9, 5, 4, 5, 6, 8,11,13,15,18, 9, 5,
- 5, 5, 7, 6,11,10,14,16,12, 7, 6, 7, 7, 9,11,13,
- 15,20, 8, 6, 7, 6, 9, 6,10, 9,12,19,14,10, 9, 8,
- 7, 7, 9, 9,12,17,10, 9,10, 8, 9, 6, 8, 7,10,14,
- 11,11,13,10,11, 8, 7, 7, 8,13,13,12,13,12,11,10,
- 7, 6, 8,13,
+ 3, 6,10, 9,12, 9,15,12,15,20, 5, 3, 4, 5, 7, 6,
+ 12,11,12,15, 9, 4, 4, 5, 6, 8,11,13,16,17, 8, 4,
+ 5, 5, 7, 6,11,10,13,16,12, 7, 6, 7, 8, 9,10,12,
+ 16,20, 8, 6, 7, 6, 9, 6,10, 9,12,19,14,10, 9, 8,
+ 7, 7, 8, 9,12,18, 9, 9,10, 8, 9, 6, 8, 7, 9,15,
+ 11,11,12,10,10, 8, 7, 6, 8,13,12,12,13,12,11,10,
+ 6, 6, 7,12,
};
static static_codebook _huff_book_res0_128_1024aux = {
1.5 +6 -5 vorbis/lib/books/res0_128_128_1.vqh
Index: res0_128_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_128_1.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_128_1.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -24,10 +25,10 @@
};
static long _vq_lengthlist_res0_128_128_1[] = {
- 3, 4, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 8, 8, 6,
- 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8,
- 8, 6, 8, 8, 6, 8, 8, 8, 9,10, 8,10, 9, 6, 8, 8,
- 8,10, 9, 8, 9,10, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
+ 3, 4, 4, 4, 6, 6, 4, 6, 6, 5, 6, 6, 6, 8, 8, 6,
+ 8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 5, 6, 6, 7, 8,
+ 8, 6, 8, 8, 7, 8, 8, 8, 9,10, 8,10, 9, 6, 8, 8,
+ 8,10, 9, 8, 9,10, 5, 6, 6, 6, 8, 8, 7, 8, 8, 6,
8, 8, 8,10, 9, 8, 9,10, 6, 8, 8, 8, 9,10, 8,10,
9,
};
1.5 +6 -152 vorbis/lib/books/res0_128_128_2.vqh
Index: res0_128_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_128_2.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_128_2.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -28,156 +29,9 @@
};
static long _vq_lengthlist_res0_128_128_2[] = {
- 3, 5, 5, 7, 7,10,10, 5, 7, 7, 9, 9,12,12, 5, 7,
- 7, 8, 8,12,12, 7, 9, 9,14,14,16,16, 7, 9, 9,12,
- 13,15,15,10,12,13,15,17,17,17,10,13,12,15,17,16,
- 17, 5, 7, 7, 9, 9,12,12, 7, 8, 8,10,10,13,13, 7,
- 8, 8,10,10,13,14, 9,10,10,15,16,15,15, 9,11,11,
- 16,15,15,15,12,13,14,16,16,17,16,12,15,14,15,17,
- 16,15, 5, 7, 7, 8, 9,12,11, 7, 8, 8,10,10,13,13,
- 6, 8, 8,10,10,13,12, 9,11,10,14,15,15,15, 9,11,
- 10,15,14,15,16,12,15,14,16,15,17,16,12,13,13,17,
- 15,17,17, 7, 9, 9,14,12,14,15, 9,10,11,15,15,16,
- 15, 9,10,11,13,15,15,17,14,15,16,16,17,17,17,13,
- 14,15,17,17,17,17,15,17,17,17,17,16,17,16,17,17,
- 17,17,17,17, 7, 9, 9,12,13,15,15, 9,10,10,14,16,
- 15,17, 9,11,11,15,15,17,17,13,14,14,17,17,17,16,
- 13,16,15,16,17,16,17,15,17,15,15,17,17,17,15,17,
- 17,16,17,17,17,10,13,12,15,14,16,17,12,14,14,17,
- 16,17,17,12,15,14,16,17,17,17,16,17,17,17,17,17,
- 17,15,16,17,17,15,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,10,12,13,15,16,17,16,12,14,14,
- 17,17,17,17,12,16,14,17,17,17,17,16,16,17,17,17,
- 17,17,15,17,17,17,17,17,17,16,17,17,17,17,17,17,
- 16,17,16,17,17,17,16, 5, 7, 7, 9, 9,12,12, 7, 8,
- 8,11,10,14,14, 7, 8, 8,10,11,13,13, 9,11,11,16,
- 17,16,17, 9,10,11,14,17,15,17,12,16,15,15,15,16,
- 17,12,16,17,17,17,17,17, 7, 9, 8,10,10,15,13, 8,
- 10,10,12,12,14,14, 8,10,10,12,11,15,16,10,12,13,
- 14,17,15,16,11,12,12,17,17,17,17,14,16,16,17,17,
- 17,17,14,16,17,17,16,17,16, 7, 8, 8,10,10,14,13,
- 8,10,10,12,12,14,13, 8,10,10,12,12,14,14,11,12,
- 12,16,16,15,16,11,13,13,16,16,17,15,15,16,17,17,
- 17,17,17,15,16,15,17,16,17,16, 9,11,11,14,15,17,
- 17,10,12,12,15,15,17,16,11,13,12,16,16,17,16,15,
- 16,17,16,17,17,17,15,17,17,17,17,16,17,17,17,17,
- 17,17,17,17,17,17,15,17,17,17,17, 9,11,11,15,15,
- 16,15,10,13,12,17,16,17,15,11,13,13,15,15,15,16,
- 14,17,16,17,17,17,16,14,17,17,17,16,17,17,16,17,
- 17,17,16,17,17,17,17,15,17,17,17,17,13,14,15,17,
- 16,16,17,14,14,15,17,16,17,17,14,16,16,17,17,16,
- 17,16,17,17,17,17,17,17,16,17,17,17,17,17,17,17,
- 16,17,17,17,17,17,17,17,17,17,17,17,17,12,13,15,
- 17,17,17,17,14,14,16,17,17,17,17,14,17,17,17,17,
- 17,17,16,17,17,17,17,17,17,17,17,17,16,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17, 5, 7,
- 7, 9, 9,12,12, 7, 9, 8,10,10,13,13, 7, 8, 8,10,
- 10,13,13, 9,11,10,14,14,16,15, 9,11,10,14,14,16,
- 15,13,14,15,16,16,17,17,12,15,14,17,16,16,17, 7,
- 8, 8,10,10,13,13, 8,10,10,12,12,14,13, 8,10,10,
- 11,12,14,15,11,13,11,17,17,15,15,10,12,13,15,17,
- 17,17,14,16,17,17,17,16,17,14,17,15,16,17,16,17,
- 7, 8, 8,10,10,14,15, 8,10,10,11,12,13,14, 8,10,
- 9,12,12,14,14,10,11,12,16,15,17,15,10,12,12,17,
- 15,16,17,14,14,15,16,17,17,16,15,15,17,17,17,17,
- 17, 9,11,10,16,15,17,16,10,12,12,16,15,17,17,10,
- 12,12,15,15,14,17,17,17,16,17,17,16,17,15,16,17,
- 16,17,17,17,17,17,17,16,17,17,17,17,17,17,17,17,
- 17,17, 9,11,11,14,14,16,16,11,12,12,14,17,16,16,
- 10,12,12,17,17,16,15,14,17,16,17,17,17,17,14,16,
- 16,17,16,17,17,17,17,17,17,17,17,17,17,17,16,17,
- 16,17,17,13,15,15,15,17,17,17,16,15,17,16,16,17,
- 16,14,14,17,16,17,16,17,17,17,17,17,17,17,17,16,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,13,15,16,17,17,17,17,15,16,16,17,16,
- 17,17,14,17,16,17,17,17,17,15,17,17,17,17,17,17,
- 17,16,17,17,17,17,17,17,17,17,17,17,17,16,17,17,
- 17,17,17,17,17, 7,10, 9,13,13,17,16, 9,11,11,14,
- 14,15,17, 9,11,11,15,15,17,17,14,14,14,16,17,17,
- 17,13,15,15,17,17,17,16,17,17,16,17,17,17,17,17,
- 16,16,15,17,17,15, 9,11,11,15,14,17,17,11,12,13,
- 16,16,16,16,11,13,12,16,17,17,16,16,16,17,17,17,
- 17,17,16,16,16,17,17,17,17,16,17,17,17,17,17,17,
- 17,17,17,17,17,17,17, 9,11,11,15,15,17,15,11,12,
- 13,16,15,16,15,11,12,12,16,15,17,17,15,17,17,17,
- 17,17,17,15,16,17,16,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,13,15,16,17,17,17,17,15,
- 16,15,17,17,17,16,16,16,17,17,17,17,17,17,15,17,
- 14,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 16,17,17,17,17,17,17,17,17,15,15,17,17,17,17,17,
- 16,17,16,17,17,17,16,17,17,16,17,16,17,17,16,17,
- 17,17,16,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,16,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,15,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17, 7, 9, 9,14,
- 14,17,17, 9,11,11,14,14,15,15, 9,11,11,14,15,15,
- 16,15,17,15,17,17,17,15,14,17,16,17,16,16,17,16,
- 17,17,17,17,17,17,17,17,16,17,17,17,17, 9,11,11,
- 15,14,15,17,11,12,13,15,17,17,17,10,13,13,16,15,
- 16,17,17,17,17,17,17,17,17,17,15,15,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17, 9,11,
- 11,15,16,17,17,11,13,13,15,16,15,15,11,12,12,15,
- 15,16,17,15,16,17,17,17,17,16,17,17,16,17,17,16,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,14,
- 16,15,17,17,17,17,17,17,15,17,16,17,17,16,15,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,16,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 15,16,15,17,17,17,17,16,17,17,17,17,17,17,16,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,15,17,
- 14,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 16,16,17,17,17,17,17,17,17,17,17,17,17,17,17,16,
- 16,16,17,17,17,16,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 16,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,16,11,13,15,14,16,17,17,14,16,14,17,17,17,
- 17,13,15,15,17,17,17,17,17,17,17,17,17,17,17,15,
- 17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,13,15,15,16,16,17,17,17,15,17,16,17,
- 17,17,14,17,16,17,16,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,16,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,16,17,17,12,15,15,17,17,17,17,15,17,15,17,
- 17,16,17,14,17,17,17,17,17,17,17,17,17,17,16,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,16,16,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,16,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,16,17,17,17,17,16,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,11,13,13,17,17,17,
- 15,13,15,15,17,17,17,17,13,16,15,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,13,14,14,16,17,
- 17,17,16,17,17,16,17,17,17,16,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,13,14,14,17,
- 17,17,17,15,16,16,17,17,17,17,15,15,16,17,17,17,
- 17,17,17,17,17,17,17,17,17,16,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,15,16,16,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 2, 3, 3, 6, 6, 9, 9, 3, 5, 5, 7, 7,10,10, 3, 5,
+ 5, 7, 7,10,10, 6, 8, 8,11,11,14,14, 6, 8, 8,12,
+ 12,14,14, 9,11,11,15,14,16,16, 9,11,11,15,15,15,
15,
};
@@ -197,7 +51,7 @@
};
static static_codebook _vq_book_res0_128_128_2 = {
- 4, 2401,
+ 2, 49,
_vq_lengthlist_res0_128_128_2,
1, -533200896, 1611661312, 3, 0,
_vq_quantlist_res0_128_128_2,
1.5 +63 -62 vorbis/lib/books/res0_128_128_3.vqh
Index: res0_128_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_128_3.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_128_3.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -52,67 +53,67 @@
};
static long _vq_lengthlist_res0_128_128_3[] = {
- 3, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,10,11,11, 4,
- 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,11,11, 4, 5,
- 5, 6, 6, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 8, 8,
- 9, 9, 9, 9, 9, 9,10,10,10,10,10,11,11, 7, 7, 7,
- 9, 8, 9,10,10,10,10,10,10,10,10,10,10,11,10,11,
- 10,11,11,11,11,12,12,12,12,13,13,13, 7, 7, 7, 9,
- 8, 9, 9,10,10,10,10,10,10,10,10,10,10,10,11,10,
- 11,11,12,11,12,12,12,12,13,13,13, 9, 9, 9,10,10,
- 11,11,11,11,12,12,11,12,12,12,12,12,12,12,12,13,
- 12,12,13,13,13,13,14,14,14,15, 9, 9, 9,11,10,11,
- 11,12,11,12,11,12,12,12,12,12,12,12,12,12,12,13,
- 13,13,13,13,13,14,14,14,14,10,10,10,12,12,13,12,
- 13,14,13,13,13,13,13,13,13,14,13,14,13,14,15,14,
- 15,15,16,15,14,15,15,15,10,10,10,11,11,13,12,13,
- 13,13,13,14,13,13,13,13,13,13,13,14,13,14,14,14,
- 14,15,15,14,15,15,15,11,11,12,13,13,13,13,14,14,
- 14,14,14,15,14,14,14,15,14,14,15,15,15,15,15,15,
- 15,17,16,16,16,16,10,11,11,12,12,14,13,13,15,14,
- 14,14,14,14,14,15,14,15,15,15,14,15,14,16,16,16,
- 16,17,16,16,15,11,12,13,13,14,14,14,13,14,15,14,
- 15,14,15,15,15,14,16,15,15,15,16,15,16,17,16,16,
- 17,16,16,16,12,12,12,14,13,14,15,15,15,15,15,14,
- 15,16,15,15,15,16,15,15,16,16,15,16,16,17,15,17,
- 16,16,16,12,13,12,14,14,15,14,15,16,16,15,14,15,
- 16,16,16,15,17,16,15,16,17,17,17,17,16,15,16,16,
- 17,17,12,13,13,14,13,14,14,16,16,15,17,15,16,16,
- 15,16,15,16,16,15,16,15,16,16,16,16,15,16,16,15,
- 16,13,14,14,14,14,15,15,16,17,15,15,17,15,16,15,
- 17,17,16,17,16,17,17,17,17,15,17,16,17,17,16,17,
- 13,14,14,15,15,16,15,17,14,16,17,15,17,17,15,17,
- 16,16,16,16,16,16,16,16,16,17,16,17,16,17,17,13,
- 14,14,15,15,16,16,17,16,17,17,16,15,17,16,17,15,
- 17,17,17,17,16,15,15,17,17,17,16,17,17,17,14,14,
- 14,16,15,16,16,16,16,17,16,16,17,16,16,15,16,16,
- 16,15,16,16,15,17,17,17,17,17,16,17,17,15,15,15,
- 17,16,17,17,16,16,17,17,16,17,16,17,17,17,17,16,
- 17,17,17,17,17,17,17,17,16,17,17,17,13,15,14,16,
- 16,16,16,15,16,17,16,16,16,16,15,16,16,16,16,16,
- 16,17,17,17,17,17,17,17,17,17,17,14,14,14,15,15,
- 17,16,17,17,17,17,17,16,16,16,17,16,17,17,16,17,
- 17,16,16,17,17,17,17,17,17,17,14,15,15,16,16,17,
- 16,17,17,17,17,16,17,17,16,16,16,17,16,17,17,17,
- 17,17,17,17,17,17,17,17,17,16,15,14,17,16,17,17,
- 16,16,17,17,17,17,17,17,17,17,17,17,17,17,17,16,
- 16,17,17,17,17,17,17,17,15,15,15,15,16,16,17,16,
- 16,17,17,17,17,17,16,17,17,16,17,17,17,17,17,17,
- 16,16,17,17,17,17,17,15,16,17,16,17,16,17,17,16,
- 16,17,17,17,17,17,17,16,17,17,17,16,17,17,17,17,
- 17,16,17,17,17,17,15,16,14,16,17,17,17,17,17,17,
- 17,17,17,16,17,17,17,16,16,16,17,16,17,17,17,17,
- 17,17,17,17,17,15,16,16,17,17,15,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,
- 17,17,17,17,15,17,17,16,16,17,17,17,16,17,17,17,
- 17,17,16,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,16,17,17,16,17,17,17,17,17,17,17,17,17,
- 16,17,17,17,17,16,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,16,17,16,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
- 17,
+ 3, 4, 4, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 9, 8, 9, 9,10, 9,10,10,11,10, 4,
+ 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9,
+ 9, 8, 9, 9, 9, 9, 9, 9,10, 9,10,10,11,10, 4, 5,
+ 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8,
+ 9, 9, 9, 9, 9,10, 9,10, 9,10,10,11,10, 7, 7, 7,
+ 9, 9, 9, 9,10,10,10,10,10,11,10,11,10,11,10,10,
+ 11,11,11,11,11,11,12,12,12,12,13,12, 7, 7, 7, 9,
+ 8, 9, 9,10,10,10,10,10,10,10,11,10,11,10,10,11,
+ 11,11,11,11,11,11,11,12,12,13,13, 9, 9, 9,10,10,
+ 11,11,11,12,11,12,12,12,11,12,12,12,12,12,12,12,
+ 12,12,13,13,13,13,13,13,14,14, 8, 9, 9,10,10,11,
+ 11,11,12,12,12,12,12,12,12,12,12,12,12,12,12,13,
+ 13,13,12,13,13,13,13,14,14, 9,10,10,11,12,13,12,
+ 13,13,13,13,13,14,13,14,13,14,13,14,13,13,14,14,
+ 15,14,15,14,15,14,15,16, 9,10,10,11,11,12,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,13,14,14,14,
+ 14,15,14,15,14,15,15,10,11,11,12,13,13,13,14,14,
+ 14,15,14,14,14,14,14,14,14,15,14,14,14,15,15,16,
+ 15,17,16,16,15,15,10,11,11,13,13,13,13,13,14,13,
+ 14,14,14,14,14,15,14,15,14,15,14,15,14,15,16,16,
+ 15,16,15,15,16,11,12,12,13,14,14,14,15,14,14,15,
+ 15,15,15,15,15,15,15,14,16,15,16,16,16,16,16,15,
+ 17,15,16,17,11,12,12,14,13,14,15,14,15,14,15,14,
+ 15,16,16,15,15,15,15,16,15,16,16,18,15,17,15,17,
+ 15,18,16,12,13,13,14,14,14,15,15,16,16,15,15,16,
+ 15,16,16,16,15,15,16,16,17,16,17,16,17,15,17,17,
+ 17,18,12,13,12,15,14,15,14,17,15,16,16,16,16,16,
+ 16,15,15,16,15,16,16,16,15,16,15,17,17,18,16,16,
+ 18,13,14,13,14,14,15,15,16,16,15,16,16,16,16,17,
+ 16,16,16,17,16,16,16,16,17,16,17,18,18,17,17,18,
+ 14,13,13,15,15,15,15,17,15,16,18,15,17,16,17,15,
+ 16,16,16,17,16,16,16,16,15,17,17,18,18,17,17,13,
+ 14,14,16,16,18,16,16,16,16,18,18,17,16,18,16,16,
+ 16,16,17,16,16,16,18,16,17,17,16,17,17,18,13,14,
+ 14,15,15,17,16,17,16,17,16,18,17,16,16,16,17,17,
+ 17,16,17,16,16,17,17,18,16,17,18,18,17,15,15,15,
+ 16,15,18,17,18,17,16,18,16,17,16,16,18,17,18,17,
+ 18,16,18,17,18,18,18,18,18,17,18,18,13,15,15,16,
+ 16,16,16,17,16,17,17,17,16,16,17,16,16,17,18,17,
+ 17,16,17,18,17,18,17,18,17,18,18,16,14,15,16,16,
+ 17,17,17,16,16,17,18,18,18,18,16,17,18,18,18,17,
+ 18,17,18,18,18,18,17,18,18,18,15,15,15,16,16,18,
+ 18,17,18,18,18,18,18,16,18,16,18,16,18,18,16,17,
+ 17,18,17,18,16,18,18,17,18,15,15,15,16,16,17,17,
+ 16,17,18,16,18,17,18,18,17,18,17,18,18,16,18,18,
+ 18,18,17,18,17,18,18,18,17,15,15,16,16,17,18,16,
+ 17,18,18,18,18,18,18,17,18,18,18,17,18,18,16,18,
+ 18,17,18,18,18,18,17,16,16,16,18,18,17,18,17,17,
+ 18,18,18,18,18,18,18,18,16,18,18,18,18,17,18,18,
+ 18,18,18,18,18,18,16,15,16,15,18,18,16,18,18,18,
+ 16,17,18,18,16,18,17,17,16,18,17,17,18,18,16,18,
+ 18,18,18,18,17,17,16,18,18,18,16,17,18,18,18,18,
+ 17,18,18,18,18,18,18,17,18,17,18,17,18,17,18,18,
+ 18,18,18,18,15,17,16,17,18,18,18,18,18,18,18,18,
+ 18,17,16,18,18,17,18,17,17,18,18,18,18,18,18,18,
+ 18,18,18,16,16,17,17,18,17,18,18,18,18,18,18,18,
+ 18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+ 18,18,16,17,18,17,16,18,17,16,18,18,18,18,18,18,
+ 18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,
+ 18,
};
static float _vq_quantthresh_res0_128_128_3[] = {
1.5 +7 -178 vorbis/lib/books/res0_128_128_4.vqh
Index: res0_128_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_4.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_128_4.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_128_4.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -74,182 +75,10 @@
};
static long _vq_lengthlist_res0_128_128_4[] = {
- 4, 4, 4, 6, 6, 7, 7, 8, 7, 7, 8, 8, 8, 8, 8, 9,
- 8, 9, 9,10,10,11,10,11,11,13,12,12,15,15,13, 8,
- 8, 8, 8, 9, 9, 9, 9,10,10,11,10,11,10,12,11,13,
- 11,12,11,12,12, 5, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8,
- 8, 9, 8, 9,10, 9,10,10,10,10,11,11,13,12,11,12,
- 13,13,12,14, 8, 8, 8, 8, 9, 9,10,10,10,10,10,11,
- 11,10,13,12,12,12,12,12,12,12, 5, 5, 5, 7, 7, 7,
- 7, 8, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9,10,10,11,11,
- 11,11,12,13,11,12,13,13,14, 8, 8, 9, 8, 9, 9, 9,
- 10,10,10,11,11,11,10,12,11,13,11,12,13,12,14, 7,
- 7, 7, 9, 9, 9, 9,10,10,10,10,11,10,12,11,11,12,
- 11,14,14,12,14,12,13,12,14,14,14,14,14,14,10,10,
- 11,10,11,11,11,11,12,11,12,12,12,12,13,14,13,13,
- 14,14,14,14, 7, 7, 7, 9, 9, 9, 9,10,10,11,11,11,
- 10,11,11,11,11,11,11,13,13,12,13,14,14,12,14,14,
- 13,14,14,10,11,10,10,10,10,11,14,11,11,12,12,11,
- 13,14,11,13,13,14,12,14,14, 9, 9, 9,11,11,11,11,
- 11,12,12,12,12,12,12,12,12,12,13,14,12,14,13,14,
- 13,14,14,14,13,14,14,14,12,11,13,13,13,13,13,12,
- 13,14,12,14,14,14,13,12,14,14,14,14,14,14, 9, 9,
- 9,10,10,11,11,12,12,12,12,13,13,12,13,12,12,13,
- 13,13,12,14,14,13,13,14,13,14,14,13,13,11,12,11,
- 12,11,11,12,13,13,14,13,14,13,14,14,14,14,14,14,
- 14,14,14,10,11,10,12,11,12,12,12,12,13,12,12,13,
- 14,14,14,13,12,13,14,14,14,14,14,13,14,14,14,14,
- 14,14,12,13,12,13,13,12,12,14,14,14,12,14,14,14,
- 14,14,14,14,14,14,14,14,10,11,10,13,12,12,12,13,
- 14,12,13,13,14,12,14,13,13,13,12,13,13,14,13,14,
- 14,14,14,14,14,14,14,12,12,13,14,12,13,12,14,14,
- 14,14,14,14,14,14,14,14,13,14,14,14,14,11,12,12,
- 12,13,14,12,13,14,14,14,12,14,12,14,14,14,14,13,
- 14,14,14,14,14,14,14,14,14,14,14,14,12,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,11,14,11,12,11,12,12,13,14,13,13,14,14,14,
- 13,14,13,13,13,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,12,13,14,14,13,14,12,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,13,11,13,14,13,14,14,14,14,
- 14,14,13,13,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,12,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,12,13,14,
- 13,13,13,13,14,14,14,13,13,14,13,14,14,14,13,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,13,14,13,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,13,12,12,14,13,13,13,14,13,14,14,14,14,14,13,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 13,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,12,13,13,14,13,13,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,13,14,14,13,14,13,
- 14,14,14,14,14,14,14,14,14,14,14,13,14,12,14,14,
- 14,14,14,14,14,14,14,13,14,14,14,13,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,13,14,13,
- 14,13,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 13,13,14,14,12,14,14,14,14,13,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,12,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,13,13,14,14,14,14,14,14,14,14,14,
- 14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,13,12,13,13,14,
- 14,14,14,14,14,14,14,14,14,14,13,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,13,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,13,
- 12,14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,13,14,14,14,14,14,13,14,14,13,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,13,14,13,14,
- 14,14,14,12,14,14,13,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,13,14,14,14,14,13,14,14,13,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,13,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,13,13,14,
- 14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,13,14,14,13,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,13,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,13,14,13,14,13,14,14,14,14,14,14,14,14,14,14,
- 13,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,13,14,14,14,13,14,14,14,14,14,
- 14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,12,13,14,14,13,14,
- 14,14,14,14,14,14,14,14,13,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,13,
- 13,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,12,13,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,13,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,12,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,13,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,13,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,13,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,13,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 13,13,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,12,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,
+ 2, 2, 2, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 7, 8,
+ 8, 9, 8,10, 9,10,10,11,10,11,11,12,12,12,12, 7,
+ 7, 8, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,10,
+ 11,10,11,10,11,
};
static float _vq_quantthresh_res0_128_128_4[] = {
@@ -280,7 +109,7 @@
};
static static_codebook _vq_book_res0_128_128_4 = {
- 2, 2809,
+ 1, 53,
_vq_lengthlist_res0_128_128_4,
1, -526778368, 1611661312, 6, 0,
_vq_quantlist_res0_128_128_4,
1.5 +21 -20 vorbis/lib/books/res0_128_128_5.vqh
Index: res0_128_128_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_5.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_128_5.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_128_5.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -322,25 +323,25 @@
};
static long _vq_lengthlist_res0_128_128_5[] = {
- 2, 3, 3, 5, 4, 6, 6, 6, 6, 7, 6, 8, 8, 9, 8, 9,
- 11, 9,10,11,11,11,11,10,10,10,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, 7, 7, 8, 8, 8,11, 8,10, 9, 8,10,
- 9,10, 9,10, 9,10, 9, 9, 9,10,10, 9,10,10, 9,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10, 9,10,10, 9,10, 9,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10, 9,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 2, 3, 2, 4, 4, 5, 5, 6, 6, 7, 6, 7, 8, 8, 8, 9,
+ 9, 9, 9,11,12,11,11,10,13,11,11,12,12,10,13,13,
+ 13,13,13,13,12,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13, 7, 8, 8,10, 8, 9, 9, 9, 8, 9, 9,
+ 10, 9,10, 8,10, 9,11, 9,11, 9,10, 9,11,11,11,10,
+ 11,10,12,10,11,11,12,10,11,10,12,10,11,11,12,11,
+ 11,11,10,12,11,12,12,12,13,11,13,12,13,12,13,13,
+ 10,12,13,13,13,13,11,13,12,11,13,12,12,12,13,12,
+ 13,12,13,13,12,12,13,12,13,13,12,12,13,13,13,11,
+ 13,13,12,12,13,12,13,12,12,13,13,13,13,11,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,13,13,12,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,12,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,12,
};
static float _vq_quantthresh_res0_128_128_5[] = {
1.5 +20 -19 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_128_128aux.vqh 2001/02/02 03:52:07 1.4
+++ res0_128_128aux.vqh 2001/02/17 10:13:51 1.5
@@ -1,12 +1,13 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
* *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
* *
********************************************************************
@@ -19,20 +20,20 @@
#include "codebook.h"
static long _huff_lengthlist_res0_128_128aux[] = {
- 13,15,16,16,16,16,13,11,13,16,16,16,11,11,13,16,
- 15,15,10,14,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15, 9,10,12,13,15,15, 5, 2, 6,13,15,15,
- 7, 5, 8,14,15,15,10,12,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15, 8, 9,10,10,15,15, 5, 4,
- 8,12,15,15, 8, 7,10,13,15,15,12,12,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,10,10,12,13,
- 15,15, 9, 2, 4, 9,15,15,11, 3, 5, 9,15,15,13, 8,
- 9,14,15,15,15,14,15,15,15,15,15,15,15,15,15,15,
- 13,14,15,15,15,15,14, 6, 7,12,15,15,15, 6, 8,14,
- 15,15,14,11,13,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,14,11,12,15,15,15,
- 15,11,13,15,15,15,15,14,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,
+ 13,16,16,16,16,16,12,11,13,14,16,16,11,11,13,13,
+ 16,16,10,13,14,14,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,10,10,12,14,16,16, 5, 3, 7,13,16,16,
+ 6, 5, 9,14,16,16,10,12,14,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16, 8, 9,11,11,16,16, 4, 3,
+ 8,13,16,16, 7, 6,10,14,16,16,11,13,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,10,10,12,15,
+ 16,16, 9, 2, 4, 9,16,16,11, 3, 5, 9,16,16,13, 8,
+ 9,13,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 13,15,16,16,16,16,15, 5, 7,12,16,16,16, 6, 7,12,
+ 16,16,15,11,12,15,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16, 8,10,15,16,16,
+ 16,10,10,15,16,16,16,14,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,
};
static static_codebook _huff_book_res0_128_128aux = {
1.5 +5 -4 vorbis/lib/books/res0_96_1024_1.vqh
Index: res0_96_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_1024_1.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_1024_1.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -25,10 +26,10 @@
static long _vq_lengthlist_res0_96_1024_1[] = {
1, 4, 4, 5, 8, 7, 4, 7, 7, 5, 8, 8, 8,11,11, 8,
- 10,11, 5, 8, 8, 8,11,10, 8,10,10, 5, 8, 8, 8,11,
- 11, 8,11,10, 8,11,11,11,14,14,11,14,14, 8,11,11,
+ 10,10, 5, 8, 8, 8,11,10, 8,11,10, 5, 8, 8, 8,11,
+ 11, 8,11,11, 8,11,11,11,14,14,11,14,14, 8,11,11,
11,14,14,11,14,14, 4, 8, 8, 8,11,11, 8,11,11, 8,
- 11,11,11,14,14,11,14,14, 8,11,11,11,14,14,10,14,
+ 11,11,11,14,14,11,14,14, 8,11,10,11,14,14,10,14,
14,
};
1.4 +7 -6 vorbis/lib/books/res0_96_1024_2.vqh
Index: res0_96_1024_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_2.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_96_1024_2.vqh 2001/02/02 03:52:08 1.3
+++ res0_96_1024_2.vqh 2001/02/17 10:13:51 1.4
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
};
static long _vq_lengthlist_res0_96_1024_2[] = {
- 3, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 7, 7, 6,
- 7, 7, 5, 6, 6, 6, 7, 7, 6, 7, 7, 5, 6, 6, 6, 8,
- 8, 6, 8, 7, 6, 8, 7, 7, 9, 9, 8, 9, 9, 6, 7, 8,
- 7, 9, 9, 7, 9, 9, 5, 6, 6, 6, 7, 7, 6, 8, 7, 6,
- 8, 7, 7, 9, 9, 7, 9, 9, 6, 7, 7, 7, 9, 9, 7, 9,
+ 3, 5, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 7, 8, 6,
+ 7, 7, 5, 6, 6, 6, 8, 7, 6, 7, 7, 5, 6, 6, 6, 8,
+ 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
+ 8, 9, 9, 8, 9, 9, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
+ 8, 8, 8, 9, 9, 7, 9, 9, 6, 8, 8, 8, 9, 9, 7, 9,
9,
};
1.5 +95 -96 vorbis/lib/books/res0_96_1024_3.vqh
Index: res0_96_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_1024_3.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_1024_3.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -26,45 +27,45 @@
};
static long _vq_lengthlist_res0_96_1024_3[] = {
- 2, 4, 4, 6, 6, 5, 7, 7,10,10, 5, 7, 7,10,10, 7,
- 10,10,15,15, 7,10,10,15,15, 4, 7, 7, 9, 9, 7,10,
- 10,12,12, 7,10,10,12,12,10,13,12,19,18,10,13,13,
- 17,19, 4, 7, 7, 9, 9, 7,10,10,12,12, 7,10, 9,12,
- 12,10,13,12,19,17,10,13,12,18,16, 7,10,10,13,13,
- 10,13,13,18,17,10,13,13,17,16,16,18,17, 0,21,15,
- 20,19, 0, 0, 7,10, 9,13,13,10,13,13,16,18,10,13,
- 13,17,18,16,19,18, 0, 0,15,18,17,20, 0, 5, 7, 7,
- 9, 9, 7,10,10,13,13, 7,10,10,13,13,10,13,13,17,
- 18,10,13,13,18,18, 7,10,10,13,13,10,12,12,15,15,
- 10,12,12,15,15,13,15,15,20, 0,13,15,15,19,20, 7,
- 10,10,13,13,10,12,12,15,15,10,12,12,15,15,13,16,
- 15, 0,21,13,15,15, 0,21,10,13,13,17,17,13,15,16,
- 19,21,13,15,16,21,21,17,19,21, 0, 0,18,20,20, 0,
- 0,10,13,13,17,18,13,16,15,21,19,13,16,15,21,20,
- 18, 0,19, 0,21,20,21,20, 0,21, 5, 7, 7, 9, 9, 7,
- 10,10,13,12, 7,10,10,13,13,10,13,13,18,17,10,13,
- 13,18,18, 7,10,10,13,12,10,12,12,16,16,10,12,12,
- 15,15,13,16,15,21,20,13,15,15,19,21, 7,10,10,12,
- 12,10,12,12,15,15,10,12,12,15,15,13,15,15,20,20,
- 13,16,15,20,18,10,13,13,17,17,13,16,15, 0,20,13,
- 15,16,19, 0,18,19,21, 0, 0,18,18, 0, 0, 0,10,13,
- 13,18,18,13,15,15,21,20,13,15,15,21,21,19,21,21,
- 0, 0,18, 0,19, 0, 0, 7,10,10,13,13,10,13,13,18,
- 17,10,13,13,19,18,13,18,18, 0, 0,13,18,18, 0,21,
- 10,13,13,18,17,13,15,15,21,20,13,16,15,21,20,17,
- 21, 0, 0, 0,17, 0,20, 0, 0,10,13,13,17,17,13,16,
- 15,21,21,13,16,15,20,20,18,21, 0, 0, 0,18,21,21,
- 0, 0,15,18,20, 0, 0,18,19,19,21, 0,19, 0,21, 0,
- 0, 0, 0, 0, 0, 0,21, 0, 0, 0, 0,15,20,18, 0, 0,
- 18,20,21,21, 0,18,20,21, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 7,10,10,13,13,10,13,13,17,17,10,13,
- 13,18,18,13,17,18, 0, 0,13,18,17, 0, 0,10,13,13,
- 17,17,13,15,16, 0, 0,13,15,16,20, 0,18,21,20, 0,
- 0,19,19,21, 0, 0,10,13,13,18,18,13,15,15,21, 0,
- 13,16,16,20, 0,18,20,18, 0, 0,18, 0,21, 0, 0,15,
- 19,19,21,21,20, 0,21, 0, 0,20,19,21, 0, 0, 0, 0,
- 0, 0, 0,21, 0, 0, 0, 0,15,21,18, 0, 0,20,21,19,
- 0, 0,17,20,19, 0, 0, 0, 0, 0, 0, 0,20, 0, 0, 0,
+ 2, 4, 4, 6, 6, 5, 7, 7,10,10, 4, 7, 7,10,10, 7,
+ 10,10,15,15, 7,10,10,15,15, 5, 7, 7, 9, 9, 7,10,
+ 10,13,12, 7,10,10,12,12,10,13,13,17,18,10,13,13,
+ 17,18, 4, 7, 7, 9, 9, 7,10,10,12,12, 7,10,10,12,
+ 12,10,13,13,16,18,10,13,13,18,17, 7,10, 9,12,13,
+ 10,13,13,17,17,10,13,13,17,17,15,18,21, 0, 0,15,
+ 17,17,21, 0, 7, 9, 9,13,13,10,13,13,16,18,10,13,
+ 13,17,17,16,19,18, 0, 0,15,18,17, 0, 0, 5, 7, 7,
+ 9, 9, 7,10,10,13,13, 7,10,10,13,13,10,13,13,18,
+ 17,10,13,13,19,17, 7,10,10,13,13,10,12,13,15,16,
+ 10,12,12,15,15,13,15,16,19, 0,13,16,15,19,20, 7,
+ 10,10,13,12,10,13,12,16,15,10,12,12,15,16,13,16,
+ 15,20,18,13,15,15,19,18,10,13,13,17,17,13,15,16,
+ 0,19,13,16,15, 0,20,18,18,20, 0, 0,18,19, 0, 0,
+ 0,10,13,13,18,18,13,15,15,19,19,13,16,16,20,19,
+ 19,20,19, 0, 0,18,19,20,20, 0, 5, 7, 7, 9, 9, 7,
+ 10,10,13,13, 7,10,10,13,13,10,13,13,18,17,10,13,
+ 13,18,18, 7,10,10,13,13,10,12,12,16,16,10,12,12,
+ 15,16,13,15,15, 0, 0,13,15,15,19, 0, 7,10,10,12,
+ 13,10,12,12,15,15,10,12,12,16,15,13,16,15, 0, 0,
+ 13,15,15, 0, 0,10,13,13,18,18,13,15,15,20,20,13,
+ 16,15,19,19,18,19,19, 0, 0,17,18,20, 0, 0,10,13,
+ 13,17,17,13,15,15,19,20,13,15,15,20,18,17,19,20,
+ 0, 0,17,20,18,20,19, 7,10,10,13,13,10,13,13,18,
+ 18,10,13,13,17,17,14,18,19,20, 0,13,17,18, 0, 0,
+ 10,13,13,17,18,13,15,16, 0, 0,13,16,15, 0,20,18,
+ 20, 0, 0, 0,18,20, 0, 0, 0,10,13,13,18,18,13,16,
+ 15, 0, 0,13,16,15, 0, 0,17,20, 0, 0, 0,17, 0,20,
+ 0, 0,15,18,18, 0,20,17,20,19,20, 0,18, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15,18,18, 0, 0,
+ 18, 0,18, 0, 0,17,20, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7,10,10,13,13,10,13,13,18,18,10,13,
+ 13,18,17,14,18,18,20, 0,13,19,18, 0, 0,10,13,13,
+ 18,17,13,16,15,20, 0,13,16,16, 0, 0,18, 0,19,20,
+ 0,17,19,19, 0, 0,10,13,13,18,17,13,16,15,20, 0,
+ 13,15,15,19, 0,18, 0,20,20, 0,18, 0,20, 0, 0,15,
+ 18,19,20, 0,18,20,20, 0,20,18, 0,19, 0, 0, 0, 0,
+ 0, 0, 0, 0,19, 0,20, 0,15,17,19, 0, 0,18,19,20,
+ 0,20,18,19,19, 0, 0, 0, 0, 0, 0, 0, 0, 0,20, 0,
0,
};
@@ -93,65 +94,63 @@
81, 83, 91, 125, 126, 128, 130, 131,
133, 140, 141, 143, 150, 151, 153, 155,
156, 158, 165, 166, 168, 200, 201, 203,
- 205, 206, 208, 215, 216, 376, 380, 381,
- 383, 391, 400, 401, 403, 405, 406, 408,
- 415, 416, 451, 455, 456, 458, 0, 7,
- 15, 27, 32, 42, 75, 82, 90, 127,
- 132, 142, 152, 157, 167, 202, 207, 217,
- 375, 382, 390, 402, 407, 450, 457, 2,
- 17, 77, 92, 377, 392, 452, 9, 29,
- 34, 44, 84, 129, 134, 144, 154, 159,
- 204, 209, 384, 404, 409, 4, 19, 79,
- 94, 379, 3, 11, 35, 36, 38, 78,
- 86, 135, 136, 138, 160, 161, 163, 210,
- 211, 213, 378, 386, 410, 411, 413, 10,
- 37, 85, 137, 162, 212, 385, 412, 460,
- 12, 87, 387, 462, 39, 139, 164, 214,
- 414, 14, 89, 389, 13, 88, 388, 21,
- 45, 46, 48, 96, 145, 146, 148, 170,
- 171, 173, 220, 221, 396, 420, 20, 47,
- 95, 147, 172, 222, 395, 422, 470, 22,
- 97, 397, 49, 149, 174, 24, 399, 23,
+ 205, 206, 215, 216, 376, 380, 381, 383,
+ 391, 400, 401, 403, 405, 406, 415, 416,
+ 451, 455, 456, 458, 0, 7, 15, 27,
+ 32, 42, 75, 82, 90, 127, 132, 142,
+ 152, 157, 167, 202, 207, 217, 375, 382,
+ 390, 402, 407, 450, 457, 2, 17, 77,
+ 92, 377, 392, 452, 9, 29, 34, 44,
+ 84, 129, 134, 144, 154, 159, 204, 209,
+ 384, 404, 4, 19, 79, 379, 454, 3,
+ 11, 35, 36, 38, 78, 86, 135, 136,
+ 138, 160, 161, 163, 210, 211, 378, 386,
+ 410, 411, 10, 37, 85, 137, 162, 212,
+ 385, 412, 460, 12, 87, 387, 39, 139,
+ 164, 214, 414, 14, 89, 389, 13, 88,
+ 388, 21, 45, 46, 48, 96, 145, 146,
+ 148, 170, 171, 173, 220, 221, 396, 420,
+ 421, 20, 47, 95, 147, 172, 395, 22,
+ 97, 397, 49, 149, 174, 24, 23, 98,
18, 51, 55, 56, 58, 66, 175, 176,
- 178, 180, 181, 183, 190, 191, 426, 430,
- 431, 433, 441, 50, 57, 65, 177, 182,
- 192, 425, 432, 440, 52, 67, 427, 59,
- 179, 184, 194, 434, 54, 69, 429, 53,
+ 178, 180, 181, 183, 190, 191, 193, 393,
+ 426, 430, 431, 441, 50, 57, 65, 177,
+ 182, 192, 425, 432, 440, 52, 67, 427,
+ 59, 179, 184, 194, 54, 69, 429, 53,
61, 185, 186, 188, 428, 436, 60, 187,
- 435, 62, 437, 189, 64, 439, 63, 438,
- 71, 195, 196, 446, 70, 197, 445, 72,
- 447, 199, 74, 73, 68, 101, 105, 106,
- 108, 116, 225, 226, 228, 230, 231, 233,
- 240, 476, 480, 481, 483, 100, 107, 115,
- 227, 232, 242, 475, 482, 102, 117, 477,
- 109, 229, 234, 244, 104, 103, 111, 235,
- 236, 238, 486, 110, 237, 485, 112, 487,
- 239, 114, 113, 121, 245, 246, 120, 247,
- 122, 249, 123, 251, 255, 256, 258, 266,
+ 435, 62, 437, 189, 64, 63, 71, 195,
+ 196, 198, 70, 197, 445, 72, 447, 199,
+ 74, 73, 68, 101, 105, 106, 108, 116,
+ 225, 226, 228, 230, 231, 233, 240, 241,
+ 476, 480, 100, 107, 115, 227, 232, 242,
+ 475, 482, 102, 117, 477, 109, 229, 234,
+ 104, 103, 111, 235, 236, 238, 486, 110,
+ 237, 485, 112, 239, 114, 113, 121, 245,
+ 246, 248, 120, 247, 122, 314, 322, 362,
+ 364, 372, 374, 251, 255, 256, 258, 266,
275, 276, 278, 280, 281, 283, 290, 291,
- 293, 326, 330, 331, 341, 250, 257, 265,
+ 326, 330, 331, 333, 341, 250, 257, 265,
277, 282, 292, 325, 332, 340, 252, 267,
- 327, 342, 259, 279, 284, 294, 334, 254,
- 269, 329, 253, 261, 285, 286, 288, 328,
- 336, 260, 287, 335, 262, 337, 289, 264,
+ 327, 342, 259, 279, 284, 334, 254, 269,
+ 329, 253, 261, 285, 286, 288, 328, 336,
+ 260, 287, 335, 262, 337, 289, 264, 339,
263, 338, 271, 295, 296, 298, 346, 270,
- 297, 345, 272, 299, 274, 273, 268, 301,
+ 297, 345, 272, 347, 274, 273, 268, 301,
305, 306, 308, 316, 300, 307, 315, 302,
- 317, 309, 304, 319, 303, 311, 310, 312,
- 314, 313, 321, 320, 322, 324, 323, 318,
- 351, 355, 356, 358, 366, 350, 357, 365,
- 352, 367, 359, 354, 353, 361, 360, 362,
- 364, 363, 370, 372, 572, 612, 501, 505,
- 506, 508, 516, 525, 526, 528, 530, 531,
- 540, 541, 576, 580, 500, 507, 515, 527,
- 532, 542, 575, 582, 502, 517, 577, 509,
- 529, 504, 579, 503, 511, 535, 536, 538,
- 578, 586, 510, 537, 585, 512, 587, 514,
- 513, 521, 545, 546, 520, 547, 595, 522,
- 551, 555, 556, 558, 566, 550, 557, 565,
- 552, 567, 554, 553, 561, 560, 562, 563,
- 570, 601, 605, 606, 600, 607, 602, 611,
- 610, 620,
+ 317, 309, 304, 303, 311, 310, 312, 313,
+ 321, 320, 351, 355, 356, 358, 366, 350,
+ 357, 365, 352, 367, 359, 354, 353, 361,
+ 360, 363, 371, 370, 373, 501, 505, 506,
+ 508, 516, 525, 526, 528, 530, 531, 533,
+ 540, 543, 576, 580, 581, 500, 507, 515,
+ 527, 532, 542, 575, 582, 502, 517, 577,
+ 509, 529, 584, 504, 503, 511, 535, 536,
+ 578, 510, 537, 585, 512, 587, 514, 513,
+ 521, 545, 546, 596, 520, 547, 522, 598,
+ 572, 518, 551, 555, 556, 558, 550, 557,
+ 565, 552, 567, 554, 553, 561, 560, 562,
+ 563, 570, 568, 601, 605, 606, 600, 607,
+ 602, 609, 611, 610, 612, 622,
};
static long _vq_fitmap_res0_96_1024_3[] = {
@@ -160,14 +159,14 @@
};
static long _vq_fitlength_res0_96_1024_3[] = {
- 506, 506, 506, 506, 506, 506, 506, 506,
- 506, 506, 506, 506, 506, 506, 506, 506,
+ 494, 494, 494, 494, 494, 494, 494, 494,
+ 494, 494, 494, 494, 494, 494, 494, 494,
};
static encode_aux_pigeonhole _vq_auxp_res0_96_1024_3 = {
-3, 1, 6, 2,
_vq_pigeonmap_res0_96_1024_3,
- 506,
+ 494,
_vq_fitlist_res0_96_1024_3,
_vq_fitmap_res0_96_1024_3,
_vq_fitlength_res0_96_1024_3
1.5 +35 -34 vorbis/lib/books/res0_96_1024_4.vqh
Index: res0_96_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_4.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_1024_4.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_1024_4.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -26,45 +27,45 @@
};
static long _vq_lengthlist_res0_96_1024_4[] = {
- 5, 6, 5, 8, 8, 6, 6, 6, 9, 9, 5, 6, 6, 9, 9, 8,
+ 5, 5, 5, 8, 8, 6, 6, 6, 9, 9, 5, 6, 6, 9, 8, 8,
9, 9,11,11, 8, 9, 9,11,11, 6, 7, 6, 9, 9, 6, 7,
7,10,10, 6, 7, 7,10,10, 9,10,10,12,12, 9,10,10,
12,12, 6, 6, 6, 9, 9, 6, 7, 7,10,10, 6, 7, 7,10,
10, 9,10,10,12,12, 9,10,10,12,12, 8, 9, 9,12,12,
- 9,10,10,13,12, 9,10,10,13,13,12,13,13,15,14,12,
- 13,13,15,15, 8, 9, 9,12,12, 9,10,10,13,13, 9,10,
- 10,13,13,12,13,13,15,15,12,13,13,15,15, 6, 7, 7,
- 9, 9, 7, 8, 8,10,10, 7, 7, 7,10,10, 9,10,10,13,
- 13, 9,10,10,12,12, 7, 8, 8,10,10, 7, 8, 8,11,11,
- 7, 8, 8,11,11,10,11,11,13,13,10,11,11,13,13, 7,
+ 9,10,10,13,13, 9,10,10,12,13,12,13,13,14,14,12,
+ 13,13,15,15, 8, 9, 9,12,12, 9,10,10,12,13, 9,10,
+ 10,13,13,12,12,12,15,15,12,13,12,15,14, 6, 7, 7,
+ 9, 9, 7, 8, 8,10,10, 7, 7, 7,10,10, 9,10,10,12,
+ 13, 9,10,10,13,13, 7, 8, 8,10,10, 8, 8, 8,11,11,
+ 8, 8, 8,11,10,10,11,11,13,13,10,11,11,13,13, 7,
8, 8,10,10, 7, 8, 8,11,11, 7, 8, 8,11,11,10,11,
- 11,13,13,10,11,11,13,13, 9,11,10,14,13,10,11,11,
- 13,14,10,11,11,14,14,13,13,14,15,16,13,13,14,15,
- 15, 9,10,11,13,13,10,11,11,14,13,10,11,11,13,14,
- 13,13,13,16,15,13,13,14,15,15, 6, 7, 7, 9, 9, 7,
- 7, 7,10,10, 7, 7, 7,10,10, 9,10,10,12,13, 9,10,
- 10,13,13, 7, 8, 8,10,10, 7, 8, 8,11,11, 7, 8, 8,
- 11,11,10,11,11,13,13,10,11,11,13,13, 7, 8, 8,10,
- 10, 7, 8, 8,11,11, 7, 8, 8,11,11,10,11,11,13,13,
- 10,11,11,13,13, 9,11,10,13,13,10,11,11,14,13,10,
+ 11,13,13,10,11,11,13,13, 9,10,10,13,13,10,11,11,
+ 13,13,10,11,11,13,13,13,13,13,15,15,13,14,13,15,
+ 15, 9,10,10,13,13,10,11,11,13,13,10,11,11,14,13,
+ 13,13,13,16,15,13,13,13,15,15, 6, 7, 7, 9, 9, 7,
+ 8, 7,10,10, 7, 7, 8,10,10, 9,10,10,13,12, 9,10,
+ 10,12,12, 7, 8, 8,10,10, 8, 8, 8,11,10, 7, 8, 8,
+ 11,10,10,11,11,13,13,10,11,11,13,13, 7, 8, 8,10,
+ 10, 7, 8, 8,11,11, 7, 8, 8,11,10,10,11,11,13,13,
+ 10,11,11,13,12, 9,10,10,13,13,10,11,11,13,13,10,
11,11,13,13,13,13,13,15,15,13,13,13,15,15, 9,10,
- 10,13,13,10,11,11,13,14,10,11,11,13,13,13,14,13,
- 16,15,13,14,13,15,14, 8,10,10,12,12,10,11,11,13,
- 13, 9,10,10,13,13,13,14,14,16,16,13,13,14,15,15,
- 9,11,11,13,13,11,11,11,14,14,10,12,11,14,14,14,
- 14,14,15,16,13,14,14,16,16, 9,11,11,13,13,11,11,
- 11,14,14,10,11,11,14,14,14,14,14,15,16,13,14,14,
- 15,16,13,14,13,15,15,13,14,14,16,16,14,14,14,16,
- 16,16,15,16,16,18,15,16,16,18,17,13,13,14,16,16,
- 13,14,14,15,15,13,14,14,15,16,16,16,16,16,16,16,
- 16,15,17,17, 8, 9, 9,12,12, 9,11,11,13,13,10,11,
- 11,13,13,13,13,13,15,15,13,13,13,15,15, 9,11,11,
- 13,13,10,11,11,14,14,10,11,11,14,14,14,14,14,15,
- 16,14,14,14,15,16, 9,11,10,13,13,10,11,12,13,13,
- 10,11,11,14,14,13,14,14,16,16,13,14,14,16,16,13,
- 14,13,16,15,13,14,14,16,16,13,14,14,16,15,16,16,
- 16,17,17,15,16,16,17,17,13,14,14,16,15,13,14,14,
- 16,16,14,13,13,15,16,16,16,15,17,17,16,16,15,17,
+ 11,13,13,10,11,11,13,13,10,11,11,13,13,13,14,13,
+ 15,15,13,13,13,15,15, 8,10, 9,12,12,10,11,11,13,
+ 13,10,10,11,13,13,12,13,13,16,15,12,13,13,15,15,
+ 9,11,11,13,13,10,11,11,14,14,11,11,11,14,14,13,
+ 14,14,15,15,13,14,14,16,15, 9,10,11,13,13,11,11,
+ 11,14,14,10,11,11,13,14,13,14,13,16,15,14,14,14,
+ 16,15,13,13,13,16,15,13,14,14,16,15,13,14,14,15,
+ 16,16,15,15,16,17,16,16,15,17,17,13,13,14,15,16,
+ 13,14,14,15,16,13,14,14,15,16,15,15,15,16,17,15,
+ 15,15,16,18, 8,10,10,12,12,10,11,11,13,13,10,11,
+ 11,13,13,13,13,14,15,15,12,14,13,15,15, 9,11,11,
+ 13,13,11,11,11,14,14,10,11,11,14,13,13,14,14,15,
+ 15,13,14,14,16,15, 9,11,11,13,13,10,11,11,13,14,
+ 11,11,11,13,13,13,14,14,15,16,14,14,14,16,15,13,
+ 14,14,15,14,13,14,13,15,16,13,13,14,15,16,16,15,
+ 16,17,18,15,15,16,16,17,13,14,13,15,15,13,13,13,
+ 16,15,13,14,13,15,16,15,16,15,17,18,15,15,15,18,
17,
};
1.5 +6 -5 vorbis/lib/books/res0_96_1024_5.vqh
Index: res0_96_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_5.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_1024_5.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_1024_5.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -31,10 +32,10 @@
static long _vq_lengthlist_res0_96_1024_5[] = {
1, 4, 4, 6, 6, 6, 6, 7, 7, 4, 6, 6, 9, 9, 9, 9,
- 11,11, 4, 6, 6, 9, 9, 9, 9,11,11, 6, 9, 9,12,12,
- 12,12,13,13, 6, 9, 9,12,12,11,11,13,13, 6, 9, 9,
- 12,12,13,13,15,15, 6, 9, 9,12,12,13,13,15,15, 8,
- 12,12,14,14,16,16,17,16, 8,12,12,14,14,15,16,16,
+ 11,11, 4, 6, 6, 9, 9, 9, 9,11,11, 6, 9, 9,12,11,
+ 11,12,13,13, 6, 9, 9,12,12,12,12,13,14, 6, 9, 9,
+ 12,12,13,13,15,14, 6, 9, 9,12,12,13,13,15,15, 8,
+ 12,12,14,14,15,15,16,17, 8,12,12,14,14,15,16,16,
17,
};
1.5 +3 -2 vorbis/lib/books/res0_96_1024_6.vqh
Index: res0_96_1024_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_6.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_1024_6.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_1024_6.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -34,7 +35,7 @@
8, 8, 4, 4, 4, 6, 6, 7, 7, 8, 8, 6, 6, 6, 8, 8,
9, 9,10,10, 6, 6, 6, 8, 8, 9, 9,10,10, 7, 8, 8,
9, 9,10,10,11,11, 7, 8, 8, 9, 9,10,10,11,11, 8,
- 9, 9,10,11,12,11,12,12, 8, 9, 9,10,10,12,11,12,
+ 9, 9,11,10,11,11,12,12, 8, 9, 9,10,11,11,11,12,
12,
};
1.5 +14 -13 vorbis/lib/books/res0_96_1024_7.vqh
Index: res0_96_1024_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_7.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_1024_7.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_1024_7.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -36,20 +37,20 @@
};
static long _vq_lengthlist_res0_96_1024_7[] = {
- 3, 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 5,
+ 3, 4, 4, 5, 5, 6, 6, 7, 6, 7, 7, 8, 8, 9, 9, 5,
5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10, 4, 5,
5, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9,10,10, 6, 7, 7,
- 8, 8, 8, 8, 9, 8, 9, 9,10,10,11,11, 6, 7, 7, 8,
- 8, 8, 8, 9, 8, 9, 9,10,10,11,11, 7, 8, 8, 9, 9,
- 9, 9, 9, 9,10,10,11,11,11,12, 7, 8, 8, 9, 9, 9,
- 9,10, 9,10,10,11,11,11,11, 8, 9, 9,10,10,10,10,
- 11,10,11,11,12,12,12,12, 8, 9, 9,10,10,10,10,10,
- 10,11,11,12,11,12,12, 8, 9, 9,10,10,11,11,11,11,
- 12,12,13,13,14,13, 8, 9, 9,10,10,11,11,11,11,12,
- 12,13,13,13,14,10,11,11,12,12,12,12,13,13,13,13,
- 14,14,15,15,10,11,11,12,12,12,12,13,13,13,13,14,
- 14,14,15,12,13,13,13,13,14,14,14,14,15,15,16,15,
- 16,16,12,13,13,14,13,14,14,14,14,15,15,16,15,16,
+ 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11, 6, 7, 7, 8,
+ 8, 8, 8, 9, 9, 9, 9,10,10,11,11, 7, 8, 8, 9, 9,
+ 9, 9,10, 9,10,10,11,11,12,12, 7, 8, 8, 9, 9, 9,
+ 9,10,10,10,10,11,11,12,12, 8, 9, 9,10,10,10,10,
+ 11,10,11,11,12,12,13,12, 8, 9, 9,10,10,10,10,11,
+ 10,11,11,12,12,13,12, 8, 9, 9,10,10,11,11,11,11,
+ 12,12,13,13,13,14, 8, 9, 9,10,10,11,11,11,11,12,
+ 12,13,13,14,14,10,11,11,12,12,12,12,13,13,13,13,
+ 14,14,15,15,10,11,11,12,12,12,12,13,13,13,14,14,
+ 14,15,15,12,13,13,14,14,14,14,14,14,15,15,15,16,
+ 16,16,12,13,13,14,13,14,14,14,14,14,15,15,16,16,
16,
};
1.4 +33 -32 vorbis/lib/books/res0_96_1024_8.vqh
Index: res0_96_1024_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_8.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_96_1024_8.vqh 2001/02/02 03:52:08 1.3
+++ res0_96_1024_8.vqh 2001/02/17 10:13:51 1.4
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -47,44 +48,44 @@
static long _vq_lengthlist_res0_96_1024_8[] = {
5, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 8,
- 8, 9, 9,10,10,10,11,11,11, 6, 6, 6, 6, 6, 6, 6,
+ 8, 9, 9,10,10,10,10,11,11, 6, 6, 6, 6, 6, 6, 6,
7, 6, 7, 7, 8, 8, 9, 9, 8, 8, 9, 9,10,10,10,11,
11,11, 6, 6, 6, 6, 6, 6, 6, 7, 6, 7, 7, 8, 8, 9,
- 9, 8, 8, 9, 9,10,10,10,11,11,11, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9,10,10,11,
+ 9, 8, 8, 9, 9,10,10,11,10,11,11, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,11,
11,11,11,12, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 9,
- 9, 9, 9, 9, 9,10,10,11,11,11,11,11,12, 8, 8, 8,
+ 9, 9, 9, 9, 9,10,10,10,11,11,11,11,12, 8, 8, 8,
8, 8, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,
- 11,11,12,12,12,12, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9,
+ 11,11,11,12,12,12, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9,
9, 9, 9,10,10,10,10,10,10,11,11,11,12,12,12, 9,
- 9, 9, 8, 9, 9, 9, 9, 9,10,10,10,10,11,11,10,10,
- 11,11,12,12,12,13,12,13, 9, 9, 9, 8, 9, 9, 9, 9,
- 9,10,10,10,10,11,11,10,11,11,11,12,12,12,13,13,
+ 9, 9, 8, 9, 9, 9, 9, 9,10, 9,10,10,11,11,10,11,
+ 11,11,12,12,12,12,13,13, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9,10, 9,10,10,11,11,11,11,11,11,12,12,12,12,12,
13,10,10,10,10,10,10,10,10,10,11,11,11,11,12,12,
- 11,12,12,12,12,13,13,13,13,14,10,10,10,10,10,10,
- 10,10,10,11,11,11,11,12,12,12,11,12,12,13,13,13,
- 13,13,14,11,11,11,11,11,11,11,11,11,12,12,12,12,
- 13,13,13,13,13,13,13,14,14,14,15,14,11,11,11,11,
- 11,11,11,11,11,12,12,12,12,13,13,13,13,13,13,13,
- 14,14,14,14,15,13,13,13,12,12,13,12,13,12,13,13,
- 14,14,14,14,14,14,14,14,16,15,15,16,15,15,13,12,
- 13,12,12,12,13,13,13,13,13,14,14,14,14,14,14,14,
- 15,15,15,16,15,16,17,13,13,13,13,13,13,14,14,14,
- 14,14,15,15,14,15,16,15,16,15,17,16,16,16,17,17,
- 12,13,13,13,13,14,13,13,14,14,14,14,15,15,15,15,
- 15,16,15,18,16,17,19,16,17,15,16,15,15,15,15,16,
- 16,16,16,16,17,16,18,16,18,17,16,17,18,18,18,18,
- 19,18,16,15,15,15,15,16,16,16,16,16,16,16,16,16,
- 17,18,17,17,17,17,17,17,18,18,18,17,18,17,19,18,
- 19,19,18,18,18,18,19,19,18,19,19,18,18,19,19,19,
- 19,19,18,18,17,18,19,17,19,19,18,18,17,18,17,17,
- 17,19,19,18,19,17,18,19,19,19,18,19,19,19,19,19,
- 19,19,19,19,19,19,18,18,19,19,19,18,19,19,19,19,
- 19,18,18,19,19,19,18,18,19,19,19,18,19,19,19,19,
- 18,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+ 11,11,12,12,13,13,13,14,13,14,10,10,10,10,10,10,
+ 10,10,10,11,11,11,11,12,12,11,11,12,12,12,13,13,
+ 13,14,14,11,11,11,11,11,11,11,11,11,12,12,13,12,
+ 13,13,13,13,13,13,14,14,14,14,14,15,11,11,11,11,
+ 11,11,11,11,11,12,12,12,12,13,13,13,13,13,13,14,
+ 14,14,14,14,14,13,12,12,13,12,12,12,13,13,13,13,
+ 14,14,15,14,14,14,14,14,15,15,15,15,16,16,13,13,
+ 12,12,12,12,12,13,13,13,13,14,13,14,14,14,14,14,
+ 14,15,15,15,16,16,16,12,13,13,13,14,13,14,14,14,
+ 14,14,15,15,15,15,15,16,16,15,17,18,16,18,16,16,
+ 12,13,13,13,13,13,13,14,14,14,14,15,15,15,15,15,
+ 15,15,15,16,17,17,16,17,16,15,15,15,16,16,16,15,
+ 16,16,17,16,17,16,18,17,16,16,17,17,19,18,19,18,
+ 18,19,15,16,15,15,15,16,16,15,16,16,16,16,17,16,
+ 16,16,16,17,18,17,18,17,18,17,18,16,18,19,18,18,
+ 19,19,19,18,19,18,18,19,18,18,19,18,18,19,19,19,
+ 19,19,19,19,17,18,17,18,18,19,18,18,18,19,18,18,
+ 18,19,18,18,18,18,17,18,19,19,19,19,19,19,19,18,
+ 19,19,19,18,19,19,19,19,19,19,19,18,18,19,19,18,
+ 19,19,19,19,19,18,19,19,19,18,19,18,19,19,19,19,
+ 19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,19,
+ 19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,19,
+ 19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,
19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,18,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,18,19,19,19,19,19,19,19,19,
19,
};
1.4 +6 -5 vorbis/lib/books/res0_96_1024_9.vqh
Index: res0_96_1024_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_9.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_96_1024_9.vqh 2001/02/02 03:52:08 1.3
+++ res0_96_1024_9.vqh 2001/02/17 10:13:51 1.4
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -80,10 +81,10 @@
};
static long _vq_lengthlist_res0_96_1024_9[] = {
- 3, 3, 3, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 7, 7, 7,
- 7, 8, 8, 8, 9, 9, 9,10,10, 7, 7, 8, 8, 8, 8, 9,
- 9, 9, 9,10,11,11,11,12,12,13,13,12,13,14,14,14,
- 15,16,15,16,15,16,16,17,17,17,17,
+ 3, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 7, 7, 8,
+ 8, 8, 8, 9, 9,10,10,10,11, 8, 8, 8, 9, 9, 9,10,
+ 10,10,10,11,11,12,12,13,13,13,13,13,13,14,15,16,
+ 15,16,15,17,16,17,18,17,18,17,17,
};
static float _vq_quantthresh_res0_96_1024_9[] = {
1.5 +66 -65 vorbis/lib/books/res0_96_1024aux.vqh
Index: res0_96_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024aux.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_1024aux.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_1024aux.vqh 2001/02/17 10:13:51 1.5
@@ -1,12 +1,13 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
* *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
* *
********************************************************************
@@ -19,68 +20,68 @@
#include "codebook.h"
static long _huff_lengthlist_res0_96_1024aux[] = {
- 4, 8,13,11,15,12,15,16,20,20, 7, 7,10,11,12,13,
- 17,15,19,19,14,11,11,13,14,17,19,18,19,19,10,11,
- 13,12,14,13,18,18,19,19,15,12,14,14,15,18,19,19,
- 19,19,11,12,16,13,18,13,19,17,19,19,16,18,18,18,
- 18,19,19,19,19,19,15,16,19,17,19,17,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19, 6, 7,11,11,13,13,17,17,19,19, 6, 3,
- 5, 6, 8, 9,13,14,19,19,11, 5, 5, 8, 8,12,15,18,
- 19,19,10, 6, 8, 7, 9,10,15,14,18,19,12, 8, 8,10,
- 10,13,16,19,19,19,10, 9,11, 9,13,10,17,15,19,19,
- 16,13,15,15,17,17,18,19,19,19,14,14,17,15,17,15,
- 18,17,19,19,19,19,19,19,19,18,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,11,11,12,14,14,15,19,17,
- 19,19, 9, 5, 5, 8, 8,11,16,17,19,19,11, 5, 4, 8,
- 7,12,15,17,19,19,13, 7, 7, 9,10,12,16,18,19,19,
- 14, 8, 7,10, 9,13,16,17,19,19,12,10,11,11,13,13,
- 17,17,19,19,18,14,14,15,16,17,17,19,19,19,13,15,
- 16,15,18,16,19,18,19,19,19,19,19,19,19,18,19,19,
+ 5, 7,12,11,14,12,18,17,18,19, 8, 7, 9,11,11,13,
+ 18,16,19,19,14,10,11,13,13,18,19,19,19,19,10,11,
+ 13,12,14,13,19,18,19,19,14,12,14,15,16,18,18,19,
+ 19,19,11,12,16,13,18,13,19,18,19,19,16,17,19,19,
+ 19,19,19,19,19,19,14,16,19,19,19,18,19,19,19,19,
+ 19,18,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+ 19,19,19,19, 7, 7,10,11,12,13,19,16,19,19, 6, 3,
+ 4, 6, 8, 9,14,15,19,19,10, 5, 5, 8, 8,12,16,18,
+ 19,19, 9, 6, 7, 7,10,10,15,15,19,19,12, 8, 8,10,
+ 11,13,16,18,19,19,10, 8,11, 9,13,10,16,15,18,19,
+ 16,14,15,15,17,17,17,18,19,19,14,14,17,15,18,15,
+ 18,16,19,19,18,18,19,19,19,19,19,18,19,19,19,19,
+ 19,19,19,19,19,19,19,19,12,10,12,14,15,16,19,19,
+ 19,19, 9, 4, 5, 8, 9,11,16,17,19,19,11, 5, 4, 8,
+ 8,13,16,17,19,19,13, 7, 8, 9,11,12,17,17,19,19,
+ 14, 8, 8,10,10,14,16,17,19,19,12,10,11,11,14,13,
+ 18,17,19,19,19,14,15,15,16,17,18,19,19,19,12,14,
+ 15,15,17,16,19,19,19,19,19,19,18,19,19,19,19,19,
19,19,19,19,19,19,19,19,19,19,19,19, 9,10,13,12,
- 14,13,19,17,19,19, 9, 6, 7, 7, 9, 9,15,14,18,19,
- 13, 7, 7, 9,10,12,17,18,19,19,11, 7, 8, 7,10, 9,
- 16,14,19,19,14, 9, 9,10,12,13,17,18,19,19,11, 9,
- 11, 9,13,10,16,14,19,19,17,14,15,14,16,15,19,18,
- 19,19,13,13,15,13,17,13,19,16,19,19,19,19,19,18,
- 18,17,19,18,19,19,19,19,19,19,19,19,19,19,19,19,
- 14,12,13,14,15,16,19,19,19,19,11, 7, 7, 9,10,11,
- 15,16,19,19,13, 7, 6, 9, 9,12,17,18,19,19,14, 8,
- 9, 9,11,11,16,16,19,19,15, 9, 9,10,11,13,17,18,
- 19,19,13,10,11,10,13,12,18,17,19,19,18,14,16,16,
- 16,17,18,18,19,19,15,14,16,14,17,15,19,17,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19, 9,11,15,12,16,13,18,16,19,19,11, 8,
- 9, 8,11, 9,15,14,18,19,16, 9,10,10,12,13,18,17,
- 19,19,12, 8,10, 8,11, 9,16,14,19,19,16,10,11,11,
- 14,13,19,17,19,19,12, 9,11, 8,13, 9,17,13,19,19,
- 18,14,16,15,17,14,19,17,19,19,14,12,15,12,16,11,
- 17,14,19,19,19,18,19,18,19,16,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,12,13,15,15,17,19,19,18,
- 19,19,15,10,10,10,12,11,16,15,19,19,17,11,11,12,
- 13,13,17,15,19,19,16,10,11,10,13,11,16,14,19,19,
- 18,11,12,12,10,12,13,12,19,19,15,11,13,10,14,11,
- 15,13,19,19,18,14,15,15,13,13,13,13,17,19,16,13,
- 17,13,15,12,14,12,17,19,18,19,19,19,18,19,17,16,
+ 15,13,18,17,19,19, 9, 6, 7, 7,10, 9,16,14,18,19,
+ 13, 7, 7, 9,10,12,16,17,19,19,11, 7, 9, 7,11, 9,
+ 16,14,19,19,14, 9,10,11,12,13,19,19,19,19,11, 9,
+ 11, 9,13,10,17,14,19,19,19,14,16,15,18,15,18,19,
+ 19,19,13,14,16,13,17,12,18,17,19,19,19,18,19,18,
+ 19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,
+ 14,12,13,14,15,17,19,19,19,19,11, 7, 8, 9,10,11,
+ 16,16,19,19,13, 7, 7, 9,10,13,17,17,19,19,14, 8,
+ 9, 9,11,11,16,17,19,19,16, 9, 9,11,12,14,17,18,
+ 19,19,13,10,11,10,13,12,17,16,19,19,18,14,16,16,
+ 17,17,18,19,19,19,15,15,15,14,19,15,19,17,19,19,
+ 19,19,19,18,18,18,19,19,19,19,19,19,19,19,19,19,
+ 19,19,19,19, 9,11,15,13,17,13,18,16,19,19,10, 8,
+ 9, 8,11, 9,17,14,19,19,17, 9,10,10,12,13,18,17,
+ 19,19,12, 8,10, 8,12, 9,16,14,19,19,16,10,11,11,
+ 14,13,17,17,19,19,12, 9,11, 8,12, 9,16,13,19,19,
+ 19,14,16,15,17,14,19,18,19,19,14,12,15,12,16,11,
+ 18,14,19,19,19,18,19,17,19,17,19,19,19,19,19,19,
+ 19,19,19,19,19,19,19,19,12,13,15,15,17,18,19,19,
+ 19,19,15,10,10,10,12,12,17,16,19,19,18,11,11,12,
+ 13,13,17,15,19,19,13, 9,11, 9,13,11,16,15,19,19,
+ 17,11,12,12,10,12,13,12,19,19,12,10,13,10,14,11,
+ 15,13,19,19,16,14,16,15,13,13,13,12,18,19,14,13,
+ 16,13,16,12,14,12,18,19,18,18,19,18,18,16,16,17,
18,19,19,19,19,19,19,19,19,19,19,19,10,13,16,14,
- 17,15,18,17,19,19,13,10,12,11,13,11,15,15,19,19,
- 19,13,12,13,13,14,15,15,19,19,12, 9,13,10,13,11,
- 14,14,19,19,16,11,11,12, 8,11, 9,11,18,19,10,10,
- 13, 9,13, 9,11,10,15,19,16,12,12,11, 8, 9, 7, 9,
- 15,19,11,11,14,10,10, 9, 8, 8,13,19,15,17,19,16,
- 17,14,13,13,18,19,19,19,19,19,19,19,19,19,19,19,
- 12,15,18,17,17,18,19,18,19,19,14,12,13,14,13,15,
- 14,18,19,19,18,14,14,16,13,17,14,18,19,19,13,12,
- 14,14,13,14,13,16,19,19,18,15,12,14, 8,12, 9,12,
- 18,19,11,12,15,12,13,11,12,12,17,19,16,14,11,13,
- 7,10, 6, 8,14,19,13,14,13,12, 9,10, 6, 7,13,19,
- 15,17,19,18,14,14,12,12,17,19,19,19,19,19,19,19,
- 19,19,19,19,15,16,18,19,19,19,18,19,19,19,17,16,
- 15,16,14,16,15,18,19,19,19,18,16,19,15,18,15,17,
- 19,19,19,17,15,16,15,15,14,16,19,19,19,17,15,18,
- 11,15,11,14,19,19,18,18,17,17,15,14,13,15,19,19,
- 19,18,14,16, 9,13, 8,10,15,19,19,19,14,16,11,13,
- 9, 9,14,19,19,19,19,18,16,16,14,14,19,19,19,19,
+ 19,16,19,16,19,19,13,11,11,11,12,11,15,15,18,19,
+ 19,13,12,14,13,14,15,14,18,19,12,10,11,10,12,10,
+ 14,14,18,19,16,11,11,12, 8,11, 9,11,18,19,10,10,
+ 12, 9,13, 9,11,10,16,19,15,12,12,11, 8, 9, 7, 9,
+ 14,19,11,11,14,10,10, 9, 8, 8,13,19,16,18,18,16,
+ 17,14,13,13,17,19,19,19,19,19,19,19,19,19,19,19,
+ 12,15,17,17,18,18,18,19,19,19,14,13,13,14,13,15,
+ 14,19,19,19,19,15,13,16,12,16,14,17,19,19,16,14,
+ 14,14,13,14,13,15,19,19,19,14,12,15, 8,13, 9,12,
+ 18,19,13,13,16,12,13,11,11,12,19,19,18,14,11,13,
+ 7,10, 6, 8,13,19,14,13,13,12, 9,10, 6, 7,13,19,
+ 16,19,18,16,14,15,12,12,17,19,19,19,19,19,19,18,
+ 19,19,19,19,15,18,18,19,19,19,18,19,19,19,16,16,
+ 16,15,15,17,15,18,19,19,19,18,16,18,15,19,14,17,
+ 19,19,18,17,16,17,14,16,14,16,19,19,19,18,15,17,
+ 11,15,11,14,19,19,18,18,17,17,16,14,14,15,19,19,
+ 19,17,14,15, 9,13, 8,10,15,19,19,19,15,16,11,13,
+ 9, 9,14,19,19,19,19,19,15,17,14,14,19,19,19,19,
19,19,19,19,19,19,19,19,
};
1.5 +7 -6 vorbis/lib/books/res0_96_128_1.vqh
Index: res0_96_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128_1.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_128_1.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_128_1.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
};
static long _vq_lengthlist_res0_96_128_1[] = {
- 3, 4, 4, 4, 6, 6, 4, 6, 6, 4, 6, 6, 6, 9, 9, 6,
- 9, 9, 4, 6, 6, 6, 9, 8, 6, 9, 9, 5, 7, 6, 7, 9,
- 9, 6, 9, 9, 7, 9, 9, 9,12,12, 9,12,11, 6, 9, 9,
- 9,11,11, 9,11,11, 4, 6, 6, 7, 9, 9, 7, 9, 9, 6,
- 9, 9, 9,12,12, 9,11,12, 6, 9, 9, 9,12,11, 9,11,
+ 2, 4, 4, 4, 7, 6, 4, 6, 6, 4, 7, 7, 7,10,10, 7,
+ 9,10, 4, 7, 7, 7,10, 9, 7,10, 9, 4, 7, 7, 7,10,
+ 10, 7,10,10, 7,10,10,10,12,13,10,13,13, 7,10,10,
+ 9,13,12,10,13,12, 4, 7, 7, 7,10,10, 7,10,10, 7,
+ 10,10,10,13,12, 9,11,13, 7,10,10,10,13,13,10,13,
12,
};
1.5 +7 -6 vorbis/lib/books/res0_96_128_2.vqh
Index: res0_96_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128_2.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_128_2.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_128_2.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -24,11 +25,11 @@
};
static long _vq_lengthlist_res0_96_128_2[] = {
- 5, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 6, 7, 6,
- 6, 7, 5, 6, 6, 6, 7, 6, 6, 7, 6, 6, 6, 6, 6, 7,
- 7, 6, 6, 7, 6, 7, 7, 7, 7, 8, 7, 8, 8, 6, 7, 7,
- 7, 8, 7, 7, 8, 8, 6, 6, 6, 6, 7, 7, 6, 7, 7, 6,
- 7, 7, 7, 8, 8, 6, 7, 8, 6, 7, 7, 7, 8, 8, 7, 8,
+ 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6,
+ 6, 7, 6, 6, 6, 6, 7, 6, 6, 7, 6, 6, 6, 6, 7, 7,
+ 7, 6, 6, 6, 6, 7, 6, 6, 6, 8, 7, 8, 8, 6, 6, 7,
+ 6, 8, 7, 7, 7, 8, 6, 6, 6, 6, 6, 6, 6, 7, 7, 6,
+ 7, 6, 7, 8, 7, 6, 6, 8, 6, 6, 7, 7, 8, 8, 6, 8,
7,
};
1.5 +8 -7 vorbis/lib/books/res0_96_128_3.vqh
Index: res0_96_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128_3.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_128_3.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_128_3.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -30,12 +31,12 @@
};
static long _vq_lengthlist_res0_96_128_3[] = {
- 3, 4, 3, 5, 5, 7, 7, 7, 7, 4, 4, 4, 6, 6, 7, 7,
- 7, 7, 4, 4, 4, 6, 6, 7, 7, 7, 7, 6, 7, 7, 9, 9,
- 9,10, 9,10, 6, 7, 7, 9, 9,10, 9, 9,10,10,10,10,
- 11,11,12,12,12,12,10,10,10,12,12,12,12,12,12,11,
- 12,12,14,13,14,14,15,14,12,12,12,14,14,15,14,14,
- 14,
+ 3, 3, 3, 5, 5, 8, 8, 8, 8, 4, 4, 4, 6, 6, 8, 8,
+ 9, 8, 4, 4, 4, 6, 6, 8, 8, 8, 9, 6, 7, 7,10,10,
+ 11,11,11,11, 6, 7, 7,10,10,11,11,11,11, 9,10,10,
+ 12,13,13,14,13,14, 9,10,10,12,12,13,14,13,13,11,
+ 13,12,15,14,15,15,15,16,11,12,12,14,14,15,16,15,
+ 15,
};
static float _vq_quantthresh_res0_96_128_3[] = {
1.5 +25 -24 vorbis/lib/books/res0_96_128_4.vqh
Index: res0_96_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128_4.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_128_4.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_128_4.vqh 2001/02/17 10:13:51 1.5
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -40,29 +41,29 @@
};
static long _vq_lengthlist_res0_96_128_4[] = {
- 4, 4, 4, 6, 6, 6, 6, 7, 7, 6, 7, 7, 8, 9, 9,10,
- 10,11,11, 4, 4, 4, 6, 6, 7, 7, 7, 7, 6, 7, 7, 7,
- 9, 9,10,10,11,11, 4, 4, 4, 6, 6, 7, 7, 7, 7, 6,
- 7, 7, 8, 8, 9,10,10,11,11, 7, 7, 7, 9, 9, 9, 9,
- 10,10, 9, 9,10,10,11,12,13,12,15,14, 7, 7, 7, 9,
- 9,10,10,10,10, 9, 9,10,10,12,12,12,12,13,13,10,
- 10,10,11,11,12,13,11,12,12,12,13,12,13,14,15,14,
- 14,14,10,10,10,11,11,11,11,12,12,12,11,13,12,13,
- 13,15,14,17,17,12,11,12,12,13,13,12,15,13,15,13,
- 14,14,15,15,15,16,16,16,11,12,11,13,13,13,13,14,
- 15,13,13,14,15,15,15,16,15,16,16,12,12,12,14,14,
- 15,14,14,13,14,14,15,16,16,15,16,16,16,16,12,12,
- 12,14,14,14,15,15,13,14,14,15,15,15,16,16,16,15,
- 16,13,13,14,14,15,15,16,16,15,15,16,16,16,16,16,
- 16,16,16,16,13,13,14,14,14,15,15,15,15,16,16,16,
- 16,16,16,16,16,16,16,14,14,15,16,16,16,16,16,15,
- 16,16,16,16,16,16,16,16,16,16,15,15,15,15,16,16,
- 15,15,15,16,16,16,16,16,16,16,16,16,16,15,16,16,
- 16,16,16,15,16,15,16,16,16,16,16,16,16,16,16,16,
- 14,16,16,15,16,16,15,16,15,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,16,
- 16,16,16,16,16,16,15,15,15,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,
+ 4, 4, 4, 6, 6, 6, 6, 7, 7, 6, 7, 7, 7, 8, 8, 8,
+ 9, 9, 9, 5, 4, 4, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7,
+ 8, 8, 9, 9, 9,10, 5, 4, 4, 6, 6, 6, 6, 7, 7, 7,
+ 7, 7, 7, 8, 8, 9, 9,10,10, 7, 7, 7, 8, 8, 9, 9,
+ 10,10,10,10,10,10,11,11,12,11,12,12, 7, 7, 7, 8,
+ 8, 9, 9,10,10, 9,10,10,10,11,11,11,12,12,12, 9,
+ 9, 9,10,11,11,11,12,12,12,12,13,13,13,13,14,14,
+ 14,15,10, 9, 9,11,10,11,11,12,12,11,12,13,13,13,
+ 13,14,14,15,15,11,12,11,12,12,13,13,13,13,13,13,
+ 14,14,15,14,15,15,16,17,11,11,11,12,12,13,13,14,
+ 14,14,13,14,14,15,14,15,14,15,15,11,12,12,14,14,
+ 15,14,15,14,15,15,16,16,14,15,17,17,17,16,11,12,
+ 12,13,14,14,14,15,14,15,15,16,15,16,16,17,16,17,
+ 17,13,13,15,15,15,16,17,14,16,17,15,16,16,15,17,
+ 17,17,17,17,13,14,13,15,15,15,15,16,15,16,16,17,
+ 15,16,16,17,17,17,16,14,15,14,16,15,17,16,17,16,
+ 16,17,17,17,16,17,16,17,16,17,14,15,14,16,14,17,
+ 16,16,17,16,15,17,17,17,17,17,16,17,17,15,17,15,
+ 17,15,17,16,17,17,17,17,16,17,17,17,17,17,17,17,
+ 15,15,14,15,15,17,17,17,17,16,17,17,16,17,17,17,
+ 17,17,17,15,15,16,17,15,17,16,17,16,16,17,17,17,
+ 17,17,17,17,17,17,15,15,16,16,17,17,17,17,17,17,
+ 17,17,17,17,17,17,17,17,17,
};
static float _vq_quantthresh_res0_96_128_4[] = {
1.4 +5 -4 vorbis/lib/books/res0_96_128_5.vqh
Index: res0_96_128_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128_5.vqh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- res0_96_128_5.vqh 2001/02/02 03:52:08 1.3
+++ res0_96_128_5.vqh 2001/02/17 10:13:51 1.4
@@ -6,7 +6,8 @@
* THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -58,9 +59,9 @@
};
static long _vq_lengthlist_res0_96_128_5[] = {
- 2, 2, 2, 4, 4, 5, 6, 8, 7,10, 9,10,11,11,11,12,
- 12,12,12, 6, 6, 8, 7, 8, 8, 9, 9,11,10,12,12,12,
- 11,11,10,12,10,
+ 2, 2, 2, 5, 5, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9,
+ 9,11,10, 6, 6, 7, 7, 9, 8, 9, 9,10,10,11,11,11,
+ 11,13,14,12,14,
};
static float _vq_quantthresh_res0_96_128_5[] = {
1.5 +21 -87 vorbis/lib/books/res0_96_128aux.vqh
Index: res0_96_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128aux.vqh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- res0_96_128aux.vqh 2001/02/02 03:52:08 1.4
+++ res0_96_128aux.vqh 2001/02/17 10:13:51 1.5
@@ -1,12 +1,13 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
* *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
* *
********************************************************************
@@ -19,91 +20,24 @@
#include "codebook.h"
static long _huff_lengthlist_res0_96_128aux[] = {
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,14,15,15,15,15,15,13,15,15,15,15,
- 15,13,13,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,13,
- 13,15,15,15,15,13,12,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,14,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,13,12,15,15,15,15,13,12,
- 14,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,14,12,15,12,
- 15,15,11, 4, 5, 6,13,15,12, 5, 5, 8,14,15,10, 6,
- 8, 9,14,15,15,14,15,14,15,15,15,15,15,15,15,15,
- 15,13,12,12,15,15,11, 4, 5, 7,15,15,11, 4, 5, 8,
- 15,15,13, 7, 8,10,15,15,15,14,15,15,15,15,15,15,
- 15,15,15,15,15,13,13,10,15,15,13, 6, 6, 7,12,15,
- 12, 6, 8, 9,15,15,12, 8, 9, 9,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,13,
- 15,13,15,15,15,14,14,15,15,15,15,14,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 12,14,15,15,15,15,15,13,14,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,14,12,11,15,15,11, 4, 5, 6,15,15,
- 12, 5, 6, 8,15,15, 9, 6, 8, 8,15,15,14,14,15,15,
- 15,15,15,15,15,15,15,15,15,15,11,12,15,15,12, 4,
- 5, 7,15,15,11, 5, 5, 8,15,15,12, 7, 8, 9,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,12,12,10,
- 15,15,12, 5, 6, 7,14,15,14, 6, 7, 9,15,15,13, 7,
- 9,10,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,13,15,13,15,15,15,15,14,14,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,10,10,12,14,14,14,11,11,13,14,14,14,12,
- 12,12,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,10,11,13,14,14,14,11,11,13,
- 14,14,14,13,13,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,11,12,12,14,14,
- 14,13,13,14,14,14,14,13,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 5, 7,10,10,15,16, 6, 5, 7, 9,14,16,11, 9,10,12,
+ 16,16,10, 9,13,11,14,16,15,14,16,16,16,16,16,16,
+ 16,16,16,16, 5, 5, 9,10,13,16, 4, 2, 5, 7,16,16,
+ 8, 5, 7,11,16,16, 9, 7,10,10,14,16,15,14,16,16,
+ 16,16,16,16,16,16,16,16, 9, 8,12,14,16,16, 7, 4,
+ 8,12,16,16,10, 7, 8,15,16,16,12,11,13,14,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16, 8, 8,13,11,
+ 15,16, 7, 6,10,10,16,16,12, 8, 7, 9,16,16,11, 7,
+ 6, 7,14,16,16,11,12,10,15,16,16,14,14,16,16,16,
+ 11,13,16,16,16,16,12,13,12,12,16,16,15, 6, 5, 6,
+ 14,16,12, 5, 4, 4,11,14,15, 9, 9, 8,13,15,16,15,
+ 15,15,16,16,16,16,16,16,16,16,16,16,16,14,16,16,
+ 16,10, 9,10,16,16,16, 8, 8, 8,16,16,16,13,13,13,
+ 16,16,16,16,16,16,16,15,
};
static static_codebook _huff_book_res0_96_128aux = {
- 4, 1296,
+ 3, 216,
_huff_lengthlist_res0_96_128aux,
0, 0, 0, 0, 0,
NULL,
1.13 +16 -24 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mode_A.h 2001/02/15 19:06:02 1.12
+++ mode_A.h 2001/02/17 10:13:57 1.13
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.12 2001/02/15 19:06:02 xiphmont Exp $
+ last mod: $Id: mode_A.h,v 1.13 2001/02/17 10:13:57 xiphmont Exp $
********************************************************************/
@@ -153,31 +153,23 @@
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
- // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*175*/
- // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*250*/
- // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*350*/
- // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*500*/
- // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*700*/
-
- // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
- // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
- // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
{-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
{-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
- {-20.f,-25.f,-30.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
- {-20.f,-25.f,-30.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*11500*/
- {-20.f,-24.f,-26.f,-32.f,-35.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*16000*/
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*16000*/
},
@@ -202,7 +194,7 @@
},
1,/*noisemaskp */
- -0.f, /* suppress any noise curve over maxspec+n */
+ -24.f, /* suppress any noise curve over maxspec+n */
.5f, /* low window */
.5f, /* high window */
25,
@@ -223,7 +215,7 @@
.850f, 0.f, /*5600*/
.900f, 0.f, /*8000*/
.900f, 0.f, /*11500*/
- .900f, 0.f, /*16000*/
+ .900f, 1.f, /*16000*/
},
95.f, /* even decade + 5 is important; saves an rint() later in a
1.9 +2 -10 vorbis/lib/modes/mode_AA.h
Index: mode_AA.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_AA.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mode_AA.h 2001/02/15 19:06:02 1.8
+++ mode_AA.h 2001/02/17 10:13:57 1.9
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_AA.h,v 1.8 2001/02/15 19:06:02 xiphmont Exp $
+ last mod: $Id: mode_AA.h,v 1.9 2001/02/17 10:13:57 xiphmont Exp $
********************************************************************/
@@ -153,15 +153,7 @@
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
- // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*175*/
- // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*250*/
- // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*350*/
- // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*500*/
- // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*700*/
-
- // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
- // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
- // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
+
{-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
{-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
{-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
--- >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