[xiph-cvs] cvs commit: vorbis/lib/modes mode_AA.h mode_A.h mode_B.h mode_C.h modes.h

Monty xiphmont at xiph.org
Tue Nov 7 22:08:18 PST 2000



xiphmont    00/11/07 22:08:17

  Modified:    lib      analysis.c codebook.h psy.c psytune.c tone.c
                        vorbisenc.c
               lib/modes mode_A.h mode_B.h mode_C.h modes.h
  Added:       lib/books 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_128_1.vqh res0_128_128_2.vqh
                        res0_128_128_3.vqh res0_128_128_4.vqh
                        res0_128_128_5.vqh res0_128_128aux.vqh
                        res0_96_1024_1.vqh res0_96_1024_2.vqh
                        res0_96_1024_3.vqh res0_96_1024_4.vqh
                        res0_96_1024_5.vqh res0_96_1024_6.vqh
                        res0_96_1024_7.vqh res0_96_1024aux.vqh
                        res0_96_128_1.vqh res0_96_128_2.vqh
                        res0_96_128_3.vqh res0_96_128_4.vqh
                        res0_96_128aux.vqh
               lib/modes mode_AA.h
  Log:
  Incremental update... new 100kbps and 128 kbps books

Revision  Changes    Path
1.36      +4 -4      vorbis/lib/analysis.c

Index: analysis.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/analysis.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- analysis.c	2000/11/06 00:07:00	1.35
+++ analysis.c	2000/11/08 06:08:11	1.36
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: single-block PCM analysis mode dispatch
- last mod: $Id: analysis.c,v 1.35 2000/11/06 00:07:00 xiphmont Exp $
+ last mod: $Id: analysis.c,v 1.36 2000/11/08 06:08:11 xiphmont Exp $
 
  ********************************************************************/
 
@@ -55,10 +55,10 @@
   if(vb->W){
     oggpack_write(&vb->opb,vb->lW,1);
     oggpack_write(&vb->opb,vb->nW,1);
-    /*fprintf(stderr,"*");*/
-  }/*else{
+    fprintf(stderr,"*");
+  }else{
     fprintf(stderr,".");
-    }*/
+  }
 
   if((ret=_mapping_P[type]->forward(vb,b->mode[mode])))
     return(ret);

1.3       +4 -1      vorbis/lib/codebook.h

Index: codebook.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/codebook.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codebook.h	2000/11/06 00:07:00	1.2
+++ codebook.h	2000/11/08 06:08:11	1.3
@@ -12,13 +12,15 @@
  ********************************************************************
 
  function: basic shared codebook operations
- last mod: $Id: codebook.h,v 1.2 2000/11/06 00:07:00 xiphmont Exp $
+ last mod: $Id: codebook.h,v 1.3 2000/11/08 06:08:11 xiphmont Exp $
 
  ********************************************************************/
 
 #ifndef _V_CODEBOOK_H_
 #define _V_CODEBOOK_H_
 
+#include "ogg/ogg.h"
+
 /* This structure encapsulates huffman and VQ style encoding books; it
    doesn't do anything specific to either.
 
@@ -114,6 +116,7 @@
   long   *codelist;   /* list of bitstream codewords for each entry */
   struct decode_aux *decode_tree;
 
+  long zeroentry;
 } codebook;
 
 extern void vorbis_staticbook_clear(static_codebook *b);

1.31      +14 -5     vorbis/lib/psy.c

Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- psy.c	2000/11/06 00:07:01	1.30
+++ psy.c	2000/11/08 06:08:11	1.31
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.30 2000/11/06 00:07:01 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.31 2000/11/08 06:08:11 xiphmont Exp $
 
  ********************************************************************/
 
@@ -164,15 +164,15 @@
      20dB down will be in a range ...+80], 40dB down is from ...+60],
      etc... */
 
-  for(i=P_LEVELS-1;i>0;i--){
-    for(j=0;j<i;j++)
-      min_curve(c[i],tempc[j]);
+  for(j=1;j<P_LEVELS;j++){
+    min_curve(tempc[j],tempc[j-1]);
+    min_curve(c[j],tempc[j]);
   }
 
   /* take things out of dB domain into linear amplitude */
   for(i=0;i<P_LEVELS;i++)
     linear_curve(c[i]);
-      
+
 }
 
 void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate){
@@ -597,10 +597,12 @@
   float *smooth=alloca(sizeof(float)*p->n);
   int i,n=p->n;
   float specmax=0.;
+  static int seq=0;
 
   float *seed=alloca(sizeof(float)*p->n);
   float *seed2=alloca(sizeof(float)*p->n);
 
+  _analysis_output("mdct",seq,f,n,1,1);
   memset(flr,0,n*sizeof(float));
 
   /* noise masking */
@@ -633,6 +635,8 @@
     smooth[n-1]=sqrt(acc);
   }
 
+  _analysis_output("smooth",seq,smooth,n,1,1);
+
   /* find the highest peak so we know the limits *************************/
   for(i=0;i<n;i++){
     if(smooth[i]>specmax)specmax=smooth[i];
@@ -651,6 +655,8 @@
     }
   }
 
+  _analysis_output("ath",seq,flr,n,1,1);
+
   /* peak attenuation ******/
   if(p->vi->peakattp){
     memset(seed,0,n*sizeof(float));
@@ -679,12 +685,15 @@
     
   }
 
+  _analysis_output("final",seq,flr,n,1,1);
+
   /* doing this here is clean, but we need to find a faster way to do
      it than to just tack it on */
 
   for(i=0;i<n;i++)if(2.*f[i]>flr[i] || -2.*f[i]>flr[i])break;
   if(i==n)memset(flr,0,sizeof(float)*n);
 
+  seq++;
 }
 
 

1.9       +64 -45    vorbis/lib/psytune.c

Index: psytune.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psytune.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- psytune.c	2000/11/06 00:07:02	1.8
+++ psytune.c	2000/11/08 06:08:12	1.9
@@ -13,7 +13,7 @@
 
  function: simple utility that runs audio through the psychoacoustics
            without encoding
- last mod: $Id: psytune.c,v 1.8 2000/11/06 00:07:02 xiphmont Exp $
+ last mod: $Id: psytune.c,v 1.9 2000/11/08 06:08:12 xiphmont Exp $
 
  ********************************************************************/
 
