diff options
author | Monty <xiphmont@xiph.org> | 2000-02-07 19:39:45 +0000 |
---|---|---|
committer | Monty <xiphmont@xiph.org> | 2000-02-07 19:39:45 +0000 |
commit | de677181b6d9a1a67cc98ababd82bea65f3615e8 (patch) | |
tree | 906039a4bd23aec4a1d82951fab49ebc0d44d823 | |
parent | a2350e7135bcb7042976b87610bac56c3b3ce77c (diff) | |
download | libvorbis-git-de677181b6d9a1a67cc98ababd82bea65f3615e8.tar.gz |
Minor optimization to align p and q indexes in .vqh files.
Monty
svn path=/trunk/vorbis/; revision=252
-rw-r--r-- | vq/bookutil.c | 7 | ||||
-rw-r--r-- | vq/build.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/vq/bookutil.c b/vq/bookutil.c index db1b9b42..d22742eb 100644 --- a/vq/bookutil.c +++ b/vq/bookutil.c @@ -12,7 +12,7 @@ ******************************************************************** function: utility functions for loading .vqh and .vqd files - last mod: $Id: bookutil.c,v 1.7 2000/01/28 09:05:19 xiphmont Exp $ + last mod: $Id: bookutil.c,v 1.8 2000/02/07 19:39:44 xiphmont Exp $ ********************************************************************/ @@ -305,8 +305,8 @@ int codebook_entry(codebook *b,double *val){ while(1){ double C=0.; - double *p=b->valuelist+t->p[ptr]*c->dim; - double *q=b->valuelist+t->q[ptr]*c->dim; + double *p=b->valuelist+t->p[ptr]; + double *q=b->valuelist+t->q[ptr]; for(k=0;k<c->dim;k++){ n[k]=p[k]-q[k]; @@ -316,6 +316,7 @@ int codebook_entry(codebook *b,double *val){ for(k=0;k<c->dim;k++) C+=n[k]*val[k]; + if(C>0.) /* in A */ ptr= -t->ptr0[ptr]; else /* in B */ @@ -12,7 +12,7 @@ ******************************************************************** function: utility main for building codebooks from training sets - last mod: $Id: build.c,v 1.9 2000/01/21 13:42:36 xiphmont Exp $ + last mod: $Id: build.c,v 1.10 2000/02/07 19:39:45 xiphmont Exp $ ********************************************************************/ @@ -253,7 +253,7 @@ int main(int argc,char *argv[]){ for(j=0;j<c.encode_tree->aux;){ fprintf(out,"\t"); for(k=0;k<8 && j<c.encode_tree->aux;k++,j++) - fprintf(out,"%6ld,",c.encode_tree->p[j]); + fprintf(out,"%6ld,",c.encode_tree->p[j]*c.elements); fprintf(out,"\n"); } fprintf(out,"};\n\n"); @@ -263,7 +263,7 @@ int main(int argc,char *argv[]){ for(j=0;j<c.encode_tree->aux;){ fprintf(out,"\t"); for(k=0;k<8 && j<c.encode_tree->aux;k++,j++) - fprintf(out,"%6ld,",c.encode_tree->q[j]); + fprintf(out,"%6ld,",c.encode_tree->q[j]*c.elements); fprintf(out,"\n"); } fprintf(out,"};\n\n"); |