[xiph-cvs] cvs commit: vorbis/vq Makefile.am auxpartition.pl distribution.c latticehint.c make_residue_books.pl residuesplit.c
Monty
xiphmont at xiph.org
Sun Jul 8 01:48:12 PDT 2001
xiphmont 01/07/08 01:48:11
Modified: examples Tag: branch_monty_20010708 chaining_example.c
lib Tag: branch_monty_20010708 backends.h barkmel.c
block.c codec_internal.h envelope.c floor0.c
floor1.c mapping0.c psy.c psy.h res0.c sharedbook.c
synthesis.c vorbisenc.c
lib/books Tag: branch_monty_20010708 res0_128_1024_1.vqh
res0_128_1024_2.vqh res0_128_1024_3.vqh
res0_128_1024_4.vqh res0_128_1024_5.vqh
res0_128_1024_6.vqh res0_128_1024_7.vqh
res0_128_1024_8.vqh res0_128_1024_9.vqh
res0_128_1024aux.vqh res0_128_128aux.vqh
lib/modes Tag: branch_monty_20010708 mode_A.h mode_B.h
mode_C.h mode_D.h mode_E.h modes.h
vq Tag: branch_monty_20010708 Makefile.am
auxpartition.pl distribution.c latticehint.c
make_residue_books.pl residuesplit.c
Log:
Thinking aloud, committing this to a safe place 'just in case'.
A few .h files are still missing.
Revision Changes Path
No revision
No revision
1.9.6.1 +3 -1 vorbis/examples/chaining_example.c
Index: chaining_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/chaining_example.c,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -u -r1.9 -r1.9.6.1
--- chaining_example.c 2001/02/26 03:50:38 1.9
+++ chaining_example.c 2001/07/08 08:48:00 1.9.6.1
@@ -11,7 +11,7 @@
********************************************************************
function: illustrate simple use of chained bitstream and vorbisfile.a
- last mod: $Id: chaining_example.c,v 1.9 2001/02/26 03:50:38 xiphmont Exp $
+ last mod: $Id: chaining_example.c,v 1.9.6.1 2001/07/08 08:48:00 xiphmont Exp $
********************************************************************/
@@ -46,6 +46,8 @@
printf("\t\t%ldHz %d channels bitrate %ldkbps serial number=%ld\n",
vi->rate,vi->channels,ov_bitrate(&ov,i)/1000,
ov_serialnumber(&ov,i));
+ printf("\t\theader length: %ld bytes\n",(long)
+ (ov.dataoffsets[i]-ov.offsets[i]));
printf("\t\tcompressed length: %ld bytes ",(long)(ov_raw_total(&ov,i)));
printf(" play time: %lds\n",(long)ov_time_total(&ov,i));
}
No revision
No revision
1.9.2.1 +3 -1 vorbis/lib/backends.h
Index: backends.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/backends.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- backends.h 2001/06/15 23:31:00 1.9
+++ backends.h 2001/07/08 08:48:01 1.9.2.1
@@ -12,7 +12,7 @@
function: libvorbis backend and mapping structures; needed for
static mode headers
- last mod: $Id: backends.h,v 1.9 2001/06/15 23:31:00 xiphmont Exp $
+ last mod: $Id: backends.h,v 1.9.2.1 2001/07/08 08:48:01 xiphmont Exp $
********************************************************************/
@@ -113,6 +113,8 @@
float twofitatten;
int unusedminsize;
int unusedmin_n;
+
+ int n;
} vorbis_info_floor1;
1.7.2.1 +2 -2 vorbis/lib/barkmel.c
Index: barkmel.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/barkmel.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- barkmel.c 2001/06/15 21:15:39 1.7
+++ barkmel.c 2001/07/08 08:48:01 1.7.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: bark scale utility
- last mod: $Id: barkmel.c,v 1.7 2001/06/15 21:15:39 xiphmont Exp $
+ last mod: $Id: barkmel.c,v 1.7.2.1 2001/07/08 08:48:01 xiphmont Exp $
********************************************************************/
@@ -54,7 +54,7 @@
{
float i;
int j;
- for(i=0.,j=0;i<28;i+=1.,j++){
+ for(i=0.,j=0;i<28;i+=3.5,j++){
fprintf(stderr,"(%d) bark=%f %gHz (%d of 128)\n",
j,i,fromBARK(i),(int)(fromBARK(i)/22050.*128.));
}
1.48.2.1 +11 -8 vorbis/lib/block.c
Index: block.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/block.c,v
retrieving revision 1.48
retrieving revision 1.48.2.1
diff -u -r1.48 -r1.48.2.1
--- block.c 2001/05/27 06:43:59 1.48
+++ block.c 2001/07/08 08:48:01 1.48.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.48 2001/05/27 06:43:59 xiphmont Exp $
+ last mod: $Id: block.c,v 1.48.2.1 2001/07/08 08:48:01 xiphmont Exp $
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -174,7 +174,6 @@
v->vi=vi;
b->modebits=ilog2(ci->modes);
- b->ampmax=-9999;
b->transform[0]=_ogg_calloc(VI_TRANSFORMB,sizeof(vorbis_look_transform *));
b->transform[1]=_ogg_calloc(VI_TRANSFORMB,sizeof(vorbis_look_transform *));
@@ -263,11 +262,11 @@
_vds_shared_init(v,vi,1);
b=v->backend_state;
+ b->psy_g_look=_vp_global_look(vi);
/* Initialize the envelope state storage */
b->ve=_ogg_calloc(1,sizeof(envelope_lookup));
_ve_envelope_init(b->ve,vi);
-
return(0);
}
@@ -307,6 +306,7 @@
_ogg_free(b->transform[1][0]);
_ogg_free(b->transform[1]);
}
+ if(b->psy_g_look)_vp_global_free(b->psy_g_look);
}
@@ -406,6 +406,7 @@
int vorbis_analysis_wrote(vorbis_dsp_state *v, int vals){
vorbis_info *vi=v->vi;
codec_setup_info *ci=vi->codec_setup;
+ backend_lookup_state *b=v->backend_state;
if(vals<=0){
int order=32;
@@ -472,6 +473,8 @@
vorbis_info *vi=v->vi;
codec_setup_info *ci=vi->codec_setup;
backend_lookup_state *b=v->backend_state;
+ vorbis_look_psy_global *g=b->psy_g_look;
+ vorbis_info_psy_global *gi=ci->psy_g_param;
long beginW=v->centerW-ci->blocksizes[v->W]/2,centerNext;
/* check to see if we're started... */
@@ -542,9 +545,10 @@
vorbis_block_internal *vbi=(vorbis_block_internal *)vb->internal;
/* this tracks 'strongest peak' for later psychoacoustics */
- if(vbi->ampmax>b->ampmax)b->ampmax=vbi->ampmax;
- b->ampmax=_vp_ampmax_decay(b->ampmax,v);
- vbi->ampmax=b->ampmax;
+ /* moved to the global psy state; clean this mess up */
+ if(vbi->ampmax>g->ampmax)g->ampmax=vbi->ampmax;
+ g->ampmax=_vp_ampmax_decay(g->ampmax,v);
+ vbi->ampmax=g->ampmax;
vb->pcm=_vorbis_block_alloc(vb,sizeof(float *)*vi->channels);
vbi->pcmdelay=_vorbis_block_alloc(vb,sizeof(float *)*vi->channels);
@@ -576,7 +580,7 @@
/* advance storage vectors and clean up */
{
- int new_centerNext=ci->blocksizes[1]/2+ci->delaycache;
+ int new_centerNext=ci->blocksizes[1]/2+gi->delaycache;
int movementW=centerNext-new_centerNext;
if(movementW>0){
@@ -614,7 +618,6 @@
}
int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi){
- codec_setup_info *ci=vi->codec_setup;
_vds_shared_init(v,vi,0);
v->pcm_returned=-1;
1.8.6.1 +19 -28 vorbis/lib/codec_internal.h
Index: codec_internal.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/codec_internal.h,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- codec_internal.h 2001/03/26 23:27:43 1.8
+++ codec_internal.h 2001/07/08 08:48:01 1.8.6.1
@@ -10,7 +10,7 @@
********************************************************************
function: libvorbis codec headers
- last mod: $Id: codec_internal.h,v 1.8 2001/03/26 23:27:43 xiphmont Exp $
+ last mod: $Id: codec_internal.h,v 1.8.6.1 2001/07/08 08:48:01 xiphmont Exp $
********************************************************************/
@@ -39,6 +39,7 @@
float **window[2][2][2]; /* block, leadin, leadout, type */
vorbis_look_transform **transform[2]; /* block, type */
codebook *fullbooks;
+ vorbis_look_psy_global *psy_g_look;
/* backend lookups are tied to the mode, not the backend or naked mapping */
int modebits;
@@ -51,9 +52,7 @@
unsigned char *header;
unsigned char *header1;
unsigned char *header2;
-
- float ampmax;
-
+
} backend_lookup_state;
/* mode ************************************************************/
@@ -83,7 +82,7 @@
long blocksizes[2];
/* modes are the primary means of supporting on-the-fly different
- blocksizes, different channel mappings (LR or mid-side),
+ blocksizes, different channel mappings (LR or M/A),
different residue backends, etc. Each mode consists of a
blocksize flag and a mapping (along with the mapping setup */
@@ -95,30 +94,22 @@
int books;
int psys; /* encode only */
- vorbis_info_mode *mode_param[64];
- int map_type[64];
- vorbis_info_mapping *map_param[64];
- int time_type[64];
- vorbis_info_time *time_param[64];
- int floor_type[64];
- vorbis_info_floor *floor_param[64];
- int residue_type[64];
- vorbis_info_residue *residue_param[64];
- static_codebook *book_param[256];
- vorbis_info_psy *psy_param[64]; /* encode only */
-
- /* for block long/sort tuning; encode only */
- int envelopesa;
- float preecho_thresh[4];
- float postecho_thresh[4];
- float preecho_minenergy;
-
- float ampmax_att_per_sec;
-
- /* delay caching... how many samples to keep around prior to our
- current block to aid in analysis? */
- int delaycache;
+ vorbis_info_mode *mode_param[64];
+ int map_type[64];
+ vorbis_info_mapping *map_param[64];
+ int time_type[64];
+ vorbis_info_time *time_param[64];
+ int floor_type[64];
+ vorbis_info_floor *floor_param[64];
+ int residue_type[64];
+ vorbis_info_residue *residue_param[64];
+ static_codebook *book_param[256];
+ vorbis_info_psy *psy_param[64]; /* encode only */
+ vorbis_info_psy_global *psy_g_param;
} codec_setup_info;
+
+extern vorbis_look_psy_global *_vp_global_look(vorbis_info *vi);
+extern void _vp_global_free(vorbis_look_psy_global *look);
#endif
1.36.2.1 +8 -8 vorbis/lib/envelope.c
Index: envelope.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/envelope.c,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -u -r1.36 -r1.36.2.1
--- envelope.c 2001/05/27 06:43:59 1.36
+++ envelope.c 2001/07/08 08:48:01 1.36.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data envelope analysis and manipulation
- last mod: $Id: envelope.c,v 1.36 2001/05/27 06:43:59 xiphmont Exp $
+ last mod: $Id: envelope.c,v 1.36.2.1 2001/07/08 08:48:01 xiphmont Exp $
Preecho calculation.
@@ -82,11 +82,12 @@
void _ve_envelope_init(envelope_lookup *e,vorbis_info *vi){
codec_setup_info *ci=vi->codec_setup;
+ vorbis_info_psy_global *gi=ci->psy_g_param;
int ch=vi->channels;
- int window=ci->envelopesa;
+ int window=gi->envelopesa;
int i;
e->winlength=window;
- e->minenergy=fromdB(ci->preecho_minenergy);
+ e->minenergy=fromdB(gi->preecho_minenergy);
e->iir=_ogg_calloc(ch*4,sizeof(IIR_state));
e->filtered=_ogg_calloc(ch*4,sizeof(float *));
e->ch=ch;
@@ -150,10 +151,9 @@
long _ve_envelope_search(vorbis_dsp_state *v,long searchpoint){
vorbis_info *vi=v->vi;
codec_setup_info *ci=vi->codec_setup;
+ vorbis_info_psy_global *gi=ci->psy_g_param;
envelope_lookup *ve=((backend_lookup_state *)(v->backend_state))->ve;
- long i,j,k,l;
- float *work=alloca(sizeof(float)*ve->winlength*2);
- static int seq=0;
+ long i,j,k;
/* make sure we have enough storage to match the PCM */
if(v->pcm_storage>ve->storage){
@@ -210,8 +210,8 @@
float *filtered=ve->filtered[i*4+k]+j;
float m=_ve_deltai(ve,filtered-ve->winlength,filtered);
- if(m>ci->preecho_thresh[k])return(0);
- if(m<ci->postecho_thresh[k])return(0);
+ if(m>gi->preecho_thresh[k])return(0);
+ if(m<gi->postecho_thresh[k])return(0);
}
}
1.43.2.1 +13 -3 vorbis/lib/floor0.c
Index: floor0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/floor0.c,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -u -r1.43 -r1.43.2.1
--- floor0.c 2001/06/15 23:31:00 1.43
+++ floor0.c 2001/07/08 08:48:01 1.43.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: floor backend 0 implementation
- last mod: $Id: floor0.c,v 1.43 2001/06/15 23:31:00 xiphmont Exp $
+ last mod: $Id: floor0.c,v 1.43.2.1 2001/07/08 08:48:01 xiphmont Exp $
********************************************************************/
@@ -42,6 +42,8 @@
lpc_lookup lpclook;
float *lsp_look;
+ long bits;
+ long frames;
} vorbis_look_floor0;
/* infrastructure for finding fit */
@@ -86,6 +88,10 @@
static void floor0_free_look(vorbis_look_floor *i){
vorbis_look_floor0 *look=(vorbis_look_floor0 *)i;
if(i){
+
+ fprintf(stderr,"floor 0 bit usage %f\n",
+ (float)look->bits/look->frames);
+
if(look->linearmap)_ogg_free(look->linearmap);
if(look->lsp_look)_ogg_free(look->lsp_look);
lpc_clear(&look->lpclook);
@@ -313,6 +319,8 @@
}
oggpack_write(&vb->opb,val,info->ampbits);
+ look->bits+=info->ampbits+1;
+ look->frames++;
if(val){
float *lspwork=alloca(look->m*sizeof(float));
@@ -342,7 +350,7 @@
b=be->fullbooks+info->books[booknum];
oggpack_write(&vb->opb,booknum,_ilog(info->numbooks));
-
+ look->bits+=_ilog(info->numbooks);
#ifdef TRAIN_LSP
{
@@ -366,7 +374,7 @@
for(j=0;j<look->m;j+=b->dim){
int entry=_f0_fit(b,codedflr,lspwork,j);
- bits+=vorbis_book_encode(b,entry,&vb->opb);
+ look->bits+=vorbis_book_encode(b,entry,&vb->opb);
#ifdef TRAIN_LSP
fprintf(ef,"%d,\n",entry);
@@ -381,6 +389,8 @@
_analysis_output("lsp2",seq-1,lspwork,look->m,0,0);
/* take the coefficients back to a spectral envelope curve */
+ for(j=0;j<look->n;j++)
+ codedflr[j]=1.f;
vorbis_lsp_to_curve(codedflr,look->linearmap,look->n,look->ln,
lspwork,look->m,amp,info->ampdB);
1.10.2.1 +17 -6 vorbis/lib/floor1.c
Index: floor1.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/floor1.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- floor1.c 2001/06/15 23:59:47 1.10
+++ floor1.c 2001/07/08 08:48:01 1.10.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: floor backend 1 implementation
- last mod: $Id: floor1.c,v 1.10 2001/06/15 23:59:47 xiphmont Exp $
+ last mod: $Id: floor1.c,v 1.10.2.1 2001/07/08 08:48:01 xiphmont Exp $
********************************************************************/
@@ -43,6 +43,9 @@
int quant_q;
vorbis_info_floor1 *vi;
+ long phrasebits;
+ long postbits;
+ long frames;
} vorbis_look_floor1;
typedef struct lsfit_acc{
@@ -80,6 +83,11 @@
static void floor1_free_look(vorbis_look_floor *i){
vorbis_look_floor1 *look=(vorbis_look_floor1 *)i;
if(i){
+ fprintf(stderr,"floor 1 bit usage %f:%f (%f total)\n",
+ (float)look->phrasebits/look->frames,
+ (float)look->postbits/look->frames,
+ (float)(look->postbits+look->phrasebits)/look->frames);
+
memset(look,0,sizeof(vorbis_look_floor1));
free(i);
}
@@ -620,7 +628,7 @@
long i,j,k,l;
vorbis_look_floor1 *look=(vorbis_look_floor1 *)in;
vorbis_info_floor1 *info=look->vi;
- long n=look->n;
+ long n=info->n;
long posts=look->posts;
long nonzero=0;
lsfit_acc fits[VIF_POSIT+1];
@@ -879,6 +887,8 @@
oggpack_write(&vb->opb,1,1);
/* beginning/end post */
+ look->frames++;
+ look->postbits+=ilog(look->quant_q-1)*2;
oggpack_write(&vb->opb,fit_valueA[0],ilog(look->quant_q-1));
oggpack_write(&vb->opb,fit_valueA[1],ilog(look->quant_q-1));
@@ -928,7 +938,8 @@
cshift+=csubbits;
}
/* write it */
- vorbis_book_encode(books+info->class_book[class],cval,&vb->opb);
+ look->phrasebits+=
+ vorbis_book_encode(books+info->class_book[class],cval,&vb->opb);
#ifdef TRAIN_FLOOR1
{
@@ -946,7 +957,7 @@
for(k=0;k<cdim;k++){
int book=info->class_subbook[class][bookas[k]];
if(book>=0){
- vorbis_book_encode(books+book,
+ look->postbits+=vorbis_book_encode(books+book,
fit_valueB[j+k],&vb->opb);
#ifdef TRAIN_FLOOR1
@@ -982,7 +993,7 @@
ly=hy;
}
}
- for(j=hx;j<look->n;j++)codedflr[j]=codedflr[j-1]; /* be certain */
+ for(j=lx;j<vb->pcmend/2;j++)codedflr[j]=codedflr[j-1]; /* be certain */
/* use it to create residue vector. Eliminate residue elements
that were below the error training attenuation relative to
@@ -995,7 +1006,7 @@
residue[j]=0.f;
else
residue[j]=mdct[j]/codedflr[j];
- for(j=n;j<look->n;j++)residue[j]=0.f;
+ for(j=n;j<vb->pcmend/2;j++)residue[j]=0.f;
}
1.33.2.1 +29 -17 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -r1.33 -r1.33.2.1
--- mapping0.c 2001/06/17 22:25:50 1.33
+++ mapping0.c 2001/07/08 08:48:01 1.33.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.33 2001/06/17 22:25:50 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.33.2.1 2001/07/08 08:48:01 xiphmont Exp $
********************************************************************/
@@ -133,6 +133,7 @@
if(ci->psys && vd->analysisp){
int psynum=info->psysubmap[i];
_vp_psy_init(look->psy_look+i,ci->psy_param[psynum],
+ ci->psy_g_param,
ci->blocksizes[vm->blockflag]/2,vi->rate);
}
}
@@ -259,6 +260,7 @@
static int mapping0_forward(vorbis_block *vb,vorbis_look_mapping *l){
vorbis_dsp_state *vd=vb->vd;
vorbis_info *vi=vd->vi;
+ codec_setup_info *ci=vi->codec_setup;
backend_lookup_state *b=vb->vd->backend_state;
vorbis_look_mapping0 *look=(vorbis_look_mapping0 *)l;
vorbis_info_mapping0 *info=look->map;
@@ -311,18 +313,21 @@
logfft[(j+1)>>1]=todB(&temp);
}
- _analysis_output("fft",seq,logfft,n/2,0,0);
- _analysis_output("mdct",seq,logmdct,n/2,0,0);
+ _analysis_output("fft",seq,logfft,n/2,1,0);
+ _analysis_output("mdct",seq,logmdct,n/2,1,0);
/* perform psychoacoustics; do masking */
ret=_vp_compute_mask(look->psy_look+submap,
+ b->psy_g_look,
+ i,
logfft, /* -> logmax */
logmdct,
logmask,
- vbi->ampmax);
+ vbi->ampmax,
+ ci->blocksizes[vb->lW]/2);
if(ret>newmax)newmax=ret;
- _analysis_output("mask",seq,logmask,n/2,0,0);
+ _analysis_output("mask",seq,logmask,n/2,1,0);
/* perform floor encoding */
nonzero[i]=look->floor_func[submap]->
@@ -338,8 +343,8 @@
if(fabs(vb->pcm[i][j]>200))
fprintf(stderr,"%ld ",seq);*/
- _analysis_output("res",seq-vi->channels+j,vb->pcm[i],n,0,0);
- _analysis_output("codedflr",seq++,codedflr,n/2,0,1);
+ _analysis_output("res",seq,vb->pcm[i],n,1,0);
+ _analysis_output("codedflr",seq++,codedflr,n/2,1,1);
}
@@ -393,16 +398,23 @@
ang=B-A;
}
- /*if(fabs(mag)<3.5f)
- ang=rint(ang/(mag*2.f))*mag*2.f;*/
-
- /*if(fabs(mag)<1.5)
- ang=0;
-
- if(j>(n*3/16))
- ang=0;
-
- if(ang>=fabs(mag*2))ang=-fabs(mag*2);*/
+ if(j>12){
+
+ if(j>=n*3/64){
+
+ if(j>=n*3/32){
+ ang=0;
+ }else{
+ ang=rint(ang/rint(mag))*rint(mag);
+ //if(fabs(mag)<2.5)
+ //ang=0;
+ }
+ }
+ }
+
+
+
+ if(ang>=fabs(mag*2))ang=-fabs(mag*2);
pcmM[j]=mag;
pcmA[j]=ang;
@@ -535,7 +547,7 @@
/* only MDCT right now.... */
for(i=0;i<vi->channels;i++){
float *pcm=vb->pcm[i];
- _analysis_output("out",seq+i,pcm,n/2,0,1);
+ _analysis_output("out",seq+i,pcm,n/2,1,1);
mdct_backward(b->transform[vb->W][0],pcm,pcm);
}
1.48.2.1 +99 -19 vorbis/lib/psy.c
Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.48
retrieving revision 1.48.2.1
diff -u -r1.48 -r1.48.2.1
--- psy.c 2001/06/18 22:19:26 1.48
+++ psy.c 2001/07/08 08:48:01 1.48.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.48 2001/06/18 22:19:26 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.48.2.1 2001/07/08 08:48:01 xiphmont Exp $
********************************************************************/
@@ -34,8 +34,41 @@
/* Why Bark scale for encoding but not masking computation? Because
masking has a strong harmonic dependancy */
-/* the beginnings of real psychoacoustic infrastructure. This is
- still not tightly tuned */
+vorbis_look_psy_global *_vp_global_look(vorbis_info *vi){
+ int i,j;
+ codec_setup_info *ci=vi->codec_setup;
+ vorbis_info_psy_global *gi=ci->psy_g_param;
+ vorbis_look_psy_global *look=_ogg_calloc(1,sizeof(vorbis_look_psy_global));
+
+ int shiftoc=rint(log(gi->eighth_octave_lines*8)/log(2))-1;
+ look->decaylines=toOC(96000.f)*(1<<(shiftoc+1))+.5f; /* max sample
+ rate of
+ 192000kHz
+ for now */
+ look->decay=_ogg_calloc(vi->channels,sizeof(float *));
+ for(i=0;i<vi->channels;i++){
+ look->decay[i]=_ogg_calloc(look->decaylines,sizeof(float));
+ for(j=0;j<look->decaylines;j++)
+ look->decay[i][j]=-9999.;
+ }
+ look->channels=vi->channels;
+
+ look->ampmax=-9999.;
+ look->gi=gi;
+ return(look);
+}
+
+void _vp_global_free(vorbis_look_psy_global *look){
+ int i;
+ if(look->decay){
+ for(i=0;i<look->channels;i++)
+ _ogg_free(look->decay[i]);
+ _ogg_free(look->decay);
+ }
+ memset(look,0,sizeof(vorbis_look_psy_global));
+ _ogg_free(look);
+}
+
void _vi_psy_free(vorbis_info_psy *i){
if(i){
memset(i,0,sizeof(vorbis_info_psy));
@@ -178,16 +211,17 @@
}
}
-void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate){
+void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,
+ vorbis_info_psy_global *gi,int n,long rate){
long i,j,lo=0,hi=0;
long maxoc;
memset(p,0,sizeof(vorbis_look_psy));
- p->eighth_octave_lines=vi->eighth_octave_lines;
- p->shiftoc=rint(log(vi->eighth_octave_lines*8)/log(2))-1;
+ p->eighth_octave_lines=gi->eighth_octave_lines;
+ p->shiftoc=rint(log(gi->eighth_octave_lines*8)/log(2))-1;
- p->firstoc=toOC(.25f*rate/n)*(1<<(p->shiftoc+1))-vi->eighth_octave_lines;
+ p->firstoc=toOC(.25f*rate/n)*(1<<(p->shiftoc+1))-gi->eighth_octave_lines;
maxoc=toOC((n*.5f-.25f)*rate/n)*(1<<(p->shiftoc+1))+.5f;
p->total_octave_lines=maxoc-p->firstoc+1;
@@ -197,9 +231,9 @@
p->bark=_ogg_malloc(n*sizeof(unsigned long));
p->vi=vi;
p->n=n;
+ p->rate=rate;
/* set up the lookups for a given blocksize and sample rate */
- /* Vorbis max sample rate is currently limited by 26 Bark (54kHz) */
if(vi->ath)
set_curve(vi->ath, p->ath,n,rate);
for(i=0;i<n;i++){
@@ -411,7 +445,7 @@
if(f[i]>max)max=f[i];
}
- if(max>flr[i]){
+ if(max+6.f>flr[i]){
oc=oc>>p->shiftoc;
if(oc>=P_BANDS)oc=P_BANDS-1;
if(oc<0)oc=0;
@@ -508,7 +542,10 @@
}
/* bleaugh, this is more complicated than it needs to be */
-static void max_seeds(vorbis_look_psy *p,float *minseed,float *maxseed,
+static void max_seeds(vorbis_look_psy *p,
+ vorbis_look_psy_global *g,
+ int channel,
+ float *minseed,float *maxseed,
float *flr){
long n=p->total_octave_lines;
int linesper=p->eighth_octave_lines;
@@ -516,6 +553,8 @@
long pos;
seed_chase(minseed,linesper,n); /* for masking */
+ _vp_compute_mask_decay(p,g,minseed,channel);
+
seed_chase(maxseed,linesper,n); /* for peak att */
pos=p->octave[0]-p->firstoc-(linesper>>1);
@@ -666,11 +705,51 @@
}
+static int seq=0;
+static void _vp_compute_mask_decay(vorbis_look_psy *p,
+ vorbis_look_psy_global *g,
+ float *seed,int channel){
+ if(g->gi->decaydBpms<0){
+ int i;
+
+ /* first decay the entire cached buffer */
+ float *decay=g->decay[channel];
+ float ms=p->n*1000.f/p->rate;
+ float decaydB=g->gi->decaydBpms*ms;
+
+ for(i=0;i<g->decaylines;i++){
+ decay[i]+=decaydB;
+ if(decay[i]<-9999.f)decay[i]=-9999.f;
+ }
+ _analysis_output("decay",seq,decay+200,g->decaylines-200,0,0);
+ _analysis_output("seed",seq++,seed-p->firstoc+200,p->total_octave_lines+p->firstoc-200,0,0);
+
+ /* now, apply decayed buffer to the valid range of the seeds,
+ copy back larger seeds into cache */
+ {
+ float end=p->total_octave_lines+p->firstoc-1;
+ int begin=-p->firstoc;
+
+ if(end>g->decaylines)end=g->decaylines;
+ if(begin<260)begin=260;
+ for(i=begin;i<end;i++){
+ if(decay[i]>seed[i-p->firstoc])
+ seed[i-p->firstoc]=decay[i];
+ else
+ decay[i]=seed[i-p->firstoc];
+ }
+ }
+ }
+}
+
float _vp_compute_mask(vorbis_look_psy *p,
- float *fft,
- float *mdct,
- float *mask,
- float specmax){
+ vorbis_look_psy_global *g,
+ int channel,
+ float *fft,
+ float *mdct,
+ float *mask,
+ float specmax,
+ int lastsize){
int i,n=p->n;
float localmax=NEGINF;
static int seq=0;
@@ -693,7 +772,7 @@
p->vi->noisewindowhimin,
p->noisemedian,
p->noiseoffset,
- (const long *)(p->vi->noisewindowfixed));
+ p->vi->noisewindowfixed);
/* suppress any noise curve > specmax+p->vi->noisemaxsupp */
for(i=0;i<n;i++)
if(mask[i]>specmax+p->vi->noisemaxsupp)
@@ -718,13 +797,12 @@
/* tone/peak masking */
- /* XXX apply decay to the fft here */
-
seed_loop(p,
(const float ***)p->tonecurves,
(const float **)p->peakatt,fft,mask,minseed,maxseed,specmax);
+
bound_loop(p,mdct,maxseed,mask,p->vi->bound_att_dB);
- max_seeds(p,minseed,maxseed,mask);
+ max_seeds(p,g,channel,minseed,maxseed,mask);
/* doing this here is clean, but we need to find a faster way to do
it than to just tack it on */
@@ -742,10 +820,12 @@
float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd){
vorbis_info *vi=vd->vi;
codec_setup_info *ci=vi->codec_setup;
+ vorbis_info_psy_global *gi=ci->psy_g_param;
+
int n=ci->blocksizes[vd->W]/2;
float secs=(float)n/vi->rate;
- amp+=secs*ci->ampmax_att_per_sec;
+ amp+=secs*gi->ampmax_att_per_sec;
if(amp<-9999)amp=-9999;
return(amp);
}
1.21.2.1 +39 -8 vorbis/lib/psy.h
Index: psy.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.h,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- psy.h 2001/06/15 21:15:40 1.21
+++ psy.h 2001/07/08 08:48:02 1.21.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.21 2001/06/15 21:15:40 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.21.2.1 2001/07/08 08:48:02 xiphmont Exp $
********************************************************************/
@@ -29,13 +29,10 @@
#define P_LEVELS 11
typedef struct vorbis_info_psy{
float *ath;
- int decayp;
float ath_adjatt;
float ath_maxatt;
- int eighth_octave_lines;
-
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
@@ -60,6 +57,34 @@
} vorbis_info_psy;
+typedef struct{
+ float decaydBpms;
+ int eighth_octave_lines;
+
+ /* for block long/short tuning; encode only */
+ int envelopesa;
+ float preecho_thresh[4];
+ float postecho_thresh[4];
+ float preecho_minenergy;
+
+ float ampmax_att_per_sec;
+
+ /* delay caching... how many samples to keep around prior to our
+ current block to aid in analysis? */
+ int delaycache;
+
+} vorbis_info_psy_global;
+
+typedef struct {
+ float ampmax;
+ float **decay;
+ int decaylines;
+ int channels;
+
+ vorbis_info_psy_global *gi;
+} vorbis_look_psy_global;
+
+
typedef struct {
int n;
struct vorbis_info_psy *vi;
@@ -77,10 +102,11 @@
long shiftoc;
int eighth_octave_lines; /* power of two, please */
int total_octave_lines;
-
+ long rate; /* cache it */
} vorbis_look_psy;
-extern void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate);
+extern void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,
+ vorbis_info_psy_global *gi,int n,long rate);
extern void _vp_psy_clear(vorbis_look_psy *p);
extern void *_vi_psy_dup(void *source);
@@ -88,10 +114,15 @@
extern vorbis_info_psy *_vi_psy_copy(vorbis_info_psy *i);
extern float _vp_compute_mask(vorbis_look_psy *p,
+ vorbis_look_psy_global *g,
+ int channel,
float *fft,
float *mdct,
- float *mask,
- float prev_maxamp);
+ float *mask,
+ float specmax,
+ int lastsize);
+
+
extern float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd);
#endif
1.32.2.1 +39 -32 vorbis/lib/res0.c
Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -r1.32 -r1.32.2.1
--- res0.c 2001/06/15 23:31:00 1.32
+++ res0.c 2001/07/08 08:48:02 1.32.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.32 2001/06/15 23:31:00 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.32.2.1 2001/07/08 08:48:02 xiphmont Exp $
********************************************************************/
@@ -45,11 +45,9 @@
int partvals;
int **decodemap;
- /*long resbits[32][32];
- long resbitsflat;
- long resvals[32];
+ long postbits;
long phrasebits;
- long frames;*/
+ long frames;
} vorbis_look_residue0;
@@ -68,13 +66,19 @@
}
void res0_free_look(vorbis_look_residue *i){
- int j,k;
+ int j;
if(i){
vorbis_look_residue0 *look=(vorbis_look_residue0 *)i;
- vorbis_info_residue0 *info=look->info;
- /*fprintf(stderr,
+ fprintf(stderr,"residue bit usage %f:%f (%f total)\n",
+ (float)look->phrasebits/look->frames,
+ (float)look->postbits/look->frames,
+ (float)(look->postbits+look->phrasebits)/look->frames);
+
+ /*vorbis_info_residue0 *info=look->info;
+
+ fprintf(stderr,
"%ld frames encoded in %ld phrasebits and %ld residue bits "
"(%g/frame) \n",look->frames,look->phrasebits,
look->resbitsflat,
@@ -282,36 +286,24 @@
int auxparts,int auxpartnum){
vorbis_info_residue0 *info=look->info;
int i,j=0;
- float max,localmax=0.f;
+ float max=0.f;
float temp[128];
- float entropy[8];
+ float entropy=0.f;
/* setup */
for(i=0;i<n;i++)temp[i]=fabs(vec[i]);
- /* handle case subgrp==1 outside */
for(i=0;i<n;i++)
- if(temp[i]>localmax)localmax=temp[i];
- max=localmax;
+ if(temp[i]>max)max=temp[i];
for(i=0;i<n;i++)temp[i]=rint(temp[i]);
-
- while(n){
- entropy[j]=localmax;
- n>>=1;
- j++;
- if(!n)break;
- for(i=0;i<n;i++){
- temp[i]=temp[i*2]+temp[i*2+1];
- }
- localmax=0.f;
- for(i=0;i<n;i++)
- if(temp[i]>localmax)localmax=temp[i];
- }
+ for(i=0;i<n;i++)
+ entropy+=temp[i];
+
for(i=0;i<auxparts-1;i++)
if(auxpartnum<info->blimit[i] &&
- entropy[info->subgrp[i]]<=info->entmax[i] &&
+ entropy<=info->entmax[i] &&
max<=info->ampmax[i])
break;
@@ -430,12 +422,28 @@
}
+#ifdef TRAIN_RES
+ {
+ FILE *of;
+ char buffer[80];
+
+ for(i=0;i<ch;i++){
+ sprintf(buffer,"resaux_%d.vqd",vb->mode);
+ of=fopen(buffer,"a");
+ for(j=info->begin,l=0;j<info->end;j+=samples_per_partition,l++)
+ fprintf(of,"%d, ",partword[i][l]);
+ fprintf(of,"\n");
+ fclose(of);
+ }
+ }
+#endif
+
/* we code the partition words for each channel, then the residual
words for a partition per channel until we've written all the
residual words for that partition word. Then write the next
partition channel words... */
- /*look->frames++;*/
+ look->frames++;
for(s=0;s<look->stages;s++){
for(i=info->begin,l=0;i<info->end;){
@@ -447,7 +455,7 @@
for(k=1;k<partitions_per_word;k++)
val= val*possible_partitions+partword[j][l+k];
ret=vorbis_book_encode(look->phrasebook,val,&vb->opb);
- /*look->phrasebits+=ret;*/
+ look->phrasebits+=ret;
}
}
@@ -461,8 +469,8 @@
if(statebook){
int ret=encode(&vb->opb,in[j]+i,samples_per_partition,
statebook,look);
- /*look->resbits[partword[j][l]][s]+=ret;
- look->resbitsflat+=ret;*/
+ /*look->resbits[partword[j][l]][s]+=ret;*/
+ look->postbits+=ret;
}
}
@@ -617,7 +625,6 @@
int partvals=n/samples_per_partition;
int partwords=(partvals+partitions_per_word-1)/partitions_per_word;
int **partword=_vorbis_block_alloc(vb,partwords*sizeof(int *));
- int used;
partvals=partwords*partitions_per_word;
for(i=0;i<ch;i++)if(nonzero[i])break;
1.16.6.1 +2 -2 vorbis/lib/sharedbook.c
Index: sharedbook.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/sharedbook.c,v
retrieving revision 1.16
retrieving revision 1.16.6.1
diff -u -r1.16 -r1.16.6.1
--- sharedbook.c 2001/02/26 03:50:43 1.16
+++ sharedbook.c 2001/07/08 08:48:02 1.16.6.1
@@ -11,7 +11,7 @@
********************************************************************
function: basic shared codebook operations
- last mod: $Id: sharedbook.c,v 1.16 2001/02/26 03:50:43 xiphmont Exp $
+ last mod: $Id: sharedbook.c,v 1.16.6.1 2001/07/08 08:48:02 xiphmont Exp $
********************************************************************/
@@ -396,7 +396,7 @@
for(k=0,o=step*(dim-1);k<dim;k++,o-=step){
int i;
/* linear search the quant list for now; it's small and although
- with > 8 entries, it would be faster to bisect, this would be
+ with > ~8 entries, it would be faster to bisect, this would be
a misplaced optimization for now */
for(i=0;i<tt->threshvals-1;i++)
if(a[o]<tt->quantthresh[i])break;
1.22.2.1 +2 -2 vorbis/lib/synthesis.c
Index: synthesis.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/synthesis.c,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- synthesis.c 2001/05/27 06:44:01 1.22
+++ synthesis.c 2001/07/08 08:48:02 1.22.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: single-block PCM synthesis
- last mod: $Id: synthesis.c,v 1.22 2001/05/27 06:44:01 xiphmont Exp $
+ last mod: $Id: synthesis.c,v 1.22.2.1 2001/07/08 08:48:02 xiphmont Exp $
********************************************************************/
@@ -75,7 +75,7 @@
long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op){
codec_setup_info *ci=vi->codec_setup;
oggpack_buffer opb;
- int type,mode,i;
+ int mode;
oggpack_readinit(&opb,op->packet,op->bytes);
1.7.2.1 +2 -2 vorbis/lib/vorbisenc.c
Index: vorbisenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisenc.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- vorbisenc.c 2001/05/27 06:44:01 1.7
+++ vorbisenc.c 2001/07/08 08:48:02 1.7.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.7 2001/05/27 06:44:01 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.7.2.1 2001/07/08 08:48:02 xiphmont Exp $
********************************************************************/
@@ -116,7 +116,7 @@
bpch=nominal_bitrate/channels;
if(bpch<60000){
/* mode A */
- mode=&info_AA;
+ //mode=&info_AA;
}else if(bpch<75000){
/* mode A */
mode=&info_A;
No revision
No revision
1.6.6.1 +204 -19 vorbis/lib/books/res0_128_1024_1.vqh
Index: res0_128_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_1.vqh,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- res0_128_1024_1.vqh 2001/02/26 03:50:52 1.6
+++ res0_128_1024_1.vqh 2001/07/08 08:48:05 1.6.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -19,43 +19,228 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_1[] = {
+ 7,
+ 6,
+ 8,
+ 5,
+ 9,
+ 4,
+ 10,
+ 3,
+ 11,
+ 2,
+ 12,
1,
+ 13,
0,
- 2,
+ 14,
};
static long _vq_lengthlist_res0_128_1024_1[] = {
- 1, 4, 4, 5, 8, 7, 4, 7, 7, 5, 8, 8, 8,11,11, 8,
- 11,11, 5, 8, 7, 8,11,11, 8,11,11, 5, 8, 8, 8,11,
- 11, 8,11,11, 8,12,11,11,15,15,12,15,15, 8,11,11,
- 11,15,15,11,15,15, 4, 8, 8, 8,11,11, 8,11,11, 8,
- 11,11,11,15,15,11,15,15, 8,11,11,11,15,15,11,15,
- 15,
+ 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10,11,11,12,12, 0,
+ 4, 5, 8, 8,10,10,11,11,12,12,13,13,14,13, 0, 4,
+ 4, 8, 8,10,10,11,11,12,12,13,13,14,14, 0, 6, 6,
+ 8, 8,10,10,11,11,12,12,13,13,14,14, 0, 0, 0, 8,
+ 8,10,10,11,11,12,12,13,13,14,14, 0, 0, 0,10,10,
+ 9, 9,12,12,13,12,13,13,14,14, 0, 0, 0,10,10, 9,
+ 9,11,11,12,12,13,13,14,14, 0, 0, 0, 8, 9,11,11,
+ 11,11,13,13,14,14,14,14, 0, 0, 0, 0, 0,11,11,11,
+ 11,13,13,14,13,14,14, 0, 0, 0, 0, 0,12,12,12,12,
+ 12,12,14,14,14,14, 0, 0, 0, 0, 0,12,12,12,12,12,
+ 12,14,14,15,14, 0, 0, 0, 0, 0,11,11,13,13,14,14,
+ 13,13,15,15, 0, 0, 0, 0, 0, 0, 0,13,13,14,14,13,
+ 13,15,15, 0, 0, 0, 0, 0, 0, 0,14,14,14,14,15,15,
+ 14,14, 0, 0, 0, 0, 0, 0, 0,14,14,14,14,15,14,14,
+ 14,
};
static float _vq_quantthresh_res0_128_1024_1[] = {
- -0.5, 0.5,
+ -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.7, 0.7,
+ 1.5, 2.5, 3.5, 4.5, 5.5, 6.5,
};
static long _vq_quantmap_res0_128_1024_1[] = {
- 1, 0, 2,
+ 13, 11, 9, 7, 5, 3, 1, 0,
+ 2, 4, 6, 8, 10, 12, 14,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_1 = {
_vq_quantthresh_res0_128_1024_1,
_vq_quantmap_res0_128_1024_1,
- 3,
- 3
+ 15,
+ 15
+};
+
+static long _vq_pigeonmap_res0_128_1024_1[] = {
+ 4, 3, 3, 2, 1, 1, 0, 0,
+ 0, 1, 2, 2, 3, 4,
};
+static long _vq_fitlist_res0_128_1024_1[] = {
+ 0, 1, 2, 3, 16, 17, 18, 31,
+ 46, 4, 19, 32, 47, 6, 21, 34,
+ 49, 33, 36, 64, 63, 66, 94, 1,
+ 3, 5, 7, 16, 18, 20, 22, 33,
+ 35, 48, 50, 0, 31, 46, 2, 4,
+ 6, 8, 17, 19, 21, 23, 34, 36,
+ 49, 51, 37, 63, 65, 32, 38, 64,
+ 66, 67, 93, 95, 68, 94, 96, 3,
+ 5, 7, 9, 18, 20, 22, 24, 35,
+ 37, 50, 52, 4, 6, 8, 10, 19,
+ 21, 23, 25, 36, 38, 51, 53, 12,
+ 27, 40, 55, 33, 39, 65, 67, 34,
+ 66, 68, 42, 70, 63, 69, 95, 97,
+ 64, 96, 98, 72, 100, 7, 9, 11,
+ 13, 22, 24, 26, 28, 39, 41, 54,
+ 56, 5, 20, 37, 52, 8, 10, 12,
+ 14, 23, 25, 27, 29, 40, 42, 55,
+ 57, 43, 69, 71, 35, 67, 38, 44,
+ 70, 72, 73, 99, 101, 65, 97, 68,
+ 74, 100, 102, 9, 11, 13, 24, 26,
+ 28, 41, 43, 56, 58, 10, 12, 14,
+ 25, 27, 29, 42, 44, 57, 59, 39,
+ 71, 73, 40, 72, 74, 69, 101, 103,
+ 70, 102, 104, 16, 46, 47, 48, 78,
+ 17, 49, 79, 19, 51, 81, 109, 0,
+ 1, 18, 2, 4, 21, 31, 32, 33,
+ 63, 64, 65, 93, 94, 95, 34, 66,
+ 96, 18, 20, 46, 48, 50, 52, 78,
+ 80, 82, 108, 110, 16, 19, 21, 47,
+ 49, 51, 53, 79, 81, 83, 109, 111,
+ 3, 5, 22, 1, 4, 6, 17, 23,
+ 33, 35, 63, 65, 67, 93, 95, 97,
+ 125, 31, 34, 36, 64, 66, 68, 94,
+ 96, 98, 126, 20, 22, 48, 50, 52,
+ 54, 78, 80, 82, 84, 110, 112, 21,
+ 23, 49, 51, 53, 55, 79, 81, 83,
+ 85, 111, 113, 25, 57, 87, 115, 5,
+ 7, 18, 24, 6, 8, 19, 10, 27,
+ 35, 37, 63, 65, 67, 69, 93, 95,
+ 97, 99, 125, 127, 36, 38, 64, 66,
+ 68, 70, 94, 96, 98, 100, 126, 128,
+ 40, 72, 102, 130, 24, 26, 52, 54,
+ 56, 58, 82, 84, 86, 88, 114, 116,
+ 22, 50, 80, 112, 25, 27, 53, 55,
+ 57, 59, 83, 85, 87, 89, 115, 117,
+ 9, 11, 28, 7, 20, 10, 12, 23,
+ 29, 39, 41, 67, 69, 71, 73, 97,
+ 99, 101, 103, 129, 131, 37, 65, 95,
+ 127, 40, 42, 68, 70, 72, 74, 98,
+ 100, 102, 104, 130, 132, 26, 28, 54,
+ 56, 58, 84, 86, 88, 116, 118, 27,
+ 29, 55, 57, 59, 85, 87, 89, 117,
+ 119, 11, 13, 24, 12, 14, 25, 41,
+ 43, 69, 71, 73, 99, 101, 103, 131,
+ 133, 42, 44, 70, 72, 74, 100, 102,
+ 104, 132, 134, 16, 46, 47, 48, 78,
+ 79, 80, 108, 109, 110, 17, 49, 81,
+ 111, 31, 63, 93, 94, 95, 125, 32,
+ 64, 96, 126, 155, 156, 128, 158, 48,
+ 50, 78, 80, 82, 108, 110, 112, 140,
+ 46, 49, 51, 79, 81, 83, 109, 111,
+ 113, 141, 63, 65, 93, 95, 97, 125,
+ 127, 155, 64, 66, 94, 96, 98, 126,
+ 128, 156, 157, 158, 50, 52, 78, 80,
+ 82, 84, 108, 110, 112, 114, 140, 142,
+ 51, 53, 79, 81, 83, 85, 109, 111,
+ 113, 115, 141, 143, 55, 87, 117, 145,
+ 65, 67, 93, 95, 97, 99, 125, 127,
+ 129, 155, 157, 66, 68, 94, 96, 98,
+ 100, 126, 128, 130, 156, 158, 70, 102,
+ 132, 160, 159, 187, 188, 162, 190, 54,
+ 56, 82, 84, 86, 88, 112, 114, 116,
+ 118, 144, 146, 52, 80, 110, 142, 55,
+ 57, 83, 85, 87, 89, 113, 115, 117,
+ 119, 145, 147, 69, 71, 97, 99, 101,
+ 103, 127, 129, 131, 133, 159, 161, 67,
+ 95, 125, 157, 70, 72, 98, 100, 102,
+ 104, 128, 130, 132, 134, 160, 162, 163,
+ 189, 191, 155, 187, 158, 164, 190, 192,
+ 56, 58, 84, 86, 88, 114, 116, 118,
+ 146, 148, 57, 59, 85, 87, 89, 115,
+ 117, 119, 147, 149, 71, 73, 99, 101,
+ 103, 129, 131, 133, 161, 163, 72, 74,
+ 100, 102, 104, 130, 132, 134, 162, 164,
+ 159, 191, 193, 160, 192, 194, 78, 108,
+ 109, 110, 140, 170, 79, 111, 141, 171,
+ 143, 173, 46, 47, 93, 94, 95, 125,
+ 155, 156, 157, 187, 96, 126, 158, 188,
+ 108, 110, 140, 142, 170, 172, 78, 109,
+ 111, 141, 143, 171, 173, 80, 112, 79,
+ 81, 113, 125, 155, 157, 187, 93, 126,
+ 156, 158, 188, 110, 112, 140, 142, 144,
+ 170, 172, 174, 202, 111, 113, 141, 143,
+ 145, 171, 173, 175, 203, 115, 147, 177,
+ 205, 80, 82, 108, 114, 81, 83, 109,
+ 85, 117, 125, 127, 155, 157, 159, 187,
+ 189, 217, 126, 128, 156, 158, 160, 188,
+ 190, 218, 130, 162, 192, 220, 114, 116,
+ 142, 144, 146, 148, 172, 174, 176, 178,
+ 204, 206, 112, 140, 170, 202, 115, 117,
+ 143, 145, 147, 149, 173, 175, 177, 179,
+ 205, 207, 84, 86, 118, 82, 110, 85,
+ 87, 113, 119, 129, 131, 157, 159, 161,
+ 163, 187, 189, 191, 193, 219, 221, 127,
+ 155, 217, 130, 132, 158, 160, 162, 164,
+ 188, 190, 192, 194, 220, 222, 116, 118,
+ 144, 146, 148, 174, 176, 178, 206, 208,
+ 117, 119, 145, 147, 149, 175, 177, 179,
+ 207, 209, 86, 88, 114, 87, 89, 115,
+ 131, 133, 159, 161, 163, 189, 191, 193,
+ 221, 223, 132, 134, 160, 162, 164, 190,
+ 192, 194, 222, 224, 108, 109, 110, 140,
+ 170, 171, 172, 202, 111, 141, 173, 203,
+ 93, 125, 155, 156, 157, 187, 217, 94,
+ 126, 158, 188, 218, 140, 170, 172, 202,
+ 108, 141, 171, 173, 203, 125, 155, 157,
+ 187, 189, 217, 219, 126, 156, 158, 188,
+ 190, 218, 220, 140, 142, 170, 172, 174,
+ 202, 204, 141, 143, 171, 173, 175, 203,
+ 205, 145, 177, 207, 155, 157, 187, 189,
+ 217, 219, 156, 158, 188, 190, 218, 220,
+ 160, 192, 222, 144, 146, 172, 174, 176,
+ 178, 202, 204, 206, 208, 142, 170, 145,
+ 147, 173, 175, 177, 179, 203, 205, 207,
+ 209, 159, 161, 187, 189, 191, 193, 217,
+ 219, 221, 223, 157, 160, 162, 188, 190,
+ 192, 194, 218, 220, 222, 224, 146, 148,
+ 174, 176, 178, 204, 206, 208, 147, 149,
+ 175, 177, 179, 205, 207, 209, 161, 163,
+ 189, 191, 193, 219, 221, 223, 162, 164,
+ 190, 192, 194, 220, 222, 224,
+};
+
+static long _vq_fitmap_res0_128_1024_1[] = {
+ 0, 23, 63, 109, 155, 187, 217, 267,
+ 332, 397, 443, 471, 508, 567, 632, 678,
+ 704, 731, 782, 846, 892, 916, 939, 971,
+ 1014,
+};
+
+static long _vq_fitlength_res0_128_1024_1[] = {
+ 23, 40, 46, 46, 32, 30, 50, 65,
+ 65, 46, 28, 37, 59, 65, 46, 26,
+ 27, 51, 64, 46, 24, 23, 32, 43,
+ 32,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res0_128_1024_1 = {
+ -7, 1, 14, 5,
+ _vq_pigeonmap_res0_128_1024_1,
+ 1046,
+ _vq_fitlist_res0_128_1024_1,
+ _vq_fitmap_res0_128_1024_1,
+ _vq_fitlength_res0_128_1024_1
+};
+
static static_codebook _vq_book_res0_128_1024_1 = {
- 4, 81,
+ 2, 225,
_vq_lengthlist_res0_128_1024_1,
- 1, -535822336, 1611661312, 2, 0,
+ 1, -530841600, 1611661312, 4, 0,
_vq_quantlist_res0_128_1024_1,
NULL,
&_vq_auxt_res0_128_1024_1,
- NULL,
+ &_vq_auxp_res0_128_1024_1,
0
};
1.5.6.1 +39 -13 vorbis/lib/books/res0_128_1024_2.vqh
Index: res0_128_1024_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_2.vqh,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -u -r1.5 -r1.5.6.1
--- res0_128_1024_2.vqh 2001/02/26 03:50:52 1.5
+++ res0_128_1024_2.vqh 2001/07/08 08:48:05 1.5.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -25,16 +25,16 @@
};
static long _vq_lengthlist_res0_128_1024_2[] = {
- 3, 4, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 8, 8, 6,
- 8, 8, 4, 6, 6, 6, 8, 8, 6, 8, 8, 5, 7, 6, 7, 8,
- 8, 6, 8, 8, 6, 8, 8, 8,10,10, 8,10,10, 6, 8, 8,
- 8,10,10, 8,10,10, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
- 8, 8, 8,10,10, 8,10,10, 6, 8, 8, 8,10,10, 8,10,
- 10,
+ 1, 3, 4, 0, 0, 0, 0, 0, 0, 3, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res0_128_1024_2[] = {
- -0.5, 0.5,
+ -0.7, 0.7,
};
static long _vq_quantmap_res0_128_1024_2[] = {
@@ -48,6 +48,32 @@
3
};
+static long _vq_pigeonmap_res0_128_1024_2[] = {
+ 0, 0,
+};
+
+static long _vq_fitlist_res0_128_1024_2[] = {
+ 0, 1, 2, 9, 10, 11, 18, 19,
+ 20,
+};
+
+static long _vq_fitmap_res0_128_1024_2[] = {
+ 0,
+};
+
+static long _vq_fitlength_res0_128_1024_2[] = {
+ 9,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res0_128_1024_2 = {
+ -1, 1, 2, 1,
+ _vq_pigeonmap_res0_128_1024_2,
+ 9,
+ _vq_fitlist_res0_128_1024_2,
+ _vq_fitmap_res0_128_1024_2,
+ _vq_fitlength_res0_128_1024_2
+};
+
static static_codebook _vq_book_res0_128_1024_2 = {
4, 81,
_vq_lengthlist_res0_128_1024_2,
@@ -55,7 +81,7 @@
_vq_quantlist_res0_128_1024_2,
NULL,
&_vq_auxt_res0_128_1024_2,
- NULL,
+ NULL,//&_vq_auxp_res0_128_1024_2,
0
};
1.6.6.1 +45 -55 vorbis/lib/books/res0_128_1024_3.vqh
Index: res0_128_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_3.vqh,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- res0_128_1024_3.vqh 2001/02/26 03:50:52 1.6
+++ res0_128_1024_3.vqh 2001/07/08 08:48:05 1.6.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -19,79 +19,69 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_3[] = {
- 2,
1,
- 3,
0,
- 4,
+ 2,
};
static long _vq_lengthlist_res0_128_1024_3[] = {
- 2, 4, 4, 7, 7, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 7,
- 10,10,14,13, 7,10,10,14,14, 5, 7, 7, 9, 9, 7, 9,
- 9,12,12, 7, 9, 9,12,12,10,12,12,16,16,10,12,12,
- 16,17, 4, 7, 7, 9, 9, 7, 9, 9,12,12, 7, 9, 9,12,
- 12,10,12,12,17,16,10,12,12,16,16, 7,10, 9,13,13,
- 10,12,12,16,16,10,12,12,17,16,14,17,17,21,21,14,
- 16,17,21,22, 7,10,10,13,13,10,12,12,16,16,10,12,
- 12,16,17,14,17,16,19,20,14,16,16,19,21, 5, 7, 7,
- 10, 9, 7, 9, 9,12,12, 7, 9, 9,12,12,10,12,12,16,
- 17,10,12,12,17,16, 7, 9, 9,12,12, 9,12,12,14,14,
- 9,12,11,15,15,12,15,15,17,19,12,14,15,18,18, 7,
- 9, 9,12,12, 9,12,11,14,14, 9,12,12,14,14,12,15,
- 14,19,18,12,14,14,18,19,10,12,12,16,17,12,14,15,
- 18,19,12,15,15,18,19,17,17,19,19,22,17,19,19,20,
- 20,10,12,12,17,16,12,14,15,18,19,12,15,15,19,18,
- 16,18,17,21,20,17,19,19,20,21, 5, 7, 7, 9, 9, 7,
- 9, 9,12,12, 7, 9, 9,12,12,10,12,12,17,17,10,12,
- 12,17,16, 7, 9, 9,12,12, 9,12,12,14,14, 9,11,12,
- 14,14,12,14,15,19,19,12,14,14,18,18, 7, 9, 9,12,
- 12, 9,11,12,14,14, 9,12,11,14,14,12,14,15,18,20,
- 12,15,14,19,18,10,12,12,16,16,12,15,15,20,18,12,
- 14,14,19,19,16,19,19,21,20,16,18,20,21,20,10,12,
- 12,17,17,12,14,15,19,19,12,14,14,19,19,17,19,18,
- 20,21,16,19,17,20,20, 7,10,10,13,13,10,12,12,17,
- 17,10,12,12,17,17,13,16,17,21,21,13,16,17,20,20,
- 10,12,12,17,17,12,15,15,19,18,12,15,15,19,20,16,
- 19,18,20,21,17,19,18,20,21,10,12,12,17,16,12,15,
- 15,20,18,12,15,15,19,19,16,19,18,21,21,16,18,18,
- 21,21,14,17,17,20,19,17,18,18,21,21,17,18,19,21,
- 20,19,19,20,21,21,20,20,20,21,21,14,17,17,19,21,
- 16,19,18,21,19,17,19,19,21,20,21,20,19,21,20,20,
- 21,20,20,21, 7,10,10,13,13,10,12,12,17,17,10,12,
- 12,17,16,13,17,17,20,20,13,17,17,20,21,10,12,12,
- 16,17,12,15,15,19,18,12,15,15,21,18,17,19,18,21,
- 21,17,19,19,20,21,10,12,12,17,16,12,15,14,19,19,
- 12,15,14,20,19,16,19,18,20,21,17,19,18,21,20,14,
- 17,16,19,20,17,19,19,20,21,16,18,19,20,21,20,20,
- 21,21,21,20,21,21,21,21,14,17,17,19,21,17,19,19,
- 21,21,16,18,17,21,21,20,21,21,21,21,19,21,20,21,
- 21,
+ 2, 3, 3, 0, 0, 0, 0, 0, 0, 3, 4, 4, 0, 0, 0, 0,
+ 0, 0, 3, 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,
};
static float _vq_quantthresh_res0_128_1024_3[] = {
- -1.5, -0.5, 0.5, 1.5,
+ -0.7, 0.7,
};
static long _vq_quantmap_res0_128_1024_3[] = {
- 3, 1, 0, 2, 4,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_3 = {
_vq_quantthresh_res0_128_1024_3,
_vq_quantmap_res0_128_1024_3,
- 5,
- 5
+ 3,
+ 3
+};
+
+static long _vq_pigeonmap_res0_128_1024_3[] = {
+ 0, 0,
};
+static long _vq_fitlist_res0_128_1024_3[] = {
+ 0, 1, 2, 9, 10, 11, 18, 19,
+ 20,
+};
+
+static long _vq_fitmap_res0_128_1024_3[] = {
+ 0,
+};
+
+static long _vq_fitlength_res0_128_1024_3[] = {
+ 9,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res0_128_1024_3 = {
+ -1, 1, 2, 1,
+ _vq_pigeonmap_res0_128_1024_3,
+ 9,
+ _vq_fitlist_res0_128_1024_3,
+ _vq_fitmap_res0_128_1024_3,
+ _vq_fitlength_res0_128_1024_3
+};
+
static static_codebook _vq_book_res0_128_1024_3 = {
- 4, 625,
+ 4, 81,
_vq_lengthlist_res0_128_1024_3,
- 1, -533725184, 1611661312, 3, 0,
+ 1, -535822336, 1611661312, 2, 0,
_vq_quantlist_res0_128_1024_3,
NULL,
&_vq_auxt_res0_128_1024_3,
- NULL,
+ NULL,// &_vq_auxp_res0_128_1024_3,
0
};
1.6.6.1 +77 -47 vorbis/lib/books/res0_128_1024_4.vqh
Index: res0_128_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_4.vqh,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- res0_128_1024_4.vqh 2001/02/26 03:50:52 1.6
+++ res0_128_1024_4.vqh 2001/07/08 08:48:05 1.6.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -27,50 +27,50 @@
};
static long _vq_lengthlist_res0_128_1024_4[] = {
- 5, 6, 6, 8, 8, 6, 6, 6, 9, 9, 6, 6, 6, 9, 9, 8,
- 9, 9,11,11, 8, 9, 9,11,11, 6, 6, 6, 9, 9, 6, 7,
- 7,10,10, 6, 7, 7,10,10, 9,10,10,12,13, 9,10,10,
- 13,13, 6, 6, 6, 9, 9, 6, 7, 7,10,10, 6, 7, 7,10,
- 10, 9,10,10,13,12, 9,10,10,13,12, 8, 9, 9,12,12,
- 9,10,10,13,13, 9,10,10,13,13,12,13,13,15,15,12,
- 13,13,15,15, 8, 9, 9,12,12, 9,10,10,13,13, 9,10,
- 10,13,13,12,13,13,15,15,12,13,13,15,15, 6, 7, 7,
- 9, 9, 7, 8, 8,10,10, 6, 7, 8,10,10, 9,10,10,13,
- 13, 9,10,10,13,13, 6, 8, 7,10,10, 7, 8, 9,11,11,
- 7, 9, 9,11,11,10,11,11,14,14,10,11,11,14,13, 6,
- 8, 8,10,10, 7, 9, 8,11,11, 7, 9, 9,11,11,10,11,
- 11,14,14,10,11,11,14,14, 9,10,10,13,13,10,11,11,
- 14,14,10,11,11,14,14,13,13,14,15,17,13,14,14,17,
- 17, 9,10,10,13,14,10,11,11,15,14,10,11,11,14,14,
- 13,14,14,16,15,13,14,14,17,17, 6, 7, 7, 9, 9, 7,
- 7, 7,10,10, 7, 8, 7,10,10, 9,10,10,13,13, 9,10,
- 10,13,13, 6, 8, 7,10,10, 7, 9, 8,11,11, 7, 9, 9,
- 11,11,10,11,11,14,14,10,11,11,14,14, 6, 7, 8,10,
- 10, 7, 9, 9,11,11, 7, 9, 8,11,11,10,11,11,14,14,
- 10,11,11,14,14, 9,10,10,13,13,10,11,11,14,14,10,
- 11,11,14,14,13,14,14,16,16,13,14,15,16,16, 9,10,
- 10,13,13,10,11,11,14,14,10,11,11,14,14,13,14,14,
- 16,16,13,14,14,17,15, 8, 9,10,12,12, 9,11,11,14,
- 13, 9,10,10,13,13,12,14,14,16,16,12,14,13,16,16,
- 9,10,10,13,13,10,11,12,14,14,10,12,12,15,14,14,
- 14,15,16,17,14,14,15,17,17, 9,10,11,13,14,10,12,
- 11,14,14,10,11,12,14,14,13,15,15,17,16,13,14,15,
- 16,17,12,13,13,16,16,13,14,14,17,16,13,15,15,17,
- 17,15,16,17,18,18,17,17,17,18,20,12,14,13,16,16,
- 13,15,14,17,16,13,14,14,16,16,15,16,16,19,16,15,
- 17,17,18,19, 8, 9, 9,12,12, 9,10,10,13,13, 9,11,
- 10,14,13,12,14,13,16,16,12,13,14,16,15, 9,10,10,
- 14,13,10,12,11,15,14,10,11,12,15,15,13,14,14,17,
- 17,14,14,15,16,19, 9,10,10,13,14,10,11,12,14,15,
- 10,12,11,15,14,13,14,15,17,17,14,15,14,17,16,12,
- 14,13,16,16,13,15,14,17,17,13,14,14,16,17,16,16,
- 16,20,18,15,16,16,17,18,12,13,14,16,17,13,15,14,
- 18,17,13,14,14,16,17,16,17,16,20,19,15,18,16,20,
- 18,
+ 1, 4, 4, 6, 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, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 7, 9, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 6, 7, 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, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res0_128_1024_4[] = {
- -1.5, -0.5, 0.5, 1.5,
+ -1.5, -0.7, 0.7, 1.5,
};
static long _vq_quantmap_res0_128_1024_4[] = {
@@ -84,6 +84,36 @@
5
};
+static long _vq_pigeonmap_res0_128_1024_4[] = {
+ 1, 0, 0, 0,
+};
+
+static long _vq_fitlist_res0_128_1024_4[] = {
+ 0, 1, 2, 3, 25, 26, 27, 28,
+ 50, 51, 52, 53, 75, 76, 77, 78,
+ 4, 29, 54, 79, 100, 101, 102, 103,
+ 104,
+};
+
+static long _vq_fitmap_res0_128_1024_4[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static long _vq_fitlength_res0_128_1024_4[] = {
+ 25, 25, 25, 25, 25, 25, 25, 25,
+ 25, 25, 25, 25, 25, 25, 25, 25,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res0_128_1024_4 = {
+ -2, 1, 4, 2,
+ _vq_pigeonmap_res0_128_1024_4,
+ 25,
+ _vq_fitlist_res0_128_1024_4,
+ _vq_fitmap_res0_128_1024_4,
+ _vq_fitlength_res0_128_1024_4
+};
+
static static_codebook _vq_book_res0_128_1024_4 = {
4, 625,
_vq_lengthlist_res0_128_1024_4,
@@ -91,7 +121,7 @@
_vq_quantlist_res0_128_1024_4,
NULL,
&_vq_auxt_res0_128_1024_4,
- NULL,
+ &_vq_auxp_res0_128_1024_4,
0
};
1.6.6.1 +84 -35 vorbis/lib/books/res0_128_1024_5.vqh
Index: res0_128_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_5.vqh,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- res0_128_1024_5.vqh 2001/02/26 03:50:52 1.6
+++ res0_128_1024_5.vqh 2001/07/08 08:48:05 1.6.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -19,60 +19,109 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_5[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
2,
- 10,
1,
- 11,
+ 3,
0,
- 12,
+ 4,
};
static long _vq_lengthlist_res0_128_1024_5[] = {
- 1, 4, 4, 6, 6, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6,
- 9, 9, 9, 9,11,11,12,12,13,13, 4, 6, 6, 9, 9, 9,
- 9,11,11,12,12,13,13, 6, 9, 9,12,11,12,12,14,14,
- 15,14,15,16, 6, 9, 9,12,11,12,12,13,13,14,15,16,
- 16, 6, 9, 9,12,12,14,14,15,15,16,17,16,17, 7, 9,
- 9,12,12,14,14,15,15,16,16,16,16, 8,11,11,14,14,
- 15,15,16,16,17,17,18,18, 8,11,11,14,14,15,15,16,
- 16,16,18,17,18, 9,12,12,15,15,16,16,17,17,18,17,
- 19,18, 9,13,13,15,15,16,16,17,16,17,17,19,18,10,
- 14,14,16,17,17,17,18,18,18,18,19,19,10,14,14,16,
- 16,17,17,18,18,21,21,20,19,
+ 3, 4, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 3, 6, 6, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 4, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 6, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res0_128_1024_5[] = {
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5,
+ -1.5, -0.7, 0.7, 1.5,
};
static long _vq_quantmap_res0_128_1024_5[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_5 = {
_vq_quantthresh_res0_128_1024_5,
_vq_quantmap_res0_128_1024_5,
- 13,
- 13
+ 5,
+ 5
+};
+
+static long _vq_pigeonmap_res0_128_1024_5[] = {
+ 1, 0, 0, 0,
};
+static long _vq_fitlist_res0_128_1024_5[] = {
+ 0, 1, 2, 3, 25, 26, 27, 28,
+ 50, 51, 52, 53, 75, 76, 77, 78,
+ 4, 29, 54, 79, 100, 101, 102, 103,
+ 104,
+};
+
+static long _vq_fitmap_res0_128_1024_5[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static long _vq_fitlength_res0_128_1024_5[] = {
+ 25, 25, 25, 25, 25, 25, 25, 25,
+ 25, 25, 25, 25, 25, 25, 25, 25,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res0_128_1024_5 = {
+ -2, 1, 4, 2,
+ _vq_pigeonmap_res0_128_1024_5,
+ 25,
+ _vq_fitlist_res0_128_1024_5,
+ _vq_fitmap_res0_128_1024_5,
+ _vq_fitlength_res0_128_1024_5
+};
+
static static_codebook _vq_book_res0_128_1024_5 = {
- 2, 169,
+ 4, 625,
_vq_lengthlist_res0_128_1024_5,
- 1, -531103744, 1611661312, 4, 0,
+ 1, -533725184, 1611661312, 3, 0,
_vq_quantlist_res0_128_1024_5,
NULL,
&_vq_auxt_res0_128_1024_5,
- NULL,
+ &_vq_auxp_res0_128_1024_5,
0
};
1.6.6.1 +84 -35 vorbis/lib/books/res0_128_1024_6.vqh
Index: res0_128_1024_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_6.vqh,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- res0_128_1024_6.vqh 2001/02/26 03:50:52 1.6
+++ res0_128_1024_6.vqh 2001/07/08 08:48:05 1.6.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -19,60 +19,109 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_6[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
2,
- 10,
1,
- 11,
+ 3,
0,
- 12,
+ 4,
};
static long _vq_lengthlist_res0_128_1024_6[] = {
- 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 4, 5, 5,
- 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 5, 5, 6, 6, 7,
- 7, 8, 8, 9, 9,10,10, 6, 6, 6, 7, 7, 9, 9,10,10,
- 11,11,12,12, 5, 6, 6, 7, 7, 9, 9,10,10,11,11,12,
- 12, 7, 7, 7, 9, 9,10,10,11,11,12,12,13,13, 7, 7,
- 7, 9, 9,10,10,11,11,12,12,13,13, 8, 9, 9,10,10,
- 11,11,13,12,13,13,14,14, 8, 9, 9,10,10,11,11,12,
- 12,13,13,14,14, 9,10,10,11,11,12,13,13,13,14,14,
- 14,14, 9,10,10,11,11,12,12,13,13,14,14,15,14,10,
- 11,11,12,12,13,13,14,14,15,14,15,15,10,11,11,12,
- 12,13,13,14,14,15,15,15,15,
+ 1, 4, 3, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 5, 9, 9, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 3, 5, 6, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 9, 9,12,12,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 8, 9,10,12,12, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res0_128_1024_6[] = {
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5,
+ -4.5, -1.5, 1.5, 4.5,
};
static long _vq_quantmap_res0_128_1024_6[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_6 = {
_vq_quantthresh_res0_128_1024_6,
_vq_quantmap_res0_128_1024_6,
- 13,
- 13
+ 5,
+ 5
+};
+
+static long _vq_pigeonmap_res0_128_1024_6[] = {
+ 1, 0, 0, 0,
};
+static long _vq_fitlist_res0_128_1024_6[] = {
+ 0, 1, 2, 3, 25, 26, 27, 28,
+ 50, 51, 52, 53, 75, 76, 77, 78,
+ 4, 29, 54, 79, 100, 101, 102, 103,
+ 104,
+};
+
+static long _vq_fitmap_res0_128_1024_6[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static long _vq_fitlength_res0_128_1024_6[] = {
+ 25, 25, 25, 25, 25, 25, 25, 25,
+ 25, 25, 25, 25, 25, 25, 25, 25,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res0_128_1024_6 = {
+ -6, 3, 4, 2,
+ _vq_pigeonmap_res0_128_1024_6,
+ 25,
+ _vq_fitlist_res0_128_1024_6,
+ _vq_fitmap_res0_128_1024_6,
+ _vq_fitlength_res0_128_1024_6
+};
+
static static_codebook _vq_book_res0_128_1024_6 = {
- 2, 169,
+ 4, 625,
_vq_lengthlist_res0_128_1024_6,
- 1, -531103744, 1611661312, 4, 0,
+ 1, -531103744, 1614282752, 3, 0,
_vq_quantlist_res0_128_1024_6,
NULL,
&_vq_auxt_res0_128_1024_6,
- NULL,
+ &_vq_auxp_res0_128_1024_6,
0
};
1.6.6.1 +83 -78 vorbis/lib/books/res0_128_1024_7.vqh
Index: res0_128_1024_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_7.vqh,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- res0_128_1024_7.vqh 2001/02/26 03:50:53 1.6
+++ res0_128_1024_7.vqh 2001/07/08 08:48:05 1.6.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -19,104 +19,109 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_7[] = {
- 12,
- 11,
- 13,
- 10,
- 14,
- 9,
- 15,
- 8,
- 16,
- 7,
- 17,
- 6,
- 18,
- 5,
- 19,
- 4,
- 20,
- 3,
- 21,
2,
- 22,
1,
- 23,
+ 3,
0,
- 24,
+ 4,
};
static long _vq_lengthlist_res0_128_1024_7[] = {
- 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
- 8, 9, 9, 9, 9, 9, 9,10,10, 4, 6, 6, 7, 7, 8, 8,
- 9, 9, 9, 9,10,10, 9, 9,10,10,10,10,11,11,11,11,
- 12,12, 4, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10, 9,
- 9,10,10,10,10,11,11,11,11,12,12, 6, 7, 7, 9, 9,
- 9, 9,10,10,11,11,11,11,11,11,11,11,12,12,12,12,
- 13,13,13,13, 6, 7, 7, 8, 8, 9, 9,10,10,11,10,11,
- 11,11,11,11,11,12,12,12,12,13,13,13,13, 7, 8, 8,
- 9,10,10,10,11,11,11,12,12,12,12,12,12,12,13,13,
- 13,13,13,13,14,14, 7, 8, 8,10,10,10,10,11,11,11,
- 12,12,12,12,12,12,12,13,13,13,13,14,13,14,14, 8,
- 9, 9,10,10,11,11,12,12,13,12,13,13,13,13,13,13,
- 14,14,14,14,14,14,15,15, 8, 9, 9,10,10,11,11,12,
- 12,12,12,13,13,13,13,13,13,13,14,14,14,14,14,15,
- 15, 8,10,10,11,11,12,12,13,13,13,13,13,13,13,14,
- 14,14,15,14,14,15,15,15,15,15, 8,10,10,11,11,12,
- 12,13,13,13,13,13,13,13,13,14,14,14,14,14,15,15,
- 15,16,15, 9,10,10,11,12,12,12,13,13,14,14,14,14,
- 14,14,14,14,15,15,15,15,15,16,16,16, 9,10,10,12,
- 11,13,12,13,13,14,14,14,14,14,14,14,14,15,14,15,
- 15,16,15,16,16, 8,10,10,12,12,12,13,13,13,14,14,
- 14,14,14,14,15,15,15,15,15,16,16,16,16,17, 8,10,
- 10,12,11,12,12,13,13,14,14,14,14,14,14,15,15,15,
- 15,15,15,16,16,16,16, 9,11,11,12,12,13,13,14,13,
- 14,14,15,14,15,15,15,15,15,16,16,16,16,16,17,16,
- 9,11,11,12,12,13,13,14,14,14,14,14,14,15,14,15,
- 15,15,15,16,16,16,16,17,17, 9,11,11,13,13,14,14,
- 14,14,15,14,15,15,15,15,15,15,16,16,16,16,16,17,
- 17,17, 9,11,11,12,13,13,13,14,14,14,15,15,15,15,
- 15,15,16,17,16,16,17,16,16,17,17,10,12,11,13,13,
- 14,14,14,15,15,15,15,15,15,16,16,17,16,16,16,17,
- 17,17,17,18,10,12,12,13,13,14,14,15,14,15,15,15,
- 15,16,16,17,16,16,16,16,17,17,18,17,17,10,12,12,
- 14,13,15,15,15,15,16,15,16,16,16,16,17,16,17,16,
- 16,16,17,17,17,17,10,12,12,14,14,15,15,15,15,16,
- 15,16,16,17,16,16,17,17,16,17,17,16,17,18,18,11,
- 12,13,14,14,15,15,15,15,16,15,16,16,17,16,17,17,
- 18,17,18,18,18,17,18,18,11,13,13,14,14,14,15,15,
- 16,16,16,16,16,16,16,17,16,17,16,17,17,18,17,17,
- 18,
+ 1, 4, 4, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 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, 5, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 8, 8,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7, 7, 8, 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,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh_res0_128_1024_7[] = {
- -11.5, -10.5, -9.5, -8.5, -7.5, -6.5, -5.5, -4.5,
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
- 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5,
+ -4.5, -1.5, 1.5, 4.5,
};
static long _vq_quantmap_res0_128_1024_7[] = {
- 23, 21, 19, 17, 15, 13, 11, 9,
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8, 10, 12, 14, 16, 18, 20, 22,
- 24,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_7 = {
_vq_quantthresh_res0_128_1024_7,
_vq_quantmap_res0_128_1024_7,
+ 5,
+ 5
+};
+
+static long _vq_pigeonmap_res0_128_1024_7[] = {
+ 1, 0, 0, 0,
+};
+
+static long _vq_fitlist_res0_128_1024_7[] = {
+ 0, 1, 2, 3, 25, 26, 27, 28,
+ 50, 51, 52, 53, 75, 76, 77, 78,
+ 4, 29, 54, 79, 100, 101, 102, 103,
+ 104,
+};
+
+static long _vq_fitmap_res0_128_1024_7[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static long _vq_fitlength_res0_128_1024_7[] = {
+ 25, 25, 25, 25, 25, 25, 25, 25,
+ 25, 25, 25, 25, 25, 25, 25, 25,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res0_128_1024_7 = {
+ -6, 3, 4, 2,
+ _vq_pigeonmap_res0_128_1024_7,
25,
- 25
+ _vq_fitlist_res0_128_1024_7,
+ _vq_fitmap_res0_128_1024_7,
+ _vq_fitlength_res0_128_1024_7
};
static static_codebook _vq_book_res0_128_1024_7 = {
- 2, 625,
+ 4, 625,
_vq_lengthlist_res0_128_1024_7,
- 1, -529006592, 1611661312, 5, 0,
+ 1, -531103744, 1614282752, 3, 0,
_vq_quantlist_res0_128_1024_7,
NULL,
&_vq_auxt_res0_128_1024_7,
- NULL,
+ &_vq_auxp_res0_128_1024_7,
0
};
1.6.6.1 +89 -63 vorbis/lib/books/res0_128_1024_8.vqh
Index: res0_128_1024_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_8.vqh,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- res0_128_1024_8.vqh 2001/02/26 03:50:53 1.6
+++ res0_128_1024_8.vqh 2001/07/08 08:48:05 1.6.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -19,90 +19,116 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_8[] = {
- 21,
- 20,
- 22,
- 19,
- 23,
- 18,
- 24,
- 17,
- 25,
- 16,
- 26,
- 15,
- 27,
- 14,
- 28,
- 13,
- 29,
- 12,
- 30,
- 11,
- 31,
- 10,
- 32,
- 9,
- 33,
- 8,
- 34,
- 7,
- 35,
- 6,
- 36,
- 5,
- 37,
4,
- 38,
3,
- 39,
+ 5,
2,
- 40,
+ 6,
1,
- 41,
+ 7,
0,
- 42,
+ 8,
};
static long _vq_lengthlist_res0_128_1024_8[] = {
- 2, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6,
- 6, 7, 7, 7, 7, 7, 7, 8, 8, 7, 7, 7, 7, 8, 8, 8,
- 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
+ 1, 3, 4, 6, 6, 8, 8,10,10, 5, 5, 5, 7, 7, 9, 9,
+ 11,11, 6, 5, 5, 7, 7, 9, 9,11,11, 0, 7, 7, 8, 8,
+ 10,10,11,12, 0, 8, 8, 8, 8,10,10,12,12, 0,12,12,
+ 9, 9,11,11,12,12, 0,13,13,10, 9,11,11,12,12, 0,
+ 0, 0,11,11,11,11,13,13, 0, 0, 0,12,12,11,11,13,
+ 13,
};
static float _vq_quantthresh_res0_128_1024_8[] = {
- -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5, -13.5,
- -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5, -5.5,
- -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5,
- 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5,
- 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5, 18.5,
- 19.5, 20.5,
+ -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, 12.5, 17.5,
};
static long _vq_quantmap_res0_128_1024_8[] = {
- 41, 39, 37, 35, 33, 31, 29, 27,
- 25, 23, 21, 19, 17, 15, 13, 11,
- 9, 7, 5, 3, 1, 0, 2, 4,
- 6, 8, 10, 12, 14, 16, 18, 20,
- 22, 24, 26, 28, 30, 32, 34, 36,
- 38, 40, 42,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_8 = {
_vq_quantthresh_res0_128_1024_8,
_vq_quantmap_res0_128_1024_8,
- 43,
- 43
+ 9,
+ 9
+};
+
+static long _vq_pigeonmap_res0_128_1024_8[] = {
+ 2, 1, 1, 0, 0, 0, 1, 2,
+};
+
+static long _vq_fitlist_res0_128_1024_8[] = {
+ 0, 1, 2, 3, 9, 10, 11, 12,
+ 18, 19, 28, 4, 13, 20, 29, 6,
+ 15, 22, 31, 21, 37, 38, 24, 40,
+ 39, 55, 56, 42, 58, 1, 3, 5,
+ 7, 10, 12, 14, 16, 21, 23, 30,
+ 32, 0, 9, 19, 28, 2, 4, 6,
+ 8, 11, 13, 15, 17, 22, 24, 31,
+ 33, 25, 39, 41, 18, 37, 20, 26,
+ 40, 42, 43, 57, 59, 55, 38, 44,
+ 58, 60, 3, 5, 7, 12, 14, 16,
+ 23, 25, 32, 34, 4, 6, 8, 13,
+ 15, 17, 24, 26, 33, 35, 21, 41,
+ 43, 22, 42, 44, 39, 59, 61, 40,
+ 60, 62, 9, 10, 28, 29, 30, 46,
+ 47, 48, 11, 31, 49, 13, 33, 51,
+ 67, 0, 1, 12, 2, 4, 15, 18,
+ 19, 37, 38, 39, 55, 56, 57, 20,
+ 40, 58, 22, 42, 60, 76, 12, 14,
+ 28, 30, 32, 34, 46, 48, 50, 52,
+ 66, 68, 10, 13, 15, 29, 31, 33,
+ 35, 47, 49, 51, 53, 67, 69, 3,
+ 5, 16, 1, 9, 4, 6, 11, 17,
+ 21, 23, 37, 39, 41, 43, 55, 57,
+ 59, 61, 75, 77, 19, 22, 24, 38,
+ 40, 42, 44, 56, 58, 60, 62, 76,
+ 78, 14, 16, 30, 32, 34, 48, 50,
+ 52, 68, 70, 15, 17, 31, 33, 35,
+ 49, 51, 53, 69, 71, 5, 7, 12,
+ 6, 8, 13, 23, 25, 39, 41, 43,
+ 57, 59, 61, 77, 79, 24, 26, 40,
+ 42, 44, 58, 60, 62, 78, 80, 30,
+ 32, 46, 48, 50, 52, 66, 68, 70,
+ 28, 31, 33, 47, 49, 51, 53, 67,
+ 69, 71, 39, 41, 55, 57, 59, 61,
+ 75, 77, 79, 37, 40, 42, 56, 58,
+ 60, 62, 76, 78, 80, 32, 34, 48,
+ 50, 52, 66, 68, 70, 33, 35, 49,
+ 51, 53, 67, 69, 71, 41, 43, 57,
+ 59, 61, 75, 77, 79, 42, 44, 58,
+ 60, 62, 76, 78, 80,
+};
+
+static long _vq_fitmap_res0_128_1024_8[] = {
+ 0, 29, 74, 106, 142, 201, 142, 247,
+ 285,
+};
+
+static long _vq_fitlength_res0_128_1024_8[] = {
+ 29, 45, 32, 36, 59, 46, 59, 38,
+ 32,
};
+static encode_aux_pigeonhole _vq_auxp_res0_128_1024_8 = {
+ -20, 5, 8, 3,
+ _vq_pigeonmap_res0_128_1024_8,
+ 317,
+ _vq_fitlist_res0_128_1024_8,
+ _vq_fitmap_res0_128_1024_8,
+ _vq_fitlength_res0_128_1024_8
+};
+
static static_codebook _vq_book_res0_128_1024_8 = {
- 1, 43,
+ 2, 81,
_vq_lengthlist_res0_128_1024_8,
- 1, -527106048, 1611661312, 6, 0,
+ 1, -527171584, 1616117760, 4, 0,
_vq_quantlist_res0_128_1024_8,
NULL,
&_vq_auxt_res0_128_1024_8,
- NULL,
+ &_vq_auxp_res0_128_1024_8,
0
};
1.6.6.1 +30 -451 vorbis/lib/books/res0_128_1024_9.vqh
Index: res0_128_1024_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_9.vqh,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- res0_128_1024_9.vqh 2001/02/26 03:50:53 1.6
+++ res0_128_1024_9.vqh 2001/07/08 08:48:05 1.6.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
@@ -19,477 +19,56 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_9[] = {
- 170,
- 169,
- 171,
- 168,
- 172,
- 167,
- 173,
- 166,
- 174,
- 165,
- 175,
- 164,
- 176,
- 163,
- 177,
- 162,
- 178,
- 161,
- 179,
- 160,
- 180,
- 159,
- 181,
- 158,
- 182,
- 157,
- 183,
- 156,
- 184,
- 155,
- 185,
- 154,
- 186,
- 153,
- 187,
- 152,
- 188,
- 151,
- 189,
- 150,
- 190,
- 149,
- 191,
- 148,
- 192,
- 147,
- 193,
- 146,
- 194,
- 145,
- 195,
- 144,
- 196,
- 143,
- 197,
- 142,
- 198,
- 141,
- 199,
- 140,
- 200,
- 139,
- 201,
- 138,
- 202,
- 137,
- 203,
- 136,
- 204,
- 135,
- 205,
- 134,
- 206,
- 133,
- 207,
- 132,
- 208,
- 131,
- 209,
- 130,
- 210,
- 129,
- 211,
- 128,
- 212,
- 127,
- 213,
- 126,
- 214,
- 125,
- 215,
- 124,
- 216,
- 123,
- 217,
- 122,
- 218,
- 121,
- 219,
- 120,
- 220,
- 119,
- 221,
- 118,
- 222,
- 117,
- 223,
- 116,
- 224,
- 115,
- 225,
- 114,
- 226,
- 113,
- 227,
- 112,
- 228,
- 111,
- 229,
- 110,
- 230,
- 109,
- 231,
- 108,
- 232,
- 107,
- 233,
- 106,
- 234,
- 105,
- 235,
- 104,
- 236,
- 103,
- 237,
- 102,
- 238,
- 101,
- 239,
- 100,
- 240,
- 99,
- 241,
- 98,
- 242,
- 97,
- 243,
- 96,
- 244,
- 95,
- 245,
- 94,
- 246,
- 93,
- 247,
- 92,
- 248,
- 91,
- 249,
- 90,
- 250,
- 89,
- 251,
- 88,
- 252,
- 87,
- 253,
- 86,
- 254,
- 85,
- 255,
- 84,
- 256,
- 83,
- 257,
- 82,
- 258,
- 81,
- 259,
- 80,
- 260,
- 79,
- 261,
- 78,
- 262,
- 77,
- 263,
- 76,
- 264,
- 75,
- 265,
- 74,
- 266,
- 73,
- 267,
- 72,
- 268,
- 71,
- 269,
- 70,
- 270,
- 69,
- 271,
- 68,
- 272,
- 67,
- 273,
- 66,
- 274,
- 65,
- 275,
- 64,
- 276,
- 63,
- 277,
- 62,
- 278,
- 61,
- 279,
- 60,
- 280,
- 59,
- 281,
- 58,
- 282,
- 57,
- 283,
- 56,
- 284,
- 55,
- 285,
- 54,
- 286,
- 53,
- 287,
- 52,
- 288,
- 51,
- 289,
- 50,
- 290,
- 49,
- 291,
- 48,
- 292,
- 47,
- 293,
- 46,
- 294,
- 45,
- 295,
- 44,
- 296,
- 43,
- 297,
- 42,
- 298,
- 41,
- 299,
- 40,
- 300,
- 39,
- 301,
- 38,
- 302,
- 37,
- 303,
- 36,
- 304,
- 35,
- 305,
- 34,
- 306,
- 33,
- 307,
- 32,
- 308,
- 31,
- 309,
- 30,
- 310,
- 29,
- 311,
- 28,
- 312,
- 27,
- 313,
- 26,
- 314,
- 25,
- 315,
- 24,
- 316,
- 23,
- 317,
- 22,
- 318,
- 21,
- 319,
- 20,
- 320,
- 19,
- 321,
- 18,
- 322,
- 17,
- 323,
- 16,
- 324,
- 15,
- 325,
- 14,
- 326,
- 13,
- 327,
- 12,
- 328,
- 11,
- 329,
- 10,
- 330,
- 9,
- 331,
- 8,
- 332,
- 7,
- 333,
6,
- 334,
5,
- 335,
+ 7,
4,
- 336,
+ 8,
3,
- 337,
+ 9,
2,
- 338,
+ 10,
1,
- 339,
+ 11,
0,
- 340,
+ 12,
};
static long _vq_lengthlist_res0_128_1024_9[] = {
- 3, 3, 3, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6,
- 6, 6, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,11,10,11,11,11,11,11,11,11,11,11,
- 11,11,11,12,11,12,12,12,12,12,12,12,12,12,12,12,
- 12,12,12,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,14,14,13,14,13,14,14,14,14,
- 14,14,14,14,14,14,14,14,15,15,15,14,15,15,15,15,
- 15,15,15,15,15,15,15,15,16,15,15,15,15,15,15,15,
- 15,15,15,16,16,16,16,16,16,16,17,16,16,17,17,16,
- 16,16,16,16,16,16,16,16,16,16,17,17,17,17,17,18,
- 17,17,17,17,18,17,18,18,17,17,18,17,17,19,20,18,
- 19,18,18,17,18,17,18,17,18,18,19,18,18,18,19,19,
- 18,19,19,20,18,19,19,18,19,19,17,19,19,19,20,19,
- 20,20,20,20,19,19,19,19,20,20,19,19,20,18,20,19,
- 20,20,19,19,20,20,19,20,19,20,20,20,19,20,20,19,
- 20,18,20,20,20,20,20,20,20,20,20,19,20,20,20,19,
- 20,20,20,20,20,20,19,20,19,20,20,20,20,20,20,20,
- 19,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
- 20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
- 20,19,19,20,20,
+ 1, 3, 3, 7, 7,12,11,14,14,17,17,16,16, 5, 4, 5,
+ 9, 9,14,13,16,13,15,15,15,16, 6, 5, 5, 9, 9,15,
+ 12,14,15,15,15,16,16,16, 8, 8,11,11,15,15,15,14,
+ 16,16,16,16,16, 9, 9,11,10,15,15,16,16,15,16,15,
+ 16,16,12,13,10,10,15,16,16,16,16,16,16,16,16,14,
+ 13,11,11,15,16,16,16,16,16,16,16,16,16,16,12,11,
+ 14,14,15,16,16,16,16,16,16,16,16,11,12,14,15,16,
+ 16,16,16,16,16,16,16,16,15,14,14,14,14,15,16,16,
+ 16,16,16,16,16,16,14,13,14,16,15,16,16,16,16,16,
+ 16,16,16,16,16,16,14,15,16,16,16,16,16,16,16,16,
+ 16,16,16,15,16,15,16,16,16,
};
static float _vq_quantthresh_res0_128_1024_9[] = {
- -169.5, -168.5, -167.5, -166.5, -165.5, -164.5, -163.5, -162.5,
- -161.5, -160.5, -159.5, -158.5, -157.5, -156.5, -155.5, -154.5,
- -153.5, -152.5, -151.5, -150.5, -149.5, -148.5, -147.5, -146.5,
- -145.5, -144.5, -143.5, -142.5, -141.5, -140.5, -139.5, -138.5,
- -137.5, -136.5, -135.5, -134.5, -133.5, -132.5, -131.5, -130.5,
- -129.5, -128.5, -127.5, -126.5, -125.5, -124.5, -123.5, -122.5,
- -121.5, -120.5, -119.5, -118.5, -117.5, -116.5, -115.5, -114.5,
- -113.5, -112.5, -111.5, -110.5, -109.5, -108.5, -107.5, -106.5,
- -105.5, -104.5, -103.5, -102.5, -101.5, -100.5, -99.5, -98.5,
- -97.5, -96.5, -95.5, -94.5, -93.5, -92.5, -91.5, -90.5,
- -89.5, -88.5, -87.5, -86.5, -85.5, -84.5, -83.5, -82.5,
- -81.5, -80.5, -79.5, -78.5, -77.5, -76.5, -75.5, -74.5,
- -73.5, -72.5, -71.5, -70.5, -69.5, -68.5, -67.5, -66.5,
- -65.5, -64.5, -63.5, -62.5, -61.5, -60.5, -59.5, -58.5,
- -57.5, -56.5, -55.5, -54.5, -53.5, -52.5, -51.5, -50.5,
- -49.5, -48.5, -47.5, -46.5, -45.5, -44.5, -43.5, -42.5,
- -41.5, -40.5, -39.5, -38.5, -37.5, -36.5, -35.5, -34.5,
- -33.5, -32.5, -31.5, -30.5, -29.5, -28.5, -27.5, -26.5,
- -25.5, -24.5, -23.5, -22.5, -21.5, -20.5, -19.5, -18.5,
- -17.5, -16.5, -15.5, -14.5, -13.5, -12.5, -11.5, -10.5,
- -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5,
- -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5,
- 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5,
- 14.5, 15.5, 16.5, 17.5, 18.5, 19.5, 20.5, 21.5,
- 22.5, 23.5, 24.5, 25.5, 26.5, 27.5, 28.5, 29.5,
- 30.5, 31.5, 32.5, 33.5, 34.5, 35.5, 36.5, 37.5,
- 38.5, 39.5, 40.5, 41.5, 42.5, 43.5, 44.5, 45.5,
- 46.5, 47.5, 48.5, 49.5, 50.5, 51.5, 52.5, 53.5,
- 54.5, 55.5, 56.5, 57.5, 58.5, 59.5, 60.5, 61.5,
- 62.5, 63.5, 64.5, 65.5, 66.5, 67.5, 68.5, 69.5,
- 70.5, 71.5, 72.5, 73.5, 74.5, 75.5, 76.5, 77.5,
- 78.5, 79.5, 80.5, 81.5, 82.5, 83.5, 84.5, 85.5,
- 86.5, 87.5, 88.5, 89.5, 90.5, 91.5, 92.5, 93.5,
- 94.5, 95.5, 96.5, 97.5, 98.5, 99.5, 100.5, 101.5,
- 102.5, 103.5, 104.5, 105.5, 106.5, 107.5, 108.5, 109.5,
- 110.5, 111.5, 112.5, 113.5, 114.5, 115.5, 116.5, 117.5,
- 118.5, 119.5, 120.5, 121.5, 122.5, 123.5, 124.5, 125.5,
- 126.5, 127.5, 128.5, 129.5, 130.5, 131.5, 132.5, 133.5,
- 134.5, 135.5, 136.5, 137.5, 138.5, 139.5, 140.5, 141.5,
- 142.5, 143.5, 144.5, 145.5, 146.5, 147.5, 148.5, 149.5,
- 150.5, 151.5, 152.5, 153.5, 154.5, 155.5, 156.5, 157.5,
- 158.5, 159.5, 160.5, 161.5, 162.5, 163.5, 164.5, 165.5,
- 166.5, 167.5, 168.5, 169.5,
+ -148.5, -121.5, -94.5, -67.5, -40.5, -13.5, 13.5, 40.5,
+ 67.5, 94.5, 121.5, 148.5,
};
static long _vq_quantmap_res0_128_1024_9[] = {
- 339, 337, 335, 333, 331, 329, 327, 325,
- 323, 321, 319, 317, 315, 313, 311, 309,
- 307, 305, 303, 301, 299, 297, 295, 293,
- 291, 289, 287, 285, 283, 281, 279, 277,
- 275, 273, 271, 269, 267, 265, 263, 261,
- 259, 257, 255, 253, 251, 249, 247, 245,
- 243, 241, 239, 237, 235, 233, 231, 229,
- 227, 225, 223, 221, 219, 217, 215, 213,
- 211, 209, 207, 205, 203, 201, 199, 197,
- 195, 193, 191, 189, 187, 185, 183, 181,
- 179, 177, 175, 173, 171, 169, 167, 165,
- 163, 161, 159, 157, 155, 153, 151, 149,
- 147, 145, 143, 141, 139, 137, 135, 133,
- 131, 129, 127, 125, 123, 121, 119, 117,
- 115, 113, 111, 109, 107, 105, 103, 101,
- 99, 97, 95, 93, 91, 89, 87, 85,
- 83, 81, 79, 77, 75, 73, 71, 69,
- 67, 65, 63, 61, 59, 57, 55, 53,
- 51, 49, 47, 45, 43, 41, 39, 37,
- 35, 33, 31, 29, 27, 25, 23, 21,
- 19, 17, 15, 13, 11, 9, 7, 5,
- 3, 1, 0, 2, 4, 6, 8, 10,
- 12, 14, 16, 18, 20, 22, 24, 26,
- 28, 30, 32, 34, 36, 38, 40, 42,
- 44, 46, 48, 50, 52, 54, 56, 58,
- 60, 62, 64, 66, 68, 70, 72, 74,
- 76, 78, 80, 82, 84, 86, 88, 90,
- 92, 94, 96, 98, 100, 102, 104, 106,
- 108, 110, 112, 114, 116, 118, 120, 122,
- 124, 126, 128, 130, 132, 134, 136, 138,
- 140, 142, 144, 146, 148, 150, 152, 154,
- 156, 158, 160, 162, 164, 166, 168, 170,
- 172, 174, 176, 178, 180, 182, 184, 186,
- 188, 190, 192, 194, 196, 198, 200, 202,
- 204, 206, 208, 210, 212, 214, 216, 218,
- 220, 222, 224, 226, 228, 230, 232, 234,
- 236, 238, 240, 242, 244, 246, 248, 250,
- 252, 254, 256, 258, 260, 262, 264, 266,
- 268, 270, 272, 274, 276, 278, 280, 282,
- 284, 286, 288, 290, 292, 294, 296, 298,
- 300, 302, 304, 306, 308, 310, 312, 314,
- 316, 318, 320, 322, 324, 326, 328, 330,
- 332, 334, 336, 338, 340,
+ 11, 9, 7, 5, 3, 1, 0, 2,
+ 4, 6, 8, 10, 12,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_9 = {
_vq_quantthresh_res0_128_1024_9,
_vq_quantmap_res0_128_1024_9,
- 341,
- 341
+ 13,
+ 13
};
static static_codebook _vq_book_res0_128_1024_9 = {
- 1, 341,
+ 2, 169,
_vq_lengthlist_res0_128_1024_9,
- 1, -520798208, 1611661312, 9, 0,
+ 1, -520863744, 1620770816, 4, 0,
_vq_quantlist_res0_128_1024_9,
NULL,
&_vq_auxt_res0_128_1024_9,
1.6.6.1 +14 -14 vorbis/lib/books/res0_128_1024aux.vqh
Index: res0_128_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024aux.vqh,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- res0_128_1024aux.vqh 2001/02/26 03:50:53 1.6
+++ res0_128_1024aux.vqh 2001/07/08 08:48:05 1.6.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
* *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
* *
********************************************************************
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res0_128_1024aux[] = {
- 3, 6,10, 9,12, 9,15,12,15,20, 5, 3, 4, 5, 7, 6,
- 12,11,12,15, 9, 4, 4, 5, 6, 8,11,13,16,17, 8, 4,
- 5, 5, 7, 6,11,10,13,16,12, 7, 6, 7, 8, 9,10,12,
- 16,20, 8, 6, 7, 6, 9, 6,10, 9,12,19,14,10, 9, 8,
- 7, 7, 8, 9,12,18, 9, 9,10, 8, 9, 6, 8, 7, 9,15,
- 11,11,12,10,10, 8, 7, 6, 8,13,12,12,13,12,11,10,
- 6, 6, 7,12,
+ 4, 9, 6, 9, 9,11, 8,13,10,13, 8, 3,20,20,20,20,
+ 20,20, 6,10, 6,20, 4, 4, 5, 7, 6,11,11,18, 9,20,
+ 4, 3, 5, 5, 7,11,13,20, 9,20, 5, 5, 6, 7, 7,12,
+ 13,20,11,20, 7, 5, 7, 6, 8,12,16,20, 8,20, 6, 7,
+ 6, 8, 7,12,12,20,13,20,11,11,12,12,12,13,17,19,
+ 9, 5,10,13,12,15,12,16, 5, 8,12, 7,16,18,19,19,
+ 17,19, 7, 9,
};
static static_codebook _huff_book_res0_128_1024aux = {
1.6.6.1 +15 -22 vorbis/lib/books/res0_128_128aux.vqh
Index: res0_128_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128aux.vqh,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- res0_128_128aux.vqh 2001/02/26 03:50:53 1.6
+++ res0_128_128aux.vqh 2001/07/08 08:48:05 1.6.6.1
@@ -1,13 +1,13 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
* *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
* *
********************************************************************
@@ -20,24 +20,17 @@
#include "codebook.h"
static long _huff_lengthlist_res0_128_128aux[] = {
- 13,16,16,16,16,16,12,11,13,14,16,16,11,11,13,13,
- 16,16,10,13,14,14,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,10,10,12,14,16,16, 5, 3, 7,13,16,16,
- 6, 5, 9,14,16,16,10,12,14,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16, 8, 9,11,11,16,16, 4, 3,
- 8,13,16,16, 7, 6,10,14,16,16,11,13,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,10,10,12,15,
- 16,16, 9, 2, 4, 9,16,16,11, 3, 5, 9,16,16,13, 8,
- 9,13,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 13,15,16,16,16,16,15, 5, 7,12,16,16,16, 6, 7,12,
- 16,16,15,11,12,15,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16, 8,10,15,16,16,
- 16,10,10,15,16,16,16,14,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,
+ 6, 9, 5, 7, 9, 9,10,12,13,13, 9, 3,17,17,17,17,
+ 17,17,10,15, 5,17, 2, 3, 6, 5, 8, 9,12,17, 7,17,
+ 4, 4, 8, 6,10,10,15,17, 8,17, 6, 7,10, 9,12,11,
+ 15,15, 9,17, 5, 6, 9, 6,10, 9,13,16,10,17, 9,10,
+ 11,10,12,10,15,16,10,17, 9,10,12,10,11,10,14,14,
+ 11, 4,13,16,15,16,14,13, 9,13,14, 6,15,17,16,17,
+ 14,16,10,12,
};
static static_codebook _huff_book_res0_128_128aux = {
- 3, 216,
+ 2, 100,
_huff_lengthlist_res0_128_128aux,
0, 0, 0, 0, 0,
NULL,
No revision
No revision
1.14.4.5.2.1 +184 -167 vorbis/lib/modes/mode_A.h
Index: mode_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_A.h,v
retrieving revision 1.14.4.5
retrieving revision 1.14.4.5.2.1
diff -u -r1.14.4.5 -r1.14.4.5.2.1
--- mode_A.h 2001/05/23 02:15:24 1.14.4.5
+++ mode_A.h 2001/07/08 08:48:07 1.14.4.5.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.14.4.5 2001/05/23 02:15:24 xiphmont Exp $
+ last mod: $Id: mode_A.h,v 1.14.4.5.2.1 2001/07/08 08:48:07 xiphmont Exp $
********************************************************************/
@@ -22,7 +22,6 @@
#include "vorbis/codec.h"
#include "backends.h"
-#include "books/line0_class0.vqh"
#include "books/line0_class1.vqh"
#include "books/line0_class2.vqh"
#include "books/line1_class0.vqh"
@@ -31,7 +30,6 @@
#include "books/line1_class3.vqh"
#include "books/line0_0sub0.vqh"
-#include "books/line0_0sub1.vqh"
#include "books/line0_1sub1.vqh"
#include "books/line0_1sub2.vqh"
#include "books/line0_1sub3.vqh"
@@ -53,32 +51,39 @@
#include "books/res0_128_128aux.vqh"
#include "books/res0_128_1024aux.vqh"
-#include "books/res0_128_128_1.vqh"
-#include "books/res0_128_128_2.vqh"
-#include "books/res0_128_128_3.vqh"
-#include "books/res0_128_128_4.vqh"
-#include "books/res0_128_128_5.vqh"
-
#include "books/res0_128_1024_1.vqh"
#include "books/res0_128_1024_2.vqh"
#include "books/res0_128_1024_3.vqh"
#include "books/res0_128_1024_4.vqh"
#include "books/res0_128_1024_5.vqh"
#include "books/res0_128_1024_6.vqh"
+#include "books/res0_128_1024_6a.vqh"
#include "books/res0_128_1024_7.vqh"
+#include "books/res0_128_1024_7a.vqh"
#include "books/res0_128_1024_8.vqh"
+#include "books/res0_128_1024_8a.vqh"
#include "books/res0_128_1024_9.vqh"
+#include "books/res0_128_1024_9a.vqh"
+#include "books/res0_128_1024_9b.vqh"
+
+static vorbis_info_psy_global _psy_set_AG={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+};
static vorbis_info_psy _psy_set_A0={
- 1,/*athp*/
- 1,/*decayp*/
+ ATH_Bark_dB_lineaggressive,
-100.,
-140.,
- 8,
-
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
@@ -95,26 +100,29 @@
{-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/
{-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*16000*/
+
+
},
1,/* peakattp */
- {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*63*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*88*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*125*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*175*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*250*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*350*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*500*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-22.f,-22.f},/*700*/
+ {{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*63*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*88*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*125*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*175*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*250*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*350*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-26.f,-26.f,-26.f},/*700*/
{-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-22.f,-22.f},/*1000*/
{-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*1400*/
{-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*2000*/
@@ -132,41 +140,38 @@
.5f, /* high window */
5,
5,
- 10,
- {.000f, 0.f,/*63*/
- .000f, 0.f,/*88*/
- .000f, 0.f,/*125*/
- .000f, 0.f,/*175*/
- .000f, 0.f,/*250*/
- .000f, 0.f,/*350*/
- .000f, 0.f,/*500*/
+ -1,
+ {.300f, 0.f,/*63*/
+ .300f, 0.f,/*88*/
+ .300f, 0.f,/*125*/
+ .300f, 0.f,/*175*/
+ .300f, 0.f,/*250*/
+ .300f, 0.f,/*350*/
+ .300f, 0.f,/*500*/
.300f, 0.f,/*700*/
.500f, 0.f,/*1000*/
.500f, 0.f,/*1400*/
.500f, 0.f,/*2000*/
.500f, 0.f,/*2800*/
- .600f, 0.f,/*4000*/
+ .700f, 0.f,/*4000*/
.700f, 0.f,/*5600*/
.850f, 0.f,/*8000*/
.900f, 0.f,/*11500*/
.900f, 0.f,/*16000*/
},
- 95.f, /* even decade + 5 is important; saves an rint() later in a
+ 90.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -22.,
+ -26.,
};
static vorbis_info_psy _psy_set_A={
- 1,/*athp*/
- 1,/*decayp*/
+ ATH_Bark_dB_lineaggressive,
-100.f,
-140.f,
- 8,
-
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
@@ -176,43 +181,43 @@
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
-
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
{-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
{-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+
+ {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
{-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
- {-30.f,-30.f,-33.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*11500*/
- {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*16000*/
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-45.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*16000*/
},
1,/* peakattp */
- {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*63*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*88*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*125*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-24.f,-24.f,-24.f},/*175*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-24.f,-24.f,-24.f},/*250*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*350*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*500*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*700*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1000*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1400*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2000*/
- {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2400*/
- {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*4000*/
- {-10.f,-10.f,-10.f,-12.f,-12.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*5600*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*8000*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*11500*/
+ {{-14.f,-16.f,-18.f,-19.f,-24.f,-30.f,-30.f,-30.f,-30.f,-30.f,-32.f},/*63*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-30.f,-30.f,-30.f,-30.f,-30.f,-32.f},/*88*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-30.f,-30.f,-30.f,-30.f,-30.f,-32.f},/*125*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-20.f,-26.f,-30.f,-30.f,-30.f,-32.f},/*175*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-26.f,-30.f,-30.f,-32.f},/*250*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-26.f},/*350*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-26.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*700*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*1000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*1400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*2000*/
+ {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*2400*/
+ {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*4000*/
+ {-10.f,-10.f,-10.f,-12.f,-12.f,-14.f,-16.f,-18.f,-22.f,-24.f,-26.f},/*5600*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-26.f},/*8000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-26.f},/*11500*/
{-10.f,-10.f,-10.f,-10.f,-10.f,-12.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*16000*/
},
@@ -220,21 +225,21 @@
-24.f, /* suppress any noise curve over maxspec+n */
.5f, /* low window */
.5f, /* high window */
- 25,
- 25,
- 40,
- {.000f, 0.f, /*63*/
- .000f, 0.f, /*88*/
- .000f, 0.f, /*125*/
- .000f, 0.f, /*175*/
- .000f, 0.f, /*250*/
- .000f, 0.f, /*350*/
- .000f, 0.f, /*500*/
- .200f, 0.f, /*700*/
+ 10,
+ 10,
+ -1,
+ {.300f, 0.f, /*63*/
+ .300f, 0.f, /*88*/
+ .300f, 0.f, /*125*/
+ .300f, 0.f, /*175*/
+ .400f, 0.f, /*250*/
+ .400f, 0.f, /*350*/
+ .400f, 0.f, /*500*/
+ .400f, 0.f, /*700*/
.300f, 0.f, /*1000*/
- .400f, 0.f, /*1400*/
- .400f, 0.f, /*2000*/
- .400f, 0.f, /*2800*/
+ .300f, 0.f, /*1400*/
+ .300f, 0.f, /*2000*/
+ .300f, 0.f, /*2800*/
.700f, 0.f, /*4000*/
.850f, 0.f, /*5600*/
.900f, 0.f, /*8000*/
@@ -250,44 +255,46 @@
/* with GNUisms, this could be short and readable. Oh well */
static vorbis_info_time0 _time_set0A={0};
-/*static vorbis_info_floor0 _floor_set0A={12, 44100, 64, 10,130, 2, {0,1},
- 0.199f, .285f};*/
+/*static vorbis_info_floor0 _floor_set0A={9, 44100, 64, 10,130, 2, {0,1},
+ 0.246f, .387f};*/
/*static vorbis_info_floor0 _floor_set1A={30, 44100, 256, 12,150, 2, {2,3},
.082f, .126f};*/
-static vorbis_info_floor1 _floor_set0A={4,
- {0,1,2,2},
-
- {3,3,3},
- {1,2,2},
+static vorbis_info_floor1 _floor_set0A={3,
{0,1,2},
- {{3,4},{-1,5,6,7},{-1,8,9,10}},
+
+ {1,3,3},
+ {0,2,2},
+ {-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+
+ 2,
- 4,
- {0,128,
- 5,21,
-
- 2,1,3,
- 11,7,15,
- 45,30,73},
+ {0,128,
+
+ 7,
+
+ 2,1,4,
+ 23,13,45},
- 60,30,600,
+ 60,30,500,
999,999,0,18.,
- 8,96};
+ 8,70,
+ 96};
static vorbis_info_floor1 _floor_set1A={10,
{0,1,2,2,2,2,2, 3,3,3},
{3,4,3,3},
{1,1,2,2},
- {11,12,13,14},
- {{15,16},
- {17,18},
- {-1,19,20,21},
- {-1,22,23,24},
+ {9,10,11,12},
+ {{13,14},
+ {15,16},
+ {-1,17,18,19},
+ {-1,20,21,22},
},
- 4,
+ 2,
{0,1024,
88,31,243,
@@ -299,32 +306,51 @@
329,282,387, 672,553,825
},
- 60,30,600,
+ 60,30,400,
20,8,1,18.,
- 20,600};
-
-static vorbis_info_residue0 _residue_set0A={0,96,16,6,25,
- {0,1,1,1,1,1},
- {27,28,29,30,31},
-
- {0,99999,9999,9999,9999},
- {999.f,1.5f,3.5f,15.5f,26.5f},
- {4,4,4,4,4},
- {99,99,99,99,99}};
-
-static vorbis_info_residue0 _residue_set1A={0, 960, 32,10,26,
- {0,1,1,1,1,1,1,1,1,1},
- {32,33,34,35,36,37,38,39,40},
-
- {0,8,9999,16,9999,
- 24,9999,9999,9999},
- {999.f,1.5f,1.5f,2.5f,2.5f,
- 6.5f,6.5f,12.5f,22.5f},
- {5,5,5,5,5,5,5,5,5},
- {99,99,99,99,99,99,99,99,99}};
+ 20,600,
+ 704};
-static vorbis_info_mapping0 _mapping_set0A={1, {0,0}, {0}, {0}, {0}, {0}};
-static vorbis_info_mapping0 _mapping_set1A={1, {0,0}, {0}, {1}, {1}, {1}};
+static vorbis_info_residue0 _residue_set0A={0,192,12,10,23,
+ {0,1,1,1,1,1,3,3,3,7},
+ {25,26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,32,
+ 33,34,
+ 35,36,
+ 37,38},
+ {9999,9999,3,9999,4,9999,8,
+ 9999,9999,9999},
+ {.7f,7.5f,1.5f,1.5f,2.5f,2.5f,
+ 7.5f,7.5f,22.5f},
+ {0},
+ {99,4,99,99,99,99,99,99,99,99}};
+
+static vorbis_info_residue0 _residue_set1A={0,1408, 32,10,24,
+ {0,1,1,1,1,1,3,3,3,7},
+ {25,26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,32,
+ 33,34,
+ 35,36,
+ 37,38},
+ {9999,9999,5,9999,10,9999,20,
+ 9999,9999,9999},
+ {.7f,7.5f,1.5f,1.5f,2.5f,2.5f,
+ 7.5f,7.5f,22.5f},
+ {0},
+ {99,12,99,99,99,99,99,99,99,99}};
+
+static vorbis_info_mapping0 _mapping_set0A={1, {0,0}, {0}, {0}, {0}, {0},
+ 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set1A={1, {0,0}, {0}, {1}, {1}, {1},
+ 1,{0},{1}};
static vorbis_info_mode _mode_set0A={0,0,0,0};
static vorbis_info_mode _mode_set1A={1,0,0,1};
@@ -334,7 +360,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 41, 2,
+ 2, 2, 1, 2, 2, 39, 2,
/* modes */
{&_mode_set0A,&_mode_set1A},
/* maps */
@@ -344,68 +370,59 @@
/* floors */
{1,1},{&_floor_set0A,&_floor_set1A},
/* residue */
- {1,1},{&_residue_set0A,&_residue_set1A},
+ {2,2},{&_residue_set0A,&_residue_set1A},
/* books */
- {&_huff_book_line0_class0, /* 0 */
+
+ {
&_huff_book_line0_class1,
- &_huff_book_line0_class2, /* 2 */
+ &_huff_book_line0_class2, /* 1 */
- &_huff_book_line0_0sub0, /* 3 */
- &_huff_book_line0_0sub1,
- &_huff_book_line0_1sub1, /* 5 */
+ &_huff_book_line0_0sub0, /* 2 */
+ &_huff_book_line0_1sub1, /* 3 */
&_huff_book_line0_1sub2,
- &_huff_book_line0_1sub3, /* 7 */
+ &_huff_book_line0_1sub3, /* 5 */
&_huff_book_line0_2sub1,
- &_huff_book_line0_2sub2, /* 9 */
+ &_huff_book_line0_2sub2, /* 7 */
&_huff_book_line0_2sub3,
&_huff_book_line1_class0,
- &_huff_book_line1_class1, /* 12 */
+ &_huff_book_line1_class1, /* 10 */
&_huff_book_line1_class2,
- &_huff_book_line1_class3, /* 14 */
+ &_huff_book_line1_class3, /* 12 */
&_huff_book_line1_0sub0,
- &_huff_book_line1_0sub1, /* 16 */
+ &_huff_book_line1_0sub1, /* 14 */
&_huff_book_line1_1sub0,
&_huff_book_line1_1sub1,
&_huff_book_line1_2sub1,
- &_huff_book_line1_2sub2, /* 20 */
+ &_huff_book_line1_2sub2, /* 18 */
&_huff_book_line1_2sub3,
&_huff_book_line1_3sub1,
&_huff_book_line1_3sub2,
- &_huff_book_line1_3sub3, /* 24 */
+ &_huff_book_line1_3sub3, /* 22 */
&_huff_book_res0_128_128aux,
&_huff_book_res0_128_1024aux,
- &_vq_book_res0_128_128_1,
- &_vq_book_res0_128_128_2,
- &_vq_book_res0_128_128_3,
- &_vq_book_res0_128_128_4,
- &_vq_book_res0_128_128_5,
-
&_vq_book_res0_128_1024_1,
- &_vq_book_res0_128_1024_2,
+ &_vq_book_res0_128_1024_2,
&_vq_book_res0_128_1024_3,
- &_vq_book_res0_128_1024_4,
+ &_vq_book_res0_128_1024_4,
&_vq_book_res0_128_1024_5,
- &_vq_book_res0_128_1024_6,
+ &_vq_book_res0_128_1024_6,
+ &_vq_book_res0_128_1024_6a,
&_vq_book_res0_128_1024_7,
- &_vq_book_res0_128_1024_8,
+ &_vq_book_res0_128_1024_7a,
+ &_vq_book_res0_128_1024_8,
+ &_vq_book_res0_128_1024_8a,
&_vq_book_res0_128_1024_9,
+ &_vq_book_res0_128_1024_9a,
+ &_vq_book_res0_128_1024_9b,
},
/* psy */
{&_psy_set_A0,&_psy_set_A},
-
- /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-
- -10.,
-
- 0,
+ &_psy_set_AG
};
-
-#define PREDEF_INFO_MAX 0
#endif
1.14.2.1 +3 -17 vorbis/lib/modes/mode_B.h
Index: mode_B.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_B.h,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- mode_B.h 2001/05/27 06:44:05 1.14
+++ mode_B.h 2001/07/08 08:48:07 1.14.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_B.h,v 1.14 2001/05/27 06:44:05 xiphmont Exp $
+ last mod: $Id: mode_B.h,v 1.14.2.1 2001/07/08 08:48:07 xiphmont Exp $
********************************************************************/
@@ -48,13 +48,11 @@
static vorbis_info_psy _psy_set_B0={
- 1,/*athp*/
- 1,/*decayp*/
+ ATH_Bark_dB_lineaggressive,
-100.,
-140.,
- 8,
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
@@ -135,14 +133,11 @@
};
static vorbis_info_psy _psy_set_B={
- 1,/*athp*/
- 1,/*decayp*/
+ ATH_Bark_dB_lineaggressive,
-100.f,
-140.f,
- 8,
-
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
@@ -300,15 +295,6 @@
},
/* psy */
{&_psy_set_B0,&_psy_set_B},
-
- /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-
- -10.,
-
- 0,
};
-
-#define PREDEF_INFO_MAX 0
#endif
1.13.2.1 +3 -18 vorbis/lib/modes/mode_C.h
Index: mode_C.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_C.h,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- mode_C.h 2001/05/27 06:44:05 1.13
+++ mode_C.h 2001/07/08 08:48:07 1.13.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_C.h,v 1.13 2001/05/27 06:44:05 xiphmont Exp $
+ last mod: $Id: mode_C.h,v 1.13.2.1 2001/07/08 08:48:07 xiphmont Exp $
********************************************************************/
@@ -48,13 +48,11 @@
static vorbis_info_psy _psy_set_C0={
- 1,/*athp*/
- 1,/*decayp*/
+ ATH_Bark_dB_lineconservative,
-100.,
-140.,
- 8,
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
@@ -135,14 +133,10 @@
};
static vorbis_info_psy _psy_set_C={
- 1,/*athp*/
- 1,/*decayp*/
-
+ ATH_Bark_dB_lineconservative,
-100.f,
-140.f,
- 8,
-
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
@@ -300,15 +294,6 @@
},
/* psy */
{&_psy_set_C0,&_psy_set_C},
-
- /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-
- -10.,
-
- 0,
};
-
-#define PREDEF_INFO_MAX 0
#endif
1.14.2.1 +3 -20 vorbis/lib/modes/mode_D.h
Index: mode_D.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_D.h,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- mode_D.h 2001/05/27 06:44:05 1.14
+++ mode_D.h 2001/07/08 08:48:07 1.14.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_D.h,v 1.14 2001/05/27 06:44:05 xiphmont Exp $
+ last mod: $Id: mode_D.h,v 1.14.2.1 2001/07/08 08:48:07 xiphmont Exp $
********************************************************************/
@@ -46,14 +46,10 @@
static vorbis_info_psy _psy_set_D0={
- 1,/*athp*/
- 1,/*decayp*/
-
+ ATH_Bark_dB_lineconservative,
-100.,
-140.,
- 8,
-
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
@@ -133,14 +129,10 @@
};
static vorbis_info_psy _psy_set_D={
- 1,/*athp*/
- 1,/*decayp*/
-
+ ATH_Bark_dB_lineconservative,
-100.f,
-140.f,
- 8,
-
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
@@ -296,15 +288,6 @@
},
/* psy */
{&_psy_set_D0,&_psy_set_D},
-
- /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-36.f,-36.f,-36.f,-36.f}, -90.f,
-
- -10.,
-
- 0,
};
-
-#define PREDEF_INFO_MAX 0
#endif
1.13.2.1 +3 -20 vorbis/lib/modes/mode_E.h
Index: mode_E.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_E.h,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- mode_E.h 2001/05/27 06:44:05 1.13
+++ mode_E.h 2001/07/08 08:48:07 1.13.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_E.h,v 1.13 2001/05/27 06:44:05 xiphmont Exp $
+ last mod: $Id: mode_E.h,v 1.13.2.1 2001/07/08 08:48:07 xiphmont Exp $
********************************************************************/
@@ -46,14 +46,10 @@
static vorbis_info_psy _psy_set_E0={
- 1,/*athp*/
- 1,/*decayp*/
-
+ ATH_Bark_dB_lineconservative,
-100.,
-140.,
- 8,
-
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
@@ -116,14 +112,10 @@
};
static vorbis_info_psy _psy_set_E={
- 1,/*athp*/
- 1,/*decayp*/
-
+ ATH_Bark_dB_lineconservative,
-100.f,
-140.f,
- 8,
-
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
@@ -262,15 +254,6 @@
},
/* psy */
{&_psy_set_E0,&_psy_set_E},
-
- /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-36.f,-36.f,-36.f,-36.f}, -90.f,
-
- -10.,
-
- 0,
};
-
-#define PREDEF_INFO_MAX 0
#endif
1.8.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.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- modes.h 2001/06/15 21:15:43 1.8
+++ modes.h 2001/07/08 08:48:07 1.8.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: modes.h,v 1.8 2001/06/15 21:15:43 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.8.2.1 2001/07/08 08:48:07 xiphmont Exp $
********************************************************************/
@@ -19,7 +19,7 @@
#define _V_MODES_H_
#include "masking.h"
-#include "modes/mode_AA.h"
+//#include "modes/mode_AA.h"
#include "modes/mode_A.h"
#include "modes/mode_B.h"
#include "modes/mode_C.h"
No revision
No revision
1.3.8.1 +1 -1 vorbis/vq/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -u -r1.3 -r1.3.8.1
--- Makefile.am 2001/01/22 01:38:51 1.3
+++ Makefile.am 2001/07/08 08:48:09 1.3.8.1
@@ -48,4 +48,4 @@
$(MAKE) vq CFLAGS="@PROFILE@"
vq:
- $(MAKE) $(EXTRA_PROGRAMS)
\ No newline at end of file
+ $(MAKE) $(EXTRA_PROGRAMS)
1.3.18.1 +1 -1 vorbis/vq/auxpartition.pl
Index: auxpartition.pl
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/auxpartition.pl,v
retrieving revision 1.3
retrieving revision 1.3.18.1
diff -u -r1.3 -r1.3.18.1
--- auxpartition.pl 2000/07/12 09:36:17 1.3
+++ auxpartition.pl 2001/07/08 08:48:09 1.3.18.1
@@ -30,7 +30,7 @@
@nums = split(/,/);
my$cols=$#nums;
for($i=0;$i<$cols;$i++){
- print $nums[$i].", ";
+ print 0+$nums[$i].", ";
}
if($bands>1){
$_=<TWO>;
1.6.2.1 +4 -4 vorbis/vq/distribution.c
Index: distribution.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/distribution.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- distribution.c 2001/06/15 21:15:43 1.6
+++ distribution.c 2001/07/08 08:48:09 1.6.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: utility for finding the distribution in a data set
- last mod: $Id: distribution.c,v 1.6 2001/06/15 21:15:43 xiphmont Exp $
+ last mod: $Id: distribution.c,v 1.6.2.1 2001/07/08 08:48:09 xiphmont Exp $
********************************************************************/
@@ -107,14 +107,14 @@
for(j=0;j<b->entries;j++){
if(c->lengthlist[j]){
int indexdiv=1;
- printf("%4ld: ",j);
+ printf("%4d: ",j);
for(k=0;k<b->dim;k++){
int index= (j/indexdiv)%bins;
printf("%+3.1f,", c->quantlist[index]*_float32_unpack(c->q_delta)+
_float32_unpack(c->q_min));
indexdiv*=bins;
}
- printf("\t|",(1<<(base-c->lengthlist[j])));
+ printf("\t|");
for(k=0;k<base-c->lengthlist[j];k++)printf("*");
printf("\n");
}
@@ -194,7 +194,7 @@
printf("Minimum scalar value: %f\n",min);
printf("Maximum scalar value: %f\n",max);
- printf("\n counting hits into %d bins...\n",bins+1);
+ printf("\n counting hits into %ld bins...\n",bins+1);
countarray=calloc(bins+1,sizeof(long));
rewind(in);
1.9.2.1 +25 -12 vorbis/vq/latticehint.c
Index: latticehint.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/latticehint.c,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- latticehint.c 2001/05/27 06:44:07 1.9
+++ latticehint.c 2001/07/08 08:48:09 1.9.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: utility main for building thresh/pigeonhole encode hints
- last mod: $Id: latticehint.c,v 1.9 2001/05/27 06:44:07 xiphmont Exp $
+ last mod: $Id: latticehint.c,v 1.9.2.1 2001/07/08 08:48:09 xiphmont Exp $
********************************************************************/
@@ -40,7 +40,7 @@
to the threshhold hint
command line:
- latticehint book.vqh
+ latticehint book.vqh [threshlist]
latticehint produces book.vqh on stdout */
@@ -123,15 +123,14 @@
float min,del;
char *name;
long i,j;
- long dB=0;
+ float *suggestions;
+ int suggcount=0;
if(argv[1]==NULL){
fprintf(stderr,"Need a lattice book on the command line.\n");
exit(1);
}
- if(argv[2])dB=1;
-
{
char *ptr;
char *filename=strdup(argv[1]);
@@ -168,6 +167,19 @@
fprintf(stderr,"Adding threshold hint to %s...\n",name);
+ /* partial/complete suggestions */
+ if(argv[2]){
+ char *ptr=strdup(argv[2]);
+ suggestions=alloca(sizeof(float)*quantvals);
+
+ for(suggcount=0;ptr && suggcount<quantvals;suggcount++){
+ char *ptr2=strchr(ptr,',');
+ if(ptr2)*ptr2++='\0';
+ suggestions[suggcount]=atof(ptr);
+ ptr=ptr2;
+ }
+ }
+
/* simplest possible threshold hint only */
t->quantthresh=_ogg_calloc(quantvals-1,sizeof(float));
t->quantmap=_ogg_calloc(quantvals,sizeof(int));
@@ -183,13 +195,14 @@
for(i=0;i<quantvals-1;i++){
float v1=*(quantsort[i])*del+min;
float v2=*(quantsort[i+1])*del+min;
- if(dB){
- if(fabs(v1)<.01)v1=(v1+v2)*.5;
- if(fabs(v2)<.01)v2=(v1+v2)*.5;
- t->quantthresh[i]=fromdB((todB(&v1)+todB(&v2))*.5);
- if(v1<0 || v2<0)t->quantthresh[i]*=-1;
-
- }else{
+
+ for(j=0;j<suggcount;j++)
+ if(v1<suggestions[j] && suggestions[j]<v2){
+ t->quantthresh[i]=suggestions[j];
+ break;
+ }
+
+ if(j==suggcount){
t->quantthresh[i]=(v1+v2)*.5;
}
}
1.4.2.1 +41 -8 vorbis/vq/make_residue_books.pl
Index: make_residue_books.pl
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/make_residue_books.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- make_residue_books.pl 2001/06/15 21:15:43 1.4
+++ make_residue_books.pl 2001/07/08 08:48:09 1.4.2.1
@@ -10,11 +10,10 @@
# haux res0_96_128aux.vqd 0,4,2
# :1 res0_128_128_1.vqd, 4, nonseq cull, 0 +- 1
# +1a, 4, nonseq, 0 +- .25 .5
-# :2 res0_128_128_2.vqd, 4, nonseq, 0 +- 1 2
-# :3 res0_128_128_3.vqd, 4, nonseq, 0 +- 1 3 5
-# :4 res0_128_128_4.vqd, 2, nonseq, 0 +- 1 3 5 8 11
+# :2 res0_128_128_2.vqd, 4, nonseq, 0 +- 1(.7) 2
+# :3 res0_128_128_3.vqd, 4, nonseq, 0 +- 1(.7) 3 5
+# :4 res0_128_128_4.vqd, 2, nonseq, 0 +- 1(.7) 3 5 8 11
# :5 res0_128_128_5.vqd, 1, nonseq, 0 +- 1 3 5 8 11 14 17 20 24 28 31 35 39
-# +1a, 4, nonseq, 0 +- .5 1
die "Could not open $ARGV[0]: $!" unless open (F,$ARGV[0]);
@@ -64,15 +63,32 @@
# build value list
my$plusminus="+";
my$list;
+ my$thlist;
my$count=0;
foreach my$val (split(' ',$vals)){
if($val=~/\-?\+?\d+/){
+ my$th;
+
+ # got an explicit threshhint?
+ if($val=~/([0-9\.]+)\(([^\)]+)/){
+ $val=$1;
+ $th=$2;
+ }
+
if($plusminus=~/-/){
$list.="-$val ";
+ if(defined($th)){
+ $thlist.="," if(defined($thlist));
+ $thlist.="-$th";
+ }
$count++;
}
if($plusminus=~/\+/){
$list.="$val ";
+ if(defined($th)){
+ $thlist.="," if(defined($thlist));
+ $thlist.="$th";
+ }
$count++;
}
}else{
@@ -94,7 +110,7 @@
die "Couldn't build latticebook.\n\tcommand:$command\n"
if syst($command);
- my $command="latticehint $globalname$name.vqh > temp$$.vqh";
+ my $command="latticehint $globalname$name.vqh $thlist > temp$$.vqh";
print ">>> $command\n";
die "Couldn't pre-hint latticebook.\n\tcommand:$command\n"
if syst($command);
@@ -117,7 +133,7 @@
if syst($command);
}
- my $command="latticehint $globalname$name.vqh > temp$$.vqh";
+ my $command="latticehint $globalname$name.vqh $thlist > temp$$.vqh";
print ">>> $command\n";
die "Couldn't post-hint latticebook.\n\tcommand:$command\n"
if syst($command);
@@ -154,15 +170,32 @@
# build value list
my$plusminus="+";
my$list;
+ my$thlist;
my$count=0;
foreach my$val (split(' ',$vals)){
if($val=~/\-?\+?\d+/){
+ my$th;
+
+ # got an explicit threshhint?
+ if($val=~/([0-9\.]+)\(([^\)]+)/){
+ $val=$1;
+ $th=$2;
+ }
+
if($plusminus=~/-/){
$list.="-$val ";
+ if(defined($th)){
+ $thlist.="," if(defined($thlist));
+ $thlist.="-$th";
+ }
$count++;
}
if($plusminus=~/\+/){
$list.="$val ";
+ if(defined($th)){
+ $thlist.="," if(defined($thlist));
+ $thlist.="$th";
+ }
$count++;
}
}else{
@@ -184,7 +217,7 @@
die "Couldn't build latticebook.\n\tcommand:$command\n"
if syst($command);
- my $command="latticehint $globalname$name.vqh > temp$$.vqh";
+ my $command="latticehint $globalname$name.vqh $thlist > temp$$.vqh";
print ">>> $command\n";
die "Couldn't pre-hint latticebook.\n\tcommand:$command\n"
if syst($command);
@@ -207,7 +240,7 @@
if syst($command);
}
- my $command="latticehint $globalname$name.vqh > temp$$.vqh";
+ my $command="latticehint $globalname$name.vqh $thlist > temp$$.vqh";
print ">>> $command\n";
die "Couldn't post-hint latticebook.\n\tcommand:$command\n"
if syst($command);
1.10.6.1 +32 -26 vorbis/vq/residuesplit.c
Index: residuesplit.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/residuesplit.c,v
retrieving revision 1.10
retrieving revision 1.10.6.1
diff -u -r1.10 -r1.10.6.1
--- residuesplit.c 2001/02/26 03:51:12 1.10
+++ residuesplit.c 2001/07/08 08:48:10 1.10.6.1
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0 partitioner/classifier
- last mod: $Id: residuesplit.c,v 1.10 2001/02/26 03:51:12 xiphmont Exp $
+ last mod: $Id: residuesplit.c,v 1.10.6.1 2001/07/08 08:48:10 xiphmont Exp $
********************************************************************/
@@ -23,10 +23,11 @@
/* does not guard against invalid settings; eg, a subn of 16 and a
subgroup request of 32. Max subn of 128 */
-static void _testhack(float *vec,int n,float *entropy){
+static float _testhack(float *vec,int n){
int i,j=0;
float max=0.f;
float temp[128];
+ float entropy=0.;
/* setup */
for(i=0;i<n;i++)temp[i]=fabs(vec[i]);
@@ -37,7 +38,11 @@
for(i=0;i<n;i++)temp[i]=rint(temp[i]);
- while(1){
+ for(i=0;i<n;i++)
+ entropy+=temp[i];
+ return entropy;
+
+ /*while(1){
entropy[j]=max;
n>>=1;
j++;
@@ -49,7 +54,7 @@
max=0.f;
for(i=0;i<n;i++)
if(temp[i]>max)max=temp[i];
- }
+ }*/
}
static FILE *of;
@@ -60,20 +65,22 @@
will need to change in the future when we get real multichannel
mappings */
int quantaux(float *res,int n,float *ebound,float *mbound,int *subgrp,int parts, int subn){
- long i,j;
- float entropy[8];
+ long i,j,part=0;
int aux;
- for(i=0;i<=n-subn;i+=subn){
+ for(i=0;i<=n-subn;i+=subn,part++){
float max=0.f;
+ float lentropy=0.f;
- _testhack(res+i,subn,entropy);
+ lentropy=_testhack(res+i,subn);
+
for(j=0;j<subn;j++)
if(fabs(res[i+j])>max)max=fabs(res[i+j]);
for(j=0;j<parts-1;j++)
- if(entropy[subgrp[j]]<=ebound[j] &&
- max<=mbound[j])
+ if(lentropy<=ebound[j] &&
+ max<=mbound[j] &&
+ part<subgrp[j])
break;
aux=j;
@@ -121,9 +128,9 @@
" number of scalars in a group\n"
" ent is the maximum entropy value allowed for membership in a group\n"
" peak is the maximum amplitude value allowed for membership in a group\n"
- " subn is the maximum entropy value allowed for membership in a group\n"
+ " subn is the maximum subpartiton number allowed in the group\n"
- "eg: residuesplit mask.vqd floor.vqd 0,1024,16 res 0,.5,16 3,1.5,8 \n"
+ "eg: residuesplit mask.vqd floor.vqd 0,1024,16 res 0,.5,2 3,1.5,4 \n"
"produces resaux.vqd and res_0...n.vqd\n\n");
exit(1);
}
@@ -166,6 +173,7 @@
for(i=0;i<parts-1;i++){
char *pos=strchr(argv[4+i],',');
+ subgrp[i]=0;
if(*argv[4+i]==',')
ebound[i]=1e50f;
else
@@ -173,25 +181,23 @@
if(!pos){
mbound[i]=1e50f;
- subgrp[i]=_ilog(subn)-1;
- }else{
- if(*(pos+1)==',')
- mbound[i]=1e50f;
- else
- mbound[i]=atof(pos+1);
- pos=strchr(pos+1,',');
+ }else{
+ if(*(pos+1)==',')
+ mbound[i]=1e50f;
+ else
+ mbound[i]=atof(pos+1);
+ pos=strchr(pos+1,',');
+
+ if(pos)
+ subgrp[i]=atoi(pos+1);
- if(!pos){
- subgrp[i]=_ilog(subn)-1;
- }else{
- subgrp[i]=_ilog(atoi(pos+1))-1;
- }
- }
+ }
+ if(subgrp[i]<=0)subgrp[i]=99999;
}
ebound[i]=1e50f;
mbound[i]=1e50f;
- subgrp[i]=_ilog(subn)-1;
+ subgrp[i]=9999999;
res=fopen(argv[1],"r");
if(!res){
--- >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