@@ -33,7 +33,7 @@
 
 static vorbis_info_psy _psy_set0={
   1,/*athp*/
-  1,/*decayp*/
+  0,/*decayp*/
   1,/*smoothp*/
   0,.2,
 
@@ -44,28 +44,28 @@
   /* 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 */
 
-  1,/* tonemaskp */
+   1,/* tonemaskp */
   /*  0   10   20   30   40   50   60   70   80   90   100 */
-  {{-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*175*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*250*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*350*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*500*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*700*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
+  {{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
+   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
+   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
+   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*175*/
+   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*250*/
+   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*350*/
+   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*500*/
+   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*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*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
-   {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
+   {-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*/
   },
 
-  1,/* peakattp */
+  0,/* peakattp */
   {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*63*/
    {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*88*/
    {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*125*/
@@ -85,30 +85,32 @@
    { -6., -6., -9., -9., -9., -9., -9., -9.,-10.,-11.,-12.}, /*16000*/
   },
 
-  1,/*noisemaskp */
+
+  0,/*noisemaskp */
   /*  0   10   20   30   40   50   60    70    80    90   100 */
   {{-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*63*/
    {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*88*/
    {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*125*/
    {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*175*/
    {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*250*/
-   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*350*/
-   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*350*/
    {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*350*/
-   { -6., -6., -6., -6., -6., -6., -6.,  -6.,  -6.,  -6.,  -6.}, /*2000*/
-   { -6., -6., -6., -6., -6., -6., -6.,  -6.,  -6.,  -6.,  -6.}, /*2000*/
-   { -6., -6., -6., -6., -6., -6., -6.,  -6.,  -6.,  -6.,  -6.}, /*2000*/
-   { -6., -6., -6., -6., -6., -6., -6.,  -6.,  -6.,  -6.,  -6.}, /*2800*/
-   { -0., -0., -0., -0., -0., -0., -0.,  -0.,  -0.,  -0.,  -0.}, /*4000*/
-   {  0.,  0.,  0.,  0.,  0.,  0.,  0.,   0.,   0.,   0.,   0.}, /*5600*/
-   {  4.,  4.,  4.,  4.,  4.,  4.,  4.,   4.,   4.,   4.,   4.}, /*8000*/
-   {  4.,  4.,  4.,  4.,  4.,  4.,  4.,   4.,   4.,   4.,   4.}, /*11500*/
-   {  4.,  4.,  4.,  4.,  4.,  4.,  4.,   4.,   4.,   4.,   4.}, /*16000*/
-  },
+   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*500*/
+   {  6.,  6.,  6.,  2.,  2.,  2.,  2.,   2.,   2.,   1.,   0.}, /*700*/
 
-  110.,
+   {  6.,  6.,  6.,  5.,  5.,  5.,  5.,   5.,   5.,   4.,   3.}, /*1000*/
+   {  6.,  6.,  6.,  5.,  5.,  5.,  5.,   5.,   5.,   4.,   3.}, /*1400*/
+   {  6.,  6.,  6.,  5.,  5.,  5.,  5.,   5.,   5.,   4.,   3.}, /*2000*/
+   {  6.,  6.,  6.,  5.,  5.,  5.,  5.,   5.,   5.,   4.,   3.}, /*2800*/
+   {  6.,  6.,  6.,  5.,  5.,  5.,  5.,   5.,   5.,   4.,   3.}, /*4000*/
+   { 10., 10., 10., 10., 10., 10.,  8.,   8.,   6.,   6.,   6.}, /*5600*/
+   { 10., 10., 10., 10., 10., 10.,  8.,   8.,   8.,   8.,   8.}, /*8000*/
+   { 10., 10., 10., 10., 10., 10., 10.,  10.,  10.,  10.,  10.}, /*11500*/
+   { 10., 10., 10., 10., 10., 10., 10.,  10.,  10.,  10.,  10.}, /*16000*/
+  },
+ 
+  100.,
 
-  -0, -.005,  /* attack/decay control */
+  -0., -.004   /* attack/decay control */
 };
 
 static int noisy=0;
@@ -146,11 +148,10 @@
   int  m;
   int *linearmap;
 
-  vorbis_info_floor0 *vi;
   lpc_lookup lpclook;
 } vorbis_look_floor0;
 
-long granulepos=0;
+long frameno=0;
 
 /* hacked from floor0.c */
 static void floorinit(vorbis_look_floor0 *look,int n,int m,int ln){
@@ -181,7 +182,7 @@
   int order=32;
   int map=256;
 
-  float *pcm[2],*out[2],*window,*decay[2],*lpc,*floor;
+  float *pcm[2],*out[2],*window,*decay[2],*lpc,*floor,*mask;
   signed char *buffer,*buffer2;
   mdct_lookup m_look;
   vorbis_look_psy p_look;
@@ -230,6 +231,7 @@
     argv++;
   }
   
+  mask=_ogg_malloc(framesize*sizeof(float));
   pcm[0]=_ogg_malloc(framesize*sizeof(float));
   pcm[1]=_ogg_malloc(framesize*sizeof(float));
   out[0]=_ogg_calloc(framesize/2,sizeof(float));
@@ -278,26 +280,43 @@
       for(i=0;i<2;i++){
         float amp;
 
-	analysis("pre",granulepos,pcm[i],framesize,0,0);
+	analysis("pre",frameno,pcm[i],framesize,0,0);
         
         /* do the psychacoustics */
         for(j=0;j<framesize;j++)
           pcm[i][j]*=window[j];
 
+	memcpy(mask,pcm[i],sizeof(float)*framesize);
+
         mdct_forward(&m_look,pcm[i],pcm[i]);
 
-	analysis("mdct",granulepos,pcm[i],framesize/2,1,1);
+	analysis("mdct",frameno,pcm[i],framesize/2,1,1);
 
         _vp_compute_mask(&p_look,pcm[i],floor,decay[i]);
         
         analysis("floor",frameno,floor,framesize/2,1,1);
         analysis("decay",frameno,decay[i],framesize/2,1,1);
-	
+
+	/*for(j=0;j<framesize/2;){
+	  float energy=0.;
+	  float acc=0.;
+	  float *v=pcm[i]+j;
+	  int flag=0;
+	  for(k=0;k<32;k++){
+	    energy+=v[k]*v[k];
+	    if(fabs(v[k]/floor[j+k])>.5)acc+=v[k]*v[k];
+	  }
+	  if(acc*2<energy){
+	    if(acc>0.)fprintf(stderr,"culling\n");
+	    for(k=0;k<32;k++)v[k]=0;
+	  }
+	  j+=k;
+	  }*/
+
         _vp_apply_floor(&p_look,pcm[i],floor);
-	/*r(j=0;j<framesize/2;j++)
-	  if(fabs(pcm[i][j])<1.)pcm[i][j]=0;*/
+
 
-	analysis("quant",granulepos,pcm[i],framesize/2,1,1);
+	analysis("quant",frameno,pcm[i],framesize/2,1,1);
 
         /* re-add floor */
         for(j=0;j<framesize/2;j++){
@@ -312,14 +331,14 @@
           }
         }
         
-	analysis("final",granulepos,pcm[i],framesize/2,1,1);
+	analysis("final",frameno,pcm[i],framesize/2,1,1);
 
         /* take it back to time */
         mdct_backward(&m_look,pcm[i],pcm[i]);
         for(j=0;j<framesize/2;j++)
           out[i][j]+=pcm[i][j]*window[j];
 
-	granulepos++;
+	frameno++;
       }
            
       /* write data.  Use the part of buffer we're about to shift out */

1.3       +34 -14    vorbis/lib/tone.c

Index: tone.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/tone.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tone.c	2000/10/12 03:12:54	1.2
+++ tone.c	2000/11/08 06:08:12	1.3
@@ -1,31 +1,51 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <string.h>
 
 void usage(){
-  fprintf(stderr,"tone <frequency_Hz> [<amplitude>]\n");
+  fprintf(stderr,"tone <frequency_Hz>,[<amplitude>] [<frequency_Hz>,[<amplitude>]...]\n");
   exit(1);
 }
 
 int main (int argc,char *argv[]){
-  int i;
-  double f;
-  double amp=32767.;
-
+  int i,j;
+  double *f;
+  double *amp;
+  
   if(argc<2)usage();
-  f=atof(argv[1]);
-  if(argc>=3)amp=atof(argv[2])*32767.;
 
+  f=alloca(sizeof(float)*(argc-1));
+  amp=alloca(sizeof(float)*(argc-1));
+
+  i=0;
+  while(argv[i+1]){
+    char *pos=strchr(argv[i+1],',');
+    
+    f[i]=atof(argv[i+1]);
+    if(pos)
+      amp[i]=atof(pos+1)*32767.;
+    else
+      amp[i]=32767.;
+
+    i++;
+  }
+
   for(i=0;i<44100*10;i++){
-    long val=rint(amp*sin(i/44100.*f*2*M_PI));
-    if(val>32767.)val=32767.;
-    if(val<-32768.)val=-32768.;
+    float val=0;
+    int ival;
+    for(j=0;j<argc-1;j++)
+      val+=amp[j]*sin(i/44100.*f[j]*2*M_PI);
+    ival=rint(val);
+
+    if(ival>32767.)ival=32767.;
+    if(ival<-32768.)ival=-32768.;
 
     fprintf(stdout,"%c%c%c%c",
-	    (char)(val&0xff),
-	    (char)((val>>8)&0xff),
-	    (char)(val&0xff),
-	    (char)((val>>8)&0xff));
+	    (char)(ival&0xff),
+	    (char)((ival>>8)&0xff),
+	    (char)(ival&0xff),
+	    (char)((ival>>8)&0xff));
   }
   return(0);
 }

1.3       +5 -2      vorbis/lib/vorbisenc.c

Index: vorbisenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisenc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbisenc.c	2000/11/06 00:07:02	1.2
+++ vorbisenc.c	2000/11/08 06:08:12	1.3
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.2 2000/11/06 00:07:02 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.3 2000/11/08 06:08:12 xiphmont Exp $
 
  ********************************************************************/
 
@@ -115,7 +115,10 @@
 
   /* copy a mode into our allocated storage */
   bpch=nominal_bitrate/channels;
-  if(bpch<75000){
+  if(bpch<55000){
+    /* mode A */
+    mode=&info_AA;
+  }else if(bpch<75000){
     /* mode A */
     mode=&info_A;
   }else if(bpch<90000){

1.1                  vorbis/lib/books/res0_128_1024_1.vqh

Index: res0_128_1024_1.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_1024_1_VQH_
#define _V_res0_128_1024_1_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_1024_1[] = {
        1,
        2,
        0,
};

tatic long _vq_lengthlist_res0_128_1024_1[] = {
         1, 4, 4, 4, 7, 7, 4, 7, 7, 5, 8, 8, 8,11,11, 8,
        11,11, 5, 8, 8, 8,11,11, 8,11,11, 5, 8, 8, 8,11,
        11, 8,11,11, 8,11,11,11,15,15,11,15,15, 8,11,11,
        11,15,15,12,15,15, 5, 8, 8, 8,11,11, 8,11,11, 8,
        11,11,11,15,15,11,15,15, 8,11,11,12,15,15,11,15,
        15,
};

tatic float _vq_quantthresh_res0_128_1024_1[] = {
        -0.5, 0.5, 
};

tatic long _vq_quantmap_res0_128_1024_1[] = {
            2,    0,    1,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_1024_1 = {
        _vq_quantthresh_res0_128_1024_1,
        _vq_quantmap_res0_128_1024_1,
        3,
        3
};

tatic static_codebook _vq_book_res0_128_1024_1 = {
        4, 81,
        _vq_lengthlist_res0_128_1024_1,
        1, -535822336, 1611661312, 2, 0,
        _vq_quantlist_res0_128_1024_1,
        NULL,
        &_vq_auxt_res0_128_1024_1,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_1024_2.vqh

Index: res0_128_1024_2.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_1024_2_VQH_
#define _V_res0_128_1024_2_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_1024_2[] = {
        1,
        2,
        0,
};

tatic long _vq_lengthlist_res0_128_1024_2[] = {
         3, 4, 4, 4, 6, 6, 5, 6, 6, 4, 6, 6, 6, 8, 8, 6,
         8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 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, 5, 6, 7, 6, 8, 8, 7, 8, 8, 6,
         8, 8, 8,10,10, 8,10,10, 6, 8, 8, 8,10,10, 8,10,
        10,
};

tatic float _vq_quantthresh_res0_128_1024_2[] = {
        -0.5, 0.5, 
};

tatic long _vq_quantmap_res0_128_1024_2[] = {
            2,    0,    1,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_1024_2 = {
        _vq_quantthresh_res0_128_1024_2,
        _vq_quantmap_res0_128_1024_2,
        3,
        3
};

tatic static_codebook _vq_book_res0_128_1024_2 = {
        4, 81,
        _vq_lengthlist_res0_128_1024_2,
        1, -535822336, 1611661312, 2, 0,
        _vq_quantlist_res0_128_1024_2,
        NULL,
        &_vq_auxt_res0_128_1024_2,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_1024_3.vqh

Index: res0_128_1024_3.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_1024_3_VQH_
#define _V_res0_128_1024_3_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_1024_3[] = {
        2,
        3,
        4,
        1,
        0,
};

tatic long _vq_lengthlist_res0_128_1024_3[] = {
         2, 4, 7, 5, 7, 5, 6, 9, 7, 9, 7, 9,13, 9,13, 5,
         7, 9, 7, 9, 7, 9,13, 9,13, 5, 7, 9, 7, 9, 7, 8,
        11, 9,11, 9,11,15,11,15, 7, 9,11, 9,11, 9,11,15,
        11,15, 7, 9,12, 9,12, 9,12,15,11,15,13,15,18,15,
        19, 9,11,15,12,15,13,15,18,16,18, 5, 7, 9, 7, 9,
         7, 9,11, 9,11, 9,11,15,11,15, 7, 9,11, 9,11, 9,
        11,15,11,15, 7, 9,12, 9,12, 9,12,15,11,15,13,16,
        19,15,18, 9,12,15,12,15,13,15,18,15,18, 5, 7, 9,
         7, 9, 7, 9,11, 9,11, 9,11,15,12,16, 7, 9,11, 9,
        11, 9,11,15,12,16, 7, 9,11, 9,11, 9,11,13,11,14,
        12,13,17,14,17, 9,11,13,11,14,12,14,17,14,17, 9,
        12,15,12,15,11,14,17,14,18,15,17,18,18,21,12,14,
        18,14,17,16,17,20,17,19, 7, 9,11, 9,11, 9,11,14,
        11,13,11,14,18,13,17, 9,11,14,11,14,12,14,17,14,
        18, 9,12,15,12,15,11,13,18,13,18,16,18,20,17,20,
        12,14,18,14,18,16,17,21,18,21, 7, 9,13, 9,13, 9,
        12,16,12,16,13,15,19,15,20, 9,12,16,12,16,13,16,
        18,16,21, 9,12,15,12,15,11,13,17,14,18,15,19,21,
        18,19,11,14,18,14,17,15,19,21,17,19,13,16,19,16,
        19,15,18,20,17,21,19,19,20,20,21,16,18,20,18,21,
        20,21,21,21,21, 9,12,15,12,16,11,14,19,14,18,15,
        18,21,17,19,11,14,18,14,19,16,17,21,18,21,13,16,
        20,16,18,15,18,21,17,20,19,21,21,18,21,16,18,21,
        18,19,20,21,21,21,21, 5, 7, 9, 7, 9, 7, 9,11, 9,
        11, 9,12,15,12,15, 7, 9,11, 9,11, 9,12,15,12,15,
         7, 9,11, 9,11, 9,11,14,11,13,11,14,17,14,17, 9,
        11,13,11,13,11,13,18,14,17, 9,12,16,12,16,12,14,
        17,14,17,15,18,19,18,20,12,14,17,14,18,15,17,19,
        21,20, 7, 9,11, 9,12, 9,11,14,11,14,12,14,17,14,
        18, 9,11,14,11,13,12,14,17,13,17, 9,12,15,12,15,
        12,14,17,14,18,16,18,21,18,19,12,14,17,14,18,16,
        18,21,17,21, 7, 9,13,10,13, 9,12,16,12,16,13,16,
        19,15,20, 9,12,16,12,16,13,15,19,16,19, 9,12,15,
        12,15,12,14,18,14,17,15,18,21,17,20,11,14,17,14,
        17,15,17,21,18,21,13,16,19,16,18,16,18,20,17,19,
        20,21,21,20,21,15,18,19,18,21,19,20,21,21,21, 9,
        12,15,12,15,12,14,17,14,18,16,18,21,19,21,12,14,
        17,14,18,15,17,19,18,20,13,15,18,16,19,15,17,20,
        18,21,20,20,21,21,21,15,17,19,17,20,18,21,21,20,
        21,
};

tatic float _vq_quantthresh_res0_128_1024_3[] = {
        -1.5, -0.5, 0.5, 1.5, 
};

tatic long _vq_quantmap_res0_128_1024_3[] = {
            4,    3,    0,    1,    2,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_1024_3 = {
        _vq_quantthresh_res0_128_1024_3,
        _vq_quantmap_res0_128_1024_3,
        5,
        5
};

tatic static_codebook _vq_book_res0_128_1024_3 = {
        4, 625,
        _vq_lengthlist_res0_128_1024_3,
        1, -533725184, 1611661312, 3, 0,
        _vq_quantlist_res0_128_1024_3,
        NULL,
        &_vq_auxt_res0_128_1024_3,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_1024_4.vqh

Index: res0_128_1024_4.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_1024_4_VQH_
#define _V_res0_128_1024_4_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_1024_4[] = {
        2,
        3,
        4,
        1,
        0,
};

tatic long _vq_lengthlist_res0_128_1024_4[] = {
         5, 6, 8, 6, 8, 6, 7, 9, 6, 9, 8, 9,11, 9,11, 6,
         7, 9, 6, 9, 8, 9,11, 9,11, 6, 7, 9, 7, 9, 6, 7,
        10, 7,10, 9,10,12,10,12, 6, 7,10, 7,10, 9,10,12,
        10,12, 8, 9,11, 9,11, 9,10,12,10,12,11,12,14,12,
        15, 9,10,12,10,12,11,12,14,12,14, 6, 6, 9, 7, 9,
         6, 7,10, 7,10, 9,10,12,10,12, 7, 7,10, 7,10, 9,
        10,12,10,12, 8, 9,11, 9,11, 9,10,12,10,12,11,12,
        14,12,14, 9,10,12,10,12,11,12,14,12,14, 6, 7, 9,
         7, 9, 7, 7,10, 7,10, 9,10,12,10,12, 7, 7,10, 7,
        10, 9,10,12,10,12, 7, 7,10, 7,10, 7, 8,11, 8,11,
        10,11,13,11,13, 7, 8,11, 8,11,10,11,13,11,13, 9,
        10,12,10,12,10,11,13,11,13,12,13,15,13,16,10,11,
        14,11,13,12,14,15,13,16, 7, 7,10, 8,10, 7, 9,11,
         8,11,10,11,13,11,13, 7, 8,11, 8,11,10,11,13,11,
        13, 9,10,12,10,12,10,11,13,11,13,12,13,16,13,15,
        10,11,13,11,13,12,13,15,13,16, 8, 9,11, 9,11, 9,
        10,13,10,12,11,12,14,12,15, 9,10,12,10,12,11,12,
        15,12,15, 9,10,12,10,12,10,11,13,11,14,12,13,16,
        13,16,10,11,13,11,13,12,13,16,13,16,11,12,15,12,
        14,12,13,15,13,16,14,15,17,15,17,12,13,15,13,16,
        15,16,20,15,18, 9,10,12,10,12,10,11,13,11,13,12,
        14,15,13,16,10,11,14,11,13,12,13,16,13,16,11,12,
        15,12,14,12,13,15,13,15,14,15,19,15,16,12,13,16,
        14,16,15,16,19,16,17, 6, 7, 9, 7, 9, 6, 7,10, 7,
        10, 9,10,12,10,12, 7, 7,10, 7,10, 9,10,12,10,12,
         7, 7,10, 7,10, 7, 8,11, 8,11,10,11,13,11,13, 7,
         8,11, 8,11,10,11,13,11,14, 9,10,12,10,12,10,11,
        13,11,13,12,13,16,13,16,10,11,13,11,13,12,13,15,
        13,15, 7, 7,10, 8,10, 7, 8,11, 8,11,10,11,13,11,
        13, 7, 8,11, 8,11,10,11,13,11,13, 9,10,12,10,12,
        10,11,13,11,13,12,13,16,13,15,10,11,13,11,14,12,
        13,15,13,15, 8, 9,11, 9,11, 9,10,12,10,12,11,12,
        14,12,15, 9,10,12,10,12,11,12,15,12,14, 9,10,12,
        10,12,10,11,14,11,13,12,14,16,13,16,10,11,13,11,
        13,12,14,16,13,16,11,13,15,12,14,12,13,15,13,16,
        15,15,20,16,18,12,13,16,13,16,14,15,17,16,19, 9,
        10,12,10,12,10,11,13,11,13,12,14,15,13,16,10,11,
        13,11,13,12,13,16,13,16,11,12,15,12,15,12,13,15,
        13,16,15,15,18,16,17,12,13,16,13,16,15,16,18,15,
        16,
};

tatic float _vq_quantthresh_res0_128_1024_4[] = {
        -1.5, -0.5, 0.5, 1.5, 
};

tatic long _vq_quantmap_res0_128_1024_4[] = {
            4,    3,    0,    1,    2,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_1024_4 = {
        _vq_quantthresh_res0_128_1024_4,
        _vq_quantmap_res0_128_1024_4,
        5,
        5
};

tatic static_codebook _vq_book_res0_128_1024_4 = {
        4, 625,
        _vq_lengthlist_res0_128_1024_4,
        1, -533725184, 1611661312, 3, 0,
        _vq_quantlist_res0_128_1024_4,
        NULL,
        &_vq_auxt_res0_128_1024_4,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_1024_5.vqh

Index: res0_128_1024_5.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_1024_5_VQH_
#define _V_res0_128_1024_5_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_1024_5[] = {
        3,
        4,
        5,
        6,
        2,
        1,
        0,
};

tatic long _vq_lengthlist_res0_128_1024_5[] = {
         1, 4, 6, 6, 4, 6, 6, 4, 6, 8, 8, 6, 8, 8, 6, 8,
        11,11, 8,11,11, 6, 9,11,12, 9,11,12, 4, 6, 8, 8,
         6, 8, 8, 6, 8,11,10, 8,10,11, 6, 9,11,12, 9,11,
        12,
};

tatic float _vq_quantthresh_res0_128_1024_5[] = {
        -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 
};

tatic long _vq_quantmap_res0_128_1024_5[] = {
            6,    5,    4,    0,    1,    2,    3,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_1024_5 = {
        _vq_quantthresh_res0_128_1024_5,
        _vq_quantmap_res0_128_1024_5,
        7,
        7
};

tatic static_codebook _vq_book_res0_128_1024_5 = {
        2, 49,
        _vq_lengthlist_res0_128_1024_5,
        1, -533200896, 1611661312, 3, 0,
        _vq_quantlist_res0_128_1024_5,
        NULL,
        &_vq_auxt_res0_128_1024_5,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_1024_6.vqh

Index: res0_128_1024_6.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_1024_6_VQH_
#define _V_res0_128_1024_6_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_1024_6[] = {
        3,
        4,
        5,
        6,
        2,
        1,
        0,
};

tatic long _vq_lengthlist_res0_128_1024_6[] = {
         2, 4, 5, 6, 4, 5, 6, 4, 5, 6, 7, 5, 6, 7, 5, 6,
         8, 9, 7, 8, 9, 6, 8,10,11, 8, 9,11, 4, 5, 6, 7,
         5, 6, 7, 5, 6, 8, 9, 7, 8, 9, 6, 8, 9,11, 8,10,
        11,
};

tatic float _vq_quantthresh_res0_128_1024_6[] = {
        -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 
};

tatic long _vq_quantmap_res0_128_1024_6[] = {
            6,    5,    4,    0,    1,    2,    3,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_1024_6 = {
        _vq_quantthresh_res0_128_1024_6,
        _vq_quantmap_res0_128_1024_6,
        7,
        7
};

tatic static_codebook _vq_book_res0_128_1024_6 = {
        2, 49,
        _vq_lengthlist_res0_128_1024_6,
        1, -533200896, 1611661312, 3, 0,
        _vq_quantlist_res0_128_1024_6,
        NULL,
        &_vq_auxt_res0_128_1024_6,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_1024_7.vqh

Index: res0_128_1024_7.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_1024_7_VQH_
#define _V_res0_128_1024_7_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_1024_7[] = {
        5,
        6,
        7,
        8,
        10,
        4,
        3,
        2,
        0,
};

tatic long _vq_lengthlist_res0_128_1024_7[] = {
         2, 4, 5, 6, 6, 4, 5, 6, 6, 4, 5, 7, 8, 8, 5, 7,
         8, 8, 6, 7, 9,10,10, 7, 9,10,10, 6, 8,10,11,10,
         8,10,11,11, 6, 8,10,11,12, 8,10,11,12, 4, 5, 7,
         8, 8, 5, 7, 8, 8, 6, 7, 9,10,10, 7, 9,10,10, 6,
         8,10,11,11, 8,10,11,10, 6, 8,10,11,12, 8,10,11,
        12,
};

tatic float _vq_quantthresh_res0_128_1024_7[] = {
        -4, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 4, 
};

tatic long _vq_quantmap_res0_128_1024_7[] = {
            8,    7,    6,    5,    0,    1,    2,    3,
            4,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_1024_7 = {
        _vq_quantthresh_res0_128_1024_7,
        _vq_quantmap_res0_128_1024_7,
        9,
        9
};

tatic static_codebook _vq_book_res0_128_1024_7 = {
        2, 81,
        _vq_lengthlist_res0_128_1024_7,
        1, -531365888, 1611661312, 4, 0,
        _vq_quantlist_res0_128_1024_7,
        NULL,
        &_vq_auxt_res0_128_1024_7,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_1024_8.vqh

Index: res0_128_1024_8.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_1024_8_VQH_
#define _V_res0_128_1024_8_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_1024_8[] = {
        11,
        12,
        13,
        14,
        16,
        19,
        22,
        10,
        9,
        8,
        6,
        3,
        0,
};

tatic long _vq_lengthlist_res0_128_1024_8[] = {
         2, 4, 6, 6, 6, 7, 8, 4, 6, 6, 7, 7, 8, 4, 6, 7,
         8, 8, 8,10, 6, 7, 8, 8, 8,10, 6, 7, 8, 9, 9, 9,
        11, 7, 8, 9, 9, 9,11, 7, 8, 9, 9, 9, 9,11, 8, 9,
         9, 9, 9,11, 7, 8, 9, 9, 9,10,11, 8, 9, 9, 9,10,
        11, 7, 9,10,10,10,11,12, 9,10,10,10,11,12, 9,11,
        11,12,12,12,13,11,12,12,12,12,13, 5, 6, 7, 8, 8,
         8,10, 6, 7, 8, 8, 8,10, 6, 7, 8, 9, 9, 9,11, 7,
         8, 9, 9, 9,11, 7, 8, 9, 9, 9, 9,11, 8, 9, 9, 9,
         9,11, 7, 8, 9, 9, 9,10,11, 8, 9, 9, 9,10,11, 7,
         9,10,10,10,11,12, 9,10,10,10,11,12, 9,11,12,12,
        12,12,13,11,12,11,12,12,13,
};

tatic float _vq_quantthresh_res0_128_1024_8[] = {
        -9.5, -6.5, -4, -2.5, -1.5, -0.5, 0.5, 1.5, 
        2.5, 4, 6.5, 9.5, 
};

tatic long _vq_quantmap_res0_128_1024_8[] = {
           12,   11,   10,    9,    8,    7,    0,    1,
            2,    3,    4,    5,    6,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_1024_8 = {
        _vq_quantthresh_res0_128_1024_8,
        _vq_quantmap_res0_128_1024_8,
        13,
        13
};

tatic static_codebook _vq_book_res0_128_1024_8 = {
        2, 169,
        _vq_lengthlist_res0_128_1024_8,
        1, -529137664, 1611661312, 5, 0,
        _vq_quantlist_res0_128_1024_8,
        NULL,
        &_vq_auxt_res0_128_1024_8,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_1024_9.vqh

Index: res0_128_1024_9.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_1024_9_VQH_
#define _V_res0_128_1024_9_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_1024_9[] = {
        56,
        57,
        58,
        59,
        61,
        64,
        67,
        70,
        73,
        76,
        80,
        84,
        87,
        91,
        95,
        99,
        103,
        107,
        112,
        55,
        54,
        53,
        51,
        48,
        45,
        42,
        39,
        36,
        32,
        28,
        25,
        21,
        17,
        13,
        9,
        5,
        0,
};

tatic long _vq_lengthlist_res0_128_1024_9[] = {
         2, 3, 4, 4, 4, 5, 7, 6, 7,10,11,12,13,14,14,16,
        18,17,19, 3, 4, 4, 4, 5, 7, 6, 8,10,11,12,13,14,
        16,17,19,18,18,
};

tatic float _vq_quantthresh_res0_128_1024_9[] = {
        -53.5, -49, -45, -41, -37, -33, -29.5, -26, 
        -22, -18.5, -15.5, -12.5, -9.5, -6.5, -4, -2.5, 
        -1.5, -0.5, 0.5, 1.5, 2.5, 4, 6.5, 9.5, 
        12.5, 15.5, 18.5, 22, 26, 29.5, 33, 37, 
        41, 45, 49, 53.5, 
};

tatic long _vq_quantmap_res0_128_1024_9[] = {
           36,   35,   34,   33,   32,   31,   30,   29,
           28,   27,   26,   25,   24,   23,   22,   21,
           20,   19,    0,    1,    2,    3,    4,    5,
            6,    7,    8,    9,   10,   11,   12,   13,
           14,   15,   16,   17,   18,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_1024_9 = {
        _vq_quantthresh_res0_128_1024_9,
        _vq_quantmap_res0_128_1024_9,
        37,
        37
};

tatic static_codebook _vq_book_res0_128_1024_9 = {
        1, 37,
        _vq_lengthlist_res0_128_1024_9,
        1, -524550144, 1611661312, 7, 0,
        _vq_quantlist_res0_128_1024_9,
        NULL,
        &_vq_auxt_res0_128_1024_9,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_1024aux.vqh

Index: res0_128_1024aux.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by huff/huffbuld

 ********************************************************************/

#ifndef _V_res0_128_1024aux_VQH_
#define _V_res0_128_1024aux_VQH_
#include "codebook.h"

tatic long _huff_lengthlist_res0_128_1024aux[] = {
         2, 6,11,10,14,11,14,11,13,16, 5, 3, 5, 6, 8, 8,
        10, 9,11,14,10, 5, 4, 5, 7, 9, 9,11,12,15, 9, 5,
         5, 5, 7, 7, 8, 8,10,13,12, 8, 7, 7, 6, 8, 7, 9,
        11,16, 9, 7, 8, 7, 8, 7, 8, 8, 9,14,13, 9, 8, 7,
         7, 8, 7, 7, 9,14, 9, 8, 9, 7, 8, 7, 7, 6, 8,11,
        10, 9,10, 8, 8, 8, 7, 6, 7,10,12,11,12,10,10,10,
         8, 7, 8,12,
};

tatic static_codebook _huff_book_res0_128_1024aux = {
        2, 100,
        _huff_lengthlist_res0_128_1024aux,
        0, 0, 0, 0, 0,
        NULL,
        NULL,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_128_1.vqh

Index: res0_128_128_1.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_128_1_VQH_
#define _V_res0_128_128_1_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_128_1[] = {
        1,
        2,
        0,
};

tatic long _vq_lengthlist_res0_128_128_1[] = {
         1, 4, 4, 4, 7, 7, 5, 7, 7, 5, 8, 8, 7,10,10, 7,
        10,10, 5, 7, 8, 7,10,10, 8,10,10, 5, 8, 8, 8,11,
        11, 8,10,10, 8,10,10,10,12,13,10,13,13, 8,10,10,
        10,13,12,10,13,13, 5, 8, 8, 8,10,11, 8,10,11, 8,
        10,10,10,13,13,10,12,13, 8,10,10,11,13,13,10,13,
        12,
};

tatic float _vq_quantthresh_res0_128_128_1[] = {
        -0.5, 0.5, 
};

tatic long _vq_quantmap_res0_128_128_1[] = {
            2,    0,    1,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_128_1 = {
        _vq_quantthresh_res0_128_128_1,
        _vq_quantmap_res0_128_128_1,
        3,
        3
};

tatic static_codebook _vq_book_res0_128_128_1 = {
        4, 81,
        _vq_lengthlist_res0_128_128_1,
        1, -535822336, 1611661312, 2, 0,
        _vq_quantlist_res0_128_128_1,
        NULL,
        &_vq_auxt_res0_128_128_1,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_128_2.vqh

Index: res0_128_128_2.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_128_2_VQH_
#define _V_res0_128_128_2_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_128_2[] = {
        2,
        3,
        4,
        1,
        0,
};

tatic long _vq_lengthlist_res0_128_128_2[] = {
         2, 4, 6, 4, 6, 5, 7, 9, 7, 9, 7,10,12, 9,13, 5,
         7, 9, 7, 9, 7, 9,13,10,13, 5, 7,10, 7,10, 7, 9,
        12, 9,11, 9,13,14,12,14, 7, 9,11, 9,12,10,12,15,
        12,14, 7,10,13,10,14, 9,12,14,12,15,12,15,14,15,
        15,10,12,15,12,14,13,15,15,14,15, 5, 7, 9, 7, 9,
         7, 9,12, 9,12, 9,14,15,12,14, 7, 9,12, 9,12,10,
        12,15,12,15, 7,10,13,10,14,10,11,15,12,15,13,14,
        15,14,15, 9,12,15,12,14,14,14,15,14,15, 5, 7, 9,
         7, 9, 7,10,12, 9,11,10,12,14,12,15, 7, 9,13, 9,
        12,10,12,15,12,14, 7, 9,12, 9,11, 9,12,14,11,13,
        12,14,15,14,15, 9,11,14,12,14,12,13,15,15,15, 9,
        12,15,12,15,12,14,15,14,15,14,15,15,15,15,12,13,
        15,14,15,15,15,15,15,15, 7, 9,12, 9,11, 9,11,14,
        12,14,12,13,14,14,15, 9,11,14,12,15,12,15,15,14,
        14,10,12,15,12,15,13,13,15,14,14,15,15,15,15,15,
        13,13,15,14,15,15,15,15,15,15, 7,10,14, 9,14,10,
        12,15,12,14,14,15,15,14,15,10,12,15,12,15,15,15,
        15,15,15,10,12,15,11,15,11,14,15,15,15,15,15,15,
        15,14,12,14,14,14,15,15,15,15,15,15,13,14,15,14,
        15,14,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
        15,15,15,15,15,10,12,15,13,14,13,13,15,14,15,15,
        15,15,15,15,12,15,15,15,15,14,14,15,14,15,14,15,
        15,15,15,14,15,15,14,15,15,15,15,15,15,14,15,15,
        15,15,15,15,15,15,15, 5, 7,10, 7, 9, 7, 9,13,10,
        11,10,13,15,12,14, 7,10,12,10,11,10,12,15,13,15,
         7, 9,12, 9,12, 9,11,14,11,14,13,15,15,13,15, 9,
        12,15,12,15,12,13,14,14,14,10,13,15,11,14,12,13,
        15,14,15,14,15,15,15,15,11,15,15,14,15,14,14,15,
        15,15, 7,10,13, 9,13, 9,12,14,11,13,13,14,15,14,
        14, 9,12,14,12,15,12,14,15,15,15,10,12,14,12,15,
        12,14,15,15,15,14,15,15,15,15,12,15,15,15,15,14,
        15,15,15,14, 7,10,14, 9,15,10,12,15,11,14,14,15,
        15,14,15,10,12,15,12,13,14,15,15,14,15, 9,12,15,
        13,15,11,14,15,14,15,15,15,15,15,15,13,13,15,13,
        15,15,15,15,15,15,13,13,15,15,15,14,15,15,14,15,
        15,15,15,15,15,14,15,15,15,15,15,15,15,15,15, 9,
        12,15,12,15,14,14,15,14,15,15,15,15,15,15,12,14,
        14,15,15,14,14,15,15,15,14,15,15,15,15,14,15,15,
        15,15,15,15,15,15,15,14,15,15,15,15,15,15,15,15,
        15,
};

tatic float _vq_quantthresh_res0_128_128_2[] = {
        -1.5, -0.5, 0.5, 1.5, 
};

tatic long _vq_quantmap_res0_128_128_2[] = {
            4,    3,    0,    1,    2,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_128_2 = {
        _vq_quantthresh_res0_128_128_2,
        _vq_quantmap_res0_128_128_2,
        5,
        5
};

tatic static_codebook _vq_book_res0_128_128_2 = {
        4, 625,
        _vq_lengthlist_res0_128_128_2,
        1, -533725184, 1611661312, 3, 0,
        _vq_quantlist_res0_128_128_2,
        NULL,
        &_vq_auxt_res0_128_128_2,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_128_3.vqh

Index: res0_128_128_3.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_128_3_VQH_
#define _V_res0_128_128_3_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_128_3[] = {
        5,
        6,
        7,
        8,
        10,
        4,
        3,
        2,
        0,
};

tatic long _vq_lengthlist_res0_128_128_3[] = {
         2, 4, 5, 5, 6, 3, 5, 6, 5, 4, 5, 7, 7, 7, 5, 7,
         7, 7, 7, 8,10,10,10, 8, 9,10,10, 8,10,12,11,12,
        10,12,12,12,10,12,14,14,13,13,14,15,14, 4, 5, 7,
         7, 7, 5, 7, 7, 7, 7, 8,10,10,10, 8,10,10,10, 8,
        10,12,11,12,10,12,12,13,10,13,14,14,13,12,13,15,
        14,
};

tatic float _vq_quantthresh_res0_128_128_3[] = {
        -4, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 4, 
};

tatic long _vq_quantmap_res0_128_128_3[] = {
            8,    7,    6,    5,    0,    1,    2,    3,
            4,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_128_3 = {
        _vq_quantthresh_res0_128_128_3,
        _vq_quantmap_res0_128_128_3,
        9,
        9
};

tatic static_codebook _vq_book_res0_128_128_3 = {
        2, 81,
        _vq_lengthlist_res0_128_128_3,
        1, -531365888, 1611661312, 4, 0,
        _vq_quantlist_res0_128_128_3,
        NULL,
        &_vq_auxt_res0_128_128_3,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_128_4.vqh

Index: res0_128_128_4.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_128_4_VQH_
#define _V_res0_128_128_4_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_128_4[] = {
        11,
        12,
        13,
        14,
        16,
        19,
        22,
        10,
        9,
        8,
        6,
        3,
        0,
};

tatic long _vq_lengthlist_res0_128_128_4[] = {
         2, 3, 5, 6, 6, 6, 7, 4, 5, 6, 6, 6, 7, 4, 5, 7,
         8, 8, 8, 9, 5, 7, 8, 8, 7, 9, 8, 8,10,10,11,11,
        12, 9,10,11,11,11,12,10,11,13,14,14,13,15,11,12,
        13,13,13,15,12,15,15,15,18,16,17,14,15,15,17,17,
        16,13,16,16,18,18,18,18,16,17,18,18,18,18,14,18,
        18,17,18,18,18,16,18,18,18,18,18, 4, 5, 7, 8, 8,
         8, 9, 5, 7, 7, 7, 7, 9, 8, 9,10,11,11,11,12, 8,
        10,11,11,10,12,10,11,12,13,13,13,15,11,13,13,13,
        13,15,13,14,15,16,16,15,18,13,15,16,15,15,17,13,
        16,18,17,18,18,18,16,17,16,17,18,18,14,17,16,18,
        18,18,18,16,18,17,18,18,18,
};

tatic float _vq_quantthresh_res0_128_128_4[] = {
        -9.5, -6.5, -4, -2.5, -1.5, -0.5, 0.5, 1.5, 
        2.5, 4, 6.5, 9.5, 
};

tatic long _vq_quantmap_res0_128_128_4[] = {
           12,   11,   10,    9,    8,    7,    0,    1,
            2,    3,    4,    5,    6,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_128_4 = {
        _vq_quantthresh_res0_128_128_4,
        _vq_quantmap_res0_128_128_4,
        13,
        13
};

tatic static_codebook _vq_book_res0_128_128_4 = {
        2, 169,
        _vq_lengthlist_res0_128_128_4,
        1, -529137664, 1611661312, 5, 0,
        _vq_quantlist_res0_128_128_4,
        NULL,
        &_vq_auxt_res0_128_128_4,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_128_5.vqh

Index: res0_128_128_5.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_128_128_5_VQH_
#define _V_res0_128_128_5_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_128_128_5[] = {
        56,
        57,
        58,
        59,
        61,
        64,
        67,
        70,
        73,
        76,
        80,
        84,
        87,
        91,
        95,
        99,
        103,
        107,
        112,
        55,
        54,
        53,
        51,
        48,
        45,
        42,
        39,
        36,
        32,
        28,
        25,
        21,
        17,
        13,
        9,
        5,
        0,
};

tatic long _vq_lengthlist_res0_128_128_5[] = {
         1, 3, 5, 5, 6, 7, 8, 6, 8,10,16,15,16,16,16,16,
        16,16,16, 3, 4, 5, 6, 7, 9, 6, 8,11,13,14,16,16,
        16,16,15,15,15,
};

tatic float _vq_quantthresh_res0_128_128_5[] = {
        -53.5, -49, -45, -41, -37, -33, -29.5, -26, 
        -22, -18.5, -15.5, -12.5, -9.5, -6.5, -4, -2.5, 
        -1.5, -0.5, 0.5, 1.5, 2.5, 4, 6.5, 9.5, 
        12.5, 15.5, 18.5, 22, 26, 29.5, 33, 37, 
        41, 45, 49, 53.5, 
};

tatic long _vq_quantmap_res0_128_128_5[] = {
           36,   35,   34,   33,   32,   31,   30,   29,
           28,   27,   26,   25,   24,   23,   22,   21,
           20,   19,    0,    1,    2,    3,    4,    5,
            6,    7,    8,    9,   10,   11,   12,   13,
           14,   15,   16,   17,   18,
};

tatic encode_aux_threshmatch _vq_auxt_res0_128_128_5 = {
        _vq_quantthresh_res0_128_128_5,
        _vq_quantmap_res0_128_128_5,
        37,
        37
};

tatic static_codebook _vq_book_res0_128_128_5 = {
        1, 37,
        _vq_lengthlist_res0_128_128_5,
        1, -524550144, 1611661312, 7, 0,
        _vq_quantlist_res0_128_128_5,
        NULL,
        &_vq_auxt_res0_128_128_5,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_128_128aux.vqh

Index: res0_128_128aux.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by huff/huffbuld

 ********************************************************************/

#ifndef _V_res0_128_128aux_VQH_
#define _V_res0_128_128aux_VQH_
#include "codebook.h"

tatic long _huff_lengthlist_res0_128_128aux[] = {
         4, 9,11,11,15,15, 3, 2, 6, 9,14,15, 6, 6, 8,11,
        14,15, 7, 4, 6, 7,11,13, 6, 2, 4, 7,11,14, 8, 4,
         7,10,15,15,
};

tatic static_codebook _huff_book_res0_128_128aux = {
        2, 36,
        _huff_lengthlist_res0_128_128aux,
        0, 0, 0, 0, 0,
        NULL,
        NULL,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_1024_1.vqh

Index: res0_96_1024_1.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_1024_1_VQH_
#define _V_res0_96_1024_1_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_1024_1[] = {
        1,
        2,
        0,
};

tatic long _vq_lengthlist_res0_96_1024_1[] = {
         1, 4, 4, 4, 7, 7, 4, 7, 7, 5, 8, 8, 8,11,11, 8,
        11,11, 5, 8, 8, 8,11,11, 8,11,11, 5, 8, 8, 8,11,
        11, 8,11,11, 8,11,11,11,15,15,11,15,15, 8,11,11,
        11,15,15,12,15,15, 5, 8, 8, 8,11,11, 8,11,11, 8,
        11,11,11,15,15,11,15,15, 8,11,11,12,15,15,11,15,
        15,
};

tatic float _vq_quantthresh_res0_96_1024_1[] = {
        -0.5, 0.5, 
};

tatic long _vq_quantmap_res0_96_1024_1[] = {
            2,    0,    1,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_1024_1 = {
        _vq_quantthresh_res0_96_1024_1,
        _vq_quantmap_res0_96_1024_1,
        3,
        3
};

tatic static_codebook _vq_book_res0_96_1024_1 = {
        4, 81,
        _vq_lengthlist_res0_96_1024_1,
        1, -535822336, 1611661312, 2, 0,
        _vq_quantlist_res0_96_1024_1,
        NULL,
        &_vq_auxt_res0_96_1024_1,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_1024_2.vqh

Index: res0_96_1024_2.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_1024_2_VQH_
#define _V_res0_96_1024_2_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_1024_2[] = {
        1,
        2,
        0,
};

tatic long _vq_lengthlist_res0_96_1024_2[] = {
         3, 4, 5, 4, 6, 6, 5, 6, 6, 5, 6, 6, 6, 7, 7, 6,
         7, 8, 5, 6, 6, 6, 7, 7, 6, 8, 7, 5, 6, 6, 6, 8,
         8, 6, 8, 8, 6, 8, 8, 7, 9, 9, 8, 9, 9, 6, 8, 8,
         7, 9, 9, 8, 9, 9, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
         8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8, 8, 9, 9, 8, 9,
         9,
};

tatic float _vq_quantthresh_res0_96_1024_2[] = {
        -0.5, 0.5, 
};

tatic long _vq_quantmap_res0_96_1024_2[] = {
            2,    0,    1,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_1024_2 = {
        _vq_quantthresh_res0_96_1024_2,
        _vq_quantmap_res0_96_1024_2,
        3,
        3
};

tatic static_codebook _vq_book_res0_96_1024_2 = {
        4, 81,
        _vq_lengthlist_res0_96_1024_2,
        1, -535822336, 1611661312, 2, 0,
        _vq_quantlist_res0_96_1024_2,
        NULL,
        &_vq_auxt_res0_96_1024_2,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_1024_3.vqh

Index: res0_96_1024_3.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_1024_3_VQH_
#define _V_res0_96_1024_3_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_1024_3[] = {
        3,
        4,
        6,
        2,
        0,
};

tatic long _vq_lengthlist_res0_96_1024_3[] = {
         3, 5, 7, 5, 7, 5, 6, 9, 6, 9, 7, 9,13, 9,13, 5,
         6, 9, 6, 9, 7, 9,13, 9,13, 5, 6, 9, 6, 9, 6, 8,
        11, 8,11, 9,11,15,11,15, 7, 8,11, 8,11, 9,11,15,
        11,15, 7, 9,12, 9,12, 9,11,15,11,15,14,15,19,15,
        19, 9,11,15,11,15,14,15,18,16,18, 5, 6, 9, 6, 9,
         7, 8,11, 8,11, 9,11,15,11,15, 7, 8,11, 8,11,10,
        11,15,11,15, 7, 9,12, 9,12, 9,11,15,11,15,13,16,
        18,15,19, 9,11,15,11,15,14,15,19,15,18, 5, 7, 9,
         7, 9, 6, 8,11, 8,11, 9,11,15,11,16, 6, 8,11, 8,
        11, 9,11,15,11,15, 7, 8,11, 8,11, 8,10,13,10,13,
        11,13,16,13,17, 8,10,13,10,13,11,13,17,13,17,10,
        12,15,12,15,11,13,17,13,17,16,16,18,17,21,11,13,
        18,13,18,16,17,19,18,19, 7, 8,11, 8,11, 8,10,13,
        10,13,11,13,17,13,16, 8,10,13,10,13,11,13,17,13,
        17,10,12,15,12,15,11,13,18,13,17,16,17,20,17,18,
        12,13,17,13,17,15,18,21,17,20, 7, 9,12, 9,12, 9,
        12,16,12,16,12,15,19,15,19, 9,12,15,12,15,12,15,
        19,15,19, 9,12,16,11,15,11,13,17,13,17,16,18,20,
        18,20,12,13,17,13,17,15,17,20,17,19,14,17,18,16,
        19,15,17,21,17,21,18,18,18,21,20,16,18,21,18,21,
        21,21,21,20,21,10,12,16,12,16,11,13,17,13,18,15,
        18,18,18,19,11,13,18,13,17,15,17,19,17,19,14,16,
        19,16,21,16,18,19,17,21,18,21,21,20,18,16,17,21,
        17,21,18,21,21,21,21, 5, 7, 9, 7, 9, 6, 8,11, 8,
        11, 9,11,15,11,15, 7, 8,11, 8,11, 9,11,16,11,16,
         7, 8,11, 8,11, 8,10,13,10,13,11,13,17,13,17, 8,
        10,13,10,13,11,13,17,13,17,10,12,15,12,15,11,14,
        18,14,17,16,18,20,17,19,11,13,16,13,17,16,17,18,
        18,21, 7, 8,11, 8,11, 8,10,13,10,13,11,13,17,13,
        17, 8,10,13,10,13,11,13,17,13,16,10,12,15,12,15,
        12,13,17,13,18,16,17,20,17,20,11,13,17,13,18,16,
        17,20,17,18, 7, 9,12,10,12, 9,11,15,12,16,12,16,
        19,15,18, 9,12,16,12,16,12,16,19,16,20,10,11,16,
        12,15,11,13,18,13,17,16,17,19,17,19,11,13,17,13,
        17,16,16,19,17,20,14,16,19,16,20,16,17,20,17,20,
        20,20,20,21,21,16,17,18,18,21,19,19,21,21,21,10,
        12,16,12,15,11,13,18,14,18,16,18,21,17,20,11,14,
        17,13,17,15,17,21,18,18,14,16,19,16,19,16,17,19,
        18,19,18,21,21,20,21,16,17,20,17,21,17,20,21,21,
        19,
};

tatic float _vq_quantthresh_res0_96_1024_3[] = {
        -2, -0.5, 0.5, 2, 
};

tatic long _vq_quantmap_res0_96_1024_3[] = {
            4,    3,    0,    1,    2,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_1024_3 = {
        _vq_quantthresh_res0_96_1024_3,
        _vq_quantmap_res0_96_1024_3,
        5,
        5
};

tatic static_codebook _vq_book_res0_96_1024_3 = {
        4, 625,
        _vq_lengthlist_res0_96_1024_3,
        1, -533200896, 1611661312, 3, 0,
        _vq_quantlist_res0_96_1024_3,
        NULL,
        &_vq_auxt_res0_96_1024_3,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_1024_4.vqh

Index: res0_96_1024_4.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_1024_4_VQH_
#define _V_res0_96_1024_4_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_1024_4[] = {
        3,
        4,
        6,
        2,
        0,
};

tatic long _vq_lengthlist_res0_96_1024_4[] = {
         5, 6, 8, 6, 8, 6, 6, 9, 6, 9, 8, 9,11, 9,11, 6,
         6, 9, 6, 9, 8, 9,11, 9,11, 6, 7, 9, 6, 9, 7, 7,
        10, 7,10, 9,10,12,10,12, 7, 7,10, 7, 9, 9,10,12,
        10,12, 8, 9,11, 9,11, 9,10,13,10,12,11,12,15,13,
        15, 9,10,12,10,12,11,12,15,12,14, 6, 6, 9, 7, 9,
         7, 7,10, 7,10, 9,10,12,10,12, 7, 7,10, 7,10, 9,
        10,12,10,12, 8, 9,11, 9,11, 9,10,12,10,12,11,12,
        15,12,14, 9,10,12,10,12,11,12,15,12,14, 6, 7, 9,
         7, 9, 7, 7,10, 7,10, 9,10,12,10,12, 7, 7,10, 7,
        10, 9,10,12,10,12, 7, 7,10, 7,10, 7, 8,10, 8,10,
        10,10,13,11,13, 7, 8,10, 8,11,10,11,13,11,13, 9,
        10,13,10,12,10,10,13,11,13,13,13,15,13,16,10,11,
        13,11,13,13,14,16,13,15, 7, 7,10, 7,10, 7, 8,10,
         8,10,10,10,13,11,13, 7, 8,10, 8,11,10,11,13,11,
        13, 9,10,12,10,12,10,11,13,11,14,13,13,16,13,15,
        10,11,13,11,14,12,13,16,13,16, 8, 9,11, 9,11, 9,
        10,12,10,13,11,13,15,13,15, 9,10,13,10,12,12,13,
        15,13,15, 9,10,13,10,12,10,11,13,11,13,13,13,16,
        13,16,10,11,13,11,13,13,14,17,13,16,12,13,16,13,
        15,13,13,15,14,16,15,15,16,16,18,13,14,17,14,15,
        15,16,18,16,17, 9,10,13,10,13,10,11,14,11,14,13,
        14,16,14,16,10,11,14,11,13,13,13,15,14,16,12,13,
        16,13,16,13,13,16,14,16,15,16,17,15,16,13,13,16,
        14,16,15,16,17,16,17, 6, 7, 9, 7, 9, 7, 7,10, 7,
        10, 9,10,12,10,12, 7, 7,10, 7,10, 9,10,12,10,12,
         7, 7,10, 7,10, 7, 8,11, 8,11,10,11,13,11,13, 7,
         8,10, 8,11,10,10,13,11,13, 9,10,13,10,12,10,11,
        13,11,13,12,13,15,14,16,10,11,13,11,13,13,13,15,
        13,15, 7, 7,10, 7,10, 7, 8,10, 8,11,10,11,13,11,
        13, 7, 8,10, 8,10,10,11,13,11,13, 9,10,13,10,13,
        10,11,13,11,14,13,14,16,14,15,10,11,14,11,13,12,
        14,16,13,15, 8, 9,11, 9,11, 9,10,12,10,12,12,13,
        15,13,16, 9,10,13,10,13,12,13,15,13,15, 9,10,12,
        10,13,10,11,14,11,14,13,14,16,13,16,10,11,13,11,
        14,13,14,16,14,16,12,13,15,13,15,13,14,16,13,16,
        15,16,18,16,19,12,13,15,14,16,15,15,16,16,18, 9,
        10,12,10,13,10,11,13,11,13,13,13,15,14,16,10,11,
        14,11,13,13,14,17,13,15,12,13,16,13,15,13,14,16,
        14,16,15,16,17,16,18,13,14,16,14,17,15,17,19,15,
        17,
};

tatic float _vq_quantthresh_res0_96_1024_4[] = {
        -2, -0.5, 0.5, 2, 
};

tatic long _vq_quantmap_res0_96_1024_4[] = {
            4,    3,    0,    1,    2,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_1024_4 = {
        _vq_quantthresh_res0_96_1024_4,
        _vq_quantmap_res0_96_1024_4,
        5,
        5
};

tatic static_codebook _vq_book_res0_96_1024_4 = {
        4, 625,
        _vq_lengthlist_res0_96_1024_4,
        1, -533200896, 1611661312, 3, 0,
        _vq_quantlist_res0_96_1024_4,
        NULL,
        &_vq_auxt_res0_96_1024_4,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_1024_5.vqh

Index: res0_96_1024_5.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_1024_5_VQH_
#define _V_res0_96_1024_5_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_1024_5[] = {
        8,
        9,
        11,
        13,
        16,
        7,
        5,
        3,
        0,
};

tatic long _vq_lengthlist_res0_96_1024_5[] = {
         2, 3, 5, 6, 8, 4, 5, 6, 8, 4, 5, 7, 8, 9, 5, 7,
         8, 9, 6, 7, 8, 9,10, 7, 8, 9,10, 7, 8, 9,10,11,
         8,10,10,11, 8,10,11,12,12,10,11,12,12, 4, 5, 7,
         8, 9, 5, 7, 8, 9, 6, 7, 8, 9,10, 7, 8, 9,10, 6,
         8, 9,10,11, 8,10,10,11, 8,10,11,12,12,10,11,12,
        12,
};

tatic float _vq_quantthresh_res0_96_1024_5[] = {
        -6.5, -4, -2, -0.5, 0.5, 2, 4, 6.5, 
};

tatic long _vq_quantmap_res0_96_1024_5[] = {
            8,    7,    6,    5,    0,    1,    2,    3,
            4,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_1024_5 = {
        _vq_quantthresh_res0_96_1024_5,
        _vq_quantmap_res0_96_1024_5,
        9,
        9
};

tatic static_codebook _vq_book_res0_96_1024_5 = {
        2, 81,
        _vq_lengthlist_res0_96_1024_5,
        1, -529530880, 1611661312, 5, 0,
        _vq_quantlist_res0_96_1024_5,
        NULL,
        &_vq_auxt_res0_96_1024_5,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_1024_6.vqh

Index: res0_96_1024_6.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_1024_6_VQH_
#define _V_res0_96_1024_6_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_1024_6[] = {
        14,
        15,
        17,
        19,
        22,
        25,
        28,
        13,
        11,
        9,
        6,
        3,
        0,
};

tatic long _vq_lengthlist_res0_96_1024_6[] = {
         3, 4, 6, 6, 7, 7, 9, 4, 6, 6, 7, 7, 9, 4, 5, 6,
         7, 8, 8,10, 6, 6, 7, 8, 8,10, 6, 7, 7, 8, 8, 9,
        11, 7, 7, 8, 8, 9,11, 7, 7, 8, 8, 9,10,12, 7, 8,
         9, 9,10,12, 7, 8, 9, 9,10,11,13, 8, 9,10,10,11,
        13, 8, 9,10,11,11,12,14, 9,10,11,11,12,14,10,11,
        12,12,13,15,16,11,12,12,13,14,16, 4, 5, 6, 7, 8,
         8,10, 6, 6, 7, 8, 8,10, 6, 7, 7, 8, 9, 9,11, 7,
         7, 8, 8, 9,11, 7, 7, 8, 8, 9,10,12, 7, 8, 8, 9,
        10,12, 7, 8, 9, 9,10,11,13, 8, 9,10,10,11,13, 8,
         9,10,11,11,12,14, 9,10,10,11,12,14,10,11,12,12,
        13,15,16,11,12,12,13,14,16,
};

tatic float _vq_quantthresh_res0_96_1024_6[] = {
        -12.5, -9.5, -6.5, -4, -2, -0.5, 0.5, 2, 
        4, 6.5, 9.5, 12.5, 
};

tatic long _vq_quantmap_res0_96_1024_6[] = {
           12,   11,   10,    9,    8,    7,    0,    1,
            2,    3,    4,    5,    6,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_1024_6 = {
        _vq_quantthresh_res0_96_1024_6,
        _vq_quantmap_res0_96_1024_6,
        13,
        13
};

tatic static_codebook _vq_book_res0_96_1024_6 = {
        2, 169,
        _vq_lengthlist_res0_96_1024_6,
        1, -528744448, 1611661312, 5, 0,
        _vq_quantlist_res0_96_1024_6,
        NULL,
        &_vq_auxt_res0_96_1024_6,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_1024_7.vqh

Index: res0_96_1024_7.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_1024_7_VQH_
#define _V_res0_96_1024_7_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_1024_7[] = {
        56,
        57,
        59,
        61,
        64,
        67,
        70,
        73,
        76,
        80,
        84,
        87,
        91,
        95,
        99,
        103,
        107,
        112,
        55,
        53,
        51,
        48,
        45,
        42,
        39,
        36,
        32,
        28,
        25,
        21,
        17,
        13,
        9,
        5,
        0,
};

tatic long _vq_lengthlist_res0_96_1024_7[] = {
         1, 3, 4, 5, 6, 8,10, 7, 9,11,12,13,14,14,16,18,
        17,19, 3, 4, 5, 6, 8,10, 7, 9,11,12,13,14,16,17,
        19,18,18,
};

tatic float _vq_quantthresh_res0_96_1024_7[] = {
        -53.5, -49, -45, -41, -37, -33, -29.5, -26, 
        -22, -18.5, -15.5, -12.5, -9.5, -6.5, -4, -2, 
        -0.5, 0.5, 2, 4, 6.5, 9.5, 12.5, 15.5, 
        18.5, 22, 26, 29.5, 33, 37, 41, 45, 
        49, 53.5, 
};

tatic long _vq_quantmap_res0_96_1024_7[] = {
           34,   33,   32,   31,   30,   29,   28,   27,
           26,   25,   24,   23,   22,   21,   20,   19,
           18,    0,    1,    2,    3,    4,    5,    6,
            7,    8,    9,   10,   11,   12,   13,   14,
           15,   16,   17,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_1024_7 = {
        _vq_quantthresh_res0_96_1024_7,
        _vq_quantmap_res0_96_1024_7,
        35,
        35
};

tatic static_codebook _vq_book_res0_96_1024_7 = {
        1, 35,
        _vq_lengthlist_res0_96_1024_7,
        1, -524550144, 1611661312, 7, 0,
        _vq_quantlist_res0_96_1024_7,
        NULL,
        &_vq_auxt_res0_96_1024_7,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_1024aux.vqh

Index: res0_96_1024aux.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by huff/huffbuld

 ********************************************************************/

#ifndef _V_res0_96_1024aux_VQH_
#define _V_res0_96_1024aux_VQH_
#include "codebook.h"

tatic long _huff_lengthlist_res0_96_1024aux[] = {
         2, 6,11,10,14,11,14,16, 5, 3, 4, 6, 9, 9,12,15,
         9, 4, 3, 6, 7, 9,13,15, 8, 6, 5, 5, 7, 7,11,15,
        13, 8, 6, 6, 6, 7,12,16, 9, 7, 7, 6, 6, 5, 8,12,
        11,10, 9, 8, 7, 6, 9,13,14,12,12,11,10, 9,11,14,
};

tatic static_codebook _huff_book_res0_96_1024aux = {
        2, 64,
        _huff_lengthlist_res0_96_1024aux,
        0, 0, 0, 0, 0,
        NULL,
        NULL,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_128_1.vqh

Index: res0_96_128_1.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_128_1_VQH_
#define _V_res0_96_128_1_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_128_1[] = {
        1,
        2,
        0,
};

tatic long _vq_lengthlist_res0_96_128_1[] = {
         1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7,10,10, 7,
         9,10, 5, 7, 7, 7,10,10, 7,10,10, 5, 7, 7, 8,10,
        10, 8,10,10, 7,10,10,10,12,13,10,12,13, 8,10,10,
        10,12,12,10,12,13, 5, 8, 8, 8,10,10, 8,10,10, 8,
        10,10,10,12,13,10,12,13, 8,10,10,10,13,13,10,13,
        12,
};

tatic float _vq_quantthresh_res0_96_128_1[] = {
        -0.5, 0.5, 
};

tatic long _vq_quantmap_res0_96_128_1[] = {
            2,    0,    1,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_128_1 = {
        _vq_quantthresh_res0_96_128_1,
        _vq_quantmap_res0_96_128_1,
        3,
        3
};

tatic static_codebook _vq_book_res0_96_128_1 = {
        4, 81,
        _vq_lengthlist_res0_96_128_1,
        1, -535822336, 1611661312, 2, 0,
        _vq_quantlist_res0_96_128_1,
        NULL,
        &_vq_auxt_res0_96_128_1,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_128_2.vqh

Index: res0_96_128_2.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_128_2_VQH_
#define _V_res0_96_128_2_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_128_2[] = {
        3,
        4,
        6,
        2,
        0,
};

tatic long _vq_lengthlist_res0_96_128_2[] = {
         4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 8,10,10,10,10, 6,
         6, 6, 6, 6, 8,10,10,10, 9, 6, 7, 7, 7, 7, 7, 7,
         7, 7, 7,10,11,10,11,11, 7, 7, 7, 7, 7,10,11,11,
        11,11, 9,10,11,10,11,10,11,11,11,12,13,15,14,14,
        14,10,11,12,11,11,13,14,15,15,15, 6, 7, 7, 7, 7,
         7, 7, 8, 7, 7,10,11,11,11,11, 7, 8, 8, 8, 7,10,
        11,11,11,11, 9,10,11,10,11,10,11,11,11,12,14,15,
        15,14,15,10,11,11,11,11,14,14,14,15,15, 6, 7, 7,
         7, 7, 8, 8, 8, 8, 8,11,12,11,12,10, 8, 8, 8, 8,
         8,11,11,11,11,11, 8, 9, 8, 8, 8, 9, 9, 9, 9, 9,
        12,13,12,13,12, 9, 9, 9, 9, 9,13,13,12,13,12,11,
        12,12,12,12,13,13,13,13,13,17,17,15,17,15,13,13,
        14,14,13,17,16,14,16,17, 8, 8, 8, 8, 8, 9, 9, 9,
         9, 9,12,13,13,13,12, 9, 9, 9, 9, 9,12,13,12,12,
        12,11,12,12,12,12,13,13,13,13,13,16,16,16,16,15,
        13,14,13,13,13,16,17,15,16,17, 9,11,11,11,11,12,
        13,12,13,13,14,16,14,14,14,12,13,12,12,12,14,14,
        15,16,15,11,13,12,12,12,13,14,13,14,13,16,16,14,
        17,17,14,16,14,14,13,15,17,16,17,15,15,15,15,15,
        15,16,16,16,15,16,17,17,17,17,17,17,17,15,17,15,
        17,17,17,17,17,12,13,12,13,12,13,14,13,15,13,16,
        17,15,16,16,14,14,14,14,13,16,16,15,16,16,15,17,
        14,16,16,17,17,17,17,17,17,17,17,17,17,17,17,17,
        17,17,17,17,17,17,17, 6, 7, 7, 7, 7, 8, 8, 8, 8,
         8,11,12,11,11,11, 8, 8, 8, 8, 8,11,11,11,12,11,
         8, 8, 8, 9, 8, 9, 9, 9, 9, 9,12,13,12,13,11, 9,
         9, 9, 9, 9,12,12,12,13,12,12,12,12,13,12,13,13,
        13,13,14,17,17,16,15,15,12,12,13,13,13,15,15,17,
        15,16, 8, 9, 8, 9, 8, 9, 9, 9, 9, 9,12,13,12,12,
        12, 9, 9, 9, 9, 9,12,12,12,12,12,12,13,12,12,12,
        13,13,13,13,13,15,16,15,17,17,12,14,13,13,13,15,
        16,15,16,17, 9,11,11,11,11,11,14,12,13,12,14,16,
        14,15,14,12,13,12,13,12,14,15,14,15,14,12,13,12,
        14,12,13,14,13,13,13,17,16,16,16,16,14,14,14,14,
        13,17,16,15,16,15,17,17,15,15,16,17,17,17,16,15,
        17,17,17,17,17,17,17,17,16,17,17,17,17,17,17,12,
        13,12,13,12,14,14,13,15,14,15,17,15,16,16,14,14,
        13,14,13,15,14,16,17,15,16,15,15,16,17,17,17,17,
        17,17,17,17,17,17,16,17,17,17,16,15,17,17,17,17,
        16,
};

tatic float _vq_quantthresh_res0_96_128_2[] = {
        -2, -0.5, 0.5, 2, 
};

tatic long _vq_quantmap_res0_96_128_2[] = {
            4,    3,    0,    1,    2,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_128_2 = {
        _vq_quantthresh_res0_96_128_2,
        _vq_quantmap_res0_96_128_2,
        5,
        5
};

tatic static_codebook _vq_book_res0_96_128_2 = {
        4, 625,
        _vq_lengthlist_res0_96_128_2,
        1, -533200896, 1611661312, 3, 0,
        _vq_quantlist_res0_96_128_2,
        NULL,
        &_vq_auxt_res0_96_128_2,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_128_3.vqh

Index: res0_96_128_3.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_128_3_VQH_
#define _V_res0_96_128_3_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_128_3[] = {
        8,
        9,
        11,
        13,
        16,
        7,
        5,
        3,
        0,
};

tatic long _vq_lengthlist_res0_96_128_3[] = {
         2, 3, 5, 6, 5, 3, 5, 6, 5, 4, 5, 7, 8, 7, 5, 7,
         8, 7, 9,10,11,12,12, 9,11,12,12,13,14,16,17,15,
        13,14,17,15,12,17,16,17,17,15,17,17,17, 4, 5, 7,
         8, 7, 5, 7, 8, 7, 9,10,11,12,11, 9,11,12,12,12,
        13,15,15,17,13,15,16,15,13,15,15,17,17,15,15,17,
        16,
};

tatic float _vq_quantthresh_res0_96_128_3[] = {
        -6.5, -4, -2, -0.5, 0.5, 2, 4, 6.5, 
};

tatic long _vq_quantmap_res0_96_128_3[] = {
            8,    7,    6,    5,    0,    1,    2,    3,
            4,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_128_3 = {
        _vq_quantthresh_res0_96_128_3,
        _vq_quantmap_res0_96_128_3,
        9,
        9
};

tatic static_codebook _vq_book_res0_96_128_3 = {
        2, 81,
        _vq_lengthlist_res0_96_128_3,
        1, -529530880, 1611661312, 5, 0,
        _vq_quantlist_res0_96_128_3,
        NULL,
        &_vq_auxt_res0_96_128_3,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_128_4.vqh

Index: res0_96_128_4.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by vq/somethingorother

 ********************************************************************/

#ifndef _V_res0_96_128_4_VQH_
#define _V_res0_96_128_4_VQH_
#include "codebook.h"

tatic long _vq_quantlist_res0_96_128_4[] = {
        56,
        57,
        59,
        61,
        64,
        67,
        70,
        73,
        76,
        80,
        84,
        87,
        91,
        95,
        99,
        103,
        107,
        112,
        55,
        53,
        51,
        48,
        45,
        42,
        39,
        36,
        32,
        28,
        25,
        21,
        17,
        13,
        9,
        5,
        0,
};

tatic long _vq_lengthlist_res0_96_128_4[] = {
         1, 2, 5, 7, 8, 9, 7, 9,11,17,16,17,17,17,17,17,
        17,17, 3, 5, 6, 8,10, 6, 9,12,14,15,17,17,17,17,
        16,16,16,
};

tatic float _vq_quantthresh_res0_96_128_4[] = {
        -53.5, -49, -45, -41, -37, -33, -29.5, -26, 
        -22, -18.5, -15.5, -12.5, -9.5, -6.5, -4, -2, 
        -0.5, 0.5, 2, 4, 6.5, 9.5, 12.5, 15.5, 
        18.5, 22, 26, 29.5, 33, 37, 41, 45, 
        49, 53.5, 
};

tatic long _vq_quantmap_res0_96_128_4[] = {
           34,   33,   32,   31,   30,   29,   28,   27,
           26,   25,   24,   23,   22,   21,   20,   19,
           18,    0,    1,    2,    3,    4,    5,    6,
            7,    8,    9,   10,   11,   12,   13,   14,
           15,   16,   17,
};

tatic encode_aux_threshmatch _vq_auxt_res0_96_128_4 = {
        _vq_quantthresh_res0_96_128_4,
        _vq_quantmap_res0_96_128_4,
        35,
        35
};

tatic static_codebook _vq_book_res0_96_128_4 = {
        1, 35,
        _vq_lengthlist_res0_96_128_4,
        1, -524550144, 1611661312, 7, 0,
        _vq_quantlist_res0_96_128_4,
        NULL,
        &_vq_auxt_res0_96_128_4,
        NULL,
        0
};

#endif

1.1                  vorbis/lib/books/res0_96_128aux.vqh

Index: res0_96_128aux.vqh
===================================================================
/********************************************************************
 *                                                                  *
 * 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
 * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company       *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: static codebook autogenerated by huff/huffbuld

 ********************************************************************/

#ifndef _V_res0_96_128aux_VQH_
#define _V_res0_96_128aux_VQH_
#include "codebook.h"

tatic long _huff_lengthlist_res0_96_128aux[] = {
         4, 8, 9,14,14, 3, 2, 7,13,13, 5, 2, 5,11,11, 6,
         3, 6,12,13, 7, 4, 7,13,13,
};

tatic static_codebook _huff_book_res0_96_128aux = {
        2, 25,
        _huff_lengthlist_res0_96_128aux,
        0, 0, 0, 0, 0,
        NULL,
        NULL,
        NULL,
        0
};

#endif

1.3       +40 -38    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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mode_A.h	2000/11/06 00:07:24	1.2
+++ mode_A.h	2000/11/08 06:08:16	1.3
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.2 2000/11/06 00:07:24 xiphmont Exp $
+ last mod: $Id: mode_A.h,v 1.3 2000/11/08 06:08:16 xiphmont Exp $
 
  ********************************************************************/
 
@@ -26,23 +26,24 @@
 #include "books/lsp12_0.vqh"
 #include "books/lsp30_0.vqh"
 
-#include "books/resaux0_128a_128.vqh"
-#include "books/resaux0_1024a_128.vqh"
+#include "books/res0_128_128aux.vqh"
+#include "books/res0_128_1024aux.vqh"
 
-#include "books/res0_128a_128_1.vqh"
-#include "books/res0_128a_128_2.vqh"
-#include "books/res0_128a_128_3.vqh"
-#include "books/res0_128a_128_4.vqh"
-#include "books/res0_128a_128_5.vqh"
-#include "books/res0_1024a_128_1.vqh"
-#include "books/res0_1024a_128_2.vqh"
-#include "books/res0_1024a_128_3.vqh"
-#include "books/res0_1024a_128_4.vqh"
-#include "books/res0_1024a_128_5.vqh"
-#include "books/res0_1024a_128_6.vqh"
-#include "books/res0_1024a_128_7.vqh"
-#include "books/res0_1024a_128_8.vqh"
-#include "books/res0_1024a_128_9.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_7.vqh"
+#include "books/res0_128_1024_8.vqh"
+#include "books/res0_128_1024_9.vqh"
 
 static vorbis_info_psy _psy_set_A={
   1,/*athp*/
@@ -122,7 +123,7 @@
  
   100.,
 
-  -0., -.004   /* attack/decay control */
+  -0., -.006   /* attack/decay control */
 };
 
 
@@ -135,7 +136,7 @@
                                             {4,5,6,7,8},
                                             
                                             {0,99999,9999,9999,9999},
-					    {99,1.5,2.5,3.5,5},
+					    {99,1.5,2.5,6.5,12.5},
                                             {5,5,5,5,5},
                                             {99,99,99,99,99}};
 
@@ -143,9 +144,9 @@
                                             {0,1,1,1,1,1,1,1,1,1},
                                             {9,10,11,12,13,14,15,16,17},
                                            
-					    {0,9,9999,17,9999,
-					     27,9999,9999,9999},
-					    {99,1.5,1.5,2.5,2.5,3.5,3.5,7,13},
+					    {0,8,9999,17,9999,
+					     28,9999,9999,9999},
+					    {99,1.5,1.5,2.5,2.5,4,4,6.5,12.5},
                                             {5,5,5,5,5,5,5,5,5},
                                             {99,99,99,99,99,99,99,99,99}};
 
@@ -175,23 +176,24 @@
   {&_vq_book_lsp12_0,      /* 0 */
    &_vq_book_lsp30_0,      /* 1 */
 
-   &_huff_book_resaux0_128a_128,
-   &_huff_book_resaux0_1024a_128,
+   &_huff_book_res0_128_128aux,
+   &_huff_book_res0_128_1024aux,
 
-   &_vq_book_res0_128a_128_1,
-   &_vq_book_res0_128a_128_2,
-   &_vq_book_res0_128a_128_3,
-   &_vq_book_res0_128a_128_4,
-   &_vq_book_res0_128a_128_5,
-   &_vq_book_res0_1024a_128_1,
-   &_vq_book_res0_1024a_128_2,
-   &_vq_book_res0_1024a_128_3,
-   &_vq_book_res0_1024a_128_4,
-   &_vq_book_res0_1024a_128_5,
-   &_vq_book_res0_1024a_128_6,
-   &_vq_book_res0_1024a_128_7,
-   &_vq_book_res0_1024a_128_8,
-   &_vq_book_res0_1024a_128_9,
+   &_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_3,
+   &_vq_book_res0_128_1024_4,
+   &_vq_book_res0_128_1024_5,
+   &_vq_book_res0_128_1024_6,
+   &_vq_book_res0_128_1024_7,
+   &_vq_book_res0_128_1024_8,
+   &_vq_book_res0_128_1024_9,
 
   },
   /* psy */

1.3       +3 -3      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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mode_B.h	2000/11/06 00:07:24	1.2
+++ mode_B.h	2000/11/08 06:08:16	1.3
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: mode_B.h,v 1.2 2000/11/06 00:07:24 xiphmont Exp $
+ last mod: $Id: mode_B.h,v 1.3 2000/11/08 06:08:16 xiphmont Exp $
 
  ********************************************************************/
 
@@ -73,7 +73,7 @@
    {-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.,-30.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
-   {-30.,-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
+   {-30.,-30.,-35.,-35.,-40.,-50.,-60.,-75.,-80.,-90.,-100.}, /*8000*/
    {-30.,-30.,-35.,-33.,-35.,-45.,-55.,-65.,-75.,-90.,-100.}, /*11500*/
    {-30.,-28.,-30.,-32.,-35.,-45.,-55.,-65.,-75.,-90.,-100.}, /*16000*/
   },
@@ -122,7 +122,7 @@
  
   110.,
 
-  -0., -.004   /* attack/decay control */
+  -3., -.006   /* attack/decay control */
 };
 
 /* with GNUisms, this could be short and readable. Oh well */

1.3       +2 -2      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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mode_C.h	2000/11/06 00:07:24	1.2
+++ mode_C.h	2000/11/08 06:08:17	1.3
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: mode_C.h,v 1.2 2000/11/06 00:07:24 xiphmont Exp $
+ last mod: $Id: mode_C.h,v 1.3 2000/11/08 06:08:17 xiphmont Exp $
 
  ********************************************************************/
 
@@ -118,7 +118,7 @@
  
   100.,
 
-  -0., -.004   /* attack/decay control */
+  -6., -.006   /* attack/decay control */
 };
 
 /* with GNUisms, this could be short and readable. Oh well */

1.3       +2 -1      vorbis/lib/modes/modes.h

Index: modes.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/modes.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modes.h	2000/11/06 00:07:24	1.2
+++ modes.h	2000/11/08 06:08:17	1.3
@@ -12,13 +12,14 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: modes.h,v 1.2 2000/11/06 00:07:24 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.3 2000/11/08 06:08:17 xiphmont Exp $
 
  ********************************************************************/
 
 #ifndef _V_MODES_H_
 #define _V_MODES_H_
 
+#include "modes/mode_AA.h"
 #include "modes/mode_A.h"
 #include "modes/mode_B.h"
 #include "modes/mode_C.h"

1.1                  vorbis/lib/modes/mode_AA.h

Index: mode_AA.h
===================================================================
/********************************************************************
 *                                                                  *
 * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
 * 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-2000             *
 * by Monty <monty at xiph.org> and the XIPHOPHORUS Company            *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: predefined encoding modes
 last mod: $Id: mode_AA.h,v 1.1 2000/11/08 06:08:16 xiphmont Exp $

 ********************************************************************/

#ifndef _V_MODES_AA_H_
#define _V_MODES_AA_H_

#include <stdio.h>
#include "vorbis/codec.h"
#include "backends.h"

#include "books/lsp12_0.vqh"
#include "books/lsp30_0.vqh"

#include "books/res0_96_128aux.vqh"
#include "books/res0_96_1024aux.vqh"

#include "books/res0_96_128_1.vqh"
#include "books/res0_96_128_2.vqh"
#include "books/res0_96_128_3.vqh"
#include "books/res0_96_128_4.vqh"

#include "books/res0_96_1024_1.vqh"
#include "books/res0_96_1024_2.vqh"
#include "books/res0_96_1024_3.vqh"
#include "books/res0_96_1024_4.vqh"
#include "books/res0_96_1024_5.vqh"
#include "books/res0_96_1024_6.vqh"
#include "books/res0_96_1024_7.vqh"

tatic vorbis_info_psy _psy_set_AA={
  1,/*athp*/
  1,/*decayp*/
  1,/*smoothp*/
  0,.1,

  -100.,
  -140.,

  /*     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 */

  1,/* tonemaskp */
  /*  0   10   20   30   40   50   60   70   80   90   100 */
  {{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*175*/
   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*250*/
   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*350*/
   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*500*/
   {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*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.,-30.,-35.,-37.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
   {-20.,-25.,-30.,-35.,-35.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
   {-20.,-25.,-30.,-33.,-35.,-45.,-55.,-65.,-75.,-90.,-100.}, /*11500*/
   {-20.,-24.,-26.,-32.,-35.,-45.,-55.,-65.,-75.,-90.,-100.}, /*16000*/
  },

  1,/* peakattp */
  {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*63*/
   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*88*/
   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*125*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*8000*/
   { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-16.,-17.}, /*8000*/
   { -6., -7., -9., -9., -9., -9.,-10.,-11.,-12.,-13.,-14.}, /*11500*/
   { -6., -6., -9., -9., -9., -9., -9., -9.,-10.,-11.,-12.}, /*16000*/
  },

  1,/*noisemaskp */
  /*  0   10   20   30   40   50   60    70    80    90   100 */
  {{-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*63*/
   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*88*/
   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*125*/
   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*175*/
   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*250*/
   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*350*/
   {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*500*/
   {  6.,  6.,  6.,  2.,  2.,  2.,  2.,   2.,   2.,   1.,   0.}, /*700*/

   {  6.,  6.,  6.,  5.,  5.,  5.,  5.,   5.,   5.,   4.,   3.}, /*1000*/
   {  6.,  6.,  6.,  5.,  5.,  5.,  5.,   5.,   5.,   4.,   3.}, /*1400*/
   {  6.,  6.,  6.,  5.,  5.,  5.,  5.,   5.,   5.,   4.,   3.}, /*2000*/
   {  6.,  6.,  6.,  5.,  5.,  5.,  5.,   5.,   5.,   4.,   3.}, /*2800*/
   {  6.,  6.,  6.,  5.,  5.,  5.,  5.,   5.,   5.,   4.,   3.}, /*4000*/
   { 10., 10., 10., 10., 10., 10.,  8.,   8.,   6.,   6.,   6.}, /*5600*/
   { 10., 10., 10., 10., 10., 10.,  8.,   8.,   8.,   8.,   8.}, /*8000*/
   { 10., 10., 10., 10., 10., 10., 10.,  10.,  10.,  10.,  10.}, /*11500*/
   { 10., 10., 10., 10., 10., 10., 10.,  10.,  10.,  10.,  10.}, /*16000*/
  },
 
  100.,

  -0., -.004   /* attack/decay control */
};

/* with GNUisms, this could be short and readable. Oh well */
static vorbis_info_time0 _time_set0AA={0};
static vorbis_info_floor0 _floor_set0AA={12, 44100,  64, 12,150, 1, {0} };
static vorbis_info_floor0 _floor_set1AA={30, 44100, 256, 12,150, 1, {1} };
static vorbis_info_residue0 _residue_set0AA={0,128, 32,5,2,
                                            {0,1,1,1,1},
                                            {4,5,6,7},
                                            
                                            {0,9999,9999,9999},
                                            {99,2.,9.5,12.5},
                                            {5,5,5,5},
                                            {99,99,99,99}};

tatic vorbis_info_residue0 _residue_set1AA={0,1024, 32,8,3,
                                            {0,1,1,1,1,1,1,1},
                                            {8,9,10,11,12,13,14},
                                           
                                            {0,9,9999,21,9999,
                                             9999,9999,9999},
                                            {99,2,2,4,4,9.5,15.5},
                                            {5,5,5,5,5,5,5},
                                            {99,99,99,99,99,99,99}};

tatic vorbis_info_mapping0 _mapping_set0AA={1, {0,0}, {0}, {0}, {0}, {0}};
static vorbis_info_mapping0 _mapping_set1AA={1, {0,0}, {0}, {1}, {1}, {0}};
static vorbis_info_mode _mode_set0AA={0,0,0,0};
static vorbis_info_mode _mode_set1AA={1,0,0,1};

/* CD quality stereo, no channel coupling */
codec_setup_info info_AA={

  /* smallblock, largeblock */
  {256, 2048}, 
  /* modes,maps,times,floors,residues,books,psys */
  2,          2,    1,     2,       2,   15,   1,
  /* modes */
  {&_mode_set0AA,&_mode_set1AA},
  /* maps */
  {0,0},{&_mapping_set0AA,&_mapping_set1AA},
  /* times */
  {0,0},{&_time_set0AA},
  /* floors */
  {0,0},{&_floor_set0AA,&_floor_set1AA},
  /* residue */
  {0,0},{&_residue_set0AA,&_residue_set1AA},
  /* books */
  {&_vq_book_lsp12_0,      /* 0 */
   &_vq_book_lsp30_0,      /* 1 */

   &_huff_book_res0_96_128aux,
   &_huff_book_res0_96_1024aux,

   &_vq_book_res0_96_128_1,
   &_vq_book_res0_96_128_2,
   &_vq_book_res0_96_128_3,
   &_vq_book_res0_96_128_4,

   &_vq_book_res0_96_1024_1,
   &_vq_book_res0_96_1024_2,
   &_vq_book_res0_96_1024_3,
   &_vq_book_res0_96_1024_4,
   &_vq_book_res0_96_1024_5,
   &_vq_book_res0_96_1024_6,
   &_vq_book_res0_96_1024_7,

  },
  /* psy */
  {&_psy_set_AA},
  /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
  256, 32, 6, -96.
};

#define PREDEF_INFO_MAX 0

#endif

--- >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