Minor optimization to align p and q indexes in .vqh files.

Monty

svn path=/trunk/vorbis/; revision=252

diff --git a/vq/bookutil.c b/vq/bookutil.c
index db1b9b4..d22742e 100644 (file)
--- 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 */

diff --git a/vq/build.c b/vq/build.c
index b15aa52..f191813 100644 (file)
--- a/vq/build.c
+++ b/vq/build.c
@@ -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");