[xiph-cvs] cvs commit: vorbis/vq res_44c_Ab.vqs distribution.c
Monty
xiphmont at xiph.org
Fri Oct 19 18:04:11 PDT 2001
xiphmont 01/10/19 18:04:10
Modified: lib Tag: branch_monty_20011009 mapping0.c psy.c psy.h
res0.c
lib/books Tag: branch_monty_20011009 res_44c_A_1024aux.vqh
res_44c_A_128aux.vqh res_Ac_0a.vqh res_Ac_1.vqh
res_Ac_2a.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 modes.h
vq Tag: branch_monty_20011009 distribution.c
Added: lib/books Tag: branch_monty_20011009 res_Ac_0.vqh
res_Ac_0b.vqh res_Ac_1a.vqh res_Ac_2b.vqh
res_Ac_2c.vqh res_Ac_3a.vqh res_Ac_3b.vqh
res_Ac_4a.vqh res_Ac_4b.vqh res_Ac_4c.vqh
res_Ac_5b.vqh res_Ac_6a.vqh res_Ac_6b.vqh
res_Ac_8b.vqh res_Ac_8c.vqh
vq Tag: branch_monty_20011009 res_44c_Ab.vqs
Log:
Ongoing bitrate management work
Revision Changes Path
No revision
No revision
1.37.2.4 +56 -48 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.37.2.3
retrieving revision 1.37.2.4
diff -u -r1.37.2.3 -r1.37.2.4
--- mapping0.c 2001/10/16 20:10:10 1.37.2.3
+++ mapping0.c 2001/10/20 01:03:59 1.37.2.4
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.37.2.3 2001/10/16 20:10:10 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.37.2.4 2001/10/20 01:03:59 xiphmont Exp $
********************************************************************/
@@ -462,9 +462,10 @@
/* partition based prequantization and channel coupling */
/* Steps in prequant and coupling:
-
+
+ classify by |mag| across all pcm vectors
+
down-couple/down-quantize from perfect residue -> quantized vector
- classify by this first quantized vector
do{
encode quantized vector; add encoded values to 'so-far' vector
@@ -489,6 +490,7 @@
float **sofar=alloca(sizeof(*sofar)*vi->channels);
long ***classifications=alloca(sizeof(*classifications)*info->submaps);
+ float ***qbundle=alloca(sizeof(*qbundle)*info->submaps);
float ***pcmbundle=alloca(sizeof(*pcmbundle)*info->submaps);
float ***sobundle=alloca(sizeof(*sobundle)*info->submaps);
int **zerobundle=alloca(sizeof(*zerobundle)*info->submaps);
@@ -507,6 +509,7 @@
memset(sofar[i],0,sizeof(*sofar[i])*n/2);
}
+ qbundle[0]=alloca(sizeof(*qbundle[0])*vi->channels);
pcmbundle[0]=alloca(sizeof(*pcmbundle[0])*vi->channels);
sobundle[0]=alloca(sizeof(*sobundle[0])*vi->channels);
zerobundle[0]=alloca(sizeof(*zerobundle[0])*vi->channels);
@@ -540,7 +543,7 @@
for(i=0;i<info->submaps;i++){
int ch_in_bundle=0;
- pcmbundle[i]=pcmbundle[0]+chcounter;
+ qbundle[i]=qbundle[0]+chcounter;
sobundle[i]=sobundle[0]+chcounter;
zerobundle[i]=zerobundle[0]+chcounter;
@@ -550,7 +553,8 @@
zerobundle[i][ch_in_bundle]=1;
else
zerobundle[i][ch_in_bundle]=0;
- pcmbundle[i][ch_in_bundle]=quantized[j];
+ qbundle[i][ch_in_bundle]=quantized[j];
+ pcmbundle[i][ch_in_bundle]=pcm[j];
sobundle[i][ch_in_bundle++]=sofar[j];
}
}
@@ -621,7 +625,11 @@
/* actual encoding loop; if we have a desired stopping point, pack
slightly past it so that the end of the packet is not
uninitialized data that could pollute the decoded audio on the
- decode side. We want to truncate at a clean byte boundary */
+ decode side. We want to truncate at a clean byte boundary.
+
+ If we're doing an average bitrate, we need to encode to the
+ bitter end then truncate (so that we can collect bit usage
+ statistics for floater adjustment) */
for(i=0;!stopflag;){
/* perform residue encoding of this pass's quantized residue
@@ -634,13 +642,13 @@
if(stoppos){
look->residue_func[j]->
forward(vb,look->residue_look[j],
- pcmbundle[j],sobundle[j],zerobundle[j],chbundle[j],
+ qbundle[j],sobundle[j],zerobundle[j],chbundle[j],
i,classifications[j],b->bitrate_floatinglimit,queueptr);
}else{
stoppos=look->residue_func[j]->
forward(vb,look->residue_look[j],
- pcmbundle[j],sobundle[j],zerobundle[j],chbundle[j],
+ qbundle[j],sobundle[j],zerobundle[j],chbundle[j],
i,classifications[j],b->bitrate_floatinglimit,queueptr);
}
i++;
@@ -856,49 +864,49 @@
b->bitrate_boundsampleacc[i]+=ci->blocksizes[vb->W]>>1;
}
- /* 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;
+ /* 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;
}
- /* adjust the floater to offset bitrate above/below desired average */
- /* 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_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);
-
- 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;
- }
- }
- }
+ 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 bin settings in recent history that bracket
+ the desired bitrate, and interpolate twixt them for the
+ flaoter setting we want */
+
+ 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);
+
+ 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;
return(0);
1.56.2.3 +11 -139 vorbis/lib/psy.c
Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.56.2.2
retrieving revision 1.56.2.3
diff -u -r1.56.2.2 -r1.56.2.3
--- psy.c 2001/10/16 20:10:11 1.56.2.2
+++ psy.c 2001/10/20 01:03:59 1.56.2.3
@@ -11,7 +11,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.56.2.2 2001/10/16 20:10:11 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.56.2.3 2001/10/20 01:03:59 xiphmont Exp $
********************************************************************/
@@ -902,7 +902,8 @@
static void couple_lossless(float A, float B,
float granule,float igranule,
- float *mag, float *ang){
+ float *mag, float *ang,
+ int flip_p){
if(fabs(A)>fabs(B)){
A=rint(A*igranule)*granule; /* must be done *after* the comparison */
@@ -916,133 +917,12 @@
*mag=B; *ang=(B>0.f?A-B:B-A);
}
- if(*ang>fabs(*mag)*1.9999f){
+ if(flip_p && *ang>fabs(*mag)*1.9999f){
*ang= -fabs(*mag)*2.f;
*mag= -*mag;
}
}
-static void couple_8phase(float A, float B, float fA, float fB,
- float granule,float igranule,
- float fmag, float *mag, float *ang){
-
- float origmag=FAST_HYPOT(A*fA,B*fB),corr;
-
- if(fmag!=0.f){
- float phase=rint((A-B)/fmag);
-
- if(fabs(A)>fabs(B)){
- *mag=A;phase=(A>0?phase:-phase);
- }else{
- *mag=B;phase=(B>0?phase:-phase);
- }
-
- switch((int)phase){
- case 0:
- corr=origmag/FAST_HYPOT(fmag*fA,fmag*fB);
- *mag=rint(*mag*corr*igranule)*granule;
- *ang=0.f;
- break;
- case 1:
- *mag=rint(*mag*igranule)*granule;
- *ang=fabs(*mag);
- break;
- case -1:
- *mag=rint(*mag*igranule)*granule;
- *ang= -fabs(*mag);
- break;
- case -2:
- corr=origmag/FAST_HYPOT(fmag*fA,fmag*fB);
- *mag=rint(*mag*corr*igranule)*granule;
- *ang= -2.f*fabs(*mag);
- break;
- case 2:
- corr=origmag/FAST_HYPOT(fmag*fA,fmag*fB);
- *mag= -rint(*mag*corr*igranule)*granule;
- *ang= -2.f*fabs(*mag);
- break;
- }
- }else{
- *mag=0.f;
- *ang=0.f;
- }
-}
-
-static void couple_6phase(float A, float B, float fA, float fB,
- float granule,float igranule,
- float fmag, float *mag, float *ang){
-
- float origmag=FAST_HYPOT(A*fA,B*fB),corr;
-
- if(fmag!=0.f){
- float phase=rint((A-B)/fmag);
-
- if(fabs(A)>fabs(B)){
- *mag=A;phase=(A>0?phase:-phase);
- }else{
- *mag=B;phase=(B>0?phase:-phase);
- }
-
- switch((int)phase){
- case 0:
- corr=origmag/FAST_HYPOT(fmag*fA,fmag*fB);
- *mag=rint(*mag*corr*igranule)*granule;
- *ang=0.f;
- break;
- case 1:case 2:
- *mag=rint(*mag*igranule)*granule;
- *ang= fabs(*mag);
- break;
- case -1:case -2:
- *mag=rint(*mag*igranule)*granule;
- *ang= -fabs(*mag);
- break;
- default:
- *mag=0.f;
- *ang=0.f;
-
- }
- }else{
- *mag=0.f;
- *ang=0.f;
- }
-}
-
-static void couple_4phase(float A, float B, float fA, float fB,
- float granule,float igranule,
- float fmag, float *mag, float *ang){
-
- float origmag=FAST_HYPOT(A*fA,B*fB),corr;
-
- if(fmag!=0.f){
- float phase=rint((A-B)*.5/fmag);
-
- if(fabs(A)>fabs(B)){
- *mag=A;phase=(A>0?phase:-phase);
- }else{
- *mag=B;phase=(B>0?phase:-phase);
- }
-
- corr=origmag/FAST_HYPOT(fmag*fA,fmag*fB);
- *mag=rint(*mag*corr*igranule)*granule;
- switch((int)phase){
- case 0:
- *ang=0.f;
- break;
- case -1:
- *ang=-2.f*fabs(*mag);
- break;
- default:
- *mag=-*mag;
- *ang=-2.f*fabs(*mag);
- break;
- }
- }else{
- *mag=0.f;
- *ang=0.f;
- }
-}
-
static void couple_point(float A, float B, float fA, float fB,
float granule,float igranule,
float fmag, float *mag, float *ang){
@@ -1091,8 +971,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. */
if(nonzero[vi->coupling_mag[i]] ||
@@ -1112,7 +991,9 @@
for(j=0,k=0;j<n;k++){
vp_couple *part=info->couple_pass[passno].couple_pass+k;
-
+ float rqlimit=part->outofphase_requant_limit;
+ float flip_p=part->outofphase_redundant_flip_p;
+
for(;j<part->limit && j<p->n;j++){
/* partition by partition; k is our by-location partition
class counter */
@@ -1121,19 +1002,10 @@
if(fmag<part->amppost_point){
couple_point(pcmM[j],pcmA[j],floorM[j],floorA[j],
granulem,igranulem,fmag,&mag,&ang);
+
}else{
- if(fmag<part->amppost_6phase){
- couple_6phase(pcmM[j],pcmA[j],floorM[j],floorA[j],
- granulem,igranulem,fmag,&mag,&ang);
- }else{
- if(fmag<part->amppost_8phase){
- couple_8phase(pcmM[j],pcmA[j],floorM[j],floorA[j],
- granulem,igranulem,fmag,&mag,&ang);
- }else{
- couple_lossless(pcmM[j],pcmA[j],
- granulem,igranulem,&mag,&ang);
- }
- }
+ couple_lossless(pcmM[j],pcmA[j],
+ granulem,igranulem,&mag,&ang,flip_p);
}
/* executive decision time: when requantizing and recoupling
1.24.2.3 +4 -4 vorbis/lib/psy.h
Index: psy.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.h,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -r1.24.2.2 -r1.24.2.3
--- psy.h 2001/10/16 20:10:11 1.24.2.2
+++ psy.h 2001/10/20 01:03:59 1.24.2.3
@@ -11,7 +11,7 @@
********************************************************************
function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.24.2.2 2001/10/16 20:10:11 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.24.2.3 2001/10/20 01:03:59 xiphmont Exp $
********************************************************************/
@@ -39,8 +39,9 @@
typedef struct vp_couple{
int limit; /* sample post */
- float amppost_8phase;
- float amppost_6phase;
+ int outofphase_redundant_flip_p;
+ float outofphase_requant_limit;
+
float amppost_point;
} vp_couple;
@@ -48,7 +49,6 @@
typedef struct vp_couple_pass{
float granulem;
float igranulem;
- float requant_limit;
vp_couple couple_pass[8];
} vp_couple_pass;
1.37.2.5 +29 -46 vorbis/lib/res0.c
Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -u -r1.37.2.4 -r1.37.2.5
--- res0.c 2001/10/16 20:10:11 1.37.2.4
+++ res0.c 2001/10/20 01:03:59 1.37.2.5
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.37.2.4 2001/10/16 20:10:11 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.37.2.5 2001/10/20 01:03:59 xiphmont Exp $
********************************************************************/
@@ -327,26 +327,13 @@
int i,bits=0;
int dim=book->dim;
int step=n/dim;
-#ifdef TRAIN_RESENT
- char buf[80];
- FILE *f;
- sprintf(buf,"res0_b%d.vqd",book-look->fullbooks);
- f=fopen(buf,"a");
-#endif
for(i=0;i<step;i++){
int entry=vorbis_book_besterror(book,vec+i,step,0);
-#ifdef TRAIN_RESENT
- fprintf(f,"%d\n",entry);
-#endif
-
bits+=vorbis_book_encode(book,entry,opb);
}
-#ifdef TRAIN_RESENT
- fclose(f);
-#endif
return(bits);
}
@@ -355,26 +342,13 @@
int i,bits=0;
int dim=book->dim;
int step=n/dim;
-#ifdef TRAIN_RESENT
- char buf[80];
- FILE *f;
- sprintf(buf,"res0_b%d.vqd",book-look->fullbooks);
- f=fopen(buf,"a");
-#endif
for(i=0;i<step;i++){
int entry=vorbis_book_besterror(book,vec+i*dim,1,0);
-#ifdef TRAIN_RESENT
- fprintf(f,"%d\n",entry);
-#endif
-
bits+=vorbis_book_encode(book,entry,opb);
}
-#ifdef TRAIN_RESENT
- fclose(f);
-#endif
return(bits);
}
@@ -419,7 +393,7 @@
char buffer[80];
for(i=0;i<ch;i++){
- sprintf(buffer,"resaux_%d.vqd",vb->mode);
+ sprintf(buffer,"resaux_%s.vqd",(vb->mode?"long":"short"));
of=fopen(buffer,"a");
for(j=0;j<partvals;j++)
fprintf(of,"%ld, ",partword[i][j]);
@@ -449,6 +423,11 @@
int partvals=n/samples_per_partition;
long **partword=_vorbis_block_alloc(vb,sizeof(*partword));
float *work=alloca(sizeof(*work)*samples_per_partition);
+
+#ifdef TRAIN_RES
+ FILE *of;
+ char buffer[80];
+#endif
partword[0]=_vorbis_block_alloc(vb,n*ch/samples_per_partition*sizeof(*partword[0]));
memset(partword[0],0,n*ch/samples_per_partition*sizeof(*partword[0]));
@@ -462,23 +441,22 @@
l++;
}
}
+
partword[0][i]=
classify(work,samples_per_partition,look,possible_partitions,i);
+
+
}
#ifdef TRAIN_RES
- {
- FILE *of;
- char buffer[80];
-
- sprintf(buffer,"resaux_%d.vqd",vb->mode);
- of=fopen(buffer,"a");
- for(i=0;i<partvals;i++)
- fprintf(of,"%ld, ",partword[0][i]);
- fprintf(of,"\n");
- fclose(of);
- }
+ sprintf(buffer,"resaux_%s.vqd",(vb->mode?"long":"short"));
+ of=fopen(buffer,"a");
+ for(i=0;i<partvals;i++)
+ fprintf(of,"%ld, ",partword[0][i]);
+ fprintf(of,"\n");
+ fclose(of);
#endif
+
look->frames++;
return(partword);
@@ -514,17 +492,22 @@
int stoppos=0;
#ifdef TRAIN_RES
- FILE *of;
+ FILE *of;
char buffer[80];
int m;
for(i=0;i<ch;i++){
- sprintf(buffer,"residue_%d#%d.vqd",vb->mode,pass);
- of=fopen(buffer,"a");
- for(m=0;m<info->end;m++)
- fprintf(of,"%.2f, ",in[i][m]);
- fprintf(of,"\n");
- fclose(of);
+ for(j=0;j<partvals;j++){
+ int class=partword[i][j];
+ float *ptr=in[i]+info->begin+j*samples_per_partition;
+ sprintf(buffer,"res_%s_part%d_it%d.vqd",(vb->mode?"long":"short"),
+ class,pass);
+ of=fopen(buffer,"a");
+ for(k=0;k<samples_per_partition;k++)
+ fprintf(of,"%.3f, ",ptr[k]);
+ fprintf(of,"\n");
+ fclose(of);
+ }
}
#endif
No revision
No revision
1.3.2.4 +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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_44c_A_1024aux.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_44c_A_1024aux.vqh 2001/10/20 01:04:01 1.3.2.4
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_A_1024aux[] = {
- 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,
+ 3, 6,18,18,17,17,17,17,11,17, 5, 5,17,17,17,17,
+ 17,17, 9,17,17,17, 3,17, 5,17, 7,10,13,17,17,17,
+ 17, 1,17, 7, 9,11,15,17,17,17, 5,17, 6,17, 8,10,
+ 17,17,17,17,17, 6,17, 8, 9,14,17,17,17,17, 8, 9,
+ 8, 9, 8,11,16,17,17,17,10,12,11,15,10,12,15,17,
+ 9, 6,14,15,16,17,16,14, 7,17,13,12,17,17,17,17,
+ 17,17,12,17,
};
static static_codebook _huff_book_res_44c_A_1024aux = {
1.3.2.5 +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.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- res_44c_A_128aux.vqh 2001/10/16 20:10:14 1.3.2.4
+++ res_44c_A_128aux.vqh 2001/10/20 01:04:01 1.3.2.5
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_A_128aux[] = {
- 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,
+ 15,15, 4,15, 5,15, 8,12,15,15, 7,12,11,15,12,15,
+ 12,15,15,15,15,15, 3,15, 6,15, 9,13,15,15,15,15,
+ 15, 1,15, 7, 8,12,15,15,15,15, 4,15, 7,15,10,13,
+ 15,15,15,15,15, 7,15,10,13,15,15,15,15,15, 7, 9,
+ 9,13,11,15,15,15,15,15,12,13,12,14,13,15,15,15,
+ 3, 9,15,15,15,15,15,15,15,15, 6,11,15,15,15,15,
+ 15,15,15,15,
};
static static_codebook _huff_book_res_44c_A_128aux = {
1.1.2.4 +9 -47 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- res_Ac_0a.vqh 2001/10/16 20:10:14 1.1.2.3
+++ res_Ac_0a.vqh 2001/10/20 01:04:01 1.1.2.4
@@ -19,58 +19,20 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_0a[] = {
- 202,
- 101,
- 303,
+ 2,
+ 1,
+ 3,
0,
- 405,
+ 4,
};
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,
+ 2, 3, 3, 0, 0, 4, 4, 4, 0, 0, 4, 4, 4, 0, 0, 0,
+ 5, 5, 0, 0, 0, 5, 5, 0, 0,
};
static float _vq_quantthresh_res_Ac_0a[] = {
- -0.5005, -0.1675, 0.1655, 0.50015,
+ -0.5, -0.16667, 0.16667, 0.5,
};
static long _vq_quantmap_res_Ac_0a[] = {
@@ -85,9 +47,9 @@
};
static static_codebook _vq_book_res_Ac_0a = {
- 4, 625,
+ 2, 25,
_vq_lengthlist_res_Ac_0a,
- 1, -537569264, 1593508447, 9, 0,
+ 1, -537569962, 1607816532, 3, 0,
_vq_quantlist_res_Ac_0a,
NULL,
&_vq_auxt_res_Ac_0a,
1.3.2.4 +8 -8 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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_1.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_1.vqh 2001/10/20 01:04:01 1.3.2.4
@@ -31,16 +31,16 @@
};
static long _vq_lengthlist_res_Ac_1[] = {
- 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,
+ 1, 3, 3, 7, 7,17,17,17,17, 5, 5, 5, 7, 8,17,17,
+ 17,17, 5, 5, 5, 8, 8,17,17,17,17,17, 8, 8, 9, 9,
+ 17,17,17,17,17, 8, 8, 9,10,17,17,17,17,17,13,13,
+ 10,10,17,17,17,17,17,12,13,11,10,17,17,17,17,17,
+ 17,17,13,13,17,17,17,17,17,17,17,13,13,17,17,16,
+ 16,
};
static float _vq_quantthresh_res_Ac_1[] = {
- -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 12.5, 17.5,
+ -31.5, -22.5, -13.5, -4.5, 4.5, 13.5, 22.5, 31.5,
};
static long _vq_quantmap_res_Ac_1[] = {
@@ -58,7 +58,7 @@
static static_codebook _vq_book_res_Ac_1 = {
2, 81,
_vq_lengthlist_res_Ac_1,
- 1, -527171584, 1616117760, 4, 0,
+ 1, -525205504, 1618083840, 4, 0,
_vq_quantlist_res_Ac_1,
NULL,
&_vq_auxt_res_Ac_1,
1.1.2.4 +47 -18 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- res_Ac_2a.vqh 2001/10/16 20:10:14 1.1.2.3
+++ res_Ac_2a.vqh 2001/10/20 01:04:01 1.1.2.4
@@ -19,46 +19,75 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_2a[] = {
- 4,
- 3,
- 5,
2,
- 6,
1,
- 7,
+ 3,
0,
- 8,
+ 4,
};
static long _vq_lengthlist_res_Ac_2a[] = {
- 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,
+ 1, 0, 0, 0, 0, 4, 6, 6, 0, 0, 4, 6, 6, 0, 0, 7,
+ 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0,
+ 0, 0, 7, 9, 9, 0, 0, 7, 8, 8, 0, 0, 9, 0, 0, 0,
+ 0, 9, 0, 0, 0, 0, 6, 0, 0, 0, 0, 8,10, 9, 0, 0,
+ 9,10,10, 0, 0,11, 0, 0, 0, 0,11, 0, 0, 0, 0, 6,
+ 0, 0, 0, 0, 9,10,10, 0, 0, 8,10,10, 0, 0,11, 0,
+ 0, 0, 0,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 7,
+ 9, 9, 0, 0, 7, 8, 8, 0, 0, 9, 0, 0, 0, 0, 9, 0,
+ 0, 0, 0, 6, 0, 0, 0, 0, 8,10,10, 0, 0, 9,10, 9,
+ 0, 0,11, 0, 0, 0, 0,11, 0, 0, 0, 0, 6, 0, 0, 0,
+ 0, 8,10,10, 0, 0, 8, 9,10, 0, 0,11, 0, 0, 0, 0,
+ 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 9,11,11, 0,
+ 0, 9,11,11, 0, 0,11, 0, 0, 0, 0,10, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7, 0, 0, 0, 0, 9,11,11, 0, 0, 9,11,
+ 11, 0, 0,10, 0, 0, 0, 0,11, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
};
static float _vq_quantthresh_res_Ac_2a[] = {
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
+ -1.5, -0.5, 0.5, 1.5,
};
static long _vq_quantmap_res_Ac_2a[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_2a = {
_vq_quantthresh_res_Ac_2a,
_vq_quantmap_res_Ac_2a,
- 9,
- 9
+ 5,
+ 5
};
static static_codebook _vq_book_res_Ac_2a = {
- 2, 81,
+ 4, 625,
_vq_lengthlist_res_Ac_2a,
- 1, -531628032, 1611661312, 4, 0,
+ 1, -533725184, 1611661312, 3, 0,
_vq_quantlist_res_Ac_2a,
NULL,
&_vq_auxt_res_Ac_2a,
1.3.2.4 +5 -5 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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_4.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_4.vqh 2001/10/20 01:04:02 1.3.2.4
@@ -27,13 +27,13 @@
};
static long _vq_lengthlist_res_Ac_4[] = {
- 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,
+ 2, 3, 3, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 4, 8, 8, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 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, 3, 4, 5, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 7,10,10,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 7, 6, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 8, 8, 8,10,10, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1.3.2.4 +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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_5.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_5.vqh 2001/10/20 01:04:02 1.3.2.4
@@ -27,13 +27,13 @@
};
static long _vq_lengthlist_res_Ac_5[] = {
- 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,
+ 1, 4, 4, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 4, 8, 8, 0, 0,
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, 7, 7, 6,10, 8,
+ 0, 0, 4, 4, 5, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 7,11,10,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 7, 6, 7, 9,10, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 8, 7, 8, 9,11, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1.1.2.4 +8 -20 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- res_Ac_5a.vqh 2001/10/16 20:10:14 1.1.2.3
+++ res_Ac_5a.vqh 2001/10/20 01:04:02 1.1.2.4
@@ -19,46 +19,34 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_5a[] = {
- 4,
- 3,
- 5,
- 2,
- 6,
1,
- 7,
0,
- 8,
+ 2,
};
static long _vq_lengthlist_res_Ac_5a[] = {
- 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,
+ 2, 1, 2, 0, 0, 0, 0, 0, 0,
};
static float _vq_quantthresh_res_Ac_5a[] = {
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
+ -0.16667, 0.16667,
};
static long _vq_quantmap_res_Ac_5a[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_5a = {
_vq_quantthresh_res_Ac_5a,
_vq_quantmap_res_Ac_5a,
- 9,
- 9
+ 3,
+ 3
};
static static_codebook _vq_book_res_Ac_5a = {
- 2, 81,
+ 2, 9,
_vq_lengthlist_res_Ac_5a,
- 1, -531628032, 1611661312, 4, 0,
+ 1, -539667116, 1607816532, 2, 0,
_vq_quantlist_res_Ac_5a,
NULL,
&_vq_auxt_res_Ac_5a,
1.3.2.4 +1 -1 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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_6.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_6.vqh 2001/10/20 01:04:02 1.3.2.4
@@ -31,7 +31,7 @@
};
static long _vq_lengthlist_res_Ac_6[] = {
- 1, 3, 2, 5, 5, 5, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0,
+ 1, 2, 3, 5, 4, 6, 7, 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,
1.3.2.4 +8 -8 vorbis/lib/books/res_Ac_7.vqh
Index: res_Ac_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Ac_7.vqh,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_7.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_7.vqh 2001/10/20 01:04:02 1.3.2.4
@@ -31,16 +31,16 @@
};
static long _vq_lengthlist_res_Ac_7[] = {
- 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,
+ 1, 2, 3, 7, 7,12,12,12,12,12, 6, 6,10,10,12,12,
+ 12,12,12, 6, 5,12,10,12,12,12,12,12,11,12,12,12,
+ 12,12,12,12,12,11,10,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,
};
static float _vq_quantthresh_res_Ac_7[] = {
- -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 12.5, 17.5,
+ -31.5, -22.5, -13.5, -4.5, 4.5, 13.5, 22.5, 31.5,
};
static long _vq_quantmap_res_Ac_7[] = {
@@ -58,7 +58,7 @@
static static_codebook _vq_book_res_Ac_7 = {
2, 81,
_vq_lengthlist_res_Ac_7,
- 1, -527171584, 1616117760, 4, 0,
+ 1, -525205504, 1618083840, 4, 0,
_vq_quantlist_res_Ac_7,
NULL,
&_vq_auxt_res_Ac_7,
1.3.2.4 +19 -48 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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_7a.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_7a.vqh 2001/10/20 01:04:02 1.3.2.4
@@ -19,75 +19,46 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_7a[] = {
+ 4,
+ 3,
+ 5,
2,
+ 6,
1,
- 3,
+ 7,
0,
- 4,
+ 8,
};
static long _vq_lengthlist_res_Ac_7a[] = {
- 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,
+ 1, 3, 3, 4, 5, 6, 6, 6, 6,10,10,11,10,10, 9, 9,
+ 8, 8,10,10,10,10,10,10,10, 8, 8,10,11,11,10,11,
+ 9,10, 8, 8,10,11,11,10,11,10,10, 8, 9,12,10,11,
+ 11,10,10,10, 9, 8,11,11,11,11,10,10,10, 9, 9,11,
+ 11,11,11,12,10,11, 9, 8,10,11,11,11,11,11,10, 9,
+ 9,
};
static float _vq_quantthresh_res_Ac_7a[] = {
- -1.5, -0.5, 0.5, 1.5,
+ -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
};
static long _vq_quantmap_res_Ac_7a[] = {
- 3, 1, 0, 2, 4,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_7a = {
_vq_quantthresh_res_Ac_7a,
_vq_quantmap_res_Ac_7a,
- 5,
- 5
+ 9,
+ 9
};
static static_codebook _vq_book_res_Ac_7a = {
- 4, 625,
+ 2, 81,
_vq_lengthlist_res_Ac_7a,
- 1, -533725184, 1611661312, 3, 0,
+ 1, -531628032, 1611661312, 4, 0,
_vq_quantlist_res_Ac_7a,
NULL,
&_vq_auxt_res_Ac_7a,
1.3.2.4 +7 -154 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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_8.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_8.vqh 2001/10/20 01:04:02 1.3.2.4
@@ -29,161 +29,14 @@
};
static long _vq_lengthlist_res_Ac_8[] = {
- 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,
+ 1, 3, 3, 8, 7,13,13, 5, 6, 5,10, 9,13,13, 4, 6,
+ 5,10,10,13,13,13, 6,10,11,12,13,13,13,10, 6,13,
+ 12,13,13,13, 8,12, 8,13,13,13,13,13,11,13,11,13,
+ 13,
};
static float _vq_quantthresh_res_Ac_8[] = {
- -62.5, -37.5, -12.5, 12.5, 37.5, 62.5,
+ -137.5, -82.5, -27.5, 27.5, 82.5, 137.5,
};
static long _vq_quantmap_res_Ac_8[] = {
@@ -198,9 +51,9 @@
};
static static_codebook _vq_book_res_Ac_8 = {
- 4, 2401,
+ 2, 49,
_vq_lengthlist_res_Ac_8,
- 1, -523059200, 1620639744, 3, 0,
+ 1, -520839168, 1622900736, 3, 0,
_vq_quantlist_res_Ac_8,
NULL,
&_vq_auxt_res_Ac_8,
1.3.2.4 +14 -10 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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_8a.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_8a.vqh 2001/10/20 01:04:02 1.3.2.4
@@ -19,37 +19,41 @@
#include "codebook.h"
static long _vq_quantlist_res_Ac_8a[] = {
+ 3,
2,
+ 4,
1,
- 3,
+ 5,
0,
- 4,
+ 6,
};
static long _vq_lengthlist_res_Ac_8a[] = {
- 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,
+ 1, 4, 4, 6, 6, 7, 7, 6, 5, 5, 6, 6, 8, 7, 6, 5,
+ 5, 7, 7, 8, 8,10, 7, 7, 7, 7, 8, 8,11, 7, 7, 7,
+ 7, 8, 8,12,11,11, 8, 8, 9, 9,12,10,10, 8, 8,10,
+ 9,
};
static float _vq_quantthresh_res_Ac_8a[] = {
- -7.5, -2.5, 2.5, 7.5,
+ -22.5, -13.5, -4.5, 4.5, 13.5, 22.5,
};
static long _vq_quantmap_res_Ac_8a[] = {
- 3, 1, 0, 2, 4,
+ 5, 3, 1, 0, 2, 4, 6,
};
static encode_aux_threshmatch _vq_auxt_res_Ac_8a = {
_vq_quantthresh_res_Ac_8a,
_vq_quantmap_res_Ac_8a,
- 5,
- 5
+ 7,
+ 7
};
static static_codebook _vq_book_res_Ac_8a = {
- 2, 25,
+ 2, 49,
_vq_lengthlist_res_Ac_8a,
- 1, -529268736, 1616117760, 3, 0,
+ 1, -526712832, 1618083840, 3, 0,
_vq_quantlist_res_Ac_8a,
NULL,
&_vq_auxt_res_Ac_8a,
1.3.2.4 +4 -4 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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_9.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_9.vqh 2001/10/20 01:04:02 1.3.2.4
@@ -29,10 +29,10 @@
};
static long _vq_lengthlist_res_Ac_9[] = {
- 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,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- 9,
+ 1, 3, 3, 9, 9, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 7,
+ 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8,
};
static float _vq_quantthresh_res_Ac_9[] = {
1.3.2.4 +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.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_9a.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_9a.vqh 2001/10/20 01:04:02 1.3.2.4
@@ -35,17 +35,17 @@
};
static long _vq_lengthlist_res_Ac_9a[] = {
- 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,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,
+ 1, 4, 4, 5, 6, 8, 7, 9, 7, 9, 7, 9,10, 7, 6, 6,
+ 10, 9, 8, 9, 9, 9,11, 8,10,11, 6, 6, 5, 8, 8, 9,
+ 8, 8,10, 9, 8,11,11,10, 9, 9, 8, 9,10, 9,10,10,
+ 10, 8,10,11,11, 7, 7, 7, 7,10, 9, 9,10, 8,10,11,
+ 11,11,11, 9, 8, 8,10,11,11,10, 9,10,11,11,11,10,
+ 11, 8, 8,10, 9,10,10,11,10,10,11,11,10,11,10,11,
+ 11,11,11,11,10,11,11,10,11,11,11,11, 9,11,11,11,
+ 11,10,11,11,11,11,11,11,11,10,10,11,11,11,10,11,
+ 10,11,11,11,10,11,11,11,10,10,11,11,10,11,11,10,
+ 11,11,11,11,11,11,10,11,11,11,11,11,11,11,11,11,
+ 11,11,11,10,11,11,10,11,11,
};
static float _vq_quantthresh_res_Ac_9a[] = {
1.3.2.4 +11 -11 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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- res_Ac_9b.vqh 2001/10/16 20:10:14 1.3.2.3
+++ res_Ac_9b.vqh 2001/10/20 01:04:02 1.3.2.4
@@ -35,17 +35,17 @@
};
static long _vq_lengthlist_res_Ac_9b[] = {
- 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, 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,
+ 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 6, 8, 6, 9, 6, 6,
+ 6, 7, 7, 6, 7, 8, 7, 7, 6, 7, 7, 7, 7, 7, 6, 7,
+ 6, 7, 7, 7, 7, 8, 7, 8, 8, 9, 8, 8, 7, 8, 8, 9,
+ 7, 7, 8, 7, 8, 8, 8, 8, 7, 8, 7, 7, 9, 7, 8, 7,
+ 8, 8, 9, 7, 7, 8, 8, 8, 9, 8, 8, 9, 7, 8, 9, 8,
+ 8, 8, 9, 8, 8, 8, 8, 8, 9, 7, 8, 9, 9, 9, 9, 8,
+ 8, 8, 9, 8, 9, 8, 8, 8, 8, 9, 8, 7, 9, 9, 7, 8,
+ 9, 8, 8, 8, 8,10, 8, 9, 9, 8, 9, 8, 9, 8,10, 8,
+ 7, 7, 8, 9, 8, 9, 9, 8, 8, 9, 8, 8, 9, 8, 9, 9,
+ 8, 8, 8, 8, 8, 9, 9, 8, 9, 8, 8, 9, 9, 9, 8, 9,
+ 9, 9, 8, 9, 8, 9, 8, 9, 8,
};
static float _vq_quantthresh_res_Ac_9b[] = {
No revision
No revision
1.1.2.1 +93 -0 vorbis/lib/books/Attic/res_Ac_0.vqh
1.1.2.1 +61 -0 vorbis/lib/books/Attic/res_Ac_0b.vqh
1.1.2.1 +70 -0 vorbis/lib/books/Attic/res_Ac_1a.vqh
1.1.2.1 +61 -0 vorbis/lib/books/Attic/res_Ac_2b.vqh
1.1.2.1 +61 -0 vorbis/lib/books/Attic/res_Ac_2c.vqh
1.1.2.1 +58 -0 vorbis/lib/books/Attic/res_Ac_3a.vqh
1.1.2.1 +58 -0 vorbis/lib/books/Attic/res_Ac_3b.vqh
1.1.2.1 +70 -0 vorbis/lib/books/Attic/res_Ac_4a.vqh
1.1.2.1 +61 -0 vorbis/lib/books/Attic/res_Ac_4b.vqh
1.1.2.1 +61 -0 vorbis/lib/books/Attic/res_Ac_4c.vqh
1.1.2.1 +58 -0 vorbis/lib/books/Attic/res_Ac_5b.vqh
1.1.2.1 +93 -0 vorbis/lib/books/Attic/res_Ac_6a.vqh
1.1.2.1 +70 -0 vorbis/lib/books/Attic/res_Ac_6b.vqh
1.1.2.1 +70 -0 vorbis/lib/books/Attic/res_Ac_8b.vqh
1.1.2.1 +100 -0 vorbis/lib/books/Attic/res_Ac_8c.vqh
No revision
No revision
1.4.2.6 +68 -59 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.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- mode_44c_A.h 2001/10/16 20:10:21 1.4.2.5
+++ mode_44c_A.h 2001/10/20 01:04:08 1.4.2.6
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_A.h,v 1.4.2.5 2001/10/16 20:10:21 xiphmont Exp $
+ last mod: $Id: mode_44c_A.h,v 1.4.2.6 2001/10/20 01:04:08 xiphmont Exp $
********************************************************************/
@@ -54,27 +54,30 @@
#include "books/res_Ac_0.vqh"
#include "books/res_Ac_0a.vqh"
+#include "books/res_Ac_0b.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_2c.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_4b.vqh"
+#include "books/res_Ac_4c.vqh"
#include "books/res_Ac_5.vqh"
#include "books/res_Ac_5a.vqh"
+#include "books/res_Ac_5b.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_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"
@@ -93,39 +96,43 @@
};
static struct vp_couple_pass _psy_pass_44c_A0[]={
- {1.f,1.f,9e10,
- {{ 24, 0, 0, 0},
- { 64, 0, 0, 4.5},
- {9999, 0, 0, 7.5}}
- },
- {1.f,1.f,9e10,
- {{ 64, 0, 0, 0},
- {9999, 0, 0, 2.5}}
+ {1.f,1.f,
+ {{ 24, 0, 9e10, 0},
+ { 64, 0, 9e10, 4.5},
+ {9999, 0, 9e10, 7.5}}
+ },
+ {1.f,1.f,
+ {{ 64, 0, 9e10, 0},
+ {9999, 0, 9e10, 2.5}}
+ },
+ {.333333f,3.f,
+ {{ 64, 0, 9e10, 0},
+ {9999, 0, 9e10, 2.5}}
+ },
+ {.111111f,9.f,
+ {{ 64, 0, 9e10, 0},
+ {9999, 0, 9e10, 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,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,9e10,
- {{9999, 0, 0, 0}}
+ {1.f,1.f,
+ {{ 288, 0, 9e10, 0},
+ { 512, 0, 9e10, 4.5},
+ {9999, 0, 9e10, 7.5}}
+ },
+ {1.f,1.f,
+ {{ 512, 0, 9e10, 0},
+ {9999, 0, 9e10, 2.5}}
+ },
+ {.333333f,3.f,
+ {{ 512, 0, 9e10, 0},
+ {9999, 0, 9e10, 2.5}}
+ },
+ {.111111f,9.f,
+ {{ 512, 0, 9e10, 0},
+ {9999, 0, 9e10, 2.5}}
},
- {.333333f,3.f,1.f,
- {{9999, 0, 0, 0}}
- },
};
static float _psy_compand_44c_A[NOISE_COMPAND_LEVELS]={
@@ -136,7 +143,6 @@
11.f,12.f,13.f,14.f,15.f,16.f,17.f, 18.f, /* 39dB */
};
-
static vorbis_info_psy _psy_set_44c_A0={
ATH_Bark_dB_lineaggressive,
-100.,-140.,
@@ -153,7 +159,7 @@
2, 2, 15,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-30,-30,-30,-30,-26,-22,-20,-14,-10,-2, -1, -1, 2, 2, 2, 3, 6},
+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, -1, -1, 0, 0, 2, 3, 6},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
@@ -178,7 +184,7 @@
4,4,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-30,-30,-30,-30,-26,-20,-20,-10, -6, -2, -3, -3, 0, 2, 2, 2, 5},
+ {-30,-30,-30,-30,-26,-20,-20,-10, -6, -2, -3, -3, 0, 0, 1, 1, 4},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
@@ -203,7 +209,7 @@
4,4,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, 0, 2, 2, 2, 5},
+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, 0, 0, 1, 1, 4},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
@@ -270,21 +276,21 @@
static vorbis_info_residue0 _residue_set_44c_A0={
0,224, 16, 10,23,
- { 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},
+ { 97, 3, 120, 104, 116, 104, 17, 3, 7, 7},
+ {25,26,27, 28,29, 30,31,32,33, 34,35,36, 37,38,39,40, 41,42,43, 44,45, 46,47, 48,49,50, 51,52,53},
+ { 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
+ { 4.5, 20.5, 1.5, 1.5, 2.5, 2.5, 4.5, 20.5, 98.5},
{0},
- { 3, 3, 8, 99, 8, 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,
- { 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},
+ { 97, 3, 116, 100, 114, 98, 17, 3, 7, 7},
+ {25,26,27, 28,29, 30,31,32,33, 34,35,36, 37,38,39,40, 41,42,43, 44,45, 46,47, 48,49,50, 51,52,53},
+ { 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
+ { 4.5, 20.5, 1.5, 1.5, 2.5, 2.5, 4.5, 20.5, 98.5},
{0},
- { 18, 18, 32, 99, 32, 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}};
@@ -299,7 +305,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 51, 3,
+ 2, 2, 1, 2, 2, 54, 3,
/* modes */
{&_mode_set_44c_A0,&_mode_set_44c_A},
/* maps */
@@ -345,28 +351,31 @@
&_vq_book_res_Ac_0, /* 25 */
&_vq_book_res_Ac_0a,
- &_vq_book_res_Ac_1, /* 27 */
+ &_vq_book_res_Ac_0b,
+ &_vq_book_res_Ac_1, /* 28 */
&_vq_book_res_Ac_1a,
- &_vq_book_res_Ac_2, /* 29 */
+ &_vq_book_res_Ac_2, /* 30 */
&_vq_book_res_Ac_2a,
&_vq_book_res_Ac_2b,
- &_vq_book_res_Ac_3, /* 32 */
+ &_vq_book_res_Ac_2c,
+ &_vq_book_res_Ac_3, /* 34 */
&_vq_book_res_Ac_3a,
&_vq_book_res_Ac_3b,
- &_vq_book_res_Ac_4, /* 35 */
+ &_vq_book_res_Ac_4, /* 37 */
&_vq_book_res_Ac_4a,
- &_vq_book_res_Ac_5, /* 37 */
+ &_vq_book_res_Ac_4b,
+ &_vq_book_res_Ac_4c,
+ &_vq_book_res_Ac_5, /* 41 */
&_vq_book_res_Ac_5a,
- &_vq_book_res_Ac_6, /* 39 */
+ &_vq_book_res_Ac_5b,
+ &_vq_book_res_Ac_6, /* 44 */
&_vq_book_res_Ac_6a,
- &_vq_book_res_Ac_6b,
- &_vq_book_res_Ac_7, /* 42 */
+ &_vq_book_res_Ac_7, /* 46 */
&_vq_book_res_Ac_7a,
- &_vq_book_res_Ac_8, /* 44 */
+ &_vq_book_res_Ac_8, /* 48 */
&_vq_book_res_Ac_8a,
&_vq_book_res_Ac_8b,
- &_vq_book_res_Ac_8c,
- &_vq_book_res_Ac_9, /* 48 */
+ &_vq_book_res_Ac_9, /* 51 */
&_vq_book_res_Ac_9a,
&_vq_book_res_Ac_9b,
@@ -377,15 +386,15 @@
&_psy_set_44c_AG,
/* progressive coding and bitrate controls */
- 4.0, 0., .1, -2.,
+ 4.0, 0., .1, -1.,
1.,4.,
- 110000,90000,0,0,
+ 110000,90000, 0,0,
112000,140000,
- 120000,128000,
+ 124000,128000,
{4,5,6,7},
4,
1.14.2.2 +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.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- modes.h 2001/10/16 20:10:21 1.14.2.1
+++ modes.h 2001/10/20 01:04:08 1.14.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: modes.h,v 1.14.2.1 2001/10/16 20:10:21 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.14.2.2 2001/10/20 01:04:08 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"
No revision
No revision
1.7.4.1 +45 -38 vorbis/vq/distribution.c
Index: distribution.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/distribution.c,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- distribution.c 2001/08/13 01:37:16 1.7
+++ distribution.c 2001/10/20 01:04:09 1.7.4.1
@@ -11,7 +11,7 @@
********************************************************************
function: utility for finding the distribution in a data set
- last mod: $Id: distribution.c,v 1.7 2001/08/13 01:37:16 xiphmont Exp $
+ last mod: $Id: distribution.c,v 1.7.4.1 2001/10/20 01:04:09 xiphmont Exp $
********************************************************************/
@@ -163,8 +163,11 @@
line=setup_line(in);
while(line){
float code;
+ char buf[80];
lines++;
- if(!(lines&0xff))spinnit("getting min/max. lines so far...",lines);
+
+ sprintf(buf,"getting min/max (%.2f::%.2f). lines...",min,max);
+ if(!(lines&0xff))spinnit(buf,lines);
while(!flag && sscanf(line,"%f",&code)==1){
line=strchr(line,',');
@@ -193,48 +196,52 @@
printf("\r \r");
printf("Minimum scalar value: %f\n",min);
printf("Maximum scalar value: %f\n",max);
-
- printf("\n counting hits into %ld bins...\n",bins+1);
- countarray=calloc(bins+1,sizeof(long));
-
- rewind(in);
- line=setup_line(in);
- while(line){
- float code;
- lines--;
- if(!(lines&0xff))spinnit("counting distribution. lines so far...",lines);
+
+ if(argv[2]){
- while(line && sscanf(line,"%f",&code)==1){
- line=strchr(line,',');
- if(line)line++;
-
- code-=min;
- code/=(max-min);
- code*=bins;
- countarray[(int)rint(code)]++;
- total++;
- }
+ printf("\n counting hits into %ld bins...\n",bins+1);
+ countarray=calloc(bins+1,sizeof(long));
+ rewind(in);
line=setup_line(in);
- }
-
- fclose(in);
+ while(line){
+ float code;
+ lines--;
+ if(!(lines&0xff))spinnit("counting distribution. lines so far...",lines);
+
+ while(line && sscanf(line,"%f",&code)==1){
+ line=strchr(line,',');
+ if(line)line++;
+
+ code-=min;
+ code/=(max-min);
+ code*=bins;
+ countarray[(int)rint(code)]++;
+ total++;
+ }
+
+ line=setup_line(in);
+ }
- /* make a pretty graph */
- {
- long maxcount=0,i,j;
- for(i=0;i<bins+1;i++)
- if(countarray[i]>maxcount)maxcount=countarray[i];
-
- printf("\r \r");
- printf("Total scalars: %ld\n",total);
- for(i=0;i<bins+1;i++){
- int stars=rint(50./maxcount*countarray[i]);
- printf("%08f (%8ld) |",(max-min)/bins*i+min,countarray[i]);
- for(j=0;j<stars;j++)printf("*");
- printf("\n");
+ /* make a pretty graph */
+ {
+ long maxcount=0,i,j;
+ for(i=0;i<bins+1;i++)
+ if(countarray[i]>maxcount)maxcount=countarray[i];
+
+ printf("\r \r");
+ printf("Total scalars: %ld\n",total);
+ for(i=0;i<bins+1;i++){
+ int stars=rint(50./maxcount*countarray[i]);
+ printf("%08f (%8ld) |",(max-min)/bins*i+min,countarray[i]);
+ for(j=0;j<stars;j++)printf("*");
+ printf("\n");
+ }
}
}
+
+ fclose(in);
+
}
printf("\nDone.\n");
exit(0);
No revision
No revision
1.1.2.1 +134 -0 vorbis/vq/Attic/res_44c_Ab.vqs
--- >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