Update the VQ tools to pared down codebook abstraction.

[platform/upstream/libvorbis.git] / vq / build.c

diff --git a/vq/build.c b/vq/build.c
index 09dfb20..ac76bc8 100644 (file)
--- a/vq/build.c
+++ b/vq/build.c
@@ -1,18 +1,17 @@
 /********************************************************************
  *                                                                  *
- * 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.                            *
+ * 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.       *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
- * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
- * http://www.xiph.org/                                             *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
  function: utility main for building codebooks from training sets
- last mod: $Id: build.c,v 1.13 2000/05/08 20:49:50 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -21,8 +20,6 @@
 #include <math.h>
 #include <string.h>
 #include <errno.h>
-#include "vorbis/codebook.h"
-#include "../lib/sharedbook.h"
 #include "bookutil.h"
 
 #include "vqgen.h"
@@ -39,26 +36,26 @@ static char *rline(FILE *in,FILE *out){
 
     while(!gotline){
       if(sofar>=lbufsize){
-       if(!lbufsize){  
-         lbufsize=1024;
-         linebuffer=malloc(lbufsize);
-       }else{
-         lbufsize*=2;
-         linebuffer=realloc(linebuffer,lbufsize);
-       }
+        if(!lbufsize){        
+          lbufsize=1024;
+          linebuffer=_ogg_malloc(lbufsize);
+        }else{
+          lbufsize*=2;
+          linebuffer=_ogg_realloc(linebuffer,lbufsize);
+        }
       }
       {
-       long c=fgetc(in);
-       switch(c){
-       case '\n':
-       case EOF:
-         gotline=1;
-         break;
-       default:
-         linebuffer[sofar++]=c;
-         linebuffer[sofar]='\0';
-         break;
-       }
+        long c=fgetc(in);
+        switch(c){
+        case '\n':
+        case EOF:
+          gotline=1;
+          break;
+        default:
+          linebuffer[sofar++]=c;
+          linebuffer[sofar]='\0';
+          break;
+        }
       }
     }
     
@@ -133,12 +130,12 @@ int main(int argc,char *argv[]){
   }
   
   /* just use it to allocate mem */
-  vqgen_init(&v,dim,0,entries,0.,NULL,NULL);
+  vqgen_init(&v,dim,0,entries,0.f,NULL,NULL,0);
   
   /* quant */
   line=rline(in,out);
   if(sscanf(line,"%ld %ld %d %d",&q.min,&q.delta,
-           &q.quant,&q.sequencep)!=4){
+            &q.quant,&q.sequencep)!=4){
     fprintf(stderr,"Syntax error reading book file\n");
     exit(1);
   }
@@ -147,12 +144,12 @@ int main(int argc,char *argv[]){
   /* save quant data; we don't want to requantize later as our method
      is currently imperfect wrt repeated application */
   i=0;
-  quantlist=malloc(sizeof(long)*v.elements*v.entries);
+  quantlist=_ogg_malloc(sizeof(long)*v.elements*v.entries);
   for(j=0;j<entries;j++){
-    double a;
+    float a;
     for(k=0;k<dim;k++){
       line=rline(in,out);
-      sscanf(line,"%lf",&a);
+      sscanf(line,"%f",&a);
       v.entrylist[i]=a;
       quantlist[i++]=rint(a);
     }
@@ -165,14 +162,14 @@ int main(int argc,char *argv[]){
   
   /* training points */
   {
-    double *b=alloca(sizeof(double)*(dim+aux));
+    float *b=alloca(sizeof(float)*(dim+aux));
     i=0;
     v.entries=0; /* hack to avoid reseeding */
     while(1){
       for(k=0;k<dim+aux;k++){
-       line=rline(in,out);
-       if(!line)break;
-       sscanf(line,"%lf",b+k);
+        line=rline(in,out);
+        if(!line)break;
+        sscanf(line,"%f",b+k);
       }
       if(feof(in))break;
       vqgen_addpoint(&v,b,NULL);