Fixed a +1 bug in the trainer; forgot to remove the quant value

increment when I removed the reserved zero entry feature from the rest
of the codebook routines.

Monty

svn path=/branches/new_acoustics_pending_merge_20000328/vorbis/; revision=362

3 files changed, 54 insertions, 8 deletions

diff --git a/vq/bookutil.c b/vq/bookutil.c
index a0e7a48f..2c8f357e 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.12.4.6 2000/05/04 23:08:10 xiphmont Exp $
+ last mod: $Id: bookutil.c,v 1.12.4.7 2000/05/06 05:41:14 xiphmont Exp $
 
  ********************************************************************/
 
@@ -563,11 +563,11 @@ void write_codebook(FILE *out,char *name,const static_codebook *c){
     fprintf(out,"\tNULL,\n");
 
   if(n)
-    fprintf(out,"\t&_vq_auxn_%s\n",name);
+    fprintf(out,"\t&_vq_auxn_%s,\n",name);
   else
     fprintf(out,"\tNULL,\n");
   if(t)
-    fprintf(out,"\t&_vq_auxt_%s\n",name);
+    fprintf(out,"\t&_vq_auxt_%s,\n",name);
   else
     fprintf(out,"\tNULL,\n");
 
diff --git a/vq/lspdata.c b/vq/lspdata.c
index e0d7df41..65ed2008 100644
--- a/vq/lspdata.c
+++ b/vq/lspdata.c
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: metrics and quantization code for LSP VQ codebooks
- last mod: $Id: lspdata.c,v 1.11.4.4 2000/05/04 23:08:10 xiphmont Exp $
+ last mod: $Id: lspdata.c,v 1.11.4.5 2000/05/06 05:41:14 xiphmont Exp $
 
  ********************************************************************/
 
@@ -21,16 +21,61 @@
 #include <stdio.h>
 #include "vqgen.h"
 #include "vqext.h"
+#include "../lib/sharedbook.h"
 
 char *vqext_booktype="LSPdata";  
 quant_meta q={0,0,0,1};          /* set sequence data */
 int vqext_aux=1;
 
+double global_maxdel=M_PI;
+double global_mindel=M_PI;
+#if 0
+void vqext_quantize(vqgen *v,quant_meta *q){
+  double delta,mindel;
+  double maxquant=((1<<q->quant)-1);
+  int j,k;
+
+  /* first find the basic delta amount from the maximum span to be
+     encoded.  Loosen the delta slightly to allow for additional error
+     during sequence quantization */
+
+  delta=(global_maxdel-global_mindel)/((1<<q->quant)-1.5);
+  
+  q->min=_float32_pack(global_mindel);
+  q->delta=_float32_pack(delta);
+
+  mindel=_float32_unpack(q->min);
+  delta=_float32_unpack(q->delta);
+
+  for(j=0;j<v->entries;j++){
+    double last=0;
+    for(k=0;k<v->elements;k++){
+      double val=_now(v,j)[k];
+      double now=rint((val-last-mindel)/delta);
+      
+      _now(v,j)[k]=now;
+      if(now<0){
+	/* be paranoid; this should be impossible */
+	fprintf(stderr,"fault; quantized value<0\n");
+	exit(1);
+      }
+
+      if(now>maxquant){
+	/* be paranoid; this should be impossible */
+	fprintf(stderr,"fault; quantized value>max\n");
+	exit(1);
+      }
+      last=(now*delta)+mindel+last;
+    }
+  }
+
+}
+#else
 void vqext_quantize(vqgen *v,quant_meta *q){
   vqgen_quantize(v,q);
 }
+#endif
 
-double global_maxdel=M_PI;
 double *weight=NULL;
 #if 0
 /* LSP training metric.  We weight error proportional to distance
@@ -99,16 +144,17 @@ void vqext_preprocess(vqgen *v){
   long j,k;
 
   global_maxdel=0.;
+  global_mindel=M_PI;
   for(j=0;j<v->points;j++){
     double last=0.;
     for(k=0;k<v->elements+v->aux;k++){
       double p=_point(v,j)[k];
       if(p-last>global_maxdel)global_maxdel=p-last;
+      if(p-last<global_mindel)global_mindel=p-last;
       last=p;
     }
   }
 
-  global_maxdel*=1.1;
   weight=malloc(sizeof(double)*v->elements);
 }
 
diff --git a/vq/vqgen.c b/vq/vqgen.c
index bef2514f..413bbdb4 100644
--- a/vq/vqgen.c
+++ b/vq/vqgen.c
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: train a VQ codebook 
- last mod: $Id: vqgen.c,v 1.30.4.3 2000/04/21 16:35:40 xiphmont Exp $
+ last mod: $Id: vqgen.c,v 1.30.4.4 2000/05/06 05:41:14 xiphmont Exp $
 
  ********************************************************************/
 
@@ -204,7 +204,7 @@ void vqgen_quantize(vqgen *v,quant_meta *q){
       double val=_now(v,j)[k];
       double now=rint((val-last-mindel)/delta);
       
-      _now(v,j)[k]=now+1;
+      _now(v,j)[k]=now;
       if(now<0){
 	/* be paranoid; this should be impossible */
 	fprintf(stderr,"fault; quantized value<0\n");