[xiph-cvs] cvs commit: vorbis/vq latticehint.c res_44c_A.vqs residuesplit.c
Monty
xiphmont at xiph.org
Thu Oct 11 08:41:58 PDT 2001
xiphmont 01/10/11 08:41:57
Modified: lib Tag: branch_monty_20011009 block.c codec_internal.h
info.c lpc.c mapping0.c psy.c res0.c
lib/books Tag: branch_monty_20011009 line_1024x31_0sub0.vqh
line_1024x31_0sub1.vqh line_1024x31_1sub0.vqh
line_1024x31_1sub1.vqh line_1024x31_2sub1.vqh
line_1024x31_2sub2.vqh line_1024x31_2sub3.vqh
line_1024x31_3sub1.vqh line_1024x31_3sub2.vqh
line_1024x31_3sub3.vqh line_1024x31_class0.vqh
line_1024x31_class1.vqh line_1024x31_class2.vqh
line_1024x31_class3.vqh line_128x19_0sub0.vqh
line_128x19_1sub2.vqh line_128x19_1sub3.vqh
line_128x19_2sub1.vqh line_128x19_2sub2.vqh
line_128x19_2sub3.vqh line_128x19_class1.vqh
line_128x19_class2.vqh res_44c_A_1024aux.vqh
res_44c_A_128aux.vqh res_Ac_1.vqh res_Ac_2.vqh
res_Ac_3.vqh res_Ac_4.vqh res_Ac_5.vqh res_Ac_6.vqh
res_Ac_7.vqh res_Ac_7a.vqh res_Ac_8.vqh
res_Ac_8a.vqh res_Ac_9.vqh res_Ac_9a.vqh
res_Ac_9b.vqh
lib/modes Tag: branch_monty_20011009 maskadj_A.h
mode_44c_A.h
vq Tag: branch_monty_20011009 latticehint.c
res_44c_A.vqs residuesplit.c
Log:
repair swapped avratemin and max.
the 'burst of static in first/last frame' bug was real; pre/post
extrapolate could overflow the autocorr accumulator. This was also
throwing off global_specmax, nailing it to infinity if preextrapolate
broke. Fixed.
Revision Changes Path
No revision
No revision
1.50.2.2 +14 -3 vorbis/lib/block.c
Index: block.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/block.c,v
retrieving revision 1.50.2.1
retrieving revision 1.50.2.2
diff -u -r1.50.2.1 -r1.50.2.2
--- block.c 2001/10/09 04:34:45 1.50.2.1
+++ block.c 2001/10/11 15:41:44 1.50.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.50.2.1 2001/10/09 04:34:45 xiphmont Exp $
+ last mod: $Id: block.c,v 1.50.2.2 2001/10/11 15:41:44 xiphmont Exp $
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -276,7 +276,8 @@
ci->bitrate_avg_queuetime)*
vi->rate+(ci->blocksizes[0]-1))/ci->blocksizes[0]+1;
long eighths=8*ci->passlimit[ci->coupling_passes-1];
- if(ci->bitrate_queue_loweravg<=0. && ci->bitrate_queue_upperavg<=0.)eighths=0;
+ if(ci->bitrate_queue_loweravg<=0. &&
+ ci->bitrate_queue_upperavg<=0.)eighths=0;
b->bitrate_queue_size=maxpackets;
b->bitrate_eighths=eighths;
@@ -395,6 +396,7 @@
return(v->pcmret);
}
+static int seq=0;
static void _preextrapolate_helper(vorbis_dsp_state *v){
int i;
int order=32;
@@ -405,21 +407,30 @@
if(v->pcm_current-v->centerW>order*2){ /* safety */
for(i=0;i<v->vi->channels;i++){
-
/* need to run the extrapolation in reverse! */
for(j=0;j<v->pcm_current;j++)
work[j]=v->pcm[i][v->pcm_current-j-1];
+ _analysis_output("preextrap",seq,v->pcm[i],v->pcm_current,0,0);
+ _analysis_output("workextrap",seq,work,v->pcm_current,0,0);
+
/* prime as above */
vorbis_lpc_from_data(work,lpc,v->pcm_current-v->centerW,order);
+ _analysis_output("lpc",seq,lpc,order,0,0);
/* run the predictor filter */
vorbis_lpc_predict(lpc,work+v->pcm_current-v->centerW-order,
order,
work+v->pcm_current-v->centerW,
v->centerW);
+
+ _analysis_output("extrap",seq,work,v->pcm_current,0,0);
+
+
for(j=0;j<v->pcm_current;j++)
v->pcm[i][v->pcm_current-j-1]=work[j];
+
+ _analysis_output("postextrap",seq++,v->pcm[i],v->pcm_current,0,0);
}
}
}
1.9.4.2 +2 -2 vorbis/lib/codec_internal.h
Index: codec_internal.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/codec_internal.h,v
retrieving revision 1.9.4.1
retrieving revision 1.9.4.2
diff -u -r1.9.4.1 -r1.9.4.2
--- codec_internal.h 2001/10/09 04:34:45 1.9.4.1
+++ codec_internal.h 2001/10/11 15:41:44 1.9.4.2
@@ -10,7 +10,7 @@
********************************************************************
function: libvorbis codec headers
- last mod: $Id: codec_internal.h,v 1.9.4.1 2001/10/09 04:34:45 xiphmont Exp $
+ last mod: $Id: codec_internal.h,v 1.9.4.2 2001/10/11 15:41:44 xiphmont Exp $
********************************************************************/
@@ -134,8 +134,8 @@
double bitrate_absolute_min;
double bitrate_queue_max;
double bitrate_queue_min;
- double bitrate_queue_upperavg;
double bitrate_queue_loweravg;
+ double bitrate_queue_upperavg;
int passlimit[32]; /* iteration limit per couple/quant pass */
int coupling_passes;
1.46.2.1 +2 -2 vorbis/lib/info.c
Index: info.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/info.c,v
retrieving revision 1.46
retrieving revision 1.46.2.1
diff -u -r1.46 -r1.46.2.1
--- info.c 2001/10/02 00:14:31 1.46
+++ info.c 2001/10/11 15:41:44 1.46.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.46 2001/10/02 00:14:31 segher Exp $
+ last mod: $Id: info.c,v 1.46.2.1 2001/10/11 15:41:44 xiphmont Exp $
********************************************************************/
@@ -407,7 +407,7 @@
}
static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){
- char temp[]="Xiphophorus libVorbis I 20010910";
+ char temp[]="Xiphophorus libVorbis I 20011009";
/* preamble */
oggpack_write(opb,0x03,8);
1.32.2.1 +3 -3 vorbis/lib/lpc.c
Index: lpc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/lpc.c,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -r1.32 -r1.32.2.1
--- lpc.c 2001/10/02 00:14:31 1.32
+++ lpc.c 2001/10/11 15:41:44 1.32.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: LPC low level routines
- last mod: $Id: lpc.c,v 1.32 2001/10/02 00:14:31 segher Exp $
+ last mod: $Id: lpc.c,v 1.32.2.1 2001/10/11 15:41:44 xiphmont Exp $
********************************************************************/
@@ -67,7 +67,7 @@
j=m+1;
while(j--){
- float d=0;
+ double d=0; /* double needed for accumulator depth */
for(i=j;i<n;i++)d+=data[i]*data[i-j];
aut[j]=d;
}
@@ -77,7 +77,7 @@
error=aut[0];
for(i=0;i<m;i++){
- float r=-aut[i+1];
+ float r= -aut[i+1];
if(error==0){
memset(lpc,0,m*sizeof(*lpc));
1.37.2.2 +126 -49 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -u -r1.37.2.1 -r1.37.2.2
--- mapping0.c 2001/10/09 04:34:45 1.37.2.1
+++ mapping0.c 2001/10/11 15:41:44 1.37.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.37.2.1 2001/10/09 04:34:45 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.37.2.2 2001/10/11 15:41:44 xiphmont Exp $
********************************************************************/
@@ -286,7 +286,9 @@
int eighth=b->bitrate_floatinglimit*8-1.;
double lobitrate;
double hibitrate;
-
+
+ if(desired_rate<=0.)return(0.);
+
lobitrate=(double)(eighth==0?0.:
b->bitrate_avgbitacc[eighth-1])/b->bitrate_avgsampleacc*vi->rate;
while(lobitrate>desired_rate && eighth>0){
@@ -388,6 +390,8 @@
temp=logfft[(j+1)>>1]=todB(&temp);
if(temp>local_ampmax[i])local_ampmax[i]=temp;
}
+
+ if(local_ampmax[i]>0.f)local_ampmax[i]=0.f;
if(local_ampmax[i]>global_ampmax)global_ampmax=local_ampmax[i];
_analysis_output("fft",seq+i,logfft,n/2,1,0);
@@ -409,7 +413,6 @@
for(j=0;j<n/2;j++)
logmdct[j]=todB(mdct+j);
_analysis_output("mdct",seq+i,logmdct,n/2,1,0);
- _analysis_output("lmdct",seq+i,mdct,n/2,0,0);
/* perform psychoacoustics; do masking */
@@ -435,7 +438,6 @@
codedflr);
- _analysis_output("mdct2",seq+i,mdct,n/2,1,1);
_vp_remove_floor(look->psy_look[blocktype],
b->psy_g_look,
logmdct,
@@ -608,7 +610,74 @@
i,classifications[j],b->bitrate_floatinglimit,queueptr);
}
i++;
+
}
+
+ {
+ char buf[80];
+ int k;
+ float *pcmM=sofar[info->coupling_mag[0]];
+ float *pcmA=sofar[info->coupling_ang[0]];
+ float *a=alloca(sizeof(*a)*n/2);
+ float *b=alloca(sizeof(*b)*n/2);
+ sprintf(buf,"sofar%d",i);
+
+ /* channel coupling */
+
+ for(j=0;j<n/2;j++){
+ float mag=pcmM[j];
+ float ang=pcmA[j];
+
+ if(mag>0)
+ if(ang>0){
+ a[j]=mag;
+ b[j]=mag-ang;
+ }else{
+ b[j]=mag;
+ a[j]=mag+ang;
+ }
+ else
+ if(ang>0){
+ a[j]=mag;
+ b[j]=mag+ang;
+ }else{
+ b[j]=mag;
+ a[j]=mag-ang;
+ }
+ }
+
+ _analysis_output(buf,seq,a,n/2,1,0);
+ _analysis_output(buf,seq+1,b,n/2,1,0);
+
+ pcmM=quantized[info->coupling_mag[0]];
+ pcmA=quantized[info->coupling_ang[0]];
+ sprintf(buf,"uquant%d",i);
+
+ for(j=0;j<n/2;j++){
+ float mag=pcmM[j];
+ float ang=pcmA[j];
+
+ if(mag>0)
+ if(ang>0){
+ a[j]=mag;
+ b[j]=mag-ang;
+ }else{
+ b[j]=mag;
+ a[j]=mag+ang;
+ }
+ else
+ if(ang>0){
+ a[j]=mag;
+ b[j]=mag+ang;
+ }else{
+ b[j]=mag;
+ a[j]=mag-ang;
+ }
+ }
+
+ _analysis_output(buf,seq,a,n/2,1,0);
+ _analysis_output(buf,seq+1,b,n/2,1,0);
+ }
/* bitrate management.... deciding when it's time to stop. */
if(i<quant_passes){
@@ -642,14 +711,17 @@
if(info->coupling_steps==0){
/* this assumes all or nothing coupling right now. it should pass
through any channels left uncoupled, but it doesn't do that now */
- for(i=0;i<vi->channels;i++){
- float *lpcm=pcm[i];
- float *lsof=sofar[i];
- float *lqua=quantized[i];
+ int k;
+ for(k=0;k<vi->channels;k++){
+ float *lpcm=pcm[k];
+ float *lsof=sofar[k];
+ float *lqua=quantized[k];
for(j=0;j<n/2;j++)
lqua[j]=lpcm[j]-lsof[j];
}
}else{
+ char buf[80];
+
_vp_quantize_couple(look->psy_look[blocktype],
info,
pcm,
@@ -657,19 +729,25 @@
quantized,
nonzero,
i);
+
+ sprintf(buf,"quant%d",i);
+ for(j=0;j<vi->channels;j++)
+ _analysis_output(buf,seq+j,quantized[j],n/2,1,0);
+
}
}
-
- /* truncate the packet according to stoppos */
- if(!stoppos)stoppos=oggpack_bytes(&vb->opb);
- if(minbits && stoppos*8<minbits)stoppos=(minbits+7)/8;
- if(maxbits && stoppos*8>maxbits)stoppos=maxbits/8;
- if(stoppos>oggpack_bytes(&vb->opb))stoppos=oggpack_bytes(&vb->opb);
- vb->opb.endbyte=stoppos;
- vb->opb.endbit=0;
/* steady as she goes */
}
+
+ /* truncate the packet according to stoppos */
+ if(!stoppos)stoppos=oggpack_bytes(&vb->opb);
+ if(minbits && stoppos*8<minbits)stoppos=(minbits+7)/8;
+ if(maxbits && stoppos*8>maxbits)stoppos=maxbits/8;
+ if(stoppos>oggpack_bytes(&vb->opb))stoppos=oggpack_bytes(&vb->opb);
+ vb->opb.endbyte=stoppos;
+ vb->opb.endbit=0;
+
seq+=vi->channels;
fprintf(stderr,"Bitrate: cav %d, cmin %ld, cmax %ld, float %.1f,"
@@ -710,41 +788,40 @@
/* update queue head */
{
int bits=oggpack_bytes(&vb->opb)*8;
-
- if(bits>32){ /* (avoid pushing the floater too far in digital silence) */
-
- /* boundaries */
- b->bitrate_queue[b->bitrate_queue_head]=bits;
- if(vb->W)b->bitrate_queue[b->bitrate_queue_head]|=0x80000000UL;
- b->bitrate_boundbitacc+=bits;
- b->bitrate_boundsampleacc+=ci->blocksizes[vb->W]>>1;
-
- /* eighths */
- if(b->bitrate_eighths){
- for(i=0;i<b->bitrate_eighths;i++)
- b->bitrate_avgbitacc[i]+=
- b->bitrate_queue_eighths[b->bitrate_queue_head*b->bitrate_eighths+i];
- b->bitrate_avgsampleacc+=ci->blocksizes[vb->W]>>1;
- }
- b->bitrate_queue_head++;
- if(b->bitrate_queue_head>=b->bitrate_queue_size)b->bitrate_queue_head=0;
-
- /* adjust the floater to offset bitrate above/below desired average */
- /* look for the eighth settings in recent history that bracket
- the desired bitrate, and interpolate twixt them for the
- flaoter setting we want */
-
- if(b->bitrate_eighths>0){
- double upper=floater_interpolate(b,vi,ci->bitrate_queue_upperavg);
- double lower=floater_interpolate(b,vi,ci->bitrate_queue_loweravg);
- b->bitrate_floatinglimit=ci->bitrate_floatinglimit_initial;
- if(upper>0 && upper<b->bitrate_floatinglimit)
- b->bitrate_floatinglimit=upper;
- if(lower>b->bitrate_floatinglimit)
- b->bitrate_floatinglimit=lower;
- }
+ /* boundaries */
+ b->bitrate_queue[b->bitrate_queue_head]=bits;
+ if(vb->W)b->bitrate_queue[b->bitrate_queue_head]|=0x80000000UL;
+ b->bitrate_boundbitacc+=bits;
+ b->bitrate_boundsampleacc+=ci->blocksizes[vb->W]>>1;
+
+ /* eighths */
+ if(b->bitrate_eighths){
+ for(i=0;i<b->bitrate_eighths;i++)
+ b->bitrate_avgbitacc[i]+=
+ b->bitrate_queue_eighths[b->bitrate_queue_head*b->bitrate_eighths+i];
+ b->bitrate_avgsampleacc+=ci->blocksizes[vb->W]>>1;
}
+
+ b->bitrate_queue_head++;
+ if(b->bitrate_queue_head>=b->bitrate_queue_size)b->bitrate_queue_head=0;
+
+ /* adjust the floater to offset bitrate above/below desired average */
+ /* look for the eighth settings in recent history that bracket
+ the desired bitrate, and interpolate twixt them for the
+ flaoter setting we want */
+
+ if(b->bitrate_eighths>0){
+ double upper=floater_interpolate(b,vi,ci->bitrate_queue_upperavg);
+ double lower=floater_interpolate(b,vi,ci->bitrate_queue_loweravg);
+
+ fprintf(stderr,"\tupper:%g :: lower:%g\n",upper,lower);
+ b->bitrate_floatinglimit=ci->bitrate_floatinglimit_initial;
+ if(upper>0. && upper<b->bitrate_floatinglimit)
+ b->bitrate_floatinglimit=upper;
+ if(lower>b->bitrate_floatinglimit)
+ b->bitrate_floatinglimit=lower;
+ }
}
}
1.56.2.1 +144 -52 vorbis/lib/psy.c
Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.56
retrieving revision 1.56.2.1
diff -u -r1.56 -r1.56.2.1
--- psy.c 2001/10/02 00:14:32 1.56
+++ psy.c 2001/10/11 15:41:44 1.56.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.56 2001/10/02 00:14:32 segher Exp $
+ last mod: $Id: psy.c,v 1.56.2.1 2001/10/11 15:41:44 xiphmont Exp $
********************************************************************/
@@ -310,9 +310,6 @@
memcpy(p->tonecurves[16][8]+2,tone_8000_80dB_SL,sizeof(*p->tonecurves[16][8])*EHMER_MAX);
memcpy(p->tonecurves[16][10]+2,tone_8000_100dB_SL,sizeof(*p->tonecurves[16][10])*EHMER_MAX);
- /* value limit the tonal masking curves; the peakatt not only
- optionally specifies maximum dynamic depth, but also [always]
- limits the masking curves to a minimum depth */
for(i=0;i<P_BANDS;i+=2)
for(j=4;j<P_LEVELS;j+=2)
for(k=2;k<EHMER_MAX+2;k++)
@@ -332,9 +329,44 @@
for(i=0;i<P_BANDS;i++)
setup_curve(p->tonecurves[i],i,vi->toneatt->block[i]);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_63Hz",i,p->tonecurves[0][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_88Hz",i,p->tonecurves[1][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_125Hz",i,p->tonecurves[2][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_170Hz",i,p->tonecurves[3][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_250Hz",i,p->tonecurves[4][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_350Hz",i,p->tonecurves[5][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_500Hz",i,p->tonecurves[6][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_700Hz",i,p->tonecurves[7][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_1kHz",i,p->tonecurves[8][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_1.4Hz",i,p->tonecurves[9][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_2kHz",i,p->tonecurves[10][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_2.4kHz",i,p->tonecurves[11][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_4kHz",i,p->tonecurves[12][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_5.6kHz",i,p->tonecurves[13][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_8kHz",i,p->tonecurves[14][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_11.5kHz",i,p->tonecurves[15][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_16kHz",i,p->tonecurves[16][i]+2,EHMER_MAX,0,0);
+
if(vi->curvelimitp){
/* value limit the tonal masking curves; the peakatt not only
- optionally specifies maximum dynamic depth, but also [always]
+ optionally specifies maximum dynamic depth, but also
limits the masking curves to a minimum depth */
for(i=0;i<P_BANDS;i++)
for(j=0;j<P_LEVELS;j++){
@@ -346,18 +378,123 @@
}
}
- if(vi->tone_guard) /* we limit depth only optionally */
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_63Hz",i,p->tonecurves[0][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_88Hz",i,p->tonecurves[1][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_125Hz",i,p->tonecurves[2][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_170Hz",i,p->tonecurves[3][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_250Hz",i,p->tonecurves[4][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_350Hz",i,p->tonecurves[5][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_500Hz",i,p->tonecurves[6][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_700Hz",i,p->tonecurves[7][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_1kHz",i,p->tonecurves[8][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_1.4Hz",i,p->tonecurves[9][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_2kHz",i,p->tonecurves[10][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_2.4kHz",i,p->tonecurves[11][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_4kHz",i,p->tonecurves[12][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_5.6kHz",i,p->tonecurves[13][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_8kHz",i,p->tonecurves[14][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_11.5kHz",i,p->tonecurves[15][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("licurve_16kHz",i,p->tonecurves[16][i]+2,EHMER_MAX,0,0);
+
+ if(vi->peakattp) /* we limit maximum depth only optionally */
for(i=0;i<P_BANDS;i++)
for(j=0;j<P_LEVELS;j++)
if(p->tonecurves[i][j][EHMER_OFFSET+2]< vi->peakatt->block[i][j])
p->tonecurves[i][j][EHMER_OFFSET+2]= vi->peakatt->block[i][j];
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_63Hz",i,p->tonecurves[0][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_88Hz",i,p->tonecurves[1][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_125Hz",i,p->tonecurves[2][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_170Hz",i,p->tonecurves[3][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_250Hz",i,p->tonecurves[4][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_350Hz",i,p->tonecurves[5][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_500Hz",i,p->tonecurves[6][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_700Hz",i,p->tonecurves[7][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_1kHz",i,p->tonecurves[8][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_1.4Hz",i,p->tonecurves[9][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_2kHz",i,p->tonecurves[10][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_2.4kHz",i,p->tonecurves[11][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_4kHz",i,p->tonecurves[12][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_5.6kHz",i,p->tonecurves[13][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_8kHz",i,p->tonecurves[14][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_11.5kHz",i,p->tonecurves[15][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("pcurve_16kHz",i,p->tonecurves[16][i]+2,EHMER_MAX,0,0);
+
/* but guarding is mandatory */
for(i=0;i<P_BANDS;i++)
for(j=0;j<P_LEVELS;j++)
if(p->tonecurves[i][j][EHMER_OFFSET+2]< vi->tone_guard)
p->tonecurves[i][j][EHMER_OFFSET+2]= vi->tone_guard;
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_63Hz",i,p->tonecurves[0][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_88Hz",i,p->tonecurves[1][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_125Hz",i,p->tonecurves[2][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_170Hz",i,p->tonecurves[3][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_250Hz",i,p->tonecurves[4][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_350Hz",i,p->tonecurves[5][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_500Hz",i,p->tonecurves[6][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_700Hz",i,p->tonecurves[7][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_1kHz",i,p->tonecurves[8][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_1.4Hz",i,p->tonecurves[9][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_2kHz",i,p->tonecurves[10][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_2.4kHz",i,p->tonecurves[11][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_4kHz",i,p->tonecurves[12][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_5.6kHz",i,p->tonecurves[13][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_8kHz",i,p->tonecurves[14][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_11.5kHz",i,p->tonecurves[15][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("fcurve_16kHz",i,p->tonecurves[16][i]+2,EHMER_MAX,0,0);
+
/* set up rolling noise median */
for(i=0;i<n;i++){
float halfoc=toOC((i+.5)*rate/(2.*n))*2.;
@@ -376,41 +513,6 @@
analysis_noisy=1;
_analysis_output("noiseoff",0,p->noiseoffset,n,1,0);
_analysis_output("noisethresh",0,p->noisethresh,n,1,0);
-
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_63Hz",i,p->tonecurves[0][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_88Hz",i,p->tonecurves[1][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_125Hz",i,p->tonecurves[2][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_170Hz",i,p->tonecurves[3][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_250Hz",i,p->tonecurves[4][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_350Hz",i,p->tonecurves[5][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_500Hz",i,p->tonecurves[6][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_700Hz",i,p->tonecurves[7][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_1kHz",i,p->tonecurves[8][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_1.4Hz",i,p->tonecurves[9][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_2kHz",i,p->tonecurves[10][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_2.4kHz",i,p->tonecurves[11][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_4kHz",i,p->tonecurves[12][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_5.6kHz",i,p->tonecurves[13][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_8kHz",i,p->tonecurves[14][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_11.5kHz",i,p->tonecurves[15][i]+2,EHMER_MAX,0,0);
- for(i=0;i<P_LEVELS;i++)
- _analysis_output("curve_16kHz",i,p->tonecurves[16][i]+2,EHMER_MAX,0,0);
analysis_noisy=1;
}
@@ -736,7 +838,6 @@
for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i];
- _analysis_output("medianmdct",seq,work,n,1,0);
bark_noise_hybridmp(n,p->bark,work,logmask,0.,
p->vi->noisewindowfixed);
@@ -745,13 +846,6 @@
/* work[i] holds the median line (.5), logmask holds the upper
envelope line (1.) */
- _analysis_output("median",seq,work,n,1,0);
-
- _analysis_output("medianenvelope",seq,logmask,n,1,0);
- for(i=0;i<n;i++)logmask[i]+=work[i];
- _analysis_output("envelope",seq,logmask,n,1,0);
- for(i=0;i<n;i++)logmask[i]-=work[i];
-
for(i=0;i<n;i++){
int dB=logmask[i]+.5;
if(dB>=NOISE_COMPAND_LEVELS)dB=NOISE_COMPAND_LEVELS-1;
@@ -759,8 +853,6 @@
if(logmask[i]>p->vi->noisemaxsupp)logmask[i]=p->vi->noisemaxsupp;
}
- _analysis_output("noise",seq,logmask,n,1,0);
-
}else{
for(i=0;i<n;i++)logmask[i]=NEGINF;
}
@@ -777,7 +869,7 @@
}
}
- /* tone/peak masking */
+ /* tone masking */
seed_loop(p,(const float ***)p->tonecurves,logfft,logmask,seed,global_specmax);
max_seeds(p,g,channel,seed,logmask);
1.37.2.2 +9 -9 vorbis/lib/res0.c
Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -u -r1.37.2.1 -r1.37.2.2
--- res0.c 2001/10/09 04:34:45 1.37.2.1
+++ res0.c 2001/10/11 15:41:45 1.37.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.37.2.1 2001/10/09 04:34:45 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.37.2.2 2001/10/11 15:41:45 xiphmont Exp $
********************************************************************/
@@ -513,14 +513,6 @@
long partialpass;
int stoppos=0;
- if((int)passlimit<ci->passlimit[pass]){
- wholepasses=passlimit;
- partialpass=rint((passlimit-wholepasses)*partvals);
- }else{
- wholepasses=ci->passlimit[pass];
- partialpass=0;
- }
-
#ifdef TRAIN_RES
FILE *of;
char buffer[80];
@@ -535,6 +527,14 @@
fclose(of);
}
#endif
+
+ if((int)passlimit<ci->passlimit[pass]){
+ wholepasses=passlimit;
+ partialpass=rint((passlimit-wholepasses)*partvals);
+ }else{
+ wholepasses=ci->passlimit[pass];
+ partialpass=0;
+ }
memset(resbits,0,sizeof(resbits));
memset(resvals,0,sizeof(resvals));
No revision
No revision
1.3.4.2 +1 -1 vorbis/lib/books/line_1024x31_0sub0.vqh
Index: line_1024x31_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_0sub0.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_0sub0.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_0sub0.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_0sub0[] = {
- 4, 3, 4, 4, 4, 3, 4, 3, 5, 4, 5, 4, 6, 4, 6, 5,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
};
static static_codebook _huff_book_line_1024x31_0sub0 = {
1.3.4.2 +4 -4 vorbis/lib/books/line_1024x31_0sub1.vqh
Index: line_1024x31_0sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_0sub1.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_0sub1.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_0sub1.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_0sub1[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 4, 3, 4, 3, 5, 3, 5, 3, 6, 4, 7, 4, 7, 4, 7, 5,
- 7, 6, 8, 6,10, 9,10,10,11,12,10,12,12,12,12,12,
- 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
};
static static_codebook _huff_book_line_1024x31_0sub1 = {
1.3.4.2 +1 -1 vorbis/lib/books/line_1024x31_1sub0.vqh
Index: line_1024x31_1sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_1sub0.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_1sub0.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_1sub0.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_1sub0[] = {
- 2, 3, 4, 4, 3, 4, 4, 4, 4, 5, 5, 6, 6, 6, 7, 7,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
};
static static_codebook _huff_book_line_1024x31_1sub0 = {
1.3.4.2 +4 -4 vorbis/lib/books/line_1024x31_1sub1.vqh
Index: line_1024x31_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_1sub1.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_1sub1.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_1sub1.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_1sub1[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 3, 3, 3, 4, 3, 3, 3, 4, 5, 5, 6, 6, 7,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,10,10,10,10,10,10,10,10,10,10,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
};
static static_codebook _huff_book_line_1024x31_1sub1 = {
1.3.4.2 +1 -1 vorbis/lib/books/line_1024x31_2sub1.vqh
Index: line_1024x31_2sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_2sub1.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_2sub1.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_2sub1.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_2sub1[] = {
- 0, 2, 4, 2, 4, 3, 4, 3, 4,
+ 0, 3, 3, 3, 3, 3, 3, 3, 3,
};
static static_codebook _huff_book_line_1024x31_2sub1 = {
1.3.4.2 +2 -2 vorbis/lib/books/line_1024x31_2sub2.vqh
Index: line_1024x31_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_2sub2.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_2sub2.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_2sub2.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,8 +20,8 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_2sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 4, 4, 6, 5, 7,
- 4, 8, 3, 9, 3,10, 4,10, 4,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4,
};
static static_codebook _huff_book_line_1024x31_2sub2 = {
1.3.4.2 +4 -4 vorbis/lib/books/line_1024x31_2sub3.vqh
Index: line_1024x31_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_2sub3.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_2sub3.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_2sub3.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_2sub3[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 2, 7, 3, 7, 2, 7,
- 4, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
+ 0, 0, 2, 0, 0, 0, 0, 1, 0, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
};
static static_codebook _huff_book_line_1024x31_2sub3 = {
1.3.4.2 +1 -1 vorbis/lib/books/line_1024x31_3sub1.vqh
Index: line_1024x31_3sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_3sub1.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_3sub1.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_3sub1.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_3sub1[] = {
- 0, 3, 3, 2, 3, 3, 4, 3, 4,
+ 0, 3, 3, 3, 3, 3, 3, 3, 3,
};
static static_codebook _huff_book_line_1024x31_3sub1 = {
1.3.4.2 +2 -2 vorbis/lib/books/line_1024x31_3sub2.vqh
Index: line_1024x31_3sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_3sub2.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_3sub2.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_3sub2.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,8 +20,8 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_3sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2, 4, 3, 6, 4,
- 7, 5, 9, 5, 9, 6, 9, 6, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4,
};
static static_codebook _huff_book_line_1024x31_3sub2 = {
1.3.4.2 +4 -4 vorbis/lib/books/line_1024x31_3sub3.vqh
Index: line_1024x31_3sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_3sub3.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_3sub3.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_3sub3.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_3sub3[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 7, 3, 7, 4, 7, 6,
- 5, 6, 7, 7, 7, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
+ 0, 0, 2, 0, 0, 0, 0, 1, 0, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
};
static static_codebook _huff_book_line_1024x31_3sub3 = {
1.2.4.2 +1 -1 vorbis/lib/books/line_1024x31_class0.vqh
Index: line_1024x31_class0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class0.vqh,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- line_1024x31_class0.vqh 2001/10/09 04:34:47 1.2.4.1
+++ line_1024x31_class0.vqh 2001/10/11 15:41:47 1.2.4.2
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class0[] = {
- 1, 2, 4, 6, 3, 5, 7, 7,
+ 3, 3, 3, 3, 3, 3, 3, 3,
};
static static_codebook _huff_book_line_1024x31_class0 = {
1.3.4.2 +1 -1 vorbis/lib/books/line_1024x31_class1.vqh
Index: line_1024x31_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class1.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_class1.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_class1.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class1[] = {
- 1, 5, 2, 4, 7,11,10,12, 3, 8, 6,10,11,12,12,12,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
};
static static_codebook _huff_book_line_1024x31_class1 = {
1.3.4.2 +4 -4 vorbis/lib/books/line_1024x31_class2.vqh
Index: line_1024x31_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class2.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_class2.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_class2.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class2[] = {
- 1, 3, 4,10, 7, 5, 6,10, 9, 6,11,15,15,15,15,15,
- 6, 3, 5,11, 7, 5, 7,11,11, 8,12,15,15,15,15,15,
- 10, 8, 8,13,11, 9,10,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,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
};
static static_codebook _huff_book_line_1024x31_class2 = {
1.3.4.2 +4 -4 vorbis/lib/books/line_1024x31_class3.vqh
Index: line_1024x31_class3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class3.vqh,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- line_1024x31_class3.vqh 2001/10/09 04:34:47 1.3.4.1
+++ line_1024x31_class3.vqh 2001/10/11 15:41:47 1.3.4.2
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class3[] = {
- 1, 3, 5,11, 7, 3, 5,11, 9, 7, 9,15,15,15,15,14,
- 7, 4, 6,11, 7, 5, 6,12,10, 8, 9,14,14,14,14,14,
- 11, 8, 9,12,11, 8, 8,11,13,10,11,14,14,14,14,14,
- 14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
};
static static_codebook _huff_book_line_1024x31_class3 = {
1.3.2.1 +4 -4 vorbis/lib/books/line_128x19_0sub0.vqh
Index: line_128x19_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_0sub0.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- line_128x19_0sub0.vqh 2001/09/11 05:45:00 1.3
+++ line_128x19_0sub0.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_0sub0[] = {
- 4, 4, 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 5, 6, 5,
- 6, 5, 6, 6, 7, 6, 7, 7, 7, 7, 7, 8, 8, 9, 8,10,
- 7,10, 7,12, 8,13, 8,11, 8,10, 8, 9, 9,10, 9,10,
- 9,10, 9,11,12,15,14,15,15,15,15,15,15,15,15,15,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
};
static static_codebook _huff_book_line_128x19_0sub0 = {
1.3.2.1 +2 -2 vorbis/lib/books/line_128x19_1sub2.vqh
Index: line_128x19_1sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_1sub2.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- line_128x19_1sub2.vqh 2001/09/11 05:45:00 1.3
+++ line_128x19_1sub2.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -20,8 +20,8 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_1sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 4, 4, 5,
- 4, 5, 5, 6, 5, 7, 6, 7, 6,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4,
};
static static_codebook _huff_book_line_128x19_1sub2 = {
1.3.2.1 +4 -4 vorbis/lib/books/line_128x19_1sub3.vqh
Index: line_128x19_1sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_1sub3.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- line_128x19_1sub3.vqh 2001/09/11 05:45:00 1.3
+++ line_128x19_1sub3.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_1sub3[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 7, 3, 7, 2, 9,
- 3, 9, 4, 9, 5, 9, 6, 9, 7, 9, 9, 9, 9, 9, 9, 9,
- 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
+ 0, 0, 2, 0, 0, 0, 0, 1, 0, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
};
static static_codebook _huff_book_line_128x19_1sub3 = {
1.1.4.1 +1 -1 vorbis/lib/books/line_128x19_2sub1.vqh
Index: line_128x19_2sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_2sub1.vqh,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- line_128x19_2sub1.vqh 2001/08/13 07:40:52 1.1
+++ line_128x19_2sub1.vqh 2001/10/11 15:41:47 1.1.4.1
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_2sub1[] = {
- 0, 2, 3, 3, 3, 3, 4, 3, 4,
+ 0, 3, 3, 3, 3, 3, 3, 3, 3,
};
static static_codebook _huff_book_line_128x19_2sub1 = {
1.3.2.1 +2 -2 vorbis/lib/books/line_128x19_2sub2.vqh
Index: line_128x19_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_2sub2.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- line_128x19_2sub2.vqh 2001/09/11 05:45:00 1.3
+++ line_128x19_2sub2.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -20,8 +20,8 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_2sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 2, 5, 3, 6, 3,
- 6, 4, 7, 5, 9, 6,10, 8,10,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4,
};
static static_codebook _huff_book_line_128x19_2sub2 = {
1.3.2.1 +4 -4 vorbis/lib/books/line_128x19_2sub3.vqh
Index: line_128x19_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_2sub3.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- line_128x19_2sub3.vqh 2001/09/11 05:45:00 1.3
+++ line_128x19_2sub3.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_2sub3[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 7, 4, 7, 4, 5, 4,
- 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
+ 0, 0, 2, 0, 0, 0, 0, 1, 0, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
};
static static_codebook _huff_book_line_128x19_2sub3 = {
1.3.2.1 +4 -4 vorbis/lib/books/line_128x19_class1.vqh
Index: line_128x19_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_class1.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- line_128x19_class1.vqh 2001/09/11 05:45:00 1.3
+++ line_128x19_class1.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_class1[] = {
- 3, 3, 4,13, 6, 4, 5,13, 8, 5, 6,15,14,14,13,15,
- 5, 3, 4,12, 7, 5, 6,14, 8, 5, 7,14,15,14,14,15,
- 7, 4, 5,12, 8, 5, 6,11, 9, 6, 6,13,15,13,13,15,
- 13,10,10,13,11, 8, 7,12,11, 8, 8,14,15,15,15,15,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
};
static static_codebook _huff_book_line_128x19_class1 = {
1.3.2.1 +4 -4 vorbis/lib/books/line_128x19_class2.vqh
Index: line_128x19_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_class2.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- line_128x19_class2.vqh 2001/09/11 05:45:00 1.3
+++ line_128x19_class2.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_class2[] = {
- 2, 3, 3,12, 6, 3, 4,13, 9, 6, 7,13,14,14,14,14,
- 6, 3, 5,11, 7, 5, 5,12, 9, 7, 8,13,14,14,14,14,
- 10, 8,10,14,11, 9, 9,11,12,10,11,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
};
static static_codebook _huff_book_line_128x19_class2 = {
1.3.2.1 +7 -7 vorbis/lib/books/res_44c_A_1024aux.vqh
Index: res_44c_A_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_44c_A_1024aux.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_44c_A_1024aux.vqh 2001/09/11 05:45:00 1.3
+++ res_44c_A_1024aux.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_A_1024aux[] = {
- 2,10, 7,14,11,11,10,10,12,17,10, 5,18, 7, 5,18,
- 6, 8,14,18, 5,18, 3,18,18, 7, 8,10,16,17,14, 7,
- 17, 5,17,17, 6, 7,14,17,11, 5,17,17, 4,17, 6, 9,
- 17,17,11,17, 6,17,17, 8,10,11,16,17,10, 6, 8, 5,
- 6, 9, 4, 5,12,17,11, 8,10, 6, 9,11, 5, 5, 9,16,
- 10,12,17,13,16,16,11, 6, 7,16,11,14,17,16,17,17,
- 16, 8,10,17,
+ 3,11, 6,17,11,10,10, 9,17,17,11, 5,17, 7, 5,17,
+ 6, 8,15,17, 5,17, 3,17,17, 7, 8, 9,17,17,15, 6,
+ 17, 5,17,17, 6, 7,14,17,10, 5,17,16, 4,16, 5, 8,
+ 16,16,10,16, 6,16,16, 9,10,11,16,16,10, 6, 7, 5,
+ 6,10, 4, 5,12,16,11, 7, 9, 6, 8,11, 4, 4, 8,16,
+ 15,12,16,12,16,16,11, 7, 5,14,16,16,16,16,16,16,
+ 15, 8, 8,14,
};
static static_codebook _huff_book_res_44c_A_1024aux = {
1.3.2.2 +6 -6 vorbis/lib/books/res_44c_A_128aux.vqh
Index: res_44c_A_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_44c_A_128aux.vqh,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- res_44c_A_128aux.vqh 2001/10/09 04:34:47 1.3.2.1
+++ res_44c_A_128aux.vqh 2001/10/11 15:41:47 1.3.2.2
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_A_128aux[] = {
- 8,16, 9,16,16,11,12,15,16,16,13, 5,16,16, 5,16,
- 7,13,16,16, 6,15, 2,15,15, 6, 6,11,15,15,15, 6,
- 15,15, 4,15, 6,11,15,15,14, 4,15,15, 3,15, 6,10,
- 15,15,10,15, 6,15,15, 8,11,13,15,15,11, 5, 8,14,
- 4,10, 5,10,15,15,13, 9,10,10, 7,13, 8,11,15,15,
+ 8,15, 9,15,15,12,12,11,15,15,13, 6,15,15, 5,15,
+ 7,13,15,15, 6,15, 2,15,15, 6, 7, 7,15,15,15, 6,
+ 15,15, 4,15, 6,10,15,15,14, 4,15,15, 3,15, 5,10,
+ 15,15, 9,15, 6,15,15, 9,11,13,15,15,10, 5, 8,15,
+ 4,11, 5, 9,15,15,12, 9,10,11, 7,12, 8,11,15,15,
15,11,15, 5,15,15, 4, 6,15,15,15,14,15, 7,15,15,
- 5, 7,13,15,
+ 5, 7,15,15,
};
static static_codebook _huff_book_res_44c_A_128aux = {
1.3.2.1 +6 -37 vorbis/lib/books/res_Ac_1.vqh
Index: res_Ac_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_1.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_1.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_1.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -25,11 +25,11 @@
};
static long _vq_lengthlist_res_Ac_1[] = {
- 2, 5, 5, 0, 5, 4, 0, 4, 5, 5, 7, 7, 0, 8, 7, 0,
- 8, 7, 5, 6, 7, 0, 7, 8, 0, 7, 8, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 5, 8, 7, 0, 7, 6, 0, 7, 7, 5, 7, 8,
- 0, 6, 7, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
- 8, 7, 0, 7, 7, 0, 7, 7, 5, 7, 8, 0, 7, 7, 0, 6,
+ 2, 6, 6, 0, 5, 4, 0, 5, 4, 6, 9, 8, 0, 7, 8, 0,
+ 9, 7, 6, 8, 9, 0, 8, 7, 0, 7, 9, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 4, 9, 7, 0, 7, 6, 0, 7, 6, 4, 7, 9,
+ 0, 6, 7, 0, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
+ 7, 8, 0, 6, 7, 0, 7, 6, 4, 8, 8, 0, 7, 6, 0, 6,
7,
};
@@ -48,37 +48,6 @@
3
};
-static long _vq_pigeonmap_res_Ac_1[] = {
- 0, 0,
-};
-
-static long _vq_fitlist_res_Ac_1[] = {
- 0, 1, 2, 4, 5, 7, 8, 9,
- 10, 11, 13, 14, 16, 17, 18, 19,
- 20, 22, 23, 25, 26, 36, 37, 38,
- 40, 41, 43, 44, 45, 46, 47, 49,
- 50, 52, 53, 63, 64, 65, 67, 68,
- 70, 71, 72, 73, 74, 76, 77, 79,
- 80,
-};
-
-static long _vq_fitmap_res_Ac_1[] = {
- 0,
-};
-
-static long _vq_fitlength_res_Ac_1[] = {
- 49,
-};
-
-static encode_aux_pigeonhole _vq_auxp_res_Ac_1 = {
- -1, 1, 2, 1,
- _vq_pigeonmap_res_Ac_1,
- 49,
- _vq_fitlist_res_Ac_1,
- _vq_fitmap_res_Ac_1,
- _vq_fitlength_res_Ac_1
-};
-
static static_codebook _vq_book_res_Ac_1 = {
4, 81,
_vq_lengthlist_res_Ac_1,
@@ -86,7 +55,7 @@
_vq_quantlist_res_Ac_1,
NULL,
&_vq_auxt_res_Ac_1,
- &_vq_auxp_res_Ac_1,
+ NULL,
0
};
1.3.2.1 +1 -27 vorbis/lib/books/res_Ac_2.vqh
Index: res_Ac_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_2.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_2.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_2.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -48,32 +48,6 @@
3
};
-static long _vq_pigeonmap_res_Ac_2[] = {
- 0, 0,
-};
-
-static long _vq_fitlist_res_Ac_2[] = {
- 0, 1, 2, 9, 10, 11, 18, 19,
- 20,
-};
-
-static long _vq_fitmap_res_Ac_2[] = {
- 0,
-};
-
-static long _vq_fitlength_res_Ac_2[] = {
- 9,
-};
-
-static encode_aux_pigeonhole _vq_auxp_res_Ac_2 = {
- -1, 1, 2, 1,
- _vq_pigeonmap_res_Ac_2,
- 9,
- _vq_fitlist_res_Ac_2,
- _vq_fitmap_res_Ac_2,
- _vq_fitlength_res_Ac_2
-};
-
static static_codebook _vq_book_res_Ac_2 = {
4, 81,
_vq_lengthlist_res_Ac_2,
@@ -81,7 +55,7 @@
_vq_quantlist_res_Ac_2,
NULL,
&_vq_auxt_res_Ac_2,
- &_vq_auxp_res_Ac_2,
+ NULL,
0
};
1.3.2.1 +36 -237 vorbis/lib/books/res_Ac_3.vqh
Index: res_Ac_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_3.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_3.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_3.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -27,45 +27,45 @@
};
static long _vq_lengthlist_res_Ac_3[] = {
- 3, 6, 6, 9, 9, 0, 5, 5, 9, 9, 0, 5, 5, 8, 9, 0,
- 7, 7, 9, 9, 0, 0, 0, 9, 9, 6, 8, 7,10,10, 0, 8,
- 7,10, 9, 0, 7, 7,10,10, 0, 9, 9,11,10, 0, 0, 0,
- 11,11, 6, 7, 8,10,10, 0, 7, 8,10,10, 0, 7, 7,10,
- 10, 0, 9, 9,10,11, 0, 0, 0,11,11, 9,10,10,12,12,
- 0,11,11,13,12, 0,11,11,12,13, 0,14,13,13,13, 0,
- 0, 0,13,13, 9,10,10,11,12, 0,11,12,12,13, 0,11,
- 11,13,13, 0,12,13,13,14, 0, 0, 0,14,14, 0, 0, 0,
+ 3, 6, 6,10,10, 0, 5, 5, 9, 9, 0, 5, 5, 9, 9, 0,
+ 7, 7, 9, 9, 0, 0, 0, 9, 9, 6, 8, 8,12,11, 0, 7,
+ 8,10,10, 0, 8, 7,11,10, 0, 9,10,10,11, 0, 0, 0,
+ 12,10, 6, 7, 8,11,12, 0, 8, 7,10,10, 0, 7, 8,10,
+ 11, 0,10, 9,11,10, 0, 0, 0,10,11,10,12,11,14,13,
+ 0,11,12,12,13, 0,12,10,14,12, 0,12,13,13,15, 0,
+ 0, 0,16,13,10,11,12,13,13, 0,12,11,13,13, 0,10,
+ 12,13,13, 0,14,12,16,13, 0, 0, 0,12,14, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 5, 8, 7,12,11, 0, 7, 7,11, 9,
+ 0, 7, 6,11,10, 0, 8, 8,10,10, 0, 0, 0,11,10, 5,
+ 7, 8,10,13, 0, 7, 7,10,11, 0, 6, 7,10,11, 0, 8,
+ 8,10,10, 0, 0, 0,10,11, 9,11,10,15,13, 0,10,11,
+ 12,12, 0,11, 9,13,11, 0,11,12,13,13, 0, 0, 0,14,
+ 12, 9, 9,11,12,13, 0,10,10,12,13, 0, 9,11,11,13,
+ 0,12,11,13,13, 0, 0, 0,12,14, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 5, 7, 8,10,12, 0, 6, 7,10,11, 0, 7, 6,
+ 10,10, 0, 7, 9,10,11, 0, 0, 0,11,10, 5, 8, 7,12,
+ 11, 0, 7, 6,11, 9, 0, 7, 7,10,10, 0, 9, 8,11,10,
+ 0, 0, 0,10,10, 9,11,10,12,13, 0, 9,11,12,13, 0,
+ 11, 9,12,12, 0,11,12,12,14, 0, 0, 0,14,12, 9,10,
+ 10,13,12, 0,10, 9,13,11, 0, 9,11,12,12, 0,13,11,
+ 13,12, 0, 0, 0,12,14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 6,10, 9,14,12, 0, 9, 8,12,11, 0, 8, 8,12,11, 0,
+ 9, 9,12,11, 0, 0, 0,11,11, 6, 9,10,12,15, 0, 8,
+ 9,11,12, 0, 8, 8,11,12, 0, 9, 9,11,12, 0, 0, 0,
+ 11,11, 9,11,10,15,12, 0,10,10,14,12, 0,11,10,15,
+ 12, 0,11,12,13,12, 0, 0, 0,13,12, 9,10,11,12,15,
+ 0,10,11,12,13, 0,10,11,12,13, 0,11,12,12,13, 0,
+ 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 5, 7, 7,11,11, 0, 7, 6,10,10,
- 0, 7, 7,10,10, 0, 9, 8,11,10, 0, 0, 0,10,10, 5,
- 7, 7,11,11, 0, 6, 7,10,10, 0, 7, 7,10,10, 0, 8,
- 9,10,10, 0, 0, 0,11,10, 9,10,10,13,12, 0,10,10,
- 12,12, 0,10,10,12,12, 0,12,12,13,13, 0, 0, 0,13,
- 13, 9,10,10,13,13, 0,10,10,12,12, 0,10,10,13,12,
- 0,11,12,12,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5, 8, 7,11,11, 0, 7, 7,10,10, 0, 7, 7,
- 10,10, 0, 8, 8,10,10, 0, 0, 0,10,10, 5, 7, 8,11,
- 11, 0, 7, 7,10,10, 0, 6, 7,10,10, 0, 8, 8,10,10,
- 0, 0, 0,10,10, 9,10,10,13,12, 0,10,10,13,12, 0,
- 10,10,12,12, 0,12,12,13,12, 0, 0, 0,13,13, 9,10,
- 10,12,12, 0,10,10,11,13, 0,10,10,11,12, 0,11,12,
- 12,14, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 7, 9, 9,13,13, 0, 8, 8,11,12, 0, 8, 9,12,12, 0,
- 10, 9,12,11, 0, 0, 0,11,12, 7, 9, 9,13,12, 0, 8,
- 8,12,11, 0, 9, 8,12,11, 0, 9,10,12,12, 0, 0, 0,
- 12,11, 9,11,11,13,14, 0,10,10,13,12, 0,10,10,13,
- 13, 0,12,11,13,12, 0, 0, 0,13,13, 9,11,11,14,14,
- 0,10,10,12,13, 0,10,10,13,13, 0,11,12,12,13, 0,
- 0, 0,13,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
- 11,10,14,13, 0,10,10,13,12, 0,10,10,13,12, 0,11,
- 11,13,12, 0, 0, 0,13,12, 9,10,11,13,14, 0,10,10,
- 12,13, 0,10,10,12,13, 0,12,11,13,12, 0, 0, 0,12,
+ 11,11,13,14, 0,10,11,12,14, 0,10,10,13,13, 0,11,
+ 12,12,13, 0, 0, 0,13,12, 9,11,10,14,13, 0,11,10,
+ 15,12, 0,10,10,13,12, 0,12,11,13,12, 0, 0, 0,12,
13,
};
@@ -84,207 +84,6 @@
5
};
-static long _vq_pigeonmap_res_Ac_3[] = {
- 1, 0, 0, 0,
-};
-
-static long _vq_fitlist_res_Ac_3[] = {
- 0, 1, 2, 3, 6, 7, 8, 11,
- 12, 13, 16, 17, 18, 25, 26, 27,
- 28, 31, 32, 33, 36, 37, 38, 41,
- 42, 43, 50, 51, 52, 53, 56, 57,
- 58, 61, 62, 63, 66, 67, 68, 75,
- 76, 77, 78, 81, 82, 83, 86, 87,
- 88, 91, 92, 93, 150, 151, 152, 153,
- 156, 157, 158, 161, 162, 163, 166, 167,
- 168, 175, 176, 177, 178, 181, 182, 183,
- 186, 187, 188, 191, 192, 193, 200, 201,
- 202, 203, 206, 207, 208, 211, 212, 213,
- 216, 217, 218, 275, 276, 277, 278, 281,
- 282, 283, 286, 287, 288, 291, 292, 293,
- 300, 301, 302, 303, 306, 307, 308, 311,
- 316, 325, 326, 327, 328, 331, 332, 333,
- 336, 341, 400, 401, 402, 403, 406, 407,
- 408, 411, 412, 413, 416, 417, 418, 425,
- 426, 427, 428, 431, 432, 433, 436, 441,
- 450, 451, 452, 453, 456, 457, 458, 461,
- 466, 4, 9, 14, 19, 29, 34, 39,
- 44, 54, 59, 64, 69, 79, 84, 89,
- 94, 154, 159, 164, 169, 179, 184, 189,
- 194, 204, 209, 214, 219, 279, 284, 289,
- 294, 304, 309, 312, 317, 329, 334, 337,
- 342, 404, 409, 414, 419, 429, 434, 437,
- 442, 454, 459, 462, 467, 314, 319, 339,
- 344, 439, 444, 464, 469, 23, 48, 73,
- 98, 173, 198, 223, 298, 313, 338, 423,
- 438, 463, 24, 49, 74, 99, 174, 199,
- 224, 299, 424, 324, 349, 449, 474, 323,
- 348, 448, 473, 100, 101, 102, 103, 106,
- 107, 108, 111, 112, 113, 116, 117, 118,
- 225, 226, 227, 228, 231, 232, 233, 236,
- 237, 238, 241, 242, 243, 318, 350, 351,
- 352, 353, 356, 357, 358, 361, 366, 443,
- 475, 476, 477, 478, 481, 482, 483, 486,
- 491, 104, 109, 114, 119, 229, 234, 239,
- 244, 354, 359, 362, 367, 479, 484, 487,
- 492, 364, 369, 489, 494, 123, 248, 363,
- 488, 124, 249, 374, 499, 373, 498, 368,
- 493, 343, 575, 576, 577, 578, 581, 582,
- 583, 586, 591, 579, 584, 587, 592, 589,
- 594, 588, 599, 598, 600, 601, 602, 603,
- 606, 607, 608, 611, 616, 604, 609, 612,
- 617, 614, 619, 613, 624, 623, 618, 593,
- 0, 1, 3, 6, 8, 11, 13, 16,
- 18, 25, 26, 28, 31, 33, 36, 38,
- 41, 43, 50, 51, 53, 56, 58, 61,
- 63, 66, 68, 75, 76, 78, 81, 83,
- 86, 88, 91, 93, 150, 151, 153, 156,
- 158, 161, 163, 166, 168, 175, 176, 178,
- 181, 183, 186, 188, 191, 193, 200, 201,
- 203, 206, 208, 211, 213, 216, 218, 275,
- 276, 278, 281, 283, 286, 288, 291, 293,
- 300, 301, 303, 306, 308, 311, 313, 316,
- 318, 325, 326, 328, 331, 333, 336, 338,
- 341, 343, 400, 401, 403, 406, 408, 411,
- 413, 416, 418, 425, 426, 428, 431, 433,
- 436, 438, 441, 443, 450, 451, 453, 456,
- 458, 461, 463, 466, 468, 23, 48, 73,
- 98, 173, 198, 223, 298, 323, 348, 423,
- 448, 473, 100, 101, 103, 106, 108, 111,
- 113, 116, 118, 225, 226, 228, 231, 233,
- 236, 238, 241, 243, 350, 351, 353, 356,
- 358, 361, 363, 366, 368, 475, 476, 478,
- 481, 483, 486, 488, 491, 493, 123, 248,
- 373, 498, 575, 576, 578, 581, 583, 586,
- 588, 591, 593, 598, 600, 601, 603, 606,
- 608, 611, 613, 616, 618, 623, 0, 1,
- 2, 3, 6, 7, 8, 16, 17, 18,
- 25, 26, 27, 28, 31, 32, 33, 41,
- 42, 43, 50, 51, 52, 53, 56, 57,
- 58, 66, 67, 68, 75, 76, 77, 78,
- 81, 82, 83, 91, 92, 93, 150, 151,
- 152, 153, 156, 157, 158, 166, 167, 168,
- 175, 176, 177, 178, 181, 182, 183, 191,
- 192, 193, 200, 201, 202, 203, 206, 207,
- 208, 216, 217, 218, 275, 276, 277, 278,
- 281, 282, 283, 291, 292, 293, 300, 301,
- 306, 307, 308, 316, 317, 318, 325, 326,
- 331, 332, 333, 341, 342, 343, 400, 401,
- 402, 403, 406, 407, 408, 416, 417, 418,
- 425, 426, 431, 432, 433, 441, 442, 443,
- 450, 451, 456, 457, 458, 466, 467, 468,
- 4, 9, 19, 29, 34, 44, 54, 59,
- 69, 79, 84, 94, 154, 159, 169, 179,
- 184, 194, 204, 209, 219, 279, 284, 294,
- 302, 309, 319, 327, 334, 344, 404, 409,
- 419, 427, 434, 444, 452, 459, 469, 304,
- 329, 429, 454, 100, 101, 102, 103, 106,
- 107, 108, 116, 117, 118, 225, 226, 227,
- 228, 231, 232, 233, 241, 242, 243, 303,
- 350, 351, 356, 357, 358, 366, 367, 368,
- 428, 475, 476, 481, 482, 483, 491, 492,
- 493, 104, 109, 119, 229, 234, 244, 352,
- 359, 369, 477, 484, 494, 354, 479, 353,
- 478, 328, 575, 576, 581, 582, 583, 591,
- 592, 593, 577, 584, 594, 579, 600, 601,
- 606, 607, 608, 616, 617, 618, 602, 609,
- 619, 604, 603, 578, 0, 1, 2, 3,
- 6, 7, 8, 11, 12, 13, 16, 17,
- 18, 25, 26, 27, 28, 31, 32, 33,
- 36, 37, 38, 41, 42, 43, 75, 76,
- 77, 78, 81, 82, 83, 86, 87, 88,
- 91, 92, 93, 150, 151, 152, 153, 156,
- 157, 158, 161, 162, 163, 166, 167, 168,
- 200, 201, 202, 203, 206, 207, 208, 211,
- 212, 213, 216, 217, 218, 275, 276, 277,
- 278, 281, 282, 283, 286, 287, 288, 291,
- 292, 293, 325, 326, 327, 328, 331, 332,
- 333, 336, 337, 338, 341, 342, 343, 400,
- 401, 402, 403, 406, 407, 408, 411, 412,
- 413, 416, 417, 418, 450, 451, 452, 453,
- 456, 457, 458, 461, 462, 463, 466, 467,
- 468, 4, 9, 14, 19, 29, 34, 39,
- 44, 79, 84, 89, 94, 154, 159, 164,
- 169, 204, 209, 214, 219, 279, 284, 289,
- 294, 329, 334, 339, 344, 404, 409, 414,
- 419, 454, 459, 464, 469, 23, 48, 98,
- 173, 223, 298, 348, 423, 473, 24, 49,
- 99, 174, 224, 299, 349, 424, 474, 575,
- 576, 577, 578, 581, 582, 583, 586, 587,
- 588, 591, 592, 593, 579, 584, 589, 594,
- 598, 599, 0, 1, 2, 3, 6, 7,
- 8, 11, 12, 13, 16, 17, 18, 25,
- 26, 27, 28, 31, 32, 33, 36, 37,
- 38, 41, 42, 43, 50, 51, 52, 53,
- 56, 57, 58, 61, 66, 75, 76, 77,
- 78, 81, 82, 83, 86, 91, 150, 151,
- 152, 153, 156, 157, 158, 161, 162, 163,
- 166, 167, 168, 175, 176, 177, 178, 181,
- 182, 183, 186, 187, 188, 191, 192, 193,
- 200, 201, 202, 203, 206, 207, 208, 211,
- 212, 213, 216, 217, 218, 400, 401, 402,
- 403, 406, 407, 408, 411, 412, 413, 416,
- 417, 418, 425, 426, 427, 428, 431, 432,
- 433, 436, 437, 438, 441, 442, 443, 450,
- 451, 452, 453, 456, 457, 458, 461, 462,
- 463, 466, 467, 468, 4, 9, 14, 19,
- 29, 34, 39, 44, 54, 59, 62, 67,
- 79, 84, 87, 92, 154, 159, 164, 169,
- 179, 184, 189, 194, 204, 209, 214, 219,
- 404, 409, 414, 419, 429, 434, 439, 444,
- 454, 459, 464, 469, 64, 69, 89, 94,
- 23, 48, 63, 88, 173, 198, 223, 423,
- 448, 473, 24, 49, 174, 199, 224, 424,
- 449, 474, 74, 99, 73, 98, 68, 100,
- 101, 102, 103, 106, 107, 108, 111, 116,
- 225, 226, 227, 228, 231, 232, 233, 236,
- 237, 238, 241, 242, 243, 475, 476, 477,
- 478, 481, 482, 483, 486, 487, 488, 491,
- 492, 493, 104, 109, 112, 117, 229, 234,
- 239, 244, 479, 484, 489, 494, 114, 119,
- 113, 248, 498, 249, 499, 124, 123, 118,
- 0, 1, 2, 3, 6, 7, 8, 16,
- 17, 18, 25, 26, 27, 28, 31, 32,
- 33, 41, 42, 43, 50, 51, 56, 57,
- 58, 66, 67, 68, 75, 76, 81, 82,
- 83, 91, 92, 93, 150, 151, 152, 153,
- 156, 157, 158, 166, 167, 168, 175, 176,
- 177, 178, 181, 182, 183, 191, 192, 193,
- 200, 201, 202, 203, 206, 207, 208, 216,
- 217, 218, 400, 401, 402, 403, 406, 407,
- 408, 416, 417, 418, 425, 426, 427, 428,
- 431, 432, 433, 441, 442, 443, 450, 451,
- 452, 453, 456, 457, 458, 466, 467, 468,
- 4, 9, 19, 29, 34, 44, 52, 59,
- 69, 77, 84, 94, 154, 159, 169, 179,
- 184, 194, 204, 209, 219, 404, 409, 419,
- 429, 434, 444, 454, 459, 469, 54, 79,
- 53, 100, 101, 106, 107, 108, 116, 117,
- 118, 225, 226, 227, 228, 231, 232, 233,
- 241, 242, 243, 475, 476, 477, 478, 481,
- 482, 483, 491, 492, 493, 102, 109, 119,
- 229, 234, 244, 479, 484, 494, 104, 103,
-};
-
-static long _vq_fitmap_res_Ac_3[] = {
- 0, 360, 550, 360, 796, 360, 796, 360,
- 986, 360, 1232, 360, 796, 360, 796, 360,
-};
-
-static long _vq_fitlength_res_Ac_3[] = {
- 360, 190, 246, 190, 190, 190, 190, 190,
- 246, 190, 168, 190, 190, 190, 190, 190,
-};
-
-static encode_aux_pigeonhole _vq_auxp_res_Ac_3 = {
- -2, 1, 4, 2,
- _vq_pigeonmap_res_Ac_3,
- 1400,
- _vq_fitlist_res_Ac_3,
- _vq_fitmap_res_Ac_3,
- _vq_fitlength_res_Ac_3
-};
-
static static_codebook _vq_book_res_Ac_3 = {
4, 625,
_vq_lengthlist_res_Ac_3,
@@ -292,7 +91,7 @@
_vq_quantlist_res_Ac_3,
NULL,
&_vq_auxt_res_Ac_3,
- &_vq_auxp_res_Ac_3,
+ NULL,
0
};
1.3.2.1 +37 -238 vorbis/lib/books/res_Ac_4.vqh
Index: res_Ac_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_4.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_4.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_4.vqh 2001/10/11 15:41:47 1.3.2.1
@@ -27,45 +27,45 @@
};
static long _vq_lengthlist_res_Ac_4[] = {
- 2, 6, 6,11,10, 0, 5, 5, 9, 9, 0, 5, 5, 9, 9, 0,
- 6, 6, 9, 9, 0, 0, 0, 9, 9, 6, 8, 7,12,11, 0, 8,
- 8,11,10, 0, 8, 8,11,11, 0,10, 9,12,12, 0, 0, 0,
- 12,11, 6, 7, 8,11,12, 0, 8, 8,10,12, 0, 8, 8,10,
- 11, 0, 9,10,11,12, 0, 0, 0,11,12,10,12,11,14,13,
- 0,12,12,15,14, 0,13,12,15,14, 0,14,16,16,15, 0,
- 0, 0,18,15,10,11,12,13,15, 0,12,13,14,15, 0,12,
- 12,13,15, 0,15,15,14,18, 0, 0, 0,15,18, 0, 0, 0,
+ 2, 7, 7,13,13, 0, 5, 5,10,10, 0, 5, 5,10,10, 0,
+ 6, 6, 9, 9, 0, 0, 0,10,10, 7,10, 9,15,14, 0, 8,
+ 8,12,12, 0, 9, 7,13,11, 0, 9,10,11,12, 0, 0, 0,
+ 13,11, 7, 9,10,13,15, 0, 8, 8,12,12, 0, 7, 9,11,
+ 14, 0,10, 9,12,11, 0, 0, 0,11,14,13,16,15, 0,18,
+ 0,14,14,16,15, 0,16,13, 0,14, 0,14,15,15,16, 0,
+ 0, 0,18,15,13,14,15, 0,17, 0,15,14,18,17, 0,13,
+ 15,15,18, 0,17,14,16,17, 0, 0, 0,14,17, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 5, 9, 7,16,12, 0, 7, 7,12,11,
+ 0, 7, 6,13,11, 0, 8, 8,11,10, 0, 0, 0,11,10, 5,
+ 7, 9,13,16, 0, 7, 7,11,12, 0, 6, 7,10,12, 0, 8,
+ 8,10,11, 0, 0, 0,10,11,10,14,11,18,15, 0,11,12,
+ 15,14, 0,13,10,17,13, 0,12,13,15,14, 0, 0, 0,15,
+ 13,10,11,14,16, 0, 0,11,12,13,18, 0,10,13,13,17,
+ 0,14,12,15,14, 0, 0, 0,13,16, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 5, 8, 8,14,15, 0, 6, 7,11,12, 0, 7, 6,
+ 11,11, 0, 8, 8,10,11, 0, 0, 0,11,10, 5, 8, 8,14,
+ 14, 0, 7, 6,12,11, 0, 7, 7,11,11, 0, 9, 8,11,10,
+ 0, 0, 0,10,11,10,12,12,15,16, 0,11,12,14,15, 0,
+ 12,11,16,14, 0,11,14,14,18, 0, 0, 0,18,13,10,12,
+ 13,16,18, 0,13,11,18,14, 0,11,12,14,16, 0,14,12,
+ 15,13, 0, 0, 0,13,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 6,10, 9,17,14, 0, 8, 7,13,12, 0, 8, 8,13,12, 0,
+ 9, 8,13,11, 0, 0, 0,12,12, 6, 9,10,14,16, 0, 8,
+ 8,12,15, 0, 8, 8,12,14, 0, 8, 9,11,13, 0, 0, 0,
+ 12,12,10,13,11,18,14, 0,11,10,15,13, 0,12,10,16,
+ 13, 0,12,12,14,13, 0, 0, 0,15,13, 9,11,13,15,18,
+ 0,10,11,13,16, 0,10,11,13, 0, 0,12,12,13,14, 0,
+ 0, 0,14,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 5, 8, 8,13,13, 0, 7, 7,11,10,
- 0, 7, 7,11,11, 0, 9, 8,11,10, 0, 0, 0,11,11, 5,
- 8, 8,12,13, 0, 7, 7,11,11, 0, 7, 7,11,11, 0, 8,
- 9,10,11, 0, 0, 0,11,11, 9,11,11,15,15, 0,11,11,
- 14,13, 0,12,11,14,13, 0,13,13,15,13, 0, 0, 0,15,
- 14, 9,10,11,14,14, 0,10,11,13,14, 0,11,11,14,14,
- 0,12,13,13,14, 0, 0, 0,14,16, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5, 8, 8,13,13, 0, 7, 7,11,11, 0, 7, 7,
- 11,11, 0, 8, 8,11,11, 0, 0, 0,11,10, 5, 8, 8,12,
- 13, 0, 7, 7,11,11, 0, 7, 7,11,11, 0, 8, 8,11,11,
- 0, 0, 0,10,11, 9,11,11,15,14, 0,11,11,14,14, 0,
- 11,11,14,12, 0,13,13,16,14, 0, 0, 0,15,14, 9,10,
- 11,14,16, 0,11,11,13,14, 0,10,11,13,14, 0,13,12,
- 14,15, 0, 0, 0,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 6,10,10,15,15, 0, 8, 8,14,13, 0, 8, 9,13,14, 0,
- 10, 9,13,12, 0, 0, 0,12,13, 7,10,10,15,15, 0, 8,
- 8,13,13, 0, 9, 8,13,13, 0, 9,10,12,13, 0, 0, 0,
- 13,12,10,12,11,17,18, 0,11,10,15,14, 0,11,11,15,
- 15, 0,13,12,15,13, 0, 0, 0,15,14,10,11,12,15,16,
- 0,10,11,13,14, 0,11,11,14,18, 0,12,13,13,15, 0,
- 0, 0,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
- 12,11,18,16, 0,11,11,15,14, 0,11,10,15,13, 0,12,
- 13,14,14, 0, 0, 0,14,13, 9,11,12,15,16, 0,11,11,
- 15,15, 0,10,11,14,15, 0,12,12,15,14, 0, 0, 0,13,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
+ 11,12,16,17, 0,10,11,13,15, 0,11,10,14,14, 0,11,
+ 13,13,16, 0, 0, 0,15,13,10,13,11,17,16, 0,12,10,
+ 16,13, 0,10,11,14,14, 0,13,11,15,13, 0, 0, 0,13,
14,
};
@@ -84,207 +84,6 @@
5
};
-static long _vq_pigeonmap_res_Ac_4[] = {
- 1, 0, 0, 0,
-};
-
-static long _vq_fitlist_res_Ac_4[] = {
- 0, 1, 2, 3, 6, 7, 8, 11,
- 12, 13, 16, 17, 18, 25, 26, 27,
- 28, 31, 32, 33, 36, 37, 38, 41,
- 42, 43, 50, 51, 52, 53, 56, 57,
- 58, 61, 62, 63, 66, 67, 68, 75,
- 76, 77, 78, 81, 82, 83, 86, 87,
- 88, 91, 92, 93, 150, 151, 152, 153,
- 156, 157, 158, 161, 162, 163, 166, 167,
- 168, 175, 176, 177, 178, 181, 182, 183,
- 186, 187, 188, 191, 192, 193, 200, 201,
- 202, 203, 206, 207, 208, 211, 212, 213,
- 216, 217, 218, 275, 276, 277, 278, 281,
- 282, 283, 286, 287, 288, 291, 292, 293,
- 300, 301, 302, 303, 306, 307, 308, 311,
- 316, 325, 326, 327, 328, 331, 332, 333,
- 336, 341, 400, 401, 402, 403, 406, 407,
- 408, 411, 412, 413, 416, 417, 418, 425,
- 426, 427, 428, 431, 432, 433, 436, 441,
- 450, 451, 452, 453, 456, 457, 458, 461,
- 466, 4, 9, 14, 19, 29, 34, 39,
- 44, 54, 59, 64, 69, 79, 84, 89,
- 94, 154, 159, 164, 169, 179, 184, 189,
- 194, 204, 209, 214, 219, 279, 284, 289,
- 294, 304, 309, 312, 317, 329, 334, 337,
- 342, 404, 409, 414, 419, 429, 434, 437,
- 442, 454, 459, 462, 467, 314, 319, 339,
- 344, 439, 444, 464, 469, 23, 48, 73,
- 98, 173, 198, 223, 298, 313, 338, 423,
- 438, 463, 24, 49, 74, 99, 174, 199,
- 224, 299, 424, 324, 349, 449, 474, 323,
- 348, 448, 473, 100, 101, 102, 103, 106,
- 107, 108, 111, 112, 113, 116, 117, 118,
- 225, 226, 227, 228, 231, 232, 233, 236,
- 237, 238, 241, 242, 243, 318, 350, 351,
- 352, 353, 356, 357, 358, 361, 366, 443,
- 475, 476, 477, 478, 481, 482, 483, 486,
- 491, 104, 109, 114, 119, 229, 234, 239,
- 244, 354, 359, 362, 367, 479, 484, 487,
- 492, 364, 369, 489, 494, 123, 248, 363,
- 488, 124, 249, 374, 499, 373, 498, 368,
- 493, 343, 575, 576, 577, 578, 581, 582,
- 583, 586, 591, 579, 584, 587, 592, 589,
- 594, 588, 599, 598, 600, 601, 602, 603,
- 606, 607, 608, 611, 616, 604, 609, 612,
- 617, 614, 619, 613, 624, 623, 618, 593,
- 0, 1, 3, 6, 8, 11, 13, 16,
- 18, 25, 26, 28, 31, 33, 36, 38,
- 41, 43, 50, 51, 53, 56, 58, 61,
- 63, 66, 68, 75, 76, 78, 81, 83,
- 86, 88, 91, 93, 150, 151, 153, 156,
- 158, 161, 163, 166, 168, 175, 176, 178,
- 181, 183, 186, 188, 191, 193, 200, 201,
- 203, 206, 208, 211, 213, 216, 218, 275,
- 276, 278, 281, 283, 286, 288, 291, 293,
- 300, 301, 303, 306, 308, 311, 313, 316,
- 318, 325, 326, 328, 331, 333, 336, 338,
- 341, 343, 400, 401, 403, 406, 408, 411,
- 413, 416, 418, 425, 426, 428, 431, 433,
- 436, 438, 441, 443, 450, 451, 453, 456,
- 458, 461, 463, 466, 468, 23, 48, 73,
- 98, 173, 198, 223, 298, 323, 348, 423,
- 448, 473, 100, 101, 103, 106, 108, 111,
- 113, 116, 118, 225, 226, 228, 231, 233,
- 236, 238, 241, 243, 350, 351, 353, 356,
- 358, 361, 363, 366, 368, 475, 476, 478,
- 481, 483, 486, 488, 491, 493, 123, 248,
- 373, 498, 575, 576, 578, 581, 583, 586,
- 588, 591, 593, 598, 600, 601, 603, 606,
- 608, 611, 613, 616, 618, 623, 0, 1,
- 2, 3, 6, 7, 8, 16, 17, 18,
- 25, 26, 27, 28, 31, 32, 33, 41,
- 42, 43, 50, 51, 52, 53, 56, 57,
- 58, 66, 67, 68, 75, 76, 77, 78,
- 81, 82, 83, 91, 92, 93, 150, 151,
- 152, 153, 156, 157, 158, 166, 167, 168,
- 175, 176, 177, 178, 181, 182, 183, 191,
- 192, 193, 200, 201, 202, 203, 206, 207,
- 208, 216, 217, 218, 275, 276, 277, 278,
- 281, 282, 283, 291, 292, 293, 300, 301,
- 306, 307, 308, 316, 317, 318, 325, 326,
- 331, 332, 333, 341, 342, 343, 400, 401,
- 402, 403, 406, 407, 408, 416, 417, 418,
- 425, 426, 431, 432, 433, 441, 442, 443,
- 450, 451, 456, 457, 458, 466, 467, 468,
- 4, 9, 19, 29, 34, 44, 54, 59,
- 69, 79, 84, 94, 154, 159, 169, 179,
- 184, 194, 204, 209, 219, 279, 284, 294,
- 302, 309, 319, 327, 334, 344, 404, 409,
- 419, 427, 434, 444, 452, 459, 469, 304,
- 329, 429, 454, 100, 101, 102, 103, 106,
- 107, 108, 116, 117, 118, 225, 226, 227,
- 228, 231, 232, 233, 241, 242, 243, 303,
- 350, 351, 356, 357, 358, 366, 367, 368,
- 428, 475, 476, 481, 482, 483, 491, 492,
- 493, 104, 109, 119, 229, 234, 244, 352,
- 359, 369, 477, 484, 494, 354, 479, 353,
- 478, 328, 575, 576, 581, 582, 583, 591,
- 592, 593, 577, 584, 594, 579, 600, 601,
- 606, 607, 608, 616, 617, 618, 602, 609,
- 619, 604, 603, 578, 0, 1, 2, 3,
- 6, 7, 8, 11, 12, 13, 16, 17,
- 18, 25, 26, 27, 28, 31, 32, 33,
- 36, 37, 38, 41, 42, 43, 75, 76,
- 77, 78, 81, 82, 83, 86, 87, 88,
- 91, 92, 93, 150, 151, 152, 153, 156,
- 157, 158, 161, 162, 163, 166, 167, 168,
- 200, 201, 202, 203, 206, 207, 208, 211,
- 212, 213, 216, 217, 218, 275, 276, 277,
- 278, 281, 282, 283, 286, 287, 288, 291,
- 292, 293, 325, 326, 327, 328, 331, 332,
- 333, 336, 337, 338, 341, 342, 343, 400,
- 401, 402, 403, 406, 407, 408, 411, 412,
- 413, 416, 417, 418, 450, 451, 452, 453,
- 456, 457, 458, 461, 462, 463, 466, 467,
- 468, 4, 9, 14, 19, 29, 34, 39,
- 44, 79, 84, 89, 94, 154, 159, 164,
- 169, 204, 209, 214, 219, 279, 284, 289,
- 294, 329, 334, 339, 344, 404, 409, 414,
- 419, 454, 459, 464, 469, 23, 48, 98,
- 173, 223, 298, 348, 423, 473, 24, 49,
- 99, 174, 224, 299, 349, 424, 474, 575,
- 576, 577, 578, 581, 582, 583, 586, 587,
- 588, 591, 592, 593, 579, 584, 589, 594,
- 598, 599, 0, 1, 2, 3, 6, 7,
- 8, 11, 12, 13, 16, 17, 18, 25,
- 26, 27, 28, 31, 32, 33, 36, 37,
- 38, 41, 42, 43, 50, 51, 52, 53,
- 56, 57, 58, 61, 66, 75, 76, 77,
- 78, 81, 82, 83, 86, 91, 150, 151,
- 152, 153, 156, 157, 158, 161, 162, 163,
- 166, 167, 168, 175, 176, 177, 178, 181,
- 182, 183, 186, 187, 188, 191, 192, 193,
- 200, 201, 202, 203, 206, 207, 208, 211,
- 212, 213, 216, 217, 218, 400, 401, 402,
- 403, 406, 407, 408, 411, 412, 413, 416,
- 417, 418, 425, 426, 427, 428, 431, 432,
- 433, 436, 437, 438, 441, 442, 443, 450,
- 451, 452, 453, 456, 457, 458, 461, 462,
- 463, 466, 467, 468, 4, 9, 14, 19,
- 29, 34, 39, 44, 54, 59, 62, 67,
- 79, 84, 87, 92, 154, 159, 164, 169,
- 179, 184, 189, 194, 204, 209, 214, 219,
- 404, 409, 414, 419, 429, 434, 439, 444,
- 454, 459, 464, 469, 64, 69, 89, 94,
- 23, 48, 63, 88, 173, 198, 223, 423,
- 448, 473, 24, 49, 174, 199, 224, 424,
- 449, 474, 74, 99, 73, 98, 68, 100,
- 101, 102, 103, 106, 107, 108, 111, 116,
- 225, 226, 227, 228, 231, 232, 233, 236,
- 237, 238, 241, 242, 243, 475, 476, 477,
- 478, 481, 482, 483, 486, 487, 488, 491,
- 492, 493, 104, 109, 112, 117, 229, 234,
- 239, 244, 479, 484, 489, 494, 114, 119,
- 113, 248, 498, 249, 499, 124, 123, 118,
- 0, 1, 2, 3, 6, 7, 8, 16,
- 17, 18, 25, 26, 27, 28, 31, 32,
- 33, 41, 42, 43, 50, 51, 56, 57,
- 58, 66, 67, 68, 75, 76, 81, 82,
- 83, 91, 92, 93, 150, 151, 152, 153,
- 156, 157, 158, 166, 167, 168, 175, 176,
- 177, 178, 181, 182, 183, 191, 192, 193,
- 200, 201, 202, 203, 206, 207, 208, 216,
- 217, 218, 400, 401, 402, 403, 406, 407,
- 408, 416, 417, 418, 425, 426, 427, 428,
- 431, 432, 433, 441, 442, 443, 450, 451,
- 452, 453, 456, 457, 458, 466, 467, 468,
- 4, 9, 19, 29, 34, 44, 52, 59,
- 69, 77, 84, 94, 154, 159, 169, 179,
- 184, 194, 204, 209, 219, 404, 409, 419,
- 429, 434, 444, 454, 459, 469, 54, 79,
- 53, 100, 101, 106, 107, 108, 116, 117,
- 118, 225, 226, 227, 228, 231, 232, 233,
- 241, 242, 243, 475, 476, 477, 478, 481,
- 482, 483, 491, 492, 493, 102, 109, 119,
- 229, 234, 244, 479, 484, 494, 104, 103,
-};
-
-static long _vq_fitmap_res_Ac_4[] = {
- 0, 360, 550, 360, 796, 360, 796, 360,
- 986, 360, 1232, 360, 796, 360, 796, 360,
-};
-
-static long _vq_fitlength_res_Ac_4[] = {
- 360, 190, 246, 190, 190, 190, 190, 190,
- 246, 190, 168, 190, 190, 190, 190, 190,
-};
-
-static encode_aux_pigeonhole _vq_auxp_res_Ac_4 = {
- -2, 1, 4, 2,
- _vq_pigeonmap_res_Ac_4,
- 1400,
- _vq_fitlist_res_Ac_4,
- _vq_fitmap_res_Ac_4,
- _vq_fitlength_res_Ac_4
-};
-
static static_codebook _vq_book_res_Ac_4 = {
4, 625,
_vq_lengthlist_res_Ac_4,
@@ -292,7 +91,7 @@
_vq_quantlist_res_Ac_4,
NULL,
&_vq_auxt_res_Ac_4,
- &_vq_auxp_res_Ac_4,
+ NULL,
0
};
1.3.2.1 +6 -36 vorbis/lib/books/res_Ac_5.vqh
Index: res_Ac_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_5.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_5.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_5.vqh 2001/10/11 15:41:48 1.3.2.1
@@ -27,13 +27,13 @@
};
static long _vq_lengthlist_res_Ac_5[] = {
- 2, 4, 4, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 4, 7, 6, 0, 0,
+ 2, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 3, 4, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6,10, 9,
+ 0, 0, 4, 4, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 6, 6, 7, 8,10, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -84,36 +84,6 @@
5
};
-static long _vq_pigeonmap_res_Ac_5[] = {
- 1, 0, 0, 0,
-};
-
-static long _vq_fitlist_res_Ac_5[] = {
- 0, 1, 2, 3, 25, 26, 27, 28,
- 50, 51, 52, 53, 75, 76, 77, 78,
- 4, 29, 54, 79, 100, 101, 102, 103,
- 104,
-};
-
-static long _vq_fitmap_res_Ac_5[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static long _vq_fitlength_res_Ac_5[] = {
- 25, 25, 25, 25, 25, 25, 25, 25,
- 25, 25, 25, 25, 25, 25, 25, 25,
-};
-
-static encode_aux_pigeonhole _vq_auxp_res_Ac_5 = {
- -2, 1, 4, 2,
- _vq_pigeonmap_res_Ac_5,
- 25,
- _vq_fitlist_res_Ac_5,
- _vq_fitmap_res_Ac_5,
- _vq_fitlength_res_Ac_5
-};
-
static static_codebook _vq_book_res_Ac_5 = {
4, 625,
_vq_lengthlist_res_Ac_5,
@@ -121,7 +91,7 @@
_vq_quantlist_res_Ac_5,
NULL,
&_vq_auxt_res_Ac_5,
- &_vq_auxp_res_Ac_5,
+ NULL,
0
};
1.3.2.1 +5 -70 vorbis/lib/books/res_Ac_6.vqh
Index: res_Ac_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_6.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_6.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_6.vqh 2001/10/11 15:41:48 1.3.2.1
@@ -31,10 +31,10 @@
};
static long _vq_lengthlist_res_Ac_6[] = {
- 2, 4, 4, 7, 7, 8, 8,10,10, 0, 4, 4, 6, 6, 8, 8,
- 10,10, 0, 4, 3, 6, 6, 8, 8,10,10, 0, 5, 5, 6, 6,
- 8, 8,10,10, 0, 0, 0, 7, 6, 8, 8,10,10, 0, 0, 0,
- 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
+ 2, 4, 4, 7, 7, 9, 9,10,10, 0, 4, 4, 6, 6, 8, 8,
+ 10,10, 0, 4, 4, 6, 6, 8, 8,10,10, 0, 5, 4, 6, 6,
+ 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0,
+ 6, 6, 9, 9,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0,
0, 0, 8, 8, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
11,
};
@@ -55,71 +55,6 @@
9
};
-static long _vq_pigeonmap_res_Ac_6[] = {
- 2, 1, 1, 0, 0, 0, 1, 2,
-};
-
-static long _vq_fitlist_res_Ac_6[] = {
- 0, 1, 2, 3, 10, 11, 12, 19,
- 28, 4, 13, 20, 29, 6, 15, 22,
- 31, 21, 24, 40, 39, 42, 58, 1,
- 3, 5, 7, 10, 12, 14, 16, 21,
- 23, 30, 32, 0, 19, 28, 2, 4,
- 6, 8, 11, 13, 15, 17, 22, 24,
- 31, 33, 25, 39, 41, 20, 26, 40,
- 42, 43, 57, 59, 44, 58, 60, 3,
- 5, 7, 12, 14, 16, 23, 25, 32,
- 34, 4, 6, 8, 13, 15, 17, 24,
- 26, 33, 35, 21, 41, 43, 22, 42,
- 44, 39, 59, 61, 40, 60, 62, 10,
- 28, 29, 30, 48, 11, 31, 49, 13,
- 33, 51, 67, 0, 1, 12, 2, 4,
- 15, 19, 20, 21, 39, 40, 41, 57,
- 58, 59, 22, 42, 60, 12, 14, 28,
- 30, 32, 34, 48, 50, 52, 66, 68,
- 10, 13, 15, 29, 31, 33, 35, 49,
- 51, 53, 67, 69, 3, 5, 16, 1,
- 4, 6, 11, 17, 21, 23, 39, 41,
- 43, 57, 59, 61, 77, 19, 22, 24,
- 40, 42, 44, 58, 60, 62, 78, 14,
- 16, 30, 32, 34, 48, 50, 52, 68,
- 70, 15, 17, 31, 33, 35, 49, 51,
- 53, 69, 71, 5, 7, 12, 6, 8,
- 13, 23, 25, 39, 41, 43, 57, 59,
- 61, 77, 79, 24, 26, 40, 42, 44,
- 58, 60, 62, 78, 80, 10, 28, 29,
- 30, 48, 49, 50, 66, 67, 68, 11,
- 31, 51, 69, 19, 39, 57, 58, 59,
- 77, 20, 40, 60, 78, 30, 32, 48,
- 50, 52, 66, 68, 70, 28, 31, 33,
- 49, 51, 53, 67, 69, 71, 39, 41,
- 57, 59, 61, 77, 79, 40, 42, 58,
- 60, 62, 78, 80, 32, 34, 48, 50,
- 52, 66, 68, 70, 33, 35, 49, 51,
- 53, 67, 69, 71, 41, 43, 57, 59,
- 61, 77, 79, 42, 44, 58, 60, 62,
- 78, 80,
-};
-
-static long _vq_fitmap_res_Ac_6[] = {
- 0, 23, 63, 95, 125, 175, 221, 245,
- 276,
-};
-
-static long _vq_fitlength_res_Ac_6[] = {
- 23, 40, 32, 30, 50, 46, 24, 31,
- 30,
-};
-
-static encode_aux_pigeonhole _vq_auxp_res_Ac_6 = {
- -4, 1, 8, 3,
- _vq_pigeonmap_res_Ac_6,
- 306,
- _vq_fitlist_res_Ac_6,
- _vq_fitmap_res_Ac_6,
- _vq_fitlength_res_Ac_6
-};
-
static static_codebook _vq_book_res_Ac_6 = {
2, 81,
_vq_lengthlist_res_Ac_6,
@@ -127,7 +62,7 @@
_vq_quantlist_res_Ac_6,
NULL,
&_vq_auxt_res_Ac_6,
- &_vq_auxp_res_Ac_6,
+ NULL,
0
};
1.3.2.1 +5 -49 vorbis/lib/books/res_Ac_7.vqh
Index: res_Ac_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_7.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_7.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_7.vqh 2001/10/11 15:41:48 1.3.2.1
@@ -29,10 +29,10 @@
};
static long _vq_lengthlist_res_Ac_7[] = {
- 1, 4, 3, 7, 7, 9, 9, 5, 4, 4, 7, 7, 9, 9, 6, 5,
- 5, 8, 8,10,10, 0, 8, 8, 9, 9,11,10, 0, 9, 8, 9,
- 9,11,11, 0,13,13,10,10,11,11, 0,13,13,10,11,12,
- 12,
+ 1, 4, 4, 7, 7, 9, 9, 5, 5, 4, 8, 7, 9,10, 5, 4,
+ 4, 7, 7, 9, 9, 0, 8, 7, 9, 9,11,11, 0, 8, 8, 8,
+ 8,10,10, 0,13,12,10,10,12,13, 0,13,13,10,10,11,
+ 11,
};
static float _vq_quantthresh_res_Ac_7[] = {
@@ -50,50 +50,6 @@
7
};
-static long _vq_pigeonmap_res_Ac_7[] = {
- 1, 1, 0, 0, 0, 1,
-};
-
-static long _vq_fitlist_res_Ac_7[] = {
- 0, 1, 2, 3, 7, 8, 9, 10,
- 14, 15, 22, 4, 11, 16, 23, 6,
- 13, 18, 25, 17, 29, 30, 20, 32,
- 31, 43, 44, 34, 46, 1, 3, 5,
- 8, 10, 12, 17, 19, 24, 26, 0,
- 7, 15, 22, 2, 4, 6, 9, 11,
- 13, 18, 20, 25, 27, 31, 33, 14,
- 29, 16, 32, 34, 45, 47, 43, 30,
- 46, 48, 7, 8, 22, 23, 24, 36,
- 37, 38, 9, 25, 39, 11, 27, 41,
- 0, 1, 10, 2, 4, 13, 14, 15,
- 29, 30, 31, 43, 44, 45, 16, 32,
- 46, 18, 34, 48, 10, 12, 22, 24,
- 26, 36, 38, 40, 8, 11, 13, 23,
- 25, 27, 37, 39, 41, 3, 5, 1,
- 7, 4, 6, 9, 17, 19, 29, 31,
- 33, 43, 45, 47, 15, 18, 20, 30,
- 32, 34, 44, 46, 48,
-};
-
-static long _vq_fitmap_res_Ac_7[] = {
- 0, 29, 66, 66, 100, 141, 141, 141,
- 141,
-};
-
-static long _vq_fitlength_res_Ac_7[] = {
- 29, 37, 0, 34, 41, 0, 0, 0,
- 0,
-};
-
-static encode_aux_pigeonhole _vq_auxp_res_Ac_7 = {
- -15, 5, 6, 3,
- _vq_pigeonmap_res_Ac_7,
- 141,
- _vq_fitlist_res_Ac_7,
- _vq_fitmap_res_Ac_7,
- _vq_fitlength_res_Ac_7
-};
-
static static_codebook _vq_book_res_Ac_7 = {
2, 49,
_vq_lengthlist_res_Ac_7,
@@ -101,7 +57,7 @@
_vq_quantlist_res_Ac_7,
NULL,
&_vq_auxt_res_Ac_7,
- &_vq_auxp_res_Ac_7,
+ NULL,
0
};
1.3.2.1 +39 -39 vorbis/lib/books/res_Ac_7a.vqh
Index: res_Ac_7a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_7a.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_7a.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_7a.vqh 2001/10/11 15:41:48 1.3.2.1
@@ -27,45 +27,45 @@
};
static long _vq_lengthlist_res_Ac_7a[] = {
- 3, 6, 6, 8, 8,10, 6, 6, 8, 8,10, 6, 6, 8, 8,10,
- 8, 8, 8, 8,11,10,11, 8, 8, 6, 7, 7, 9, 9,11, 8,
- 8, 9, 9,11, 8, 8, 9, 9,11,10,10,10,10,11,11,11,
- 10,10, 6, 7, 7, 9, 9,11, 8, 8, 9, 9,11, 8, 8, 9,
- 9,11,10, 9,10,10,11,11,11,10,10, 8, 9, 9,10, 9,
- 11,10,10,10,10,11,10,10,10,10,12,11,11,11,10,12,
- 12,12,11,10, 8, 9, 9,10,10,11,10,10,11,10,12,10,
- 10,10,10,12,11,11,10,11,12,12,12,10,11,10,11,11,
- 11,12,12,11,12,12,12,13,12,11,11,11,12,12,12,11,
- 12,12,13,13,11,12, 6, 8, 8,10,10,11, 8, 8,10, 9,
- 11, 8, 8,10,10,11, 9, 9, 9, 9,11,12,11, 9, 9, 6,
- 8, 8,10,10,11, 8, 8,10,10,11, 8, 8, 9, 9,11, 9,
- 9, 9, 9,12,11,11, 9,10, 8, 9, 9,10,10,11,10,10,
- 10,11,12,10,10,10,10,12,11,10,10,10,12,12,12,10,
- 10, 9, 9, 9,10,10,12, 9,10,10,11,12, 9,10,10,10,
- 12,11,11,11,11,12,12,12,10,10,10,11,11,12,11,13,
- 11,11,12,12,12,11,11,11,11,13,12,12,12,12,14,13,
- 12,12,11, 6, 8, 8,10,10,11, 8, 8,10,10,11, 8, 8,
- 10, 9,11, 9, 9, 9, 9,11,12,11, 9, 9, 6, 8, 8,10,
- 10,11, 8, 8,10,10,11, 7, 8, 9, 9,11, 9, 9, 9, 9,
- 11,11,12, 9, 9, 8, 9,10,11,10,12,10,10,11,10,12,
- 10, 9,10,10,12,10,10,10,10,12,11,12,10,10, 8, 9,
- 9,10,10,12,10, 9,10,11,12, 9, 9,10,10,11,10,10,
- 10,10,12,12,12,10,10,11,11,11,12,12,13,12,11,12,
- 12,13,11,11,12,12,13,12,12,12,12,13,12,13,11,12,
- 8,10,10,11,11,12, 9, 9,11,11,12, 9, 9,10,10,11,
- 10,10,10,10,12,12,12,10,10, 8,10, 9,11,11,12, 9,
- 9,10,11,12, 9, 9,10,10,12,10,10,10,10,12,12,12,
- 10,10, 8,10,10,10,10,11, 9, 9,10,11,12, 9, 9,10,
- 10,12,10,10,10,10,12,11,12,10,10, 8,10,10,11,10,
- 12, 9, 9,10,10,12, 9, 9,10,10,11,10,10,10,10,12,
- 12,12,10,10,11,11,11,12,12,13,11,11,12,12,13,11,
- 11,11,12,13,12,12,12,12,13,13,14,11,11,11,11,12,
- 12,12,13,11,11,12,12,13,12,12,12,12,13,12,12,12,
- 11,13,13,13,12,12,11,11,11,12,13,13,12,12,13,12,
- 12,11,12,12,12,13,12,12,12,12,13,13,13,11,12, 8,
- 10,10,10,10,12, 9,10,10,11,12, 9, 9,10,10,11,10,
- 10,10,10,11,12,12,10,10, 8,10,10,11,11,12, 9, 9,
- 11,10,11, 9, 9,10,10,12,10,10,10,10,11,12,12,10,
+ 3, 6, 6, 8, 8,11, 6, 6, 8, 8,11, 6, 6, 8, 8,10,
+ 8, 8, 8, 8,11,11,11, 8, 9, 6, 8, 7, 9, 9,11, 8,
+ 8,10, 9,11, 8, 8,10, 9,11, 9,10,10, 9,11,11,11,
+ 10, 9, 6, 7, 8, 9,10,11, 8, 8, 9,10,11, 8, 8, 9,
+ 10,11,10,10,10, 9,11,11,11, 9,10, 8, 9, 9,10,10,
+ 12,10,10,10,10,12,10,10,10,10,12,10,10,10,11,12,
+ 12,12,10,10, 9, 9, 9,10,10,12,10,10,10,10,12,10,
+ 10,10,10,11,10,10,10,10,12,12,12,10,10,10,11,11,
+ 12,12,13,11,12,12,12,13,11,11,12,12,13,12,12,12,
+ 12,13,13,13,12,12, 6, 8, 8,10,10,11, 8, 8,10,10,
+ 11, 8, 8, 9,10,11, 9, 9,10, 9,11,11,11,10, 9, 6,
+ 8, 8,10,10,11, 8, 8,10,10,11, 8, 8, 9,10,11, 9,
+ 9, 9, 9,11,11,11, 9,10, 8, 9, 9,10,10,12,10,10,
+ 10,10,11,10, 9,10,10,12,10,10,10,10,11,11,12,10,
+ 10, 8, 9, 9,10,10,12,10,10,11,10,12, 9,10,10,10,
+ 12,10,10,10,10,11,12,11,10,10,11,11,11,12,12,13,
+ 11,11,11,12,13,11,11,12,11,14,12,12,12,12,13,13,
+ 12,11,12, 6, 8, 8,10,10,11, 8, 8, 9, 9,11, 8, 8,
+ 9,10,11, 9, 9, 9, 9,11,11,11,10, 9, 6, 8, 8,10,
+ 10,11, 8, 8,10,10,11, 8, 8, 9,10,11, 9, 9,10, 9,
+ 11,11,11, 9, 9, 8,10, 9,10,10,11, 9, 9,10,10,11,
+ 10, 9,10,10,11,10,10,10,10,12,11,11,10,10, 8, 9,
+ 10,10,10,12, 9, 9,10,10,12, 9,10,10,10,11,10,10,
+ 10,10,12,11,12,10,10,11,11,11,12,12,13,11,12,12,
+ 12,13,11,11,12,11,13,12,12,11,11,13,13,13,11,11,
+ 8,10,10,11,10,12, 9, 9,11,10,12, 9, 9,10,10,12,
+ 10, 9,10,10,11,12,12,10,10, 8, 9,10,11,10,12, 9,
+ 9,10,10,11, 9, 9,10,10,12, 9,10,10,10,12,12,12,
+ 10,10, 8,10,10,10,10,11, 9, 9,10,10,11, 9, 9,10,
+ 10,12,10,10,10,10,11,11,11,10,10, 8, 9,10,10,10,
+ 11, 9,10,10,10,11, 9, 9,10,10,12,10,10,10,10,12,
+ 12,11,10,10,11,11,11,12,12,14,11,11,12,11,13,11,
+ 12,12,12,13,12,12,12,12,12,12,13,12,11,11,11,12,
+ 12,12,12,11,11,12,12,13,11,11,11,12,12,12,12,12,
+ 11,12,13,13,11,12,11,12,11,12,12,13,11,11,12,12,
+ 13,12,11,12,12,12,12,12,12,12,13,13,13,12,12, 8,
+ 10,10,10,10,11, 9,10,10,10,12, 9, 9,10,10,12,10,
+ 10,10,10,12,11,11,10,10, 8,10,10,10,10,11, 9, 9,
+ 10,10,12, 9, 9,10,10,11,10,10,10,10,11,12,11,10,
10,
};
1.3.2.1 +12 -134 vorbis/lib/books/res_Ac_8.vqh
Index: res_Ac_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_8.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_8.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_8.vqh 2001/10/11 15:41:48 1.3.2.1
@@ -35,17 +35,17 @@
};
static long _vq_lengthlist_res_Ac_8[] = {
- 1, 4, 3, 6, 6, 7, 7, 9, 9,10,10,11,10, 6, 5, 5,
- 7, 7, 9, 9, 9,10,11,11,12,12, 6, 5, 5, 7, 7, 9,
- 8,10,10,11,11,12,12, 0, 8, 8, 8, 8,10,10,11,11,
- 12,12,13,13, 0, 8, 8, 8, 8,10,10,11,10,12,13,13,
- 12, 0,13,12,10,10,11,11,11,11,13,13,13,16, 0,13,
- 13,10,10,10,11,12,12,13,13,15,16, 0, 0, 0,13,12,
- 12,12,13,13,13,13,16,14, 0, 0, 0,12,13,12,11,12,
- 13,14,14,15,15, 0, 0, 0,16,16,14,12,13,14,16,13,
- 14,14, 0, 0, 0,15, 0,14,13,13,13,15,15,15,14, 0,
- 0, 0, 0, 0,14,16,16, 0,16,14,16,16, 0, 0, 0, 0,
- 0,14,14,15,14,15,13,15,16,
+ 1, 3, 4, 6, 6, 8, 8, 9, 9,11,10,12,11, 6, 5, 5,
+ 7, 7, 9, 9,10,10,12,12,13,13, 6, 5, 5, 7, 7, 9,
+ 9,10,10,11,11,13,13, 0, 7, 8, 8, 8,10, 9,12,11,
+ 13,14,13,13, 0, 7, 7, 8, 8, 9, 9,11,12,12,13,13,
+ 13, 0,13,14,10,10,10,11,13,12,14,13,16,15, 0,14,
+ 14, 9,10,11,11,12,12,13,13,13,14, 0, 0, 0,12,12,
+ 12,11,13,13,14,14,16,15, 0, 0, 0,12,12,12,12,13,
+ 13,14,14,16,16, 0, 0, 0,16, 0,12,13,13,13,14,16,
+ 16,16, 0, 0, 0, 0,15,14,13,14,13,15,13,15,15, 0,
+ 0, 0, 0, 0,16,16,14,15,16,14, 0,16, 0, 0, 0, 0,
+ 0,16,16,15,15,16,16, 0,15,
};
static float _vq_quantthresh_res_Ac_8[] = {
@@ -65,128 +65,6 @@
13
};
-static long _vq_pigeonmap_res_Ac_8[] = {
- 3, 3, 2, 1, 1, 0, 0, 0,
- 1, 2, 2, 3,
-};
-
-static long _vq_fitlist_res_Ac_8[] = {
- 0, 1, 2, 3, 13, 14, 15, 16,
- 26, 27, 40, 4, 17, 28, 41, 6,
- 19, 30, 43, 29, 53, 54, 32, 56,
- 55, 79, 80, 58, 82, 1, 3, 5,
- 7, 14, 16, 18, 20, 29, 31, 42,
- 44, 0, 13, 27, 40, 2, 4, 6,
- 8, 15, 17, 19, 21, 30, 32, 43,
- 45, 33, 55, 57, 26, 53, 28, 34,
- 56, 58, 59, 81, 83, 79, 54, 60,
- 82, 84, 3, 5, 7, 9, 16, 18,
- 20, 22, 31, 33, 44, 46, 4, 6,
- 8, 10, 17, 19, 21, 23, 32, 34,
- 45, 47, 12, 25, 36, 49, 29, 35,
- 57, 59, 30, 58, 60, 38, 62, 55,
- 61, 83, 85, 56, 84, 86, 64, 88,
- 7, 9, 11, 20, 22, 24, 35, 37,
- 48, 50, 5, 18, 33, 46, 8, 10,
- 12, 21, 23, 25, 36, 38, 49, 51,
- 61, 63, 31, 59, 34, 62, 64, 87,
- 89, 57, 85, 60, 88, 90, 13, 14,
- 40, 41, 42, 66, 67, 68, 15, 43,
- 69, 17, 45, 71, 95, 0, 1, 16,
- 2, 4, 19, 26, 27, 53, 54, 55,
- 79, 80, 81, 28, 56, 82, 30, 58,
- 84, 108, 16, 18, 40, 42, 44, 46,
- 66, 68, 70, 72, 94, 96, 14, 17,
- 19, 41, 43, 45, 47, 67, 69, 71,
- 73, 95, 97, 3, 5, 20, 1, 13,
- 4, 6, 15, 21, 29, 31, 53, 55,
- 57, 59, 79, 81, 83, 85, 107, 109,
- 27, 30, 32, 54, 56, 58, 60, 80,
- 82, 84, 86, 108, 110, 18, 20, 42,
- 44, 46, 48, 68, 70, 72, 74, 96,
- 98, 19, 21, 43, 45, 47, 49, 69,
- 71, 73, 75, 97, 99, 23, 51, 77,
- 101, 5, 7, 16, 22, 6, 8, 17,
- 10, 25, 31, 33, 55, 57, 59, 61,
- 81, 83, 85, 87, 109, 111, 32, 34,
- 56, 58, 60, 62, 82, 84, 86, 88,
- 110, 112, 36, 64, 90, 114, 22, 24,
- 46, 48, 50, 72, 74, 76, 100, 102,
- 20, 44, 70, 98, 23, 25, 47, 49,
- 51, 73, 75, 77, 101, 103, 9, 11,
- 7, 18, 10, 12, 21, 35, 37, 59,
- 61, 63, 85, 87, 89, 113, 115, 33,
- 57, 83, 111, 36, 38, 60, 62, 64,
- 86, 88, 90, 114, 116, 40, 66, 67,
- 68, 94, 41, 69, 95, 43, 71, 97,
- 121, 53, 79, 80, 81, 107, 54, 82,
- 108, 56, 84, 110, 109, 133, 135, 136,
- 42, 44, 66, 68, 70, 72, 94, 96,
- 98, 120, 122, 40, 43, 45, 67, 69,
- 71, 73, 95, 97, 99, 121, 123, 55,
- 57, 79, 81, 83, 85, 107, 109, 111,
- 133, 135, 53, 56, 58, 80, 82, 84,
- 86, 108, 110, 112, 136, 137, 161, 138,
- 162, 44, 46, 68, 70, 72, 74, 94,
- 96, 98, 100, 122, 124, 45, 47, 69,
- 71, 73, 75, 95, 97, 99, 101, 123,
- 125, 49, 77, 103, 127, 57, 59, 81,
- 83, 85, 87, 107, 109, 111, 113, 135,
- 137, 58, 60, 82, 84, 86, 88, 108,
- 110, 112, 114, 136, 138, 62, 90, 116,
- 140, 133, 139, 161, 163, 162, 164, 142,
- 166, 48, 50, 72, 74, 76, 98, 100,
- 102, 126, 128, 46, 70, 96, 124, 49,
- 51, 73, 75, 77, 99, 101, 103, 127,
- 129, 61, 63, 85, 87, 89, 111, 113,
- 115, 139, 141, 59, 83, 109, 137, 62,
- 64, 86, 88, 90, 112, 114, 116, 140,
- 142, 165, 167, 135, 163, 138, 166, 168,
- 66, 94, 120, 121, 122, 148, 67, 95,
- 123, 149, 40, 68, 96, 41, 69, 97,
- 79, 107, 133, 135, 161, 80, 82, 108,
- 110, 136, 162, 138, 164, 94, 96, 120,
- 122, 124, 148, 150, 95, 97, 121, 123,
- 125, 149, 68, 70, 98, 66, 69, 71,
- 99, 107, 109, 133, 135, 137, 161, 163,
- 108, 110, 136, 138, 162, 164, 96, 98,
- 120, 122, 124, 126, 148, 150, 152, 97,
- 99, 121, 123, 125, 127, 149, 153, 101,
- 129, 155, 70, 72, 94, 100, 71, 73,
- 95, 75, 103, 109, 111, 133, 135, 137,
- 139, 161, 163, 165, 110, 112, 136, 138,
- 140, 162, 164, 166, 114, 142, 168, 100,
- 102, 124, 126, 128, 150, 152, 154, 98,
- 122, 148, 101, 103, 125, 127, 129, 153,
- 155, 74, 76, 72, 96, 75, 77, 99,
- 113, 115, 137, 139, 141, 163, 165, 167,
- 111, 135, 161, 114, 116, 138, 140, 142,
- 164, 166, 168,
-};
-
-static long _vq_fitmap_res_Ac_8[] = {
- 0, 29, 74, 120, 158, 158, 194, 253,
- 318, 373, 373, 400, 449, 513, 568, 568,
- 597, 630, 679, 723, 723, 723, 723, 723,
- 723,
-};
-
-static long _vq_fitlength_res_Ac_8[] = {
- 29, 45, 46, 38, 0, 36, 59, 65,
- 55, 0, 27, 49, 64, 55, 0, 29,
- 33, 49, 44, 0, 0, 0, 0, 0,
- 0,
-};
-
-static encode_aux_pigeonhole _vq_auxp_res_Ac_8 = {
- -78, 13, 12, 5,
- _vq_pigeonmap_res_Ac_8,
- 723,
- _vq_fitlist_res_Ac_8,
- _vq_fitmap_res_Ac_8,
- _vq_fitlength_res_Ac_8
-};
-
static static_codebook _vq_book_res_Ac_8 = {
2, 169,
_vq_lengthlist_res_Ac_8,
@@ -194,7 +72,7 @@
_vq_quantlist_res_Ac_8,
NULL,
&_vq_auxt_res_Ac_8,
- &_vq_auxp_res_Ac_8,
+ NULL,
0
};
1.3.2.1 +6 -6 vorbis/lib/books/res_Ac_8a.vqh
Index: res_Ac_8a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_8a.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_8a.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_8a.vqh 2001/10/11 15:41:48 1.3.2.1
@@ -35,12 +35,12 @@
};
static long _vq_lengthlist_res_Ac_8a[] = {
- 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 9, 6, 6,
- 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 6, 6, 6, 6, 7,
- 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7, 7, 8, 8,
- 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 8,
- 8, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
- 9, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
+ 4, 5, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6,
+ 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 9, 6, 6, 6, 6, 7,
+ 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7, 7, 7, 7, 7,
+ 8, 7, 7, 7, 9, 9, 9, 7, 7, 7, 7, 7, 8, 8, 8, 7,
+ 8, 9, 9, 9, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
+ 9, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8,
8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8,
8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9,
1.3.2.1 +3 -3 vorbis/lib/books/res_Ac_9.vqh
Index: res_Ac_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_9.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_9.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_9.vqh 2001/10/11 15:41:48 1.3.2.1
@@ -29,9 +29,9 @@
};
static long _vq_lengthlist_res_Ac_9[] = {
- 1, 4, 3,10,10,11,11, 4, 4, 9,11,11,11,11, 3,10,
- 5, 9,10,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,10,10,10,10,10,10,10,10,10,10,10,
+ 1, 4, 3, 9,10,11,11, 3,10, 5,11,11,11,11, 4, 4,
+ 9,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,10,10,10,10,10,10,10,10,10,10,10,10,10,
10,
};
1.3.2.1 +11 -11 vorbis/lib/books/res_Ac_9a.vqh
Index: res_Ac_9a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_9a.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_9a.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_9a.vqh 2001/10/11 15:41:48 1.3.2.1
@@ -35,17 +35,17 @@
};
static long _vq_lengthlist_res_Ac_9a[] = {
- 1, 4, 4, 7, 7, 9, 9,10, 9, 8,10, 8, 8, 6, 6, 6,
- 9, 9,11,10,10,10,12,10,10, 8, 5, 5, 4, 9, 9,10,
- 10,10,11,10,10, 8, 9,13, 9, 7,11,11,12,11,12,12,
- 10,11,10, 8,14, 6, 6, 7, 6,11,11,11,11,10,13, 8,
- 10,14,12,10,10, 9,12,12,12,12,11,10,11, 9,14,11,
- 9, 7, 6,12,11,12,12,10,12, 9,12,12,14,13,11,11,
- 13,13,12,12,12,11,11, 9,14,14,14,12, 9,12,10,12,
- 13,10,14,13,13,14,13,14,14,13,13,14,14,12,12,11,
- 12,12,13,14,14,14,14,13,14,12,12,11,12,14,14,14,
- 14,14,14,14,14,13,13,12,12,12,11,12,14,14,13,13,
- 14,13,14,11,13,13,12,13,12,
+ 2, 3, 3, 7, 7, 8, 8, 9, 9, 8, 9, 7, 7, 4, 5, 4,
+ 8, 8, 9, 9,10,10,10,10, 8, 8, 6, 5, 6, 9, 9,10,
+ 9,10, 9,10,10, 9, 8,12, 5, 5, 7, 6,10,11,13,10,
+ 9,11, 8, 9,13, 9, 7,10, 9,10,11,11,11,10,10, 9,
+ 8,13, 9, 9, 7, 6,11,10,11,11, 9,11, 9,12,12,12,
+ 9,10, 9,10,12,12,11,12,10,11, 8,13,12,13,13, 9,
+ 11,10,13,13,10,13,12,12,13,13,13,11,11,12,12,12,
+ 12,13,10,12, 9,12,13,12,13,13,12,12,11,13,11,13,
+ 13,13,13,12,13,13,13,11,13,12,12,11,11,12,12,13,
+ 13,13,13,13,12,13,11,13,13,11,12,11,13,13,13,12,
+ 13,13,12,12,11,12,11,11,12,
};
static float _vq_quantthresh_res_Ac_9a[] = {
1.3.2.1 +10 -10 vorbis/lib/books/res_Ac_9b.vqh
Index: res_Ac_9b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_9b.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_Ac_9b.vqh 2001/09/11 05:45:00 1.3
+++ res_Ac_9b.vqh 2001/10/11 15:41:48 1.3.2.1
@@ -35,17 +35,17 @@
};
static long _vq_lengthlist_res_Ac_9b[] = {
- 4, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7,
+ 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 9, 8, 8, 8, 8, 8, 8, 7, 8,
- 8, 7, 7, 7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 7, 7,
- 7, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 9,
- 9, 7, 8, 7, 8, 7, 8, 7, 7, 7, 8, 9, 9, 8, 8, 8,
- 9, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
- 7, 7, 8, 7, 7, 9, 9, 8, 9, 8, 8, 8, 8, 8, 7, 7,
- 8, 7, 9, 8, 8, 9, 8, 8, 8, 7, 7, 8, 7, 8, 8, 9,
- 9, 9, 9, 8, 8, 8, 8, 7, 8, 8, 7, 7, 9, 9, 8, 8,
- 8, 8, 8, 8, 7, 8, 7, 8, 7,
+ 7, 7, 7, 7, 7, 7, 7, 9, 7, 8, 7, 8, 7, 8, 7, 8,
+ 7, 7, 7, 7, 9, 8, 9, 8, 8, 8, 8, 7, 8, 7, 7, 7,
+ 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 7, 7, 7, 7, 9, 8,
+ 9, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 8, 9, 8, 8, 8,
+ 8, 8, 7, 8, 7, 7, 7, 7, 9, 9, 8, 9, 8, 8, 8, 8,
+ 8, 8, 7, 7, 7, 8, 9, 8, 8, 8, 8, 8, 8, 7, 7, 7,
+ 7, 7, 8, 9, 8, 8, 9, 8, 8, 7, 7, 8, 7, 7, 7, 8,
+ 9, 8, 8, 8, 7, 8, 8, 7, 7, 8, 8, 7, 9, 8, 9, 9,
+ 8, 8, 8, 8, 7, 8, 7, 7, 7,
};
static float _vq_quantthresh_res_Ac_9b[] = {
No revision
No revision
1.2.4.1 +9 -9 vorbis/lib/modes/maskadj_A.h
Index: maskadj_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/maskadj_A.h,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- maskadj_A.h 2001/08/13 08:38:30 1.2
+++ maskadj_A.h 2001/10/11 15:41:55 1.2.4.1
@@ -95,15 +95,15 @@
{{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*63*/
{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*88*/
{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*125*/
- {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*175*/
- {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*250*/
- {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*350*/
- {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*500*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-26.f,-32.f,-40.f},/*700*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-32.f,-40.f},/*1000*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-32.f,-40.f},/*1400*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-32.f,-40.f},/*2000*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-32.f,-40.f},/*2400*/
+ {-14.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-30.f,-32.f,-32.f,-40.f},/*175*/
+ {-14.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-30.f,-32.f,-32.f,-40.f},/*250*/
+ {-14.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-32.f,-32.f,-40.f},/*350*/
+ {-14.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-32.f,-32.f,-40.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*700*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-20.f,-24.f,-22.f,-32.f,-40.f},/*1000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-20.f,-24.f,-22.f,-32.f,-40.f},/*1400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-20.f,-24.f,-22.f,-32.f,-40.f},/*2000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-20.f,-24.f,-22.f,-32.f,-40.f},/*2400*/
{-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-32.f,-40.f},/*4000*/
{-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-32.f,-40.f},/*5600*/
{-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-32.f,-40.f},/*8000*/
1.4.2.2 +33 -24 vorbis/lib/modes/mode_44c_A.h
Index: mode_44c_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_44c_A.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- mode_44c_A.h 2001/10/09 04:34:55 1.4.2.1
+++ mode_44c_A.h 2001/10/11 15:41:55 1.4.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_A.h,v 1.4.2.1 2001/10/09 04:34:55 xiphmont Exp $
+ last mod: $Id: mode_44c_A.h,v 1.4.2.2 2001/10/11 15:41:55 xiphmont Exp $
********************************************************************/
@@ -52,14 +52,18 @@
#include "books/res_44c_A_128aux.vqh"
#include "books/res_44c_A_1024aux.vqh"
+#include "books/res_Ac_0a.vqh"
#include "books/res_Ac_1.vqh"
#include "books/res_Ac_2.vqh"
+#include "books/res_Ac_2a.vqh"
#include "books/res_Ac_3.vqh"
#include "books/res_Ac_4.vqh"
#include "books/res_Ac_5.vqh"
+#include "books/res_Ac_5a.vqh"
#include "books/res_Ac_6.vqh"
#include "books/res_Ac_7.vqh"
#include "books/res_Ac_7a.vqh"
+#include "books/res_Ac_7b.vqh"
#include "books/res_Ac_8.vqh"
#include "books/res_Ac_8a.vqh"
#include "books/res_Ac_9.vqh"
@@ -168,7 +172,7 @@
0.f,-26.f,-30.f,
&_vp_tonemask_consbass_A,
/* peakattp, curvelimitp */
- 1, 4, &_vp_peakatt_A,
+ 0, 4, &_vp_peakatt_A,
/*noisemaskp */
1, -10.f, /* suppress any noise curve over maxspec+n */
@@ -239,16 +243,16 @@
60,30,400,
20,8,1,18.,
20,600,
- 896};
+ 928};
static vorbis_info_residue0 _residue_set_44c_A0={
0,192, 16, 10,23,
- {0,4,40,
- 1,2,20,
- 4,6,6,7},
- {25, 26,26,
- 27, 28, 29,29,
- 30, 31,32, 33,34, 35,36,37},
+ {64,4,40,
+ 2,2,20,
+ 18,22,22,7},
+ {38, 25, 26,39,
+ 27, 28, 29,40,
+ 30,40, 31,32,41, 33,34,41, 35,36,37},
{9999,9999,9999,9999,9999,9999,
9999,9999,9999,9999},
{.5f,
@@ -259,13 +263,13 @@
{99,8,99,3,8,99,99,99,99,99}};
static vorbis_info_residue0 _residue_set_44c_A={
- 0,1792, 32,10,24,
- {0,4,40,
- 1,2,20,
- 4,6,6,7},
- {25, 26,26,
- 27, 28, 29,29,
- 30, 31,32, 33,34, 35,36,37},
+ 0,1856, 32,10,24,
+ {64,4,40,
+ 2,2,20,
+ 18,22,22,7},
+ {38, 25, 26,39,
+ 27, 28, 29,40,
+ 30,40, 31,32,41, 33,34,41, 35,36,37},
{9999,9999,9999,9999,9999,9999,
9999,9999,9999,9999},
{.5f,
@@ -288,7 +292,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 38, 3,
+ 2, 2, 1, 2, 2, 42, 3,
/* modes */
{&_mode_set_44c_A0,&_mode_set_44c_A},
/* maps */
@@ -332,12 +336,12 @@
&_huff_book_res_44c_A_128aux,
&_huff_book_res_44c_A_1024aux,
- &_vq_book_res_Ac_1,
+ &_vq_book_res_Ac_1, /* 25 */
&_vq_book_res_Ac_2,
- &_vq_book_res_Ac_3,
+ &_vq_book_res_Ac_3, /* 27 */
&_vq_book_res_Ac_4,
&_vq_book_res_Ac_5,
- &_vq_book_res_Ac_6,
+ &_vq_book_res_Ac_6, /* 30 */
&_vq_book_res_Ac_7,
&_vq_book_res_Ac_7a,
&_vq_book_res_Ac_8,
@@ -346,6 +350,11 @@
&_vq_book_res_Ac_9a,
&_vq_book_res_Ac_9b,
+ &_vq_book_res_Ac_0a, /* 38 */
+ &_vq_book_res_Ac_2a,
+ &_vq_book_res_Ac_5a,
+ &_vq_book_res_Ac_7b,
+
},
/* psy */
@@ -353,18 +362,18 @@
&_psy_set_44c_AG,
/* progressive coding and bitrate controls */
- 3.0,
+ 4.0,
1.,4.,
0,
- 0,
+ 100000,
- 0,
0,
+ 0000,
- 0,0,
+ 120000,0,
- {4,6},
+ {4,7},
2,
};
No revision
No revision
1.10.4.1 +3 -1 vorbis/vq/latticehint.c
Index: latticehint.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/latticehint.c,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -r1.10 -r1.10.4.1
--- latticehint.c 2001/08/13 01:37:17 1.10
+++ latticehint.c 2001/10/11 15:41:56 1.10.4.1
@@ -11,7 +11,7 @@
********************************************************************
function: utility main for building thresh/pigeonhole encode hints
- last mod: $Id: latticehint.c,v 1.10 2001/08/13 01:37:17 xiphmont Exp $
+ last mod: $Id: latticehint.c,v 1.10.4.1 2001/10/11 15:41:56 xiphmont Exp $
********************************************************************/
@@ -209,6 +209,7 @@
}
/* Do we want to gen a pigeonhole hint? */
+#if 0
for(i=0;i<entries;i++)if(c->lengthlist[i]==0)break;
if(c->q_sequencep || i<entries){
long **tempstack;
@@ -420,6 +421,7 @@
}
}
}
+#endif
write_codebook(stdout,name,c);
fprintf(stderr,"\r "
1.1.4.2 +33 -11 vorbis/vq/res_44c_A.vqs
Index: res_44c_A.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/res_44c_A.vqs,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- res_44c_A.vqs 2001/10/09 04:34:55 1.1.4.1
+++ res_44c_A.vqs 2001/10/11 15:41:56 1.1.4.2
@@ -9,13 +9,30 @@
huffbuild line_128x19_2sub2.vqd 9-25
huffbuild line_128x19_2sub3.vqd 25-64
+huffbuild line_1024x31_class0.vqd 0-8
+huffbuild line_1024x31_class1.vqd 0-16
+huffbuild line_1024x31_class2.vqd 0-64
+huffbuild line_1024x31_class3.vqd 0-64
+
+huffbuild line_1024x31_0sub0.vqd 0-16
+huffbuild line_1024x31_0sub1.vqd 16-64
+
+huffbuild line_1024x31_1sub0.vqd 0-16
+huffbuild line_1024x31_1sub1.vqd 16-64
+
+huffbuild line_1024x31_2sub1.vqd 1-9
+huffbuild line_1024x31_2sub2.vqd 9-25
+huffbuild line_1024x31_2sub3.vqd 25-64
+huffbuild line_1024x31_3sub1.vqd 1-9
+huffbuild line_1024x31_3sub2.vqd 9-25
+huffbuild line_1024x31_3sub3.vqd 25-64
+
residuesplit residue_0#0.vqd 0,192,16 res_A ,.7, ,1.5,8 ,1.5 ,2.5,3 ,2.5,8 ,2.5 ,4.5 ,17.5 ,84.5
mv res_Aaux.vqd res_44c_A_128aux.vqd
-residuesplit residue_1#0.vqd 0,1792,32 res_B ,.7, ,1.5,32 ,1.5 ,2.5,18 ,2.5,32 ,2.5 ,4.5 ,17.5 ,84.5
+residuesplit residue_1#0.vqd residue_1#1.vqd 0,1792,32 res_B ,.7, ,1.5,32 ,1.5 ,2.5,18 ,2.5,32 ,2.5 ,4.5 ,17.5 ,84.5
mv res_Baux.vqd res_44c_A_1024aux.vqd
-
GO
>res_Ac_128 noninterleaved
@@ -24,22 +41,27 @@
>res_Ac noninterleaved
haux res_44c_A_1024aux.vqd 0,56,2
-:_1 res_B_1.vqd, 4, nonseq cull, 0 +- 1
-:_2 res_B_2.vqd, 4, nonseq cull, 0 +- 1
-:_3 res_B_3.vqd, 4, nonseq cull, 0 +- 1 2
-:_4 res_B_4.vqd, 4, nonseq cull, 0 +- 1 2
-:_5 res_B_5.vqd, 4, nonseq cull, 0 +- 1 2
-:_6 res_B_6.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_7 res_B_7.vqd, 2, nonseq cull, 0 +- 5 10 15
+:_1 res_B_1A.vqd, 4, nonseq cull, 0 +- 1
+:_2 res_B_2A.vqd, 4, nonseq cull, 0 +- 1
+:_3 res_B_3A.vqd, 4, nonseq cull, 0 +- 1 2
+:_4 res_B_4A.vqd, 4, nonseq cull, 0 +- 1 2
+:_5 res_B_5A.vqd, 4, nonseq cull, 0 +- 1 2
+:_6 res_B_6A.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_7 res_B_7A.vqd, 2, nonseq cull, 0 +- 5 10 15
+_7a, 4, nonseq cull, 0 +- 1 2
-:_8 res_B_8.vqd, 2, nonseq cull, 0 +- 13 26 39 52 65 78
+:_8 res_B_8A.vqd, 2, nonseq cull, 0 +- 13 26 39 52 65 78
+_8a, 2, nonseq cull, 0 +- 1 2 3 4 5 6
-:_9 res_B_9.vqd, 2, nonseq, 0 +- 169 338 507
+:_9 res_B_9A.vqd, 2, nonseq, 0 +- 169 338 507
+_9a, 2, nonseq, 0 +- 13 26 39 52 65 78
+_9b, 2, nonseq, 0 +- 1 2 3 4 5 6
+
+:_0a res_B_0B.vqd, 4, nonseq cull, 0 +- 1 2
+:_2a res_B_2B.vqd, 2, nonseq cull, 0 +- 1 2 3
+:_5a res_B_5B.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_7b res_B_7B.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6
1.11.4.1 +78 -40 vorbis/vq/residuesplit.c
Index: residuesplit.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/residuesplit.c,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -u -r1.11 -r1.11.4.1
--- residuesplit.c 2001/08/13 01:37:17 1.11
+++ residuesplit.c 2001/10/11 15:41:56 1.11.4.1
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0 partitioner/classifier
- last mod: $Id: residuesplit.c,v 1.11 2001/08/13 01:37:17 xiphmont Exp $
+ last mod: $Id: residuesplit.c,v 1.11.4.1 2001/10/11 15:41:56 xiphmont Exp $
********************************************************************/
@@ -64,7 +64,8 @@
/* This is currently a bit specific to/hardwired for mapping 0; things
will need to change in the future when we get real multichannel
mappings */
-int quantaux(float *res,int n,float *ebound,float *mbound,int *subgrp,int parts, int subn){
+int quantaux(float *res,int n,float *ebound,float *mbound,int *subgrp,int parts, int subn,
+ int *class){
long i,j,part=0;
int aux;
@@ -82,18 +83,28 @@
max<=mbound[j] &&
part<subgrp[j])
break;
- aux=j;
+ class[part]=aux=j;
fprintf(of,"%d, ",aux);
+ }
+ fprintf(of,"\n");
+
+ return(0);
+}
+
+int quantwrite(float *res,int n,int subn, int *class,int offset){
+ long i,j,part=0;
+ int aux;
+
+ for(i=0;i<=n-subn;i+=subn,part++){
+ aux=class[part];
for(j=0;j<subn;j++)
- fprintf(or[aux],"%g, ",res[j+i]);
+ fprintf(or[aux+offset],"%g, ",res[j+i]);
- fprintf(or[aux],"\n");
+ fprintf(or[aux+offset],"\n");
}
- fprintf(of,"\n");
-
return(0);
}
@@ -122,33 +133,45 @@
static void usage(){
fprintf(stderr,
"usage:\n"
- "residuesplit <res> <begin,n,group> <baseout> <ent,peak,sub> [<ent,peak,sub>]...\n"
+ "residuesplit <res> [<res>] <begin,n,group> <baseout> <ent,peak,sub> [<ent,peak,sub>]...\n"
" where begin,n,group is first scalar, \n"
" number of scalars of each in line,\n"
" number of scalars in a group\n"
" ent is the maximum entropy value allowed for membership in a group\n"
" peak is the maximum amplitude value allowed for membership in a group\n"
- " subn is the maximum subpartiton number allowed in the group\n"
-
- "eg: residuesplit mask.vqd floor.vqd 0,1024,16 res 0,.5,2 3,1.5,4 \n"
- "produces resaux.vqd and res_0...n.vqd\n\n");
+ " subn is the maximum subpartiton number allowed in the group\n\n");
exit(1);
}
int main(int argc, char *argv[]){
char *buffer;
char *base;
- int i,parts,begin,n,subn,*subgrp;
- FILE *res;
+ int i,j,parts,begin,n,subn,*subgrp,*class;
+ FILE **res;
+ int resfiles=0;
float *ebound,*mbound,*vec;
long c=0;
if(argc<5)usage();
+
+ /* count the res file names, open the files */
+ while(!strcmp(argv[resfiles+1]+strlen(argv[resfiles+1])-4,".vqd"))
+ resfiles++;
+ if(resfiles<1)usage();
+
+ res=alloca(sizeof(*res)*resfiles);
+ for(i=0;i<resfiles;i++){
+ res[i]=fopen(argv[i+1],"r");
+ if(!(res+i)){
+ fprintf(stderr,"Could not open file %s\n",argv[1+i]);
+ exit(1);
+ }
+ }
- base=strdup(argv[3]);
+ base=strdup(argv[2+resfiles]);
buffer=alloca(strlen(base)+20);
{
- char *pos=strchr(argv[2],',');
- begin=atoi(argv[2]);
+ char *pos=strchr(argv[1+resfiles],',');
+ begin=atoi(argv[1+resfiles]);
if(!pos)
usage();
else
@@ -165,19 +188,19 @@
}
/* how many parts?... */
- parts=argc-3;
+ parts=argc-resfiles-2;
ebound=_ogg_malloc(sizeof(float)*parts);
mbound=_ogg_malloc(sizeof(float)*parts);
subgrp=_ogg_malloc(sizeof(int)*parts);
for(i=0;i<parts-1;i++){
- char *pos=strchr(argv[4+i],',');
+ char *pos=strchr(argv[3+i+resfiles],',');
subgrp[i]=0;
- if(*argv[4+i]==',')
+ if(*argv[3+i+resfiles]==',')
ebound[i]=1e50f;
else
- ebound[i]=atof(argv[4+i]);
+ ebound[i]=atof(argv[3+i+resfiles]);
if(!pos){
mbound[i]=1e50f;
@@ -198,42 +221,57 @@
ebound[i]=1e50f;
mbound[i]=1e50f;
subgrp[i]=9999999;
-
- res=fopen(argv[1],"r");
- if(!res){
- fprintf(stderr,"Could not open file %s\n",argv[1]);
- exit(1);
- }
- or=alloca(parts*sizeof(FILE*));
+ or=alloca(parts*resfiles*sizeof(FILE*));
sprintf(buffer,"%saux.vqd",base);
of=fopen(buffer,"w");
if(!of){
fprintf(stderr,"Could not open file %s for writing\n",buffer);
exit(1);
}
- for(i=0;i<parts;i++){
- sprintf(buffer,"%s_%d.vqd",base,i);
- or[i]=fopen(buffer,"w");
- if(!or[i]){
- fprintf(stderr,"Could not open file %s for writing\n",buffer);
- exit(1);
+
+ for(j=0;j<resfiles;j++){
+ for(i=0;i<parts;i++){
+ sprintf(buffer,"%s_%d%c.vqd",base,i,j+65);
+ or[i+j*parts]=fopen(buffer,"w");
+ if(!or[i+j*parts]){
+ fprintf(stderr,"Could not open file %s for writing\n",buffer);
+ exit(1);
+ }
}
}
vec=_ogg_malloc(sizeof(float)*n);
+ class=_ogg_malloc(sizeof(float)*n);
/* get the input line by line and process it */
- while(!feof(res)){
- if(getline(res,vec,begin,n))
- quantaux(vec,n,ebound,mbound,subgrp,parts,subn);
+ while(1){
+ if(getline(res[0],vec,begin,n)){
+ quantaux(vec,n,ebound,mbound,subgrp,parts,subn,class);
+ quantwrite(vec,n,subn,class,0);
+
+ for(i=1;i<resfiles;i++){
+ if(getline(res[i],vec,begin,n)){
+ quantwrite(vec,n,subn,class,parts*i);
+ }else{
+ fprintf(stderr,"Getline loss of sync (%d).\n\n",i);
+ exit(1);
+ }
+ }
+ }else{
+ if(feof(res[0]))break;
+ fprintf(stderr,"Getline loss of sync (0).\n\n");
+ exit(1);
+ }
+
c++;
if(!(c&0xf)){
- spinnit("kB so far...",(int)(ftell(res)/1024));
+ spinnit("kB so far...",(int)(ftell(res[0])/1024));
}
}
- fclose(res);
+ for(i=0;i<resfiles;i++)
+ fclose(res[i]);
fclose(of);
- for(i=0;i<parts;i++)
+ for(i=0;i<parts*resfiles;i++)
fclose(or[i]);
fprintf(stderr,"\rDone \n");
return(0);
--- >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