[xiph-cvs] cvs commit: vorbis/lib/modes mode_44c_A.h mode_44c_Z.h modes.h
Monty
xiphmont at xiph.org
Tue Oct 16 13:10:22 PDT 2001
xiphmont 01/10/16 13:10:22
Modified: lib Tag: branch_monty_20011009 block.c codec_internal.h
mapping0.c psy.c psy.h res0.c sharedbook.c
lib/books Tag: branch_monty_20011009 line_1024x31_0sub0.vqh
line_1024x31_0sub1.vqh line_1024x31_1sub1.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_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_0a.vqh res_Ac_1.vqh
res_Ac_2a.vqh res_Ac_3.vqh res_Ac_4.vqh
res_Ac_5.vqh res_Ac_5a.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 mode_44c_A.h
mode_44c_Z.h modes.h
Log:
More bitrate management additions/fixes/tuning
Revision Changes Path
No revision
No revision
1.50.2.3 +9 -8 vorbis/lib/block.c
Index: block.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/block.c,v
retrieving revision 1.50.2.2
retrieving revision 1.50.2.3
diff -u -r1.50.2.2 -r1.50.2.3
--- block.c 2001/10/11 15:41:44 1.50.2.2
+++ block.c 2001/10/16 20:10:10 1.50.2.3
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.50.2.2 2001/10/11 15:41:44 xiphmont Exp $
+ last mod: $Id: block.c,v 1.50.2.3 2001/10/16 20:10:10 xiphmont Exp $
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -275,16 +275,17 @@
long maxpackets=(max(ci->bitrate_bound_queuetime,
ci->bitrate_avg_queuetime)*
vi->rate+(ci->blocksizes[0]-1))/ci->blocksizes[0]+1;
- long eighths=8*ci->passlimit[ci->coupling_passes-1];
+ long bins=BITTRACK_DIVISOR*ci->passlimit[ci->coupling_passes-1];
if(ci->bitrate_queue_loweravg<=0. &&
- ci->bitrate_queue_upperavg<=0.)eighths=0;
+ ci->bitrate_queue_upperavg<=0.)bins=0;
b->bitrate_queue_size=maxpackets;
- b->bitrate_eighths=eighths;
+ b->bitrate_bins=bins;
b->bitrate_queue=_ogg_malloc(maxpackets*sizeof(*b->bitrate_queue));
- if(eighths){
- b->bitrate_queue_eighths=_ogg_malloc(maxpackets*eighths*sizeof(*b->bitrate_queue));
- b->bitrate_avgbitacc=_ogg_malloc(eighths*sizeof(*b->bitrate_avgbitacc));
+ if(bins){
+ b->bitrate_queue_bin=_ogg_malloc(maxpackets*bins*
+ sizeof(*b->bitrate_queue));
+ b->bitrate_avgbitacc=_ogg_malloc(bins*sizeof(*b->bitrate_avgbitacc));
}
b->bitrate_floatinglimit=ci->bitrate_floatinglimit_initial;
}
@@ -330,7 +331,7 @@
}
if(b->psy_g_look)_vp_global_free(b->psy_g_look);
if(b->bitrate_queue)_ogg_free(b->bitrate_queue);
- if(b->bitrate_queue_eighths)_ogg_free(b->bitrate_queue_eighths);
+ if(b->bitrate_queue_bin)_ogg_free(b->bitrate_queue_bin);
if(b->bitrate_avgbitacc)_ogg_free(b->bitrate_avgbitacc);
}
1.9.4.3 +18 -9 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.2
retrieving revision 1.9.4.3
diff -u -r1.9.4.2 -r1.9.4.3
--- codec_internal.h 2001/10/11 15:41:44 1.9.4.2
+++ codec_internal.h 2001/10/16 20:10:10 1.9.4.3
@@ -10,7 +10,7 @@
********************************************************************
function: libvorbis codec headers
- last mod: $Id: codec_internal.h,v 1.9.4.2 2001/10/11 15:41:44 xiphmont Exp $
+ last mod: $Id: codec_internal.h,v 1.9.4.3 2001/10/16 20:10:10 xiphmont Exp $
********************************************************************/
@@ -46,6 +46,7 @@
#include "psy.h"
+#define BITTRACK_DIVISOR 16
typedef struct backend_lookup_state {
/* local lookup storage */
envelope_lookup *ve; /* envelope lookup */
@@ -68,14 +69,15 @@
/* encode side bitrate tracking */
ogg_uint32_t *bitrate_queue;
- ogg_uint32_t *bitrate_queue_eighths;
+ ogg_uint32_t *bitrate_queue_bin;
int bitrate_queue_size;
int bitrate_queue_head;
- int bitrate_eighths;
+ int bitrate_bins;
- long bitrate_boundbitacc;
- long bitrate_boundsampleacc;
- long bitrate_boundtail;
+ /* 0, -1, -4, -16, -n/16, -n/8, -n/4, -n/2 */
+ long bitrate_boundbitacc[8];
+ long bitrate_boundsampleacc[8];
+ long bitrate_boundtail[8];
long *bitrate_avgbitacc;
long bitrate_avgsampleacc;
@@ -127,13 +129,20 @@
/* detailed bitrate management setup */
double bitrate_floatinglimit_initial; /* set by mode */
+ double bitrate_floatinglimit_minimum; /* set by mode */
+ double bitrate_floatinglimit_upslew_max;
+ double bitrate_floatinglimit_downslew_max;
+
double bitrate_bound_queuetime;
double bitrate_avg_queuetime;
- double bitrate_absolute_max;
- double bitrate_absolute_min;
- double bitrate_queue_max;
+ double bitrate_absolute_min_short;
+ double bitrate_absolute_min_long;
+ double bitrate_absolute_max_short;
+ double bitrate_absolute_max_long;
+
double bitrate_queue_min;
+ double bitrate_queue_max;
double bitrate_queue_loweravg;
double bitrate_queue_upperavg;
1.37.2.3 +173 -98 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -u -r1.37.2.2 -r1.37.2.3
--- mapping0.c 2001/10/11 15:41:44 1.37.2.2
+++ mapping0.c 2001/10/16 20:10:10 1.37.2.3
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.37.2.2 2001/10/11 15:41:44 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.37.2.3 2001/10/16 20:10:10 xiphmont Exp $
********************************************************************/
@@ -179,7 +179,8 @@
return(ret);
}
-static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm,oggpack_buffer *opb){
+static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm,
+ oggpack_buffer *opb){
int i;
vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)vm;
@@ -283,34 +284,34 @@
static double floater_interpolate(backend_lookup_state *b,vorbis_info *vi,
double desired_rate){
- int eighth=b->bitrate_floatinglimit*8-1.;
+ int bin=b->bitrate_floatinglimit*BITTRACK_DIVISOR-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){
- eighth--;
- lobitrate=(double)(eighth==0?0.:
- b->bitrate_avgbitacc[eighth-1])/b->bitrate_avgsampleacc*vi->rate;
+ lobitrate=(double)(bin==0?0.:
+ b->bitrate_avgbitacc[bin-1])/b->bitrate_avgsampleacc*vi->rate;
+ while(lobitrate>desired_rate && bin>0){
+ bin--;
+ lobitrate=(double)(bin==0?0.:
+ b->bitrate_avgbitacc[bin-1])/b->bitrate_avgsampleacc*vi->rate;
}
- hibitrate=(eighth>=b->bitrate_eighths?b->bitrate_avgbitacc[b->bitrate_eighths-1]:
- (double)b->bitrate_avgbitacc[eighth])/b->bitrate_avgsampleacc*vi->rate;
- while(hibitrate<desired_rate && eighth<b->bitrate_eighths){
- eighth++;
- if(eighth<b->bitrate_eighths)
- hibitrate=(double)b->bitrate_avgbitacc[eighth]/b->bitrate_avgsampleacc*vi->rate;
+ hibitrate=(bin>=b->bitrate_bins?b->bitrate_avgbitacc[b->bitrate_bins-1]:
+ (double)b->bitrate_avgbitacc[bin])/b->bitrate_avgsampleacc*vi->rate;
+ while(hibitrate<desired_rate && bin<b->bitrate_bins){
+ bin++;
+ if(bin<b->bitrate_bins)
+ hibitrate=(double)b->bitrate_avgbitacc[bin]/b->bitrate_avgsampleacc*vi->rate;
}
/* interpolate */
- if(eighth==b->bitrate_eighths){
- return eighth/8.;
+ if(bin==b->bitrate_bins){
+ return bin/(double)BITTRACK_DIVISOR;
}else{
double delta=(desired_rate-lobitrate)/(hibitrate-lobitrate);
- return (eighth+delta)/8.;
+ return (bin+delta)/(double)BITTRACK_DIVISOR;
}
}
@@ -501,8 +502,8 @@
int stopflag=0,stoppos=0;
for(i=0;i<vi->channels;i++){
- quantized[i]=pcm[i]+n/2;
- sofar[i]=_vorbis_block_alloc(vb,n/2*sizeof(*sofar[i]));
+ quantized[i]=_vorbis_block_alloc(vb,n*sizeof(*sofar[i]));
+ sofar[i]=quantized[i]+n/2;
memset(sofar[i],0,sizeof(*sofar[i])*n/2);
}
@@ -570,16 +571,49 @@
else, use the bits sunk by a single iteration (bounded by min/max)
*/
{
- long period_samples=b->bitrate_boundsampleacc+ci->blocksizes[vb->W]/2;
- long maxbits_period=ci->bitrate_queue_max/vi->rate*period_samples;
- long minbits_period=ci->bitrate_queue_min/vi->rate*period_samples;
- long maxbits_absolute=ci->bitrate_absolute_max/vi->rate*
- ci->blocksizes[vb->W]/2;
- long minbits_absolute=ci->bitrate_absolute_min/vi->rate*
- ci->blocksizes[vb->W]/2;
+ long maxbits_absolute=
+ (vb->W?
+ ci->bitrate_absolute_max_long/vi->rate*ci->blocksizes[1]/2:
+ ci->bitrate_absolute_max_short/vi->rate*ci->blocksizes[0]/2);
+ long minbits_absolute=
+ (vb->W?
+ ci->bitrate_absolute_min_long/vi->rate*ci->blocksizes[1]/2:
+ ci->bitrate_absolute_min_short/vi->rate*ci->blocksizes[0]/2);
+
+ long minbits_period=ci->bitrate_queue_min/vi->rate*
+ (b->bitrate_boundsampleacc[0]+ci->blocksizes[vb->W]/2)-
+ b->bitrate_boundbitacc[0];
+
+ long period_samples=max(ci->bitrate_bound_queuetime*vi->rate,
+ b->bitrate_boundsampleacc[0]);
+ long maxbits_period=-1;
+
+ /* pessimistic checkahead */
+ for(i=0;i<8;i++){
+ long ahead_samples=period_samples-b->bitrate_boundsampleacc[i];
+ if(ahead_samples>=0){
+ long maxbits_local=ci->bitrate_queue_max/vi->rate*
+ (period_samples+ci->blocksizes[vb->W]/2)-
+ b->bitrate_boundbitacc[i]-
+ ci->bitrate_queue_min/vi->rate*ahead_samples;
- maxbits=min(maxbits_period-b->bitrate_boundbitacc,maxbits_absolute);
- minbits=max(minbits_period-b->bitrate_boundbitacc,minbits_absolute);
+ if(maxbits_period==-1 || maxbits_local<maxbits_period)
+ maxbits_period=maxbits_local;
+
+ }
+ }
+
+
+ if(maxbits_absolute){
+ if(ci->bitrate_queue_max>0.){
+ maxbits=min(maxbits_period,maxbits_absolute);
+ }else{
+ maxbits=maxbits_absolute;
+ }
+ }else
+ maxbits=maxbits_period;
+ minbits=max(minbits_period,minbits_absolute);
+
if(maxbits<0)maxbits=0;
if(maxbits)minbits=min(minbits,maxbits);
}
@@ -594,8 +628,8 @@
vector, according residue mapping */
for(j=0;j<info->submaps;j++){
- ogg_uint32_t *queueptr=b->bitrate_queue_eighths;
- if(queueptr)queueptr+=b->bitrate_queue_head*b->bitrate_eighths;
+ ogg_uint32_t *queueptr=b->bitrate_queue_bin;
+ if(queueptr)queueptr+=b->bitrate_queue_head*b->bitrate_bins;
if(stoppos){
look->residue_func[j]->
@@ -681,7 +715,7 @@
/* bitrate management.... deciding when it's time to stop. */
if(i<quant_passes){
- if(b->bitrate_eighths==0){ /* average bitrate always runs
+ if(b->bitrate_bins==0){ /* average bitrate always runs
encode to the bitter end in
order to collect statistics */
@@ -706,35 +740,32 @@
/* down-couple/down-quantize from perfect-'so-far' ->
new quantized vector */
- if(!stoppos){ /* only do this if we're doing a real iteration
- and not padding */
- 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 */
- 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,
- sofar,
- 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);
-
+ 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 */
+ 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,
+ sofar,
+ 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);
+
}
/* steady as she goes */
@@ -752,24 +783,51 @@
fprintf(stderr,"Bitrate: cav %d, cmin %ld, cmax %ld, float %.1f,"
" this %ld\n",
- (int)((double)b->bitrate_boundbitacc*vi->rate/b->bitrate_boundsampleacc),
+ (int)((double)b->bitrate_boundbitacc[0]*vi->rate/b->bitrate_boundsampleacc[0]),
minbits,maxbits,b->bitrate_floatinglimit,
oggpack_bytes(&vb->opb)*8);
- fprintf(stderr,"\thead:%d, boundtail:%ld(%ld), avtail:%ld(%ld)\n",
- b->bitrate_queue_head,b->bitrate_boundtail,b->bitrate_boundsampleacc,
- b->bitrate_avgtail,b->bitrate_avgsampleacc);
/* track bitrate*/
/* update boundary accumulators */
- while(b->bitrate_boundsampleacc>ci->bitrate_bound_queuetime*vi->rate){
- int samples=ci->blocksizes[0]>>1;
- if(b->bitrate_queue[b->bitrate_boundtail]&0x80000000UL)
- samples=ci->blocksizes[1]>>1;
- b->bitrate_boundsampleacc-=samples;
- b->bitrate_boundbitacc-=
- b->bitrate_queue[b->bitrate_boundtail]&0x7fffffffUL;
- b->bitrate_boundtail++;
- if(b->bitrate_boundtail>=b->bitrate_queue_size)b->bitrate_boundtail=0;
+ for(i=0;i<8;i++){
+ long desired=ci->bitrate_bound_queuetime*vi->rate;
+ switch(i){
+ case 0:
+ break;
+ case 1:
+ desired-=ci->blocksizes[0]/2;
+ break;
+ case 2:
+ desired-=ci->blocksizes[0]*2;
+ break;
+ case 3:
+ desired-=ci->blocksizes[0]*8;
+ break;
+ case 4:
+ desired-=ci->bitrate_bound_queuetime*vi->rate*(1./16.);
+ break;
+ case 5:
+ desired-=ci->bitrate_bound_queuetime*vi->rate*(1./8.);
+ break;
+ case 6:
+ desired-=ci->bitrate_bound_queuetime*vi->rate*(1./4.);
+ break;
+ case 7:
+ desired-=ci->bitrate_bound_queuetime*vi->rate*(1./2.);
+ break;
+ }
+
+ while(b->bitrate_boundsampleacc[i]>desired){
+ int samples=ci->blocksizes[0]>>1;
+ if(b->bitrate_queue[b->bitrate_boundtail[i]]&0x80000000UL)
+ samples=ci->blocksizes[1]>>1;
+ b->bitrate_boundsampleacc[i]-=samples;
+ b->bitrate_boundbitacc[i]-=
+ b->bitrate_queue[b->bitrate_boundtail[i]]&0x7fffffffUL;
+ b->bitrate_boundtail[i]++;
+ if(b->bitrate_boundtail[i]>=b->bitrate_queue_size)
+ b->bitrate_boundtail[i]=0;
+ }
}
/* update moving average accumulators */
@@ -778,51 +836,68 @@
if(b->bitrate_queue[b->bitrate_avgtail]&0x80000000UL)
samples=ci->blocksizes[1]>>1;
b->bitrate_avgsampleacc-=samples;
- for(i=0;i<b->bitrate_eighths;i++)
+ for(i=0;i<b->bitrate_bins;i++)
b->bitrate_avgbitacc[i]-=
- b->bitrate_queue_eighths[b->bitrate_avgtail*b->bitrate_eighths+i];
+ b->bitrate_queue_bin[b->bitrate_avgtail*b->bitrate_bins+i];
b->bitrate_avgtail++;
if(b->bitrate_avgtail>=b->bitrate_queue_size)b->bitrate_avgtail=0;
}
/* update queue head */
- {
+ if(oggpack_bytes(&vb->opb)>2){
+
int bits=oggpack_bytes(&vb->opb)*8;
-
+
/* 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;
+ for(i=0;i<8;i++){
+ b->bitrate_boundbitacc[i]+=bits;
+ b->bitrate_boundsampleacc[i]+=ci->blocksizes[vb->W]>>1;
}
- b->bitrate_queue_head++;
- if(b->bitrate_queue_head>=b->bitrate_queue_size)b->bitrate_queue_head=0;
+ /* bins */
+ if(b->bitrate_bins){
+ for(i=0;i<b->bitrate_bins;i++)
+ b->bitrate_avgbitacc[i]+=
+ b->bitrate_queue_bin[b->bitrate_queue_head*b->bitrate_bins+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
+ /* look for the bin settings in recent history that bracket
the desired bitrate, and interpolate twixt them for the
flaoter setting we want */
- if(b->bitrate_eighths>0){
+ if(b->bitrate_bins>0 &&
+ (b->bitrate_avgsampleacc>ci->bitrate_avg_queuetime*vi->rate/8 ||
+ b->bitrate_avgsampleacc>8192)){
double upper=floater_interpolate(b,vi,ci->bitrate_queue_upperavg);
double lower=floater_interpolate(b,vi,ci->bitrate_queue_loweravg);
-
+ double new=ci->bitrate_floatinglimit_initial;
+ double slew;
+
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;
- }
- }
+
+ if(upper>0. && upper<new)new=upper;
+ if(lower<ci->bitrate_floatinglimit_minimum)
+ lower=ci->bitrate_floatinglimit_minimum;
+ if(lower>new)new=lower;
+
+ slew=new-b->bitrate_floatinglimit;
+
+ if(slew<ci->bitrate_floatinglimit_downslew_max)
+ new=b->bitrate_floatinglimit+ci->bitrate_floatinglimit_downslew_max;
+ if(slew>ci->bitrate_floatinglimit_upslew_max)
+ new=b->bitrate_floatinglimit+ci->bitrate_floatinglimit_upslew_max;
+
+ b->bitrate_floatinglimit=new;
+ }
+ }
}
look->lastframe=vb->sequence;
1.56.2.2 +29 -9 vorbis/lib/psy.c
Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.2
diff -u -r1.56.2.1 -r1.56.2.2
--- psy.c 2001/10/11 15:41:44 1.56.2.1
+++ psy.c 2001/10/16 20:10:11 1.56.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.56.2.1 2001/10/11 15:41:44 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.56.2.2 2001/10/16 20:10:11 xiphmont Exp $
********************************************************************/
@@ -904,17 +904,22 @@
float granule,float igranule,
float *mag, float *ang){
- A=rint(A*igranule)*granule;
- B=rint(B*igranule)*granule;
-
if(fabs(A)>fabs(B)){
+ A=rint(A*igranule)*granule; /* must be done *after* the comparison */
+ B=rint(B*igranule)*granule;
+
*mag=A; *ang=(A>0.f?A-B:B-A);
}else{
+ A=rint(A*igranule)*granule;
+ B=rint(B*igranule)*granule;
+
*mag=B; *ang=(B>0.f?A-B:B-A);
}
- if(*ang>fabs(*mag)*1.9999f)*ang=-fabs(*mag)*2.f;
-
+ if(*ang>fabs(*mag)*1.9999f){
+ *ang= -fabs(*mag)*2.f;
+ *mag= -*mag;
+ }
}
static void couple_8phase(float A, float B, float fA, float fB,
@@ -1086,6 +1091,7 @@
for(i=0;i<vi->coupling_steps;i++){
float granulem=info->couple_pass[passno].granulem;
float igranulem=info->couple_pass[passno].igranulem;
+ float rqlimit=info->couple_pass[passno].requant_limit;
/* make sure coupling a zero and a nonzero channel results in two
nonzero channels. */
@@ -1128,10 +1134,24 @@
granulem,igranulem,&mag,&ang);
}
}
+ }
+
+ /* executive decision time: when requantizing and recoupling
+ residue in order to progressively encode at finer
+ resolution, an out of phase component that originally
+ quntized to 2*mag can flip flop magnitude/angle if it
+ requantizes to not-quite out of phase. If that happens,
+ we opt not to fill in additional resolution (in order to
+ simplify the iterative codebook design and
+ efficiency). */
+
+ if(ang<-rqlimit || ang>rqlimit){
+ qM[j]=0.f;
+ qA[j]=0.f;
+ }else{
+ qM[j]=mag-sofarM[j];
+ qA[j]=ang-sofarA[j];
}
-
- qM[j]=mag-sofarM[j];
- qA[j]=ang-sofarA[j];
}
}
}
1.24.2.2 +2 -1 vorbis/lib/psy.h
Index: psy.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.h,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- psy.h 2001/10/09 04:34:45 1.24.2.1
+++ psy.h 2001/10/16 20:10:11 1.24.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.24.2.1 2001/10/09 04:34:45 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.24.2.2 2001/10/16 20:10:11 xiphmont Exp $
********************************************************************/
@@ -48,6 +48,7 @@
typedef struct vp_couple_pass{
float granulem;
float igranulem;
+ float requant_limit;
vp_couple couple_pass[8];
} vp_couple_pass;
1.37.2.4 +13 -9 vorbis/lib/res0.c
Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.37.2.3
retrieving revision 1.37.2.4
diff -u -r1.37.2.3 -r1.37.2.4
--- res0.c 2001/10/12 00:08:06 1.37.2.3
+++ res0.c 2001/10/16 20:10:11 1.37.2.4
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.37.2.3 2001/10/12 00:08:06 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.37.2.4 2001/10/16 20:10:11 xiphmont Exp $
********************************************************************/
@@ -49,7 +49,7 @@
long phrasebits;
long frames;
- int qoffsets[8];
+ int qoffsets[BITTRACK_DIVISOR];
} vorbis_look_residue0;
@@ -243,8 +243,8 @@
int n=info->end-info->begin,i;
int partvals=n/samples_per_partition;
- for(i=0;i<8;i++)
- look->qoffsets[i]=partvals*(i+1)/8;
+ for(i=0;i<BITTRACK_DIVISOR;i++)
+ look->qoffsets[i]=partvals*(i+1)/BITTRACK_DIVISOR;
}
return(look);
@@ -545,9 +545,9 @@
partition channel words... */
for(s=(pass==0?0:ci->passlimit[pass-1]);s<ci->passlimit[pass];s++){
- int eighth=0;
+ int bin=0;
ogg_uint32_t *qptr=NULL;
- if(stats)qptr=stats+s*8;
+ if(stats)qptr=stats+s*BITTRACK_DIVISOR;
for(i=0;i<partvals;){
@@ -602,8 +602,8 @@
}
}
- if(qptr)while(i>=look->qoffsets[eighth])
- qptr[eighth++]=oggpack_bits(&vb->opb);
+ if(qptr)while(i>=look->qoffsets[bin])
+ qptr[bin++]=oggpack_bits(&vb->opb);
@@ -824,9 +824,13 @@
float *pcm=in[i];
float *sofar=out[i];
for(j=0,k=i;j<n;j++,k+=ch)
+#ifdef TRAIN_RES
+ sofar[j]+=pcm[j]; /* when training, our previous stage books
+ might be dummies */
+#else
sofar[j]+=pcm[j]-work[k];
+#endif
}
-
return(ret);
}else
return(0);
1.18.2.1 +1 -2 vorbis/lib/sharedbook.c
Index: sharedbook.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/sharedbook.c,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- sharedbook.c 2001/10/02 00:14:32 1.18
+++ sharedbook.c 2001/10/16 20:10:11 1.18.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: basic shared codebook operations
- last mod: $Id: sharedbook.c,v 1.18 2001/10/02 00:14:32 segher Exp $
+ last mod: $Id: sharedbook.c,v 1.18.2.1 2001/10/16 20:10:11 xiphmont Exp $
********************************************************************/
@@ -379,7 +379,6 @@
return(acc);
}
-#include <stdio.h>
int _best(codebook *book, float *a, int step){
encode_aux_nearestmatch *nt=book->c->nearest_tree;
encode_aux_threshmatch *tt=book->c->thresh_tree;
No revision
No revision
1.3.4.4 +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.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- line_1024x31_0sub0.vqh 2001/10/12 00:08:07 1.3.4.3
+++ line_1024x31_0sub0.vqh 2001/10/16 20:10:13 1.3.4.4
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_0sub0[] = {
- 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5,
+ 3, 4, 4, 4, 3, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5,
};
static static_codebook _huff_book_line_1024x31_0sub0 = {
1.3.4.4 +3 -3 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.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- line_1024x31_0sub1.vqh 2001/10/12 00:08:07 1.3.4.3
+++ line_1024x31_0sub1.vqh 2001/10/16 20:10:13 1.3.4.4
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_1024x31_0sub1[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7,
- 6, 8, 8,10,10,10, 8,12, 9,12,10,12,11,12,12,12,
- 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+ 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 5, 7, 6, 7,
+ 6, 7, 6, 7, 8, 7, 6, 6, 8, 9, 9, 9, 9, 9, 5, 6,
+ 8,10,10, 9, 9,12,10,11,12,10, 8, 8,12,12,12,12,
};
static static_codebook _huff_book_line_1024x31_0sub1 = {
1.3.4.4 +3 -3 vorbis/lib/books/line_1024x31_1sub1.vqh
Index: line_1024x31_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_1sub1.vqh,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- line_1024x31_1sub1.vqh 2001/10/12 00:08:07 1.3.4.3
+++ line_1024x31_1sub1.vqh 2001/10/16 20:10:13 1.3.4.4
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_1024x31_1sub1[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 3, 3, 3, 3, 4, 3, 5, 3, 5, 4, 7, 5, 8, 7,10, 9,
- 12,10,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
- 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,11,
+ 3, 3, 3, 3, 4, 3, 5, 4, 5, 4, 6, 6, 7, 7, 7,10,
+ 7,10, 8,10, 8,10, 9, 9, 9,11, 8, 8, 8, 8, 8, 9,
+ 7, 8, 8, 9,10, 9,12,12,12,12,12,12,12,12,12,12,
};
static static_codebook _huff_book_line_1024x31_1sub1 = {
1.3.4.4 +3 -3 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.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- line_1024x31_2sub3.vqh 2001/10/12 00:08:07 1.3.4.3
+++ line_1024x31_2sub3.vqh 2001/10/16 20:10:13 1.3.4.4
@@ -21,9 +21,9 @@
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, 4, 1, 5, 2, 8, 4, 9,
- 6, 9, 7, 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, 9, 9, 9, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 5, 2, 7, 4, 7,
+ 4, 9, 4, 9, 5, 8, 6, 6, 6, 9, 6, 6, 6, 6, 7, 9,
+ 8, 9, 7, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8,
};
static static_codebook _huff_book_line_1024x31_2sub3 = {
1.3.4.3 +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.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- line_1024x31_3sub1.vqh 2001/10/11 15:41:47 1.3.4.2
+++ line_1024x31_3sub1.vqh 2001/10/16 20:10:13 1.3.4.3
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_3sub1[] = {
- 0, 3, 3, 3, 3, 3, 3, 3, 3,
+ 0, 3, 3, 2, 3, 3, 4, 3, 4,
};
static static_codebook _huff_book_line_1024x31_3sub1 = {
1.3.4.4 +1 -1 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.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- line_1024x31_3sub2.vqh 2001/10/12 00:08:07 1.3.4.3
+++ line_1024x31_3sub2.vqh 2001/10/16 20:10:13 1.3.4.4
@@ -21,7 +21,7 @@
static long _huff_lengthlist_line_1024x31_3sub2[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 2, 5, 3, 7, 3,
- 8, 4, 9, 5,10, 5,11, 6,11,
+ 7, 4, 8, 5, 8, 6, 8, 6, 8,
};
static static_codebook _huff_book_line_1024x31_3sub2 = {
1.3.4.4 +3 -3 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.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- line_1024x31_3sub3.vqh 2001/10/12 00:08:07 1.3.4.3
+++ line_1024x31_3sub3.vqh 2001/10/16 20:10:13 1.3.4.4
@@ -21,9 +21,9 @@
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, 2, 7, 3, 7, 4,
- 7, 5, 7, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 5, 5, 5,
+ 4, 7, 5, 7, 6, 8, 5, 8, 5, 8, 5, 8, 7, 8, 5, 8,
+ 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.4 +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.3
retrieving revision 1.2.4.4
diff -u -r1.2.4.3 -r1.2.4.4
--- line_1024x31_class0.vqh 2001/10/12 00:08:07 1.2.4.3
+++ line_1024x31_class0.vqh 2001/10/16 20:10:13 1.2.4.4
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class0[] = {
- 1, 2, 4, 5, 3, 6, 7, 7,
+ 1, 3, 4, 3, 3, 5, 6, 6,
};
static static_codebook _huff_book_line_1024x31_class0 = {
1.3.4.4 +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.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- line_1024x31_class1.vqh 2001/10/12 00:08:07 1.3.4.3
+++ line_1024x31_class1.vqh 2001/10/16 20:10:13 1.3.4.4
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class1[] = {
- 1, 3, 5, 7, 9, 9,10,11, 2, 5, 5, 6,10,11,11,11,
+ 1, 3, 4, 8, 7, 7, 7,11, 3, 4, 4, 5,10,11,10,10,
};
static static_codebook _huff_book_line_1024x31_class1 = {
1.3.4.4 +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.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- line_1024x31_class2.vqh 2001/10/12 00:08:07 1.3.4.3
+++ line_1024x31_class2.vqh 2001/10/16 20:10:13 1.3.4.4
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class2[] = {
- 2, 3, 4,10, 6, 4, 5,10, 8, 6, 6,15,16,15,16,15,
- 5, 3, 5, 9, 6, 4, 6, 9, 8, 5, 7,14,15,15,15,15,
- 8, 6, 6, 9, 8, 6, 6, 9,10, 7, 8,14,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+ 2, 3, 4,10, 6, 4, 5,10, 8, 6, 6,11,14,12,15,11,
+ 5, 3, 5, 9, 6, 4, 6, 9, 8, 5, 7,13,16,16,13,16,
+ 8, 6, 6, 9, 9, 6, 6, 9,10, 7, 8,11,16,15,15,15,
+ 15,15,15,15,14,14,15,15,15,13,13,15,15,15,15,15,
};
static static_codebook _huff_book_line_1024x31_class2 = {
1.3.4.4 +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.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- line_1024x31_class3.vqh 2001/10/12 00:08:07 1.3.4.3
+++ line_1024x31_class3.vqh 2001/10/16 20:10:13 1.3.4.4
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class3[] = {
- 1, 4, 3,11, 6, 4, 5,13,10, 8,10,15,15,15,15,15,
- 7, 4, 5,11, 7, 5, 6,12,11, 8,11,15,14,14,14,14,
- 11, 8, 6, 9,11, 9, 8,11,13,10,12,14,14,14,14,14,
- 14,14,11, 9,14,14,12,11,14,14,14,14,14,14,14,14,
+ 1, 3, 3,10, 7, 5, 5,11,10, 8,10,11,12,12,11,12,
+ 7, 4, 5,10, 8, 5, 7,13,12, 9,11,15,15,15,15,15,
+ 11, 9, 7, 9,11, 9, 9,12,12,11,12,15,14,14,14,14,
+ 14,10,10,10,14,13,13,12,14,13,14,14,14,14,14,14,
};
static static_codebook _huff_book_line_1024x31_class3 = {
1.3.2.3 +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.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- line_128x19_0sub0.vqh 2001/10/12 00:08:07 1.3.2.2
+++ line_128x19_0sub0.vqh 2001/10/16 20:10:13 1.3.2.3
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_0sub0[] = {
- 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 6, 4, 6, 5,
- 6, 5, 6, 5, 7, 6, 7, 6, 7, 7, 7, 8, 8, 8, 8, 9,
- 8,10, 8,11, 8,12, 8,13, 8,10, 8,10, 9,11, 9,11,
- 9,10,10,11,12,14,14,14,14,16,16,16,16,16,16,15,
+ 3, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 6, 5, 6, 5,
+ 6, 5, 6, 6, 7, 6, 7, 7, 7, 8, 7, 8, 8, 9, 8,10,
+ 8,11, 8,11, 8,13, 8,12, 8,10, 8,10, 9,11, 9,11,
+ 9,11,10,11,12,14,14,14,14,16,16,16,16,16,16,15,
};
static static_codebook _huff_book_line_128x19_0sub0 = {
1.3.2.3 +3 -3 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.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- line_128x19_1sub3.vqh 2001/10/12 00:08:07 1.3.2.2
+++ line_128x19_1sub3.vqh 2001/10/16 20:10:13 1.3.2.3
@@ -21,9 +21,9 @@
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, 6, 3, 7, 2, 8,
- 3,10, 4,10, 5,10, 5,10, 7,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 2, 6, 2, 7, 3, 8,
+ 3,10, 4,10, 5, 9, 5, 9, 6, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
};
static static_codebook _huff_book_line_128x19_1sub3 = {
1.1.4.3 +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.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- line_128x19_2sub1.vqh 2001/10/12 00:08:07 1.1.4.2
+++ line_128x19_2sub1.vqh 2001/10/16 20:10:13 1.1.4.3
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_2sub1[] = {
- 0, 3, 3, 3, 3, 2, 4, 3, 4,
+ 0, 3, 3, 2, 3, 3, 4, 3, 4,
};
static static_codebook _huff_book_line_128x19_2sub1 = {
1.3.2.3 +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.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- line_128x19_2sub2.vqh 2001/10/12 00:08:07 1.3.2.2
+++ line_128x19_2sub2.vqh 2001/10/16 20:10:13 1.3.2.3
@@ -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, 4,
- 7, 4, 8, 4, 9, 5,10, 5,10,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2, 5, 3, 6, 4,
+ 7, 4, 8, 5, 9, 6,10, 6,10,
};
static static_codebook _huff_book_line_128x19_2sub2 = {
1.3.2.3 +3 -3 vorbis/lib/books/line_128x19_2sub3.vqh
Index: line_128x19_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_2sub3.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- line_128x19_2sub3.vqh 2001/10/12 00:08:07 1.3.2.2
+++ line_128x19_2sub3.vqh 2001/10/16 20:10:13 1.3.2.3
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_128x19_2sub3[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 7, 2, 8, 4, 9, 4,
- 7, 6, 8, 8, 8, 9, 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,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 3, 8, 3, 7, 4,
+ 7, 6, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7,
};
static static_codebook _huff_book_line_128x19_2sub3 = {
1.3.2.3 +4 -4 vorbis/lib/books/line_128x19_class1.vqh
Index: line_128x19_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_class1.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- line_128x19_class1.vqh 2001/10/12 00:08:07 1.3.2.2
+++ line_128x19_class1.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_class1[] = {
- 3, 3, 4,11, 6, 4, 5,12, 7, 5, 6,12,14,13,13,15,
- 5, 3, 4,10, 7, 5, 6,12, 8, 5, 7,12,14,13,14,15,
- 7, 4, 5,11, 8, 5, 6,11, 9, 6, 6,12,15,12,13,15,
- 14,11,10,13,11, 8, 8,12,11, 8, 9,14,15,15,14,14,
+ 3, 3, 4,11, 6, 4, 5,11, 8, 5, 6,12,14,13,14,15,
+ 5, 3, 4, 9, 7, 5, 6,11, 8, 5, 7,12,14,14,14,15,
+ 7, 4, 5,11, 8, 5, 6,10, 9, 6, 6,11,14,12,13,15,
+ 13,11,10,13,11, 8, 8,13,11, 8, 8,15,15,15,15,15,
};
static static_codebook _huff_book_line_128x19_class1 = {
1.3.2.3 +4 -4 vorbis/lib/books/line_128x19_class2.vqh
Index: line_128x19_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x19_class2.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- line_128x19_class2.vqh 2001/10/12 00:08:07 1.3.2.2
+++ line_128x19_class2.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_class2[] = {
- 1, 3, 4,13, 6, 4, 5,14, 9, 6, 8,15,15,15,15,15,
- 6, 4, 6,12, 7, 5, 6,13,10, 8, 9,15,15,15,15,15,
- 11, 8, 7, 9,11, 9, 8,10,13,11,11,13,15,15,15,15,
- 15,15,10,11,15,15,11,12,15,15,13,14,15,15,15,15,
+ 1, 3, 4,13, 6, 4, 5,15, 9, 6, 8,14,15,15,15,15,
+ 7, 4, 6,13, 7, 5, 6,13,10, 7, 9,15,15,15,15,15,
+ 10, 7, 7,10,12, 8, 8,11,13,11,11,13,15,15,15,15,
+ 15,15,10,12,15,14,12,13,15,15,13,15,15,15,15,15,
};
static static_codebook _huff_book_line_128x19_class2 = {
1.3.2.3 +7 -7 vorbis/lib/books/res_44c_A_1024aux.vqh
Index: res_44c_A_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_44c_A_1024aux.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_44c_A_1024aux.vqh 2001/10/12 00:08:07 1.3.2.2
+++ res_44c_A_1024aux.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_A_1024aux[] = {
- 3,11, 6,15,11,10,10,10,17,17,11, 4,17, 7, 5,17,
- 6, 8,14,17, 5,17, 3,17,17, 7, 8,10,17,17,15, 6,
- 17, 5,17,17, 5, 7,13,17,11, 5,17,17, 4,17, 5, 8,
- 17,17,11,17, 6,17,17, 8, 9,11,17,17,10, 6, 8, 5,
- 6, 9, 4, 5,12,17,12, 7,10, 6, 9,11, 5, 4, 8,17,
- 17,13,17,12,17,17,10, 6, 6,14,17,17,17,17,17,17,
- 16, 8, 9,16,
+ 3, 5,18,18,17,17,17,17,11,17, 5, 4,17,17,17,17,
+ 17,17, 8,16,17,17, 3,17, 6,17, 7, 9,13,17,17,17,
+ 17, 1,17, 7, 9,11,15,17,17,17, 6,17, 7,17, 9,10,
+ 16,17,17,17,17, 7,17, 8,10,15,17,17,17,17, 8, 9,
+ 9,10, 9,11,16,17,17,17, 9,13,10,17,11,12,15,17,
+ 9, 6,14,15,17,17,16,15, 7,14,12, 8,16,17,17,17,
+ 17,16,11,16,
};
static static_codebook _huff_book_res_44c_A_1024aux = {
1.3.2.4 +7 -7 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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_44c_A_128aux.vqh 2001/10/12 00:08:07 1.3.2.3
+++ res_44c_A_128aux.vqh 2001/10/16 20:10:14 1.3.2.4
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_A_128aux[] = {
- 4,15, 7,15,15,11,10,12,15,15,13, 4,15,15, 5,15,
- 8,12,15,15, 4,15, 2,15,15, 7, 7,10,15,15,15, 5,
- 15,15, 5,15, 6,11,15,15,14, 4,15,15, 4,15, 6,10,
- 15,15, 9,15, 7,15,15,10,11,13,15,15,10, 5, 8,15,
- 4,12, 6,10,15,15,12, 9,11,12, 7,13, 8,12,15,15,
- 15,11,15, 5,15,15, 4, 6,15,15,15,15,15, 7,15,15,
- 6, 8,14,15,
+ 16,17, 3,17, 7,17,11,13,17,17, 8,12,11,17,13,17,
+ 15,17,17,17,17,17, 2,17, 8,17,11,14,17,17,17,17,
+ 17, 1,17, 8,10,17,17,17,17,17, 6,17,10,17,13,16,
+ 17,17,17,17,17, 9,17,13,15,17,17,17,17,17,10,11,
+ 13,15,15,17,17,17,17,17,12,16,14,17,15,17,17,17,
+ 4, 9,17,17,17,17,17,17,17,17, 6,10,17,16,16,16,
+ 16,16,16,16,
};
static static_codebook _huff_book_res_44c_A_128aux = {
1.1.2.3 +30 -30 vorbis/lib/books/Attic/res_Ac_0a.vqh
Index: res_Ac_0a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_0a.vqh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- res_Ac_0a.vqh 2001/10/12 00:08:07 1.1.2.2
+++ res_Ac_0a.vqh 2001/10/16 20:10:14 1.1.2.3
@@ -19,58 +19,58 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_0a[] = {
- 2,
- 1,
- 3,
+ 202,
+ 101,
+ 303,
0,
- 4,
+ 405,
};
static long _vq_lengthlist_res_Ac_0a[] = {
+ 3, 5, 5, 0, 0, 7, 6, 6, 0, 0, 7, 6, 6, 0, 0, 0,
+ 6, 6, 0, 0, 0, 7, 7, 0, 0, 5, 6, 6, 0, 0, 8, 7,
+ 7, 0, 0, 8, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9,
+ 0, 0, 5, 6, 6, 0, 0, 8, 7, 7, 0, 0, 8, 7, 7, 0,
+ 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8,
+ 0, 0, 9, 9, 9, 0, 0, 9, 9, 9, 0, 0, 0, 9, 9, 0,
+ 0, 0,10,10, 0, 0, 6, 7, 7, 0, 0, 9, 8, 8, 0, 0,
+ 9, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 6,
+ 7, 7, 0, 0, 9, 8, 8, 0, 0, 9, 8, 8, 0, 0, 0, 8,
+ 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 9,
+ 9, 9, 0, 0, 9, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0,10,
+ 10, 0, 0, 6, 7, 7, 0, 0, 9, 8, 8, 0, 0, 9, 8, 8,
+ 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 6, 7, 7, 0,
+ 0, 9, 8, 8, 0, 0, 9, 8, 8, 0, 0, 0, 8, 8, 0, 0,
+ 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 6, 8, 8, 0, 0, 9, 8, 8, 0, 0, 9, 8, 8, 0, 0, 0,
+ 9, 9, 0, 0, 0,10,10, 0, 0, 6, 8, 8, 0, 0, 9, 8,
+ 8, 0, 0, 9, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0,10,10,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9,
+ 0, 0,10, 9,10, 0, 0,10,10, 9, 0, 0, 0,10,10, 0,
+ 0, 0,11,10, 0, 0, 7, 9, 9, 0, 0,10,10, 9, 0, 0,
+ 10, 9, 9, 0, 0, 0,10,10, 0, 0, 0,10,11, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
};
static float _vq_quantthresh_res_Ac_0a[] = {
- -1.5, -0.5, 0.5, 1.5,
+ -0.5005, -0.1675, 0.1655, 0.50015,
};
static long _vq_quantmap_res_Ac_0a[] = {
@@ -87,7 +87,7 @@
static static_codebook _vq_book_res_Ac_0a = {
4, 625,
_vq_lengthlist_res_Ac_0a,
- 1, -533725184, 1611661312, 3, 0,
+ 1, -537569264, 1593508447, 9, 0,
_vq_quantlist_res_Ac_0a,
NULL,
&_vq_auxt_res_Ac_0a,
1.3.2.3 +20 -13 vorbis/lib/books/res_Ac_1.vqh
Index: res_Ac_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_1.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_1.vqh 2001/10/12 00:08:07 1.3.2.2
+++ res_Ac_1.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -19,39 +19,46 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_1[] = {
+ 4,
+ 3,
+ 5,
+ 2,
+ 6,
1,
+ 7,
0,
- 2,
+ 8,
};
static long _vq_lengthlist_res_Ac_1[] = {
- 2, 5, 5, 0, 4, 4, 0, 4, 5, 5, 7, 6, 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, 7, 7, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
- 8, 7, 0, 7, 7, 0, 7, 7, 5, 7, 8, 0, 7, 7, 0, 6,
- 7,
+ 1, 4, 3, 6, 6, 8, 8,10,10, 5, 5, 5, 7, 7, 9, 9,
+ 10,10, 6, 5, 5, 7, 7, 9, 9,10,11, 0, 7, 8, 8, 8,
+ 9,10,11,11, 0, 8, 8, 8, 8,10,10,11,11, 0,12,12,
+ 9, 9,10,10,12,11, 0,13,12,10, 9,11,11,12,12, 0,
+ 0, 0,11,11,12,11,12,13, 0, 0, 0,12,12,12,12,13,
+ 13,
};
static float _vq_quantthresh_res_Ac_1[] = {
- -0.5, 0.5,
+ -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 12.5, 17.5,
};
static long _vq_quantmap_res_Ac_1[] = {
- 1, 0, 2,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_1 = {
_vq_quantthresh_res_Ac_1,
_vq_quantmap_res_Ac_1,
- 3,
- 3
+ 9,
+ 9
};
static static_codebook _vq_book_res_Ac_1 = {
- 4, 81,
+ 2, 81,
_vq_lengthlist_res_Ac_1,
- 1, -535822336, 1611661312, 2, 0,
+ 1, -527171584, 1616117760, 4, 0,
_vq_quantlist_res_Ac_1,
NULL,
&_vq_auxt_res_Ac_1,
1.1.2.3 +17 -12 vorbis/lib/books/Attic/res_Ac_2a.vqh
Index: res_Ac_2a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_2a.vqh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- res_Ac_2a.vqh 2001/10/12 00:08:07 1.1.2.2
+++ res_Ac_2a.vqh 2001/10/16 20:10:14 1.1.2.3
@@ -19,41 +19,46 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_2a[] = {
+ 4,
3,
+ 5,
2,
- 4,
+ 6,
1,
- 5,
+ 7,
0,
- 6,
+ 8,
};
static long _vq_lengthlist_res_Ac_2a[] = {
- 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 5, 0, 0, 0, 0,
+ 0, 0, 3, 4, 4, 0, 0, 0, 0, 0, 0, 6, 9, 9, 6, 6,
+ 0, 0, 0, 0, 0, 8, 8,14,13, 0, 0, 0, 0, 0,11,10,
+ 16,14, 0, 0, 0, 0, 0,10,10,13,14, 0, 0, 0, 0, 0,
+ 0, 0,17,17, 0, 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0,
0,
};
static float _vq_quantthresh_res_Ac_2a[] = {
- -2.5, -1.5, -0.5, 0.5, 1.5, 2.5,
+ -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
};
static long _vq_quantmap_res_Ac_2a[] = {
- 5, 3, 1, 0, 2, 4, 6,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_2a = {
_vq_quantthresh_res_Ac_2a,
_vq_quantmap_res_Ac_2a,
- 7,
- 7
+ 9,
+ 9
};
static static_codebook _vq_book_res_Ac_2a = {
- 2, 49,
+ 2, 81,
_vq_lengthlist_res_Ac_2a,
- 1, -533200896, 1611661312, 3, 0,
+ 1, -531628032, 1611661312, 4, 0,
_vq_quantlist_res_Ac_2a,
NULL,
&_vq_auxt_res_Ac_2a,
1.3.2.3 +10 -46 vorbis/lib/books/res_Ac_3.vqh
Index: res_Ac_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_3.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_3.vqh 2001/10/12 00:08:07 1.3.2.2
+++ res_Ac_3.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -19,75 +19,39 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_3[] = {
- 2,
1,
- 3,
0,
- 4,
+ 2,
};
static long _vq_lengthlist_res_Ac_3[] = {
- 3, 6, 6, 9, 9, 0, 5, 5, 9, 9, 0, 5, 5, 9, 9, 0,
- 7, 7, 9, 9, 0, 0, 0, 9, 9, 6, 8, 7,11,10, 0, 8,
- 7,11,10, 0, 7, 7,10,10, 0, 9, 9,11,10, 0, 0, 0,
- 11,11, 6, 7, 8,10,11, 0, 7, 8,10,11, 0, 7, 7,10,
- 10, 0, 9, 9,10,11, 0, 0, 0,10,11, 9,11,10,13,12,
- 0,11,11,13,13, 0,11,11,13,13, 0,13,12,14,14, 0,
- 0, 0,14,15, 9,10,11,12,12, 0,11,11,12,14, 0,11,
- 11,12,13, 0,13,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, 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,12,11, 0, 6, 7,10,10, 0, 7, 7,10,10, 0, 8,
- 9,10,10, 0, 0, 0,10,10, 9,10,10,13,12, 0,10,10,
- 12,12, 0,10,10,12,12, 0,12,11,13,12, 0, 0, 0,13,
- 13, 9,10,10,13,13, 0,10,11,12,12, 0,10,10,12,12,
- 0,11,12,12,14, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0,
+ 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 0,
+ 0, 0, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5, 8, 7,12,11, 0, 7, 7,10,10, 0, 7, 6,
- 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,13, 0,10,10,13,12, 0,
- 10,10,13,12, 0,12,12,14,13, 0, 0, 0,13,12, 9,10,
- 10,12,13, 0,10,10,12,13, 0,10,10,11,12, 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,
- 7, 9, 9,13,14, 0, 8, 8,11,12, 0, 8, 9,11,12, 0,
- 10, 9,11,11, 0, 0, 0,11,12, 7, 9, 9,13,13, 0, 8,
- 8,12,12, 0, 9, 8,12,11, 0, 9,10,11,12, 0, 0, 0,
- 12,11, 9,11,11,13,15, 0,10,10,13,13, 0,10,10,12,
- 13, 0,12,11,13,12, 0, 0, 0,12,13, 9,11,11,14,14,
- 0,10,11,13,13, 0,10,10,13,13, 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, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 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,13, 0,10,10,13,12, 0,12,
- 12,13,13, 0, 0, 0,13,13, 9,10,11,13,14, 0,10,10,
- 12,13, 0,10,10,13,13, 0,11,11,13,13, 0, 0, 0,12,
- 13,
+ 0,
};
static float _vq_quantthresh_res_Ac_3[] = {
- -1.5, -0.5, 0.5, 1.5,
+ -0.5, 0.5,
};
static long _vq_quantmap_res_Ac_3[] = {
- 3, 1, 0, 2, 4,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_3 = {
_vq_quantthresh_res_Ac_3,
_vq_quantmap_res_Ac_3,
- 5,
- 5
+ 3,
+ 3
};
static static_codebook _vq_book_res_Ac_3 = {
- 4, 625,
+ 4, 81,
_vq_lengthlist_res_Ac_3,
- 1, -533725184, 1611661312, 3, 0,
+ 1, -535822336, 1611661312, 2, 0,
_vq_quantlist_res_Ac_3,
NULL,
&_vq_auxt_res_Ac_3,
1.3.2.3 +37 -37 vorbis/lib/books/res_Ac_4.vqh
Index: res_Ac_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_4.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_4.vqh 2001/10/12 00:08:07 1.3.2.2
+++ res_Ac_4.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -27,46 +27,46 @@
};
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,11,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,16, 0,
- 0, 0,18,15,10,11,12,13,15, 0,12,13,14,15, 0,12,
- 13,13,15, 0,15,15,14,17, 0, 0, 0,15,18, 0, 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,14, 0,11,11,
- 14,13, 0,11,11,14,13, 0,13,12,15,13, 0, 0, 0,14,
- 14,10,10,11,13,15, 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,12, 0, 7, 7,11,11, 0, 7, 7,
- 11,10, 0, 8, 8,11,11, 0, 0, 0,11,10, 5, 8, 8,13,
- 13, 0, 7, 7,11,11, 0, 7, 7,10,11, 0, 8, 8,11,11,
- 0, 0, 0,10,11, 9,11,11,14,14, 0,11,11,14,13, 0,
- 11,11,14,13, 0,13,13,15,14, 0, 0, 0,14,13, 9,10,
- 11,14,16, 0,11,11,14,14, 0,11,11,13,14, 0,13,13,
- 14,15, 0, 0, 0,13,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,14,13, 0,
- 10, 9,14,12, 0, 0, 0,12,13, 7,10,10,16,15, 0, 8,
- 8,13,14, 0, 9, 8,13,13, 0, 9,10,12,13, 0, 0, 0,
- 13,12,10,12,11,18,16, 0,11,10,15,14, 0,11,11,15,
- 15, 0,13,12,15,13, 0, 0, 0,14,14, 9,11,12,15,16,
- 0,10,11,14,15, 0,11,11,14,17, 0,12,13,13,15, 0,
- 0, 0,15,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 4, 4, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 4, 5, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 6, 9, 9,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7, 6, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
- 12,11,18,16, 0,11,11,15,14, 0,11,10,15,14, 0,12,
- 13,14,14, 0, 0, 0,15,13, 9,11,12,15,16, 0,11,11,
- 14,15, 0,10,11,13,14, 0,13,12,15,14, 0, 0, 0,13,
- 14,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res_Ac_4[] = {
1.3.2.3 +5 -5 vorbis/lib/books/res_Ac_5.vqh
Index: res_Ac_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_5.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_5.vqh 2001/10/12 00:08:07 1.3.2.2
+++ res_Ac_5.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -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,
+ 1, 4, 4, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 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, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 6,10, 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, 7, 9,10, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1.1.2.3 +5 -5 vorbis/lib/books/Attic/res_Ac_5a.vqh
Index: res_Ac_5a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/res_Ac_5a.vqh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- res_Ac_5a.vqh 2001/10/12 00:08:07 1.1.2.2
+++ res_Ac_5a.vqh 2001/10/16 20:10:14 1.1.2.3
@@ -31,11 +31,11 @@
};
static long _vq_lengthlist_res_Ac_5a[] = {
- 1, 3, 2, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 5, 0, 0, 0, 0,
+ 0, 0, 3, 5, 5, 0, 0, 0, 0, 0, 0, 5, 8, 8, 6, 6,
+ 0, 0, 0, 0, 8, 8, 8, 0,10, 0, 0, 0, 0, 7, 8,10,
+ 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0, 0, 0, 0, 0, 7,
+ 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0,
0,
};
1.3.2.3 +6 -6 vorbis/lib/books/res_Ac_6.vqh
Index: res_Ac_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_6.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_6.vqh 2001/10/12 00:08:07 1.3.2.2
+++ res_Ac_6.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -31,12 +31,12 @@
};
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, 7, 6,
- 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0,
- 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
- 0, 0, 8, 8, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
- 11,
+ 1, 3, 2, 5, 5, 5, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res_Ac_6[] = {
1.3.2.3 +18 -13 vorbis/lib/books/res_Ac_7.vqh
Index: res_Ac_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_7.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_7.vqh 2001/10/12 00:08:07 1.3.2.2
+++ res_Ac_7.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -19,41 +19,46 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_7[] = {
+ 4,
3,
+ 5,
2,
- 4,
+ 6,
1,
- 5,
+ 7,
0,
- 6,
+ 8,
};
static long _vq_lengthlist_res_Ac_7[] = {
- 1, 4, 4, 6, 6, 8, 8, 5, 4, 4, 7, 7, 9, 9, 5, 5,
- 5, 7, 7, 9, 9, 0, 7, 7, 8, 8,10,10, 0, 8, 8, 9,
- 9,10,10, 0,12,12, 9,10,11,10, 0,13,13,10,10,12,
- 11,
+ 1, 3, 3, 6, 6, 8, 7, 8, 8, 0, 5, 5, 7, 7, 8, 9,
+ 10,12, 0, 5, 5, 7, 7, 9, 8,10,12, 0, 7, 7,10,11,
+ 0, 0, 0,12, 0, 8, 8,12, 9,12, 0, 0, 0, 0,12, 0,
+ 12, 0, 0, 0, 0, 0, 0, 0, 0, 0,11, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res_Ac_7[] = {
- -12.5, -7.5, -2.5, 2.5, 7.5, 12.5,
+ -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 12.5, 17.5,
};
static long _vq_quantmap_res_Ac_7[] = {
- 5, 3, 1, 0, 2, 4, 6,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_7 = {
_vq_quantthresh_res_Ac_7,
_vq_quantmap_res_Ac_7,
- 7,
- 7
+ 9,
+ 9
};
static static_codebook _vq_book_res_Ac_7 = {
- 2, 49,
+ 2, 81,
_vq_lengthlist_res_Ac_7,
- 1, -528613376, 1616117760, 3, 0,
+ 1, -527171584, 1616117760, 4, 0,
_vq_quantlist_res_Ac_7,
NULL,
&_vq_auxt_res_Ac_7,
1.3.2.3 +40 -40 vorbis/lib/books/res_Ac_7a.vqh
Index: res_Ac_7a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_7a.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_7a.vqh 2001/10/12 00:08:08 1.3.2.2
+++ res_Ac_7a.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -27,46 +27,46 @@
};
static long _vq_lengthlist_res_Ac_7a[] = {
- 3, 6, 6, 8, 8,10, 6, 6, 8, 8,10, 6, 6, 8, 8,11,
- 8, 8, 8, 8,11,11,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,10, 9,11, 8, 8, 9,
- 10,11,10,10,10,10,11,11,11, 9,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,11, 8, 9, 9,10,10,12,10,10,10,10,11,10,
- 10,10,10,12,11,11,10,10,11,12,12,10,10,10,11,11,
- 11,12,13,11,11,11,11,13,12,11,12,12,13,12,12,12,
- 12,13,13,12,11,11, 6, 8, 8,10,10,11, 8, 8,10, 9,
- 12, 8, 8,10, 9,11, 9, 9, 9,10,11,11,11, 9, 9, 6,
- 8, 8,10,10,11, 8, 8,10,10,12, 8, 8, 9,10,11, 9,
- 9, 9, 9,11,11,11, 9,10, 8, 9, 9,10,10,11,10, 9,
- 10,10,12,10,10,10,10,12,11,11,10,10,12,12,12,11,
- 10, 8, 9,10,10,10,12,10,10,10,10,11,10,10,10,10,
- 12,11,10,11,11,12,12,11,10,11,10,11,11,12,11,13,
- 11,11,12,12,13,11,11,11,12,12,12,12,12,12,13,12,
- 12,12,12, 6, 8, 8,10,10,12, 8, 8,10,10,11, 8, 8,
- 9, 9,11, 9, 9, 9, 9,11,12,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,12, 9, 9, 8, 9, 9,10,10,12,10,10,10,10,12,
- 9, 9,10,10,11,10,10,10,10,11,11,11,10,10, 8, 9,
- 10,10,10,12,10, 9,10,10,12, 9, 9,10,10,11,10,10,
- 10,10,11,12,11,10,10,11,11,11,12,12,13,11,11,12,
- 12,13,11,12,12,12,13,12,12,11,11,13,13,13,11,12,
- 8,10,10,11,10,12, 9, 9,11,11,12, 9, 9,10,10,12,
- 10,10,10,10,12,12,12,10,10, 8,10, 9,11,11,12, 9,
- 9,10,10,12, 9, 9,10,10,12,10,10,10,10,12,12,12,
- 10,10, 9,10,10,10,10,12, 9, 9,10,10,12, 9, 9,10,
- 10,12,10,10,10,10,11,12,12,10,10, 8, 9,10,10,10,
- 11, 9,10,10,10,11, 9, 9,10,10,11,10,10,10,10,11,
- 12,12,10,10,10,11,11,12,12,12,11,11,11,12,13,11,
- 11,12,12,12,12,12,12,11,13,12,13,11,12,11,11,11,
- 12,12,13,11,11,12,12,13,12,11,12,12,12,12,12,12,
- 11,12,12,13,12,12,11,12,11,12,12,13,11,12,12,12,
- 13,11,11,12,12,13,12,12,12,11,12,13,12,11,12, 8,
- 10,10,10,11,12, 9, 9,10,11,12, 9, 9,10,10,11,10,
- 10,10,10,11,12,12,10,10, 8,10,10,10,11,11, 9, 9,
- 10,11,12, 9, 9,10,10,12,10,10,10,10,12,12,12,10,
- 10,
+ 1, 5, 4, 7, 7,11,13,13, 0,14,10,11,14,13,12,10,
+ 13, 0,12,13,10,12,13,12,12, 5, 6, 5, 7, 7,10,12,
+ 11, 0,12,10,13,12,12,11, 9,13,13,12,12, 9, 0,12,
+ 12,12, 4, 5, 6, 7, 7,10,12,13,13,12, 9,12,11,12,
+ 12,10,12,11,13, 0,10,13,12,11,13, 7, 7, 7, 8, 8,
+ 10,12,12,13, 0,10,13,12, 0,12,10,13,12,12,13, 9,
+ 13,11, 0,12, 7, 7, 7, 7, 8,10,11,11,12,13, 9,12,
+ 12,13, 0,10,12,11,13,13, 9,11,11, 0,13, 9, 9,10,
+ 10,10, 0,13, 0, 0,12, 0, 0, 0, 0,13,13, 0, 0,13,
+ 13,12,13, 0,13, 0,11,12,11,11,13,13,13, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,13, 0, 0, 0, 0, 0, 0, 0, 0,12,
+ 11, 0,11,12, 0, 0, 0,13,13,13, 0,13, 0, 0, 0,13,
+ 0, 0, 0, 0, 0,13, 0,13,12,12,11,12,11, 0, 0, 0,
+ 0, 0,12, 0,13,13, 0,12, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,12, 0,12,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,13,13, 0, 0, 0, 0,10,10, 9, 9, 9, 0,
+ 0, 0,13, 0,12, 0, 0,13, 0, 0, 0,13,13, 0,13,13,
+ 0, 0,12,13,11,11,13,11, 0, 0, 0, 0, 0,12, 0, 0,
+ 0, 0,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,11,12,12,
+ 13, 0, 0,13,13, 0, 0, 0,13, 0, 0, 0, 0, 0, 0, 0,
+ 12,13, 0, 0,13,13,12,12,12,13, 0,12, 0, 0, 0, 0,
+ 13,13, 0, 0, 0, 0, 0, 0, 0,13, 0, 0, 0, 0,12,11,
+ 13,11,12, 0,13, 0, 0, 0, 0, 0, 0, 0, 0,13, 0, 0,
+ 0,13, 0, 0, 0, 0, 0,10, 9, 9,10, 9,13, 0, 0, 0,
+ 0,13, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,
+ 13,12,11,11,11, 0, 0, 0, 0, 0, 0,13, 0,13, 0, 0,
+ 13, 0, 0, 0, 0, 0, 0, 0, 0,13,11,12,11,12, 0, 0,
+ 13, 0, 0, 0, 0, 0, 0, 0,12, 0, 0,13, 0, 0, 0,13,
+ 0, 0, 0,12, 0, 0,11, 0, 0, 0, 0,13, 0, 0, 0, 0,
+ 13, 0, 0, 0, 0, 0, 0,13, 0, 0,12,13,12,11,12,13,
+ 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13, 0,13, 0, 0,
+ 0, 0, 0, 0,10, 9, 9,10,10, 0,13,13, 0, 0, 0, 0,
+ 0, 0,13, 0,13, 0, 0, 0,12,13, 0,13,13,12,11,12,
+ 12,12, 0, 0,13, 0,12, 0, 0,13, 0, 0, 0,13, 0, 0,
+ 0,13, 0,13, 0,13,13,11,13,13,12, 0, 0, 0, 0, 0,
+ 0,13, 0, 0,12,12, 0,13,13, 0, 0,13, 0, 0,13,13,
+ 13,12,13,12, 0, 0, 0, 0,13, 0, 0, 0, 0, 0,13, 0,
+ 13, 0, 0, 0, 0, 0, 0, 0,13,13,12, 0,13, 0, 0, 0,
+ 0, 0, 0, 0,13, 0,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res_Ac_7a[] = {
1.3.2.3 +160 -28 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.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_8.vqh 2001/10/12 00:08:08 1.3.2.2
+++ res_Ac_8.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -19,56 +19,188 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_8[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
3,
- 9,
2,
- 10,
+ 4,
1,
- 11,
+ 5,
0,
- 12,
+ 6,
};
static long _vq_lengthlist_res_Ac_8[] = {
- 1, 4, 3, 6, 6, 8, 8, 9, 9,10,10,11,10, 6, 5, 5,
- 7, 7, 9, 9,10,10,11,11,13,12, 6, 5, 5, 7, 7, 9,
- 9,10,10,12,11,13,12, 0, 7, 7, 8, 8,10, 9,11,12,
- 12,13,13,13, 0, 8, 8, 8, 8,10,10,11,11,13,14,14,
- 13, 0,12,12, 9, 9,10,10,12,12,13,13,14,14, 0,13,
- 13,10, 9,10,11,12,13,14,14,17,17, 0, 0, 0,12,11,
- 12,12,13,12,14,14,15,14, 0, 0, 0,12,12,11,11,13,
- 13,14,15,15,16, 0, 0, 0,16,14,13,12,14,14,15,15,
- 16,15, 0, 0, 0,16, 0,13,13,13,14,15,15,16, 0, 0,
- 0, 0, 0, 0,14,14,15,15,15,15,16,16, 0, 0, 0, 0,
- 0,15,15,16,13,15,13,16, 0,
+ 1, 5, 4, 8, 8,11, 9, 7, 7, 7,10, 9,13,11, 7, 7,
+ 6,10,10,12,11, 0,11,10,12,11,13,14, 0,11,10,11,
+ 11,16,16, 0,14,14,13,15, 0,14, 0, 0, 0,13,12,14,
+ 13, 4, 7, 7,10, 9,12,11,10, 9, 9,12,12,14,12,10,
+ 10, 9,12,12,14,14, 0,14,13,15,14,15, 0, 0,14,14,
+ 13,15, 0, 0, 0, 0, 0, 0,14, 0,15, 0, 0, 0, 0, 0,
+ 0, 0, 4, 7, 7,10, 9,12,12,10,10, 9,12,12,14,15,
+ 11,10,10,11,14, 0,15, 0,13,13,13,15, 0, 0, 0,13,
+ 14,14,13, 0,15, 0,15, 0, 0, 0,15, 0, 0,15, 0, 0,
+ 0, 0, 0, 8,10,10,12,11,15, 0,14,12,13,13,14, 0,
+ 15,14,12,13,15,13,15,15, 0,15,15,15,15, 0, 0, 0,
+ 15, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 8, 9,10,12,12,15,14,15,15,12, 0,13,
+ 0, 0,15,13,13,15,15, 0,14, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,10,11,12,14,13, 0, 0,15, 0,14, 0,
+ 15, 0, 0, 0, 0,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,11,13,12,13, 0, 0,15,15, 0,14,
+ 0, 0, 0, 0, 0,14, 0,15, 0,15, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 6,10,10,13,14, 0,15,11,11,
+ 11, 0,15, 0, 0,11,10,11,14,14,15, 0, 0,14,15,14,
+ 0, 0, 0, 0,14,14,14,15, 0, 0, 0, 0, 0, 0, 0, 0,
+ 15, 0, 0, 0, 0,13, 0, 0, 6,10, 9,12,13, 0,15,11,
+ 11,11,14,15, 0,15,11,10,10,13,14,14,14, 0,14,13,
+ 0,14,15,15, 0,13,14,13,14,15, 0, 0, 0,15, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,10,10,12,13,14, 0,
+ 12,10,10,14,14, 0,15,11,10,10,13,13,15,15, 0,14,
+ 0,15,14, 0,14, 0,14,14,14,15, 0,15, 0, 0, 0,15,
+ 0,14, 0, 0, 0, 0, 0, 0, 0, 0,10,11,12, 0,14, 0,
+ 0,15,14,13,15,15,15, 0,14,12,14,14,14, 0, 0, 0,
+ 0,15, 0, 0, 0, 0, 0, 0, 0,15, 0, 0,14, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,13,12,14, 0,
+ 0, 0,14,13,14, 0,15, 0,15,14,14,13,15, 0, 0, 0,
+ 0,15, 0,15, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,14,14,15,
+ 14, 0, 0, 0, 0,15, 0,14, 0, 0,15,15,14, 0,15, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,14, 0,
+ 14, 0, 0, 0, 0, 0, 0,14, 0, 0, 0, 0,14, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,10,
+ 10,14,14,15, 0,11,11,11,13,13, 0, 0,11,11,12,15,
+ 0, 0,15, 0,14,14,15,14, 0, 0, 0,14,14,15,15, 0,
+ 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 7,
+ 10,10,13,14,14,15,11,10,10,14,13,13,15,11,11,11,
+ 14,15, 0, 0, 0,14,13,14, 0,15,14, 0,15,13, 0,15,
+ 0, 0, 0, 0, 0,14, 0, 0, 0, 0, 0, 0, 0,15, 0, 0,
+ 7, 9,10,13,13, 0,14,10,10,10,13,13, 0, 0,12,11,
+ 11,14,15, 0, 0, 0,15,13,14,13,14, 0, 0,14,14,14,
+ 14, 0, 0, 0, 0, 0,14, 0, 0, 0, 0, 0, 0,15,15, 0,
+ 15,10,12,12,14,14,15,15, 0,14,14,15, 0, 0, 0, 0,
+ 14,13, 0, 0, 0, 0, 0,15,14,15, 0, 0, 0, 0, 0, 0,
+ 0,15, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0,
+ 0, 0,10,11,13,15,15,15, 0,14,14,12,15, 0,15, 0,
+ 14,14,14,15,15, 0,15, 0, 0, 0,15, 0,15, 0, 0, 0,
+ 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,12,13, 0,15,14, 0, 0,15,15, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,12,14,14,14, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,11,13,13, 0, 0, 0, 0, 0,15,14,
+ 15,15, 0, 0,15,15,13, 0, 0, 0, 0, 0,14, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,11,13, 0,15, 0,15,15,15,15,
+ 15, 0, 0,15, 0,14,14,13, 0, 0, 0, 0, 0,15,14,15,
+ 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,12,14,15, 0, 0, 0, 0, 0,
+ 15,14,15, 0, 0, 0, 0,15,13, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,12,14,13, 0, 0, 0, 0,
+ 0,15,15, 0, 0, 0, 0,14,15,13, 0, 0, 0,15, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0,15, 0, 0, 0,15,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14, 0, 0, 0, 0,
+ 0, 0, 0,15, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,14,14,
+ 0, 0, 0, 0,15,15,13, 0, 0, 0, 0, 0,15,15, 0, 0,
+ 0, 0, 0,15,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,11,14,
+ 14, 0, 0, 0, 0,15,13,14, 0, 0, 0, 0,15,15,15, 0,
+ 0, 0, 0, 0, 0,15,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,12,
+ 13,14, 0,15, 0, 0, 0,13,14,15, 0, 0, 0, 0,15,15,
+ 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,
+ 13,14,14, 0, 0, 0, 0, 0,13,14, 0,14, 0, 0,15,15,
+ 15,15, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,14, 0,15, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0,
+ 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,15, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0,
+ 0, 0,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,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,14, 0, 0, 0,15, 0, 0,15,15, 0,
+ 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,14,15,15, 0, 0, 0, 0,15,15,
+ 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0,15,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0,
+ 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,15,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,15,15, 0,
+ 0, 0, 0, 0, 0, 0,14, 0, 0, 0, 0, 0,14, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14, 0,
+ 0, 0, 0, 0, 0, 0,15,13, 0, 0, 0, 0,15,15, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14,
+ 0,15, 0, 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res_Ac_8[] = {
- -71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5,
- 32.5, 45.5, 58.5, 71.5,
+ -62.5, -37.5, -12.5, 12.5, 37.5, 62.5,
};
static long _vq_quantmap_res_Ac_8[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
+ 5, 3, 1, 0, 2, 4, 6,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_8 = {
_vq_quantthresh_res_Ac_8,
_vq_quantmap_res_Ac_8,
- 13,
- 13
+ 7,
+ 7
};
static static_codebook _vq_book_res_Ac_8 = {
- 2, 169,
+ 4, 2401,
_vq_lengthlist_res_Ac_8,
- 1, -523010048, 1618608128, 4, 0,
+ 1, -523059200, 1620639744, 3, 0,
_vq_quantlist_res_Ac_8,
NULL,
&_vq_auxt_res_Ac_8,
1.3.2.3 +10 -29 vorbis/lib/books/res_Ac_8a.vqh
Index: res_Ac_8a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_8a.vqh,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_8a.vqh 2001/10/12 00:08:08 1.3.2.2
+++ res_Ac_8a.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -19,56 +19,37 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_8a[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
2,
- 10,
1,
- 11,
+ 3,
0,
- 12,
+ 4,
};
static long _vq_lengthlist_res_Ac_8a[] = {
- 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6,
- 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 6, 7,
- 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7, 7, 7, 7,
- 8, 7, 7, 8, 9, 9, 9, 7, 7, 7, 7, 7, 7, 8, 8, 7,
- 8, 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9,
- 9, 7, 7, 8, 7, 8, 8, 7, 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,
- 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
- 9, 9, 9, 8, 8, 8, 8, 8, 8,
+ 2, 3, 3, 5, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 7,
+ 6, 6, 6, 6, 7, 6, 6, 5, 6,
};
static float _vq_quantthresh_res_Ac_8a[] = {
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5,
+ -7.5, -2.5, 2.5, 7.5,
};
static long _vq_quantmap_res_Ac_8a[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_8a = {
_vq_quantthresh_res_Ac_8a,
_vq_quantmap_res_Ac_8a,
- 13,
- 13
+ 5,
+ 5
};
static static_codebook _vq_book_res_Ac_8a = {
- 2, 169,
+ 2, 25,
_vq_lengthlist_res_Ac_8a,
- 1, -531103744, 1611661312, 4, 0,
+ 1, -529268736, 1616117760, 3, 0,
_vq_quantlist_res_Ac_8a,
NULL,
&_vq_auxt_res_Ac_8a,
1.3.2.3 +2 -2 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.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_9.vqh 2001/10/12 00:08:08 1.3.2.2
+++ res_Ac_9.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -29,9 +29,9 @@
};
static long _vq_lengthlist_res_Ac_9[] = {
- 1, 4, 4,10,10,10,10, 3, 4,10,10,10,10,10, 3,10,
+ 1, 4, 4,10,10,10,10, 3, 4,10,10,10,10,10, 3, 9,
7,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
9,
};
1.3.2.3 +10 -10 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.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_9a.vqh 2001/10/12 00:08:08 1.3.2.2
+++ res_Ac_9a.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -35,17 +35,17 @@
};
static long _vq_lengthlist_res_Ac_9a[] = {
- 2, 3, 3, 7, 7, 9, 8,10, 9,11, 9, 9, 9, 5, 5, 5,
- 9, 9,10,10,10,11,13,10, 9, 9, 5, 4, 4, 8, 9,10,
- 9,10,12,11,10, 9, 9,13, 8, 8,10,10,11,10,12,12,
- 12,11,10,11,13, 6, 5, 6, 6,11,11,11,11,10,11, 8,
+ 2, 3, 3, 7, 7,10, 8,10, 9,11, 9, 9, 8, 5, 5, 5,
+ 9, 9,10,10,10,11,12, 9,10, 9, 5, 4, 4, 8, 9,10,
+ 9,10,11,11,10, 9, 9,12, 8, 8,10,10,11,10,12,12,
+ 12,10,10,11,13, 6, 5, 6, 6,11,11,11,12,10,11, 8,
9,13,12, 9, 9, 8,11,12,12,12,11, 9,12, 9,13,10,
- 10, 7, 6,11,10,12,12, 8,12, 9,11,13,12,13,11,11,
- 12,12,12,12,12, 8,12,10,13,13,13,12, 9,13, 9,12,
- 12, 8,13,11,12,13,13,13,13,13,12,13,13, 9,11, 9,
- 12,12,13,13,12,13,13,12,12, 8,13, 9,12,13,13,13,
- 13,13,13,13,13,13,11, 9,11,10,11,11,13,13,13,13,
- 13,11,12, 9,12,12,12,12,11,
+ 10, 7, 6,11,10,12,12, 8,12, 9,11,13,12,13,11,12,
+ 12,12,13,12,12, 8,12,10,13,13,13,12, 9,13,10,12,
+ 12, 8,13,11,12,13,13,13,13,12,12,13,13, 9,11, 9,
+ 12,12,13,13,12,13,13,12,12, 8,13, 9,12,13,13,12,
+ 13,13,13,13,13,13,11, 9,11,10,11,12,13,13,13,13,
+ 13,11,12, 9,13,12,12,12,12,
};
static float _vq_quantthresh_res_Ac_9a[] = {
1.3.2.3 +8 -8 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.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- res_Ac_9b.vqh 2001/10/12 00:08:08 1.3.2.2
+++ res_Ac_9b.vqh 2001/10/16 20:10:14 1.3.2.3
@@ -35,17 +35,17 @@
};
static long _vq_lengthlist_res_Ac_9b[] = {
- 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 8, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 8,
+ 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 9, 8, 8, 8, 8, 7, 8, 7, 8,
7, 8, 7, 7, 8, 8, 8, 7, 8, 7, 7, 7, 7, 8, 7, 7,
7, 9, 9, 8, 8, 7, 8, 8, 7, 8, 7, 8, 7, 7, 8, 8,
9, 8, 8, 7, 8, 7, 7, 7, 7, 7, 7, 9, 9, 9, 8, 8,
- 8, 8, 8, 8, 8, 7, 7, 7, 9, 8, 8, 8, 8, 7, 7, 8,
- 7, 7, 8, 7, 8, 8, 8, 9, 8, 8, 8, 8, 8, 7, 8, 7,
- 7, 7, 8, 9, 8, 9, 8, 7, 8, 7, 7, 7, 7, 8, 7, 8,
- 9, 8, 8, 8, 7, 8, 8, 7, 8, 7, 7, 7, 9, 9, 9, 8,
- 8, 9, 8, 7, 7, 8, 7, 8, 7,
+ 8, 8, 8, 8, 8, 7, 7, 7, 9, 8, 9, 8, 8, 7, 7, 8,
+ 7, 7, 8, 7, 8, 8, 8, 9, 8, 8, 8, 8, 8, 8, 8, 7,
+ 7, 7, 8, 9, 8, 9, 8, 7, 8, 7, 7, 7, 8, 8, 7, 8,
+ 9, 8, 8, 9, 7, 8, 8, 7, 8, 7, 7, 8, 9, 9, 9, 8,
+ 8, 9, 9, 7, 7, 8, 7, 8, 8,
};
static float _vq_quantthresh_res_Ac_9b[] = {
No revision
No revision
1.4.2.5 +78 -62 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.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- mode_44c_A.h 2001/10/12 00:08:15 1.4.2.4
+++ mode_44c_A.h 2001/10/16 20:10:21 1.4.2.5
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_A.h,v 1.4.2.4 2001/10/12 00:08:15 xiphmont Exp $
+ last mod: $Id: mode_44c_A.h,v 1.4.2.5 2001/10/16 20:10:21 xiphmont Exp $
********************************************************************/
@@ -52,20 +52,29 @@
#include "books/res_44c_A_128aux.vqh"
#include "books/res_44c_A_1024aux.vqh"
+#include "books/res_Ac_0.vqh"
#include "books/res_Ac_0a.vqh"
#include "books/res_Ac_1.vqh"
+#include "books/res_Ac_1a.vqh"
#include "books/res_Ac_2.vqh"
#include "books/res_Ac_2a.vqh"
+#include "books/res_Ac_2b.vqh"
#include "books/res_Ac_3.vqh"
+#include "books/res_Ac_3a.vqh"
+#include "books/res_Ac_3b.vqh"
#include "books/res_Ac_4.vqh"
+#include "books/res_Ac_4a.vqh"
#include "books/res_Ac_5.vqh"
#include "books/res_Ac_5a.vqh"
#include "books/res_Ac_6.vqh"
+#include "books/res_Ac_6a.vqh"
+#include "books/res_Ac_6b.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_8b.vqh"
+#include "books/res_Ac_8c.vqh"
#include "books/res_Ac_9.vqh"
#include "books/res_Ac_9a.vqh"
#include "books/res_Ac_9b.vqh"
@@ -84,25 +93,39 @@
};
static struct vp_couple_pass _psy_pass_44c_A0[]={
- {1.f,1.f,
- {{24, 0, 0, 0},
- {64, 0, 0, 0},
- {9999, 0, 0, 2.5f}}
+ {1.f,1.f,9e10,
+ {{ 24, 0, 0, 0},
+ { 64, 0, 0, 4.5},
+ {9999, 0, 0, 7.5}}
},
- {1.f,1.f,
+ {1.f,1.f,9e10,
+ {{ 64, 0, 0, 0},
+ {9999, 0, 0, 2.5}}
+ },
+ {1.f,1.f,9e10,
+ {{9999, 0, 0, 0}}
+ },
+ {.333333f,3.f,1.f,
{{9999, 0, 0, 0}}
},
};
static vp_couple_pass _psy_pass_44c_A[]={
- {1.f,1.f,
- {{288, 0, 0, 0},
- {512, 0, 0, 0},
- {9999, 0, 0, 2.5f}}
+ {1.f,1.f,9e10,
+ {{ 288, 0, 0, 0},
+ { 512, 0, 0, 4.5},
+ {9999, 0, 0, 7.5}}
+ },
+ {1.f,1.f,9e10,
+ {{ 512, 0, 0, 0},
+ {9999, 0, 0, 2.5}}
},
- {1.f,1.f,
+ {1.f,1.f,9e10,
{{9999, 0, 0, 0}}
},
+ {.333333f,3.f,1.f,
+ {{9999, 0, 0, 0}}
+ },
};
static float _psy_compand_44c_A[NOISE_COMPAND_LEVELS]={
@@ -130,7 +153,7 @@
2, 2, 15,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-30,-30,-30,-30,-26,-22,-20,-14,-10,-2, -3, -3, 0, 0, 0, 1, 4},
+ {-30,-30,-30,-30,-26,-22,-20,-14,-10,-2, -1, -1, 2, 2, 2, 3, 6},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
@@ -155,7 +178,7 @@
4,4,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-30,-30,-30,-30,-26,-20,-20,-10, -6, -2, -5, -5, -2, 0, 0, 0, 3},
+ {-30,-30,-30,-30,-26,-20,-20,-10, -6, -2, -3, -3, 0, 2, 2, 2, 5},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
@@ -180,7 +203,7 @@
4,4,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -5, -5, -2, 0, 0, 0, 3},
+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, 0, 2, 2, 2, 5},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
@@ -247,37 +270,21 @@
static vorbis_info_residue0 _residue_set_44c_A0={
0,224, 16, 10,23,
- {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,
- 1.5f,1.5f,
- 2.5f,2.5f,2.5f,
- 4.5f,17.5f,84.5f},
+ { 65, 3, 82, 104, 17, 40, 49, 51, 55, 23},
+ {25,26, 27,28, 29,30,31, 32,33,34, 35,36, 37,38, 39,40,41, 42,43,40,41, 44,45,46,47,41, 48,49,50,47},
+ { 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
+ { 4.5, 22.5, 1.5, 1.5, 2.5, 2.5, 4.5, 22.5, 87.5},
{0},
- {99,8,99,3,8,99,99,99,99,99}};
+ { 3, 3, 8, 99, 8, 99, 99, 99, 99}};
static vorbis_info_residue0 _residue_set_44c_A={
0,1792, 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,
- 1.5f,1.5f,
- 2.5f,2.5f,2.5f,
- 4.5f,17.5f,84.5f},
+ { 65, 3, 82, 98, 17, 33, 49, 51, 55, 23},
+ {25,26, 27,28, 29,30,31, 32,33,34, 35,36, 37,38, 39,40,41, 42,43,40,41, 44,45,46,47,41, 48,49,50,47},
+ { 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
+ { 4.5, 22.5, 1.5, 1.5, 2.5, 2.5, 4.5, 22.5, 87.5},
{0},
- {99,32,99,18,32,99,99,99,99,99}};
+ { 18, 18, 32, 99, 32, 99, 99, 99, 99}};
static vorbis_info_mapping0 _mapping_set_44c_A0={
1, {0,0}, {0}, {0}, {0}, {0,0}, 1,{0},{1}};
@@ -292,7 +299,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 42, 3,
+ 2, 2, 1, 2, 2, 51, 3,
/* modes */
{&_mode_set_44c_A0,&_mode_set_44c_A},
/* maps */
@@ -335,44 +342,53 @@
&_huff_book_res_44c_A_128aux,
&_huff_book_res_44c_A_1024aux,
-
- &_vq_book_res_Ac_1, /* 25 */
- &_vq_book_res_Ac_2,
- &_vq_book_res_Ac_3, /* 27 */
- &_vq_book_res_Ac_4,
- &_vq_book_res_Ac_5,
- &_vq_book_res_Ac_6, /* 30 */
- &_vq_book_res_Ac_7,
+
+ &_vq_book_res_Ac_0, /* 25 */
+ &_vq_book_res_Ac_0a,
+ &_vq_book_res_Ac_1, /* 27 */
+ &_vq_book_res_Ac_1a,
+ &_vq_book_res_Ac_2, /* 29 */
+ &_vq_book_res_Ac_2a,
+ &_vq_book_res_Ac_2b,
+ &_vq_book_res_Ac_3, /* 32 */
+ &_vq_book_res_Ac_3a,
+ &_vq_book_res_Ac_3b,
+ &_vq_book_res_Ac_4, /* 35 */
+ &_vq_book_res_Ac_4a,
+ &_vq_book_res_Ac_5, /* 37 */
+ &_vq_book_res_Ac_5a,
+ &_vq_book_res_Ac_6, /* 39 */
+ &_vq_book_res_Ac_6a,
+ &_vq_book_res_Ac_6b,
+ &_vq_book_res_Ac_7, /* 42 */
&_vq_book_res_Ac_7a,
- &_vq_book_res_Ac_8,
+ &_vq_book_res_Ac_8, /* 44 */
&_vq_book_res_Ac_8a,
- &_vq_book_res_Ac_9,
+ &_vq_book_res_Ac_8b,
+ &_vq_book_res_Ac_8c,
+ &_vq_book_res_Ac_9, /* 48 */
&_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 */
{&_psy_set_44c_A0,&_psy_set_44c_AT,&_psy_set_44c_A},
&_psy_set_44c_AG,
/* progressive coding and bitrate controls */
- 4.0,
+ 4.0, 0., .1, -2.,
+
1.,4.,
- 0,0,
+ 110000,90000,0,0,
- 0,0,
+ 112000,140000,
- 0,0,
+ 120000,128000,
- {4,7},
- 2,
+ {4,5,6,7},
+ 4,
};
#endif
1.6.4.2 +42 -21 vorbis/lib/modes/mode_44c_Z.h
Index: mode_44c_Z.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_44c_Z.h,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- mode_44c_Z.h 2001/10/09 04:34:55 1.6.4.1
+++ mode_44c_Z.h 2001/10/16 20:10:21 1.6.4.2
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_Z.h,v 1.6.4.1 2001/10/09 04:34:55 xiphmont Exp $
+ last mod: $Id: mode_44c_Z.h,v 1.6.4.2 2001/10/16 20:10:21 xiphmont Exp $
********************************************************************/
@@ -91,12 +91,21 @@
}
};
+
+static float _psy_compand_44c_AA[NOISE_COMPAND_LEVELS]={
+ 0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, /* 7dB */
+ 8.f, 8.f, 7.f, 6.f, 5.f, 4.f, 4.f, 4.f, /* 15dB */
+ 4.f, 4.f, 5.f, 5.f, 5.f, 6.f, 6.f, 6.f, /* 23dB */
+ 7.f, 7.f, 7.f, 8.f, 8.f, 8.f, 9.f, 10.f, /* 31dB */
+ 11.f,12.f,13.f,14.f,15.f,16.f,17.f, 18.f, /* 39dB */
+};
+
static float _psy_compand_44c_Z[NOISE_COMPAND_LEVELS]={
0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, /* 7dB */
8.f, 9.f, 9.f,10.f,10.f,10.f,11.f, 11.f, /* 15dB */
- 12.f,12.f,11.f,11.f,10.f,10.f, 9.f, 9.f, /* 23dB */
- 8.f, 8.f, 8.f, 9.f, 9.f,10.f,11.f, 12.f, /* 31dB */
- 13.f,14.f,15.f,16.f,17.f,18.f,19.f, 20.f, /* 39dB */
+ 12.f,12.f,13.f,13.f,14.f,14.f,15.f, 15.f, /* 23dB */
+ 16.f,16.f,17.f,17.f,17.f,18.f,18.f, 19.f, /* 31dB */
+ 19.f,19.f,20.f,21.f,22.f,23.f,24.f, 25.f, /* 39dB */
};
static float _psy_compand_44c_Z0[NOISE_COMPAND_LEVELS]={
@@ -112,7 +121,7 @@
-100.,-110.,
/* tonemaskp */
- 3.f, -24.f,-10.f,
+ 3.f, -18.f,-10.f,
&_vp_tonemask_consbass_Z,
/* peakattp, curvelimitp */
1, 0, &_vp_peakatt_Z,
@@ -125,11 +134,10 @@
/*63 125 250 500 1k 2k 4k 8k 16k*/
{-26,-26,-26,-26,-26,-22,-20,-14, -10, -2, 2, 2, 2, 2, 3, 4, 10},
//{-20,-20,-20,-20,-20,-20,-20,-26, -22, -22,-20,-20,-22, -22, -22,-23,-20},
- _psy_compand_44c_Z,
+ _psy_compand_44c_Z0,
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- 1,
_psy_pass_44c_Z0
};
@@ -138,7 +146,7 @@
-100.f,-110.f,
/* tonemask */
- 3.f,-24.f,-10.f,
+ 3.f,-18.f,-10.f,
&_vp_tonemask_consbass_Z,
/* peakattp,curvelimitp */
1, 0, &_vp_peakatt_Z,
@@ -156,7 +164,7 @@
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- 1,_psy_pass_44c_Z
+ _psy_pass_44c_Z
};
static vorbis_info_psy _psy_set_44c_Z={
@@ -164,7 +172,7 @@
-100.f, -110.f,
/* tonemask */
- 3.f,-24.f,-10.f,
+ 3.f,-18.f,-10.f,
&_vp_tonemask_Z,
/* peakattp, curvelimitp */
1, 0, &_vp_peakatt_Z,
@@ -182,7 +190,7 @@
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- 1,_psy_pass_44c_Z
+ _psy_pass_44c_Z
};
static vorbis_info_time0 _time_set_44c_Z={0};
@@ -242,23 +250,21 @@
static vorbis_info_residue0 _residue_set_44c_Z0={
0,144, 12, 10,23,
- {0,1,1,1,1,1,1,1,1,7},
- {25, 26, 27, 28, 29, 30, 31, 32, 33,34,35},
- {9999, 9999, 9999, 9999, 2,9999, 9999, 9999, 9999, 9999},
- {.5, 1.5, 2.5f, 7.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+ { 0, 1, 1, 1, 4, 4, 1, 1, 1, 11},
+ { 25, 26, 27, 28, 29, 30, 31, 32, 33,34,35},
+ {9999, 9999, 9999, 9999, 2, 9999, 9999, 9999, 9999, 9999},
+ { .5, 1.5, 2.5f, 7.5, 1.5f, 1.5, 2.5, 7.5, 22.5},
{0},
- {99, 4, 4, 4, 99,99, 99, 99, 99},
- {3}};
+ { 99, 4, 4, 4, 99, 99, 99, 99, 99}};
static vorbis_info_residue0 _residue_set_44c_Z={
0,1408, 32, 10,24,
- {0,1,1,1,1,1,1,1,1,7},
+ {0,1,1,1,4,4,1,1,1,11},
{25, 26, 27, 28, 29, 30, 31, 32, 33,34,35},
{9999, 9999, 9999, 9999, 3,9999, 9999, 9999, 9999, 9999},
{.5, 1.5, 2.5f, 7.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
{0},
- {99, 18, 18, 18, 99,99, 99, 99, 99},
- {3}};
+ {99, 18, 18, 18, 99,99, 99, 99, 99}};
static vorbis_info_mapping0 _mapping_set_44c_Z0={
1, {0,0}, {0}, {0}, {0}, {0,0}, 1,{0},{1}};
@@ -332,7 +338,22 @@
},
/* psy */
{&_psy_set_44c_Z0,&_psy_set_44c_ZT,&_psy_set_44c_Z},
- &_psy_set_44c_ZG
+ &_psy_set_44c_ZG,
+
+ /* progressive coding and bitrate controls */
+ 5.0,
+ 2.,8.,
+
+ 0,0,
+
+ 56000,64000,
+
+ 60000,62000,
+
+ {5,7},
+ 1,
+
};
#endif
+
1.14.2.1 +2 -2 vorbis/lib/modes/modes.h
Index: modes.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/modes.h,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- modes.h 2001/09/01 06:14:52 1.14
+++ modes.h 2001/10/16 20:10:21 1.14.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: modes.h,v 1.14 2001/09/01 06:14:52 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.14.2.1 2001/10/16 20:10:21 xiphmont Exp $
********************************************************************/
@@ -20,7 +20,7 @@
#include "masking.h"
/* stereo (coupled) */
-//#include "modes/mode_44c_Z.h"
+#include "modes/mode_44c_Z.h"
//#include "modes/mode_44c_Y.h"
//#include "modes/mode_44c_X.h"
#include "modes/mode_44c_A.h"
--- >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