[xiph-cvs] cvs commit: vorbis/lib/modes mode_A.h mode_AA.h mode_B.h mode_C.h mode_D.h mode_E.h
Monty
xiphmont at xiph.org
Fri Nov 17 03:47:40 PST 2000
xiphmont 00/11/17 03:47:39
Modified: lib Makefile.am backends.h codec_internal.h floor0.c
mapping0.c masking.h res0.c vorbisenc.c
lib/books res0_128_1024_1.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_160_1024_1.vqh
res0_160_1024_3.vqh res0_160_1024_4.vqh
res0_160_1024_5.vqh res0_160_1024_6.vqh
res0_160_1024_7.vqh res0_160_1024_8.vqh
res0_160_1024_9.vqh res0_160_1024aux.vqh
res0_160_128_1.vqh res0_160_128_2.vqh
res0_160_128_3.vqh res0_160_128_4.vqh
res0_160_128_5.vqh res0_160_128aux.vqh
res0_192_1024_2.vqh res0_192_1024_3.vqh
res0_192_1024_4.vqh res0_192_1024_5.vqh
res0_192_1024aux.vqh res0_192_128_1.vqh
res0_192_128_2.vqh res0_192_128_3.vqh
res0_192_128_4.vqh res0_192_128_5.vqh
res0_192_128aux.vqh res0_256_1024_1.vqh
res0_256_1024_2.vqh res0_256_1024_3.vqh
res0_256_1024_4.vqh res0_256_1024_5.vqh
res0_256_1024aux.vqh res0_256_128_1.vqh
res0_256_128_2.vqh res0_256_128_3.vqh
res0_256_128_4.vqh res0_256_128_5.vqh
res0_256_128aux.vqh res0_96_1024_1.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_A.h mode_AA.h mode_B.h mode_C.h mode_D.h
mode_E.h
Added: lib/books res0_350_1024_1.vqh res0_350_1024_2.vqh
res0_350_1024_3.vqh res0_350_1024_4.vqh
res0_350_1024_5.vqh res0_350_1024aux.vqh
res0_350_128_1.vqh res0_350_128_2.vqh
res0_350_128_3.vqh res0_350_128_4.vqh
res0_350_128_5.vqh res0_350_128aux.vqh
res0_96_128_5.vqh
Removed: lib/books res0_1024a_128_1.vqh res0_1024a_128_2.vqh
res0_1024a_128_3.vqh res0_1024a_128_4.vqh
res0_1024a_128_5.vqh res0_1024a_128_6.vqh
res0_1024a_128_7.vqh res0_1024a_128_8.vqh
res0_1024a_128_9.vqh res0_1024a_160_1.vqh
res0_1024a_160_2.vqh res0_1024a_160_3.vqh
res0_1024a_160_4.vqh res0_1024a_160_5.vqh
res0_1024a_160_6.vqh res0_1024a_160_7.vqh
res0_1024a_160_8.vqh res0_1024a_160_9.vqh
res0_1024a_192_1.vqh res0_1024a_192_2.vqh
res0_1024a_192_3.vqh res0_1024a_192_4.vqh
res0_1024a_192_5.vqh res0_1024a_256_1.vqh
res0_1024a_256_2.vqh res0_1024a_256_3.vqh
res0_1024a_256_4.vqh res0_1024a_256_5.vqh
res0_1024a_350_1.vqh res0_1024a_350_2.vqh
res0_1024a_350_3.vqh res0_1024a_350_4.vqh
res0_1024a_350_5.vqh res0_128a_128_1.vqh
res0_128a_128_2.vqh res0_128a_128_3.vqh
res0_128a_128_4.vqh res0_128a_128_5.vqh
res0_128a_160_1.vqh res0_128a_160_2.vqh
res0_128a_160_3.vqh res0_128a_160_4.vqh
res0_128a_160_5.vqh res0_128a_192_1.vqh
res0_128a_192_2.vqh res0_128a_192_3.vqh
res0_128a_192_4.vqh res0_128a_192_5.vqh
res0_128a_256_1.vqh res0_128a_256_2.vqh
res0_128a_256_3.vqh res0_128a_256_4.vqh
res0_128a_256_5.vqh res0_128a_350_1.vqh
res0_128a_350_2.vqh res0_128a_350_3.vqh
res0_128a_350_4.vqh res0_128a_350_5.vqh
resaux0_1024a_128.vqh resaux0_1024a_160.vqh
resaux0_1024a_192.vqh resaux0_1024a_256.vqh
resaux0_1024a_350.vqh resaux0_128a_128.vqh
resaux0_128a_160.vqh resaux0_128a_192.vqh
resaux0_128a_256.vqh resaux0_128a_350.vqh
Log:
beta 3 commit. Unless I missed something (give it 50/50 odds ;-)
we're done for b3.
Monty
Revision Changes Path
1.8 +2 -2 vorbis/lib/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 2000/11/09 00:53:45 1.7
+++ Makefile.am 2000/11/17 11:47:18 1.8
@@ -11,11 +11,11 @@
libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c lpc.c\
analysis.c synthesis.c psy.c info.c time0.c floor0.c\
res0.c mapping0.c registry.c codebook.c sharedbook.c\
- iir.c lookup.c\
+ iir.c lookup.c bitbuffer.c\
envelope.h lpc.h lsp.h codebook.h misc.h psy.h\
masking.h iir.h os.h mdct.h smallft.h\
registry.h scales.h window.h lookup.h lookup_data.h\
- codec_internal.h backends.h
+ codec_internal.h backends.h bitbuffer.h
libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
libvorbisfile_la_SOURCES = vorbisfile.c
1.3 +5 -3 vorbis/lib/backends.h
Index: backends.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/backends.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- backends.h 2000/11/06 00:07:00 1.2
+++ backends.h 2000/11/17 11:47:18 1.3
@@ -13,7 +13,7 @@
function: libvorbis backend and mapping structures; needed for
static mode headers
- last mod: $Id: backends.h,v 1.2 2000/11/06 00:07:00 xiphmont Exp $
+ last mod: $Id: backends.h,v 1.3 2000/11/17 11:47:18 xiphmont Exp $
********************************************************************/
@@ -62,7 +62,9 @@
void (*free_info) (vorbis_info_floor *);
void (*free_look) (vorbis_look_floor *);
int (*forward) (struct vorbis_block *,vorbis_look_floor *,
- float *,float *);
+ float *,float *,vorbis_bitbuffer *);
+ float(*forward2) (struct vorbis_block *,vorbis_look_floor *,
+ long,float, vorbis_bitbuffer *);
int (*inverse) (struct vorbis_block *,vorbis_look_floor *,
float *);
} vorbis_func_floor;
@@ -89,7 +91,7 @@
void (*free_info) (vorbis_info_residue *);
void (*free_look) (vorbis_look_residue *);
int (*forward) (struct vorbis_block *,vorbis_look_residue *,
- float **,int);
+ float **,int,vorbis_bitbuffer *);
int (*inverse) (struct vorbis_block *,vorbis_look_residue *,
float **,int);
} vorbis_func_residue;
1.3 +2 -1 vorbis/lib/codec_internal.h
Index: codec_internal.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/codec_internal.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codec_internal.h 2000/11/06 00:07:00 1.2
+++ codec_internal.h 2000/11/17 11:47:18 1.3
@@ -12,7 +12,7 @@
********************************************************************
function: libvorbis codec headers
- last mod: $Id: codec_internal.h,v 1.2 2000/11/06 00:07:00 xiphmont Exp $
+ last mod: $Id: codec_internal.h,v 1.3 2000/11/17 11:47:18 xiphmont Exp $
********************************************************************/
@@ -22,6 +22,7 @@
#include "envelope.h"
#include "codebook.h"
#include "psy.h"
+#include "bitbuffer.h"
typedef void vorbis_look_time;
typedef void vorbis_look_mapping;
1.29 +32 -10 vorbis/lib/floor0.c
Index: floor0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/floor0.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- floor0.c 2000/11/14 00:05:31 1.28
+++ floor0.c 2000/11/17 11:47:18 1.29
@@ -12,7 +12,7 @@
********************************************************************
function: floor backend 0 implementation
- last mod: $Id: floor0.c,v 1.28 2000/11/14 00:05:31 xiphmont Exp $
+ last mod: $Id: floor0.c,v 1.29 2000/11/17 11:47:18 xiphmont Exp $
********************************************************************/
@@ -239,13 +239,14 @@
/* generate the whole freq response curve of an LSP IIR filter */
static int floor0_forward(vorbis_block *vb,vorbis_look_floor *i,
- float *in,float *out){
+ float *in,float *out,vorbis_bitbuffer *vbb){
long j;
vorbis_look_floor0 *look=(vorbis_look_floor0 *)i;
vorbis_info_floor0 *info=look->vi;
float *work=alloca((look->ln+look->n)*sizeof(float));
float amp;
long bits=0;
+ long val=0;
static int seq=0;
#ifdef TRAIN_LSP
@@ -278,25 +279,25 @@
{
long maxval=(1L<<info->ampbits)-1;
- long val=rint(amp/info->ampdB*maxval);
+ val=rint(amp/info->ampdB*maxval);
if(val<0)val=0; /* likely */
if(val>maxval)val=maxval; /* not bloody likely */
- oggpack_write(&vb->opb,val,info->ampbits);
+ /*oggpack_write(&vb->opb,val,info->ampbits);*/
if(val>0)
amp=(float)val/maxval*info->ampdB;
else
amp=0;
}
- if(amp>0){
+ if(val){
/* the spec supports using one of a number of codebooks. Right
now, encode using this lib supports only one */
backend_lookup_state *be=vb->vd->backend_state;
codebook *b=be->fullbooks+info->books[0];
- oggpack_write(&vb->opb,0,_ilog(info->numbooks));
+ bitbuf_write(vbb,0,_ilog(info->numbooks));
/* LSP <-> LPC is orthogonal and LSP quantizes more stably */
vorbis_lpc_to_lsp(out,out,look->m);
@@ -334,7 +335,7 @@
for(j=0;j<look->m;j+=b->dim){
int entry=_f0_fit(b,out,work,j);
- bits+=vorbis_book_encode(b,entry,&vb->opb);
+ bits+=vorbis_book_bufencode(b,entry,vbb);
#ifdef TRAIN_LSP
fprintf(ef,"%d,\n",entry);
@@ -360,14 +361,35 @@
/* take the coefficients back to a spectral envelope curve */
vorbis_lsp_to_curve(out,look->linearmap,look->n,look->ln,
work,look->m,amp,info->ampdB);
- return(1);
+ return(val);
}
memset(out,0,sizeof(float)*look->n);
seq++;
- return(0);
+ return(val);
}
+static float floor0_forward2(vorbis_block *vb,vorbis_look_floor *i,
+ long amp,float error,
+ vorbis_bitbuffer *vbb){
+
+ if(amp){
+ vorbis_look_floor0 *look=(vorbis_look_floor0 *)i;
+ vorbis_info_floor0 *info=look->vi;
+ long maxval=(1L<<info->ampbits)-1;
+ long adj=rint(todB(error)/info->ampdB*maxval/2);
+
+ amp+=adj;
+ if(amp<1)amp=1;
+
+ oggpack_write(&vb->opb,amp,info->ampbits);
+ bitbuf_pack(&vb->opb,vbb);
+ return(fromdB((float)adj/maxval*info->ampdB));
+ }
+ return(0.);
+}
+
+
static int floor0_inverse(vorbis_block *vb,vorbis_look_floor *i,float *out){
vorbis_look_floor0 *look=(vorbis_look_floor0 *)i;
vorbis_info_floor0 *info=look->vi;
@@ -409,7 +431,7 @@
/* export hooks */
vorbis_func_floor floor0_exportbundle={
&floor0_pack,&floor0_unpack,&floor0_look,&floor0_copy_info,&floor0_free_info,
- &floor0_free_look,&floor0_forward,&floor0_inverse
+ &floor0_free_look,&floor0_forward,&floor0_forward2,&floor0_inverse
};
1.20 +81 -12 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mapping0.c 2000/11/14 00:05:31 1.19
+++ mapping0.c 2000/11/17 11:47:18 1.20
@@ -12,7 +12,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.19 2000/11/14 00:05:31 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.20 2000/11/17 11:47:18 xiphmont Exp $
********************************************************************/
@@ -24,6 +24,7 @@
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "codebook.h"
+#include "bitbuffer.h"
#include "registry.h"
#include "psy.h"
#include "misc.h"
@@ -222,8 +223,20 @@
float *window=b->window[vb->W][vb->lW][vb->nW][mode->windowtype];
float **pcmbundle=alloca(sizeof(float *)*vi->channels);
- int *nonzero=alloca(sizeof(int)*vi->channels);
-
+
+ int *nonzero=alloca(sizeof(int)*vi->channels);
+ float **floor=_vorbis_block_alloc(vb,vi->channels*sizeof(float *));
+ float **nonquant=_vorbis_block_alloc(vb,vi->channels*sizeof(float *));
+
+ vorbis_bitbuffer vbb_res;
+ vorbis_bitbuffer *vbb_flr=_vorbis_block_alloc(vb,
+ sizeof(vorbis_bitbuffer)*
+ vi->channels);
+
+ for(i=0;i<vi->channels;i++)
+ bitbuf_init(vbb_flr+i,vb);
+ bitbuf_init(&vbb_res,vb);
+
/* time domain pre-window: NONE IMPLEMENTED */
/* window the PCM data: takes PCM vector, vb; modifies PCM vector */
@@ -240,16 +253,22 @@
/* only MDCT right now.... */
for(i=0;i<vi->channels;i++){
float *pcm=vb->pcm[i];
+ float *outq=nonquant[i]=_vorbis_block_alloc(vb,n*sizeof(float));
mdct_forward(b->transform[vb->W][0],pcm,pcm);
+
+ memcpy(pcm+n/2,pcm,n*sizeof(float)/2);
+ mdct_backward(b->transform[vb->W][0],pcm,outq);
+ for(j=0;j<n;j++)
+ outq[j]*=window[j];
+
}
{
- float *floor=_vorbis_block_alloc(vb,n*sizeof(float)/2);
-
for(i=0;i<vi->channels;i++){
float *pcm=vb->pcm[i];
float *decay=look->decay[i];
int submap=info->chmuxlist[i];
+ floor[i]=_vorbis_block_alloc(vb,n*sizeof(float)/2);
/* if some other mode/mapping was called last frame, our decay
accumulator is out of date. Clear it. */
@@ -257,21 +276,21 @@
memset(decay,0,n*sizeof(float)/2);
/* perform psychoacoustics; do masking */
- _vp_compute_mask(look->psy_look+submap,pcm,floor,decay);
+ _vp_compute_mask(look->psy_look+submap,pcm,floor[i],decay);
_analysis_output("decay",seq,decay,n/2,0,1);
_analysis_output("mdct",seq,pcm,n/2,0,1);
_analysis_output("lmdct",seq,pcm,n/2,0,0);
- _analysis_output("prefloor",seq,floor,n/2,0,1);
+ _analysis_output("prefloor",seq,floor[i],n/2,0,1);
/* perform floor encoding */
nonzero[i]=look->floor_func[submap]->
- forward(vb,look->floor_look[submap],floor,floor);
+ forward(vb,look->floor_look[submap],floor[i],floor[i],vbb_flr+i);
- _analysis_output("floor",seq,floor,n/2,0,1);
+ _analysis_output("floor",seq,floor[i],n/2,0,1);
/* apply the floor, do optional noise levelling */
- _vp_apply_floor(look->psy_look+submap,pcm,floor);
+ _vp_apply_floor(look->psy_look+submap,pcm,floor[i]);
_analysis_output("res",seq++,pcm,n/2,0,0);
@@ -299,14 +318,64 @@
for(i=0;i<info->submaps;i++){
int ch_in_bundle=0;
for(j=0;j<vi->channels;j++){
- if(info->chmuxlist[j]==i && nonzero[j]==1){
+ if(info->chmuxlist[j]==i && nonzero[j]>0){
pcmbundle[ch_in_bundle++]=vb->pcm[j];
}
}
look->residue_func[i]->forward(vb,look->residue_look[i],
- pcmbundle,ch_in_bundle);
+ pcmbundle,ch_in_bundle,&vbb_res);
}
+
+ /* go back and compute the original MDCT inverse and our quantized
+ inverse; we'll want to give the floor mapping a shot at
+ massaging things before we write out the final version. */
+
+ {
+ static int seq=0;
+ for(i=0;i<vi->channels;i++){
+ float *pcm=vb->pcm[i];
+ float *pcmori=vb->pcm[i]+n/2;
+ float *orig=nonquant[i];
+ float *quant=floor[i];
+ float num=0.,den=0.;
+ int submap=info->chmuxlist[i];
+
+ if(nonzero[i]){
+
+ for(j=0;j<n/2;j++)
+ pcm[j]=pcmori[j]-pcm[j]*quant[j];
+
+ mdct_backward(b->transform[vb->W][0],pcm,pcm);
+ for(j=0;j<n;j++)
+ pcm[j]*=window[j];
+
+ /* weighted compare twixt original and quantized mdct output */
+ for(j=0;j<n;j++){
+ den+=(pcm[j]*pcm[j]);
+ num+=(orig[j]*orig[j]);
+ }
+
+ num=sqrt(num);
+ den=sqrt(den);
+
+ }
+
+ num=look->floor_func[submap]->
+ forward2(vb,look->floor_look[submap],
+ nonzero[i],den==0.?0:num/den,vbb_flr+i);
+
+ /*for(j=0;j<n;j++)
+ pcm[j]*=num;
+ _analysis_output("i_orig",seq,orig,n,0,0);
+ _analysis_output("i_quant",seq++,pcm,n,0,0);
+ */
+
+ }
+ }
+
+ bitbuf_pack(&vb->opb,&vbb_res);
+
}
look->lastframe=vb->sequence;
1.7 +6 -6 vorbis/lib/masking.h
Index: masking.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/masking.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- masking.h 2000/11/06 00:07:01 1.6
+++ masking.h 2000/11/17 11:47:18 1.7
@@ -12,7 +12,7 @@
********************************************************************
function: masking curve data for psychoacoustics
- last mod: $Id: masking.h,v 1.6 2000/11/06 00:07:01 xiphmont Exp $
+ last mod: $Id: masking.h,v 1.7 2000/11/17 11:47:18 xiphmont Exp $
********************************************************************/
@@ -38,22 +38,22 @@
#define EHMER_MAX 56
float tone_125_40dB_SL[EHMER_MAX]={
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 29, 27, 26, 25, 23, 21,
+ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
20, 18, 16, 14, 12, 11, 9, 7, 5, 3, 2, 0, -2, -4, -6, -8,
-10, -12, -14, -16, -18, -20, -23, -25, -28,-30,-34,-37,-40,-44,-48,-52,
-900,-900,-900,-900,-900,-900,-900,-900};
float tone_125_60dB_SL[EHMER_MAX]={
- 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 49, 47, 46, 45, 43, 41,
+ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
40, 38, 36, 34, 32, 31, 29, 27, 25, 23, 22, 20, 18, 16, 14, 12,
10, 8, 6, 4, 2, 0, -3, -5, -8,-10,-14,-17,-20,-24,-28,-32,
-900,-900,-900,-900,-900,-900,-900,-900};
float tone_125_80dB_SL[EHMER_MAX]={
- 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 69, 67, 66, 65, 63, 61,
+ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
60, 58, 56, 54, 52, 51, 49, 47, 45, 43, 42, 40, 38, 36, 34, 32,
30, 28, 26, 24, 22, 20, 17, 15, 12, 10, 6, 3, 0, -4, -8,-12,
-900,-900,-900,-900,-900,-900,-900,-900};
float tone_125_100dB_SL[EHMER_MAX]={
- 85, 85, 85, 85, 85, 85, 85, 85, 85, 84, 84, 83, 82, 81, 80, 79,
+ 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
78, 77, 75, 74, 73, 72, 71, 70, 69, 68, 67, 65, 64, 63, 62, 60,
58, 57, 55, 54, 52, 50, 48, 46, 44, 42, 40, 38, 36, 34, 31, 29,
27, 24, 22, 20, 18, 15, 13, 11};
@@ -179,7 +179,7 @@
-900,-900,-900,-900,-900,-900,-900,-900};
float tone_8000_80dB_SL[EHMER_MAX]={
-900,-900,-900,-900,-900,-900,-900, -10, -1, 2, 6, 10, 13, 19, 25, 35,
- 63, 60, 56, 55, 56, 58, 61, 63, 65, 70, 75, 80, 85, 90, 95, 100,
+ 63, 55, 50, 48, 46, 45, 45, 50, 55, 65, 75, 80, 85, 90, 95, 100,
100, 100, 100, 100,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900,
-900,-900,-900,-900,-900,-900,-900,-900};
1.22 +16 -33 vorbis/lib/res0.c
Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- res0.c 2000/11/14 00:05:31 1.21
+++ res0.c 2000/11/17 11:47:18 1.22
@@ -12,7 +12,7 @@
********************************************************************
function: residue backend 0 implementation
- last mod: $Id: res0.c,v 1.21 2000/11/14 00:05:31 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.22 2000/11/17 11:47:18 xiphmont Exp $
********************************************************************/
@@ -32,6 +32,7 @@
#include "codebook.h"
#include "misc.h"
#include "os.h"
+#include "bitbuffer.h"
typedef struct {
vorbis_info_residue0 *info;
@@ -211,11 +212,10 @@
return(i);
}
-static int _encodepart(oggpack_buffer *opb,float *vec, int n,
+static int _encodepart(vorbis_bitbuffer *vbb,float *vec, int n,
int stages, codebook **books,int mode,int part){
- int i,j,bits=0,flag=0;
-
- for(j=0;j<stages;j++){
+ int i,j=0,bits=0;
+ if(stages){
int dim=books[j]->dim;
int step=n/dim;
for(i=0;i<step;i++){
@@ -230,13 +230,10 @@
fclose(f);
}
#endif
- bits+=vorbis_book_encode(books[j],entry,opb);
- if(entry!=books[j]->zeroentry)flag=1;
-
+ bits+=vorbis_book_bufencode(books[j],entry,vbb);
}
}
-
- return(flag);
+ return(bits);
}
static int _decodepart(oggpack_buffer *opb,float *work,float *vec, int n,
@@ -258,7 +255,7 @@
}
int res0_forward(vorbis_block *vb,vorbis_look_residue *vl,
- float **in,int ch){
+ float **in,int ch,vorbis_bitbuffer *vbb){
long i,j,k,l;
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
vorbis_info_residue0 *info=look->info;
@@ -275,7 +272,6 @@
int partvals=n/samples_per_partition;
int partwords=(partvals+partitions_per_word-1)/partitions_per_word;
long **partword=_vorbis_block_alloc(vb,ch*sizeof(long *));
- long lastbyte,lastbit;;
partvals=partwords*partitions_per_word;
@@ -304,8 +300,6 @@
residual words for that partition word. Then write the next
partition channel words... */
- lastbyte=vb->opb.endbyte;
- lastbit=vb->opb.endbit;
for(i=info->begin,l=0;i<info->end;){
/* first we encode a partition codeword for each channel */
@@ -313,36 +307,25 @@
long val=partword[j][l];
for(k=1;k<partitions_per_word;k++)
val= val*possible_partitions+partword[j][l+k];
- phrasebits+=vorbis_book_encode(look->phrasebook,val,&vb->opb);
+ phrasebits+=vorbis_book_bufencode(look->phrasebook,val,vbb);
}
/* now we encode interleaved residual values for the partitions */
for(k=0;k<partitions_per_word;k++,l++,i+=samples_per_partition)
for(j=0;j<ch;j++){
/*resbits[partword[j][l]]+=*/
- int flag=_encodepart(&vb->opb,in[j]+i,samples_per_partition,
- info->secondstages[partword[j][l]],
- look->partbooks[partword[j][l]],look->map,partword[j][l]);
+ resbitsT+=_encodepart(vbb,in[j]+i,samples_per_partition,
+ info->secondstages[partword[j][l]],
+ look->partbooks[partword[j][l]],look->map,partword[j][l]);
resvals[partword[j][l]]+=samples_per_partition;
- if(flag){
- lastbyte=vb->opb.endbyte;
- lastbit=vb->opb.endbit;
- }
}
}
-
- /* grab a free byte or two here and there */
- if(lastbyte<vb->opb.endbyte){
- vb->opb.endbyte=lastbyte;
- vb->opb.endbit=lastbit; /* yeah overengineered */
- }
-
- /*for(i=0;i<possible_partitions;i++)resbitsT+=resbits[i];*/
+ for(i=0;i<possible_partitions;i++)resbitsT+=resbits[i];
/*fprintf(stderr,
- "Encoded %ld res vectors in %ld phrasing and %ld res bits\n\t",
- ch*(info->end-info->begin),phrasebits,resbitsT);
- for(i=0;i<possible_partitions;i++)
+ "Encoded %ld res vectors in %ld phrasing and %ld res bits\n\t",
+ ch*(info->end-info->begin),phrasebits,resbitsT);
+ for(i=0;i<possible_partitions;i++)
fprintf(stderr,"%ld(%ld):%ld ",i,resvals[i],resbits[i]);
fprintf(stderr,"\n");*/
1.4 +2 -2 vorbis/lib/vorbisenc.c
Index: vorbisenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisenc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vorbisenc.c 2000/11/08 06:08:12 1.3
+++ vorbisenc.c 2000/11/17 11:47:18 1.4
@@ -12,7 +12,7 @@
********************************************************************
function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.3 2000/11/08 06:08:12 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.4 2000/11/17 11:47:18 xiphmont Exp $
********************************************************************/
@@ -115,7 +115,7 @@
/* copy a mode into our allocated storage */
bpch=nominal_bitrate/channels;
- if(bpch<55000){
+ if(bpch<60000){
/* mode A */
mode=&info_AA;
}else if(bpch<75000){
1.2 +2 -2 vorbis/lib/books/res0_128_1024_1.vqh
Index: res0_128_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_1.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_1024_1.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_1024_1.vqh 2000/11/17 11:47:20 1.2
@@ -26,8 +26,8 @@
};
static 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,
+ 1, 4, 4, 4, 7, 7, 5, 7, 7, 5, 8, 8, 8,11,11, 8,
+ 11,11, 5, 8, 8, 8,11,11, 8,11,11, 4, 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,
1.2 +35 -35 vorbis/lib/books/res0_128_1024_3.vqh
Index: res0_128_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_3.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_1024_3.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_1024_3.vqh 2000/11/17 11:47:20 1.2
@@ -30,44 +30,44 @@
static 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,
+ 11, 9,11, 9,11,15,12,15, 7, 9,11, 9,11, 9,11,15,
+ 11,15, 7, 9,13, 9,12, 9,11,15,11,15,13,15,19,15,
+ 18, 9,11,15,12,15,13,15,19,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,
+ 11,15,11,15, 7, 9,12, 9,13, 9,12,15,12,15,13,15,
+ 19,15,18, 9,12,15,12,16,13,15,19,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,11,15,12,15, 7, 9,11, 9,11, 9,11,13,11,13,
+ 11,13,17,14,17, 9,11,13,11,14,12,14,18,14,18, 9,
+ 12,15,12,15,11,14,17,14,17,15,17,18,18,20,12,14,
+ 18,14,18,16,17,20,17,21, 7, 9,11, 9,11, 9,11,14,
+ 11,13,12,14,18,13,17, 9,11,14,11,14,12,14,18,14,
+ 17, 9,12,15,12,15,11,14,18,13,18,15,17,20,17,19,
+ 12,14,18,14,18,16,18,20,18,21, 7, 9,13, 9,13, 9,
+ 12,16,12,16,13,16,19,15,19, 9,12,15,12,16,13,15,
+ 18,16,21, 9,12,15,12,15,11,13,18,14,18,15,18,21,
+ 18,19,12,14,18,13,18,15,18,21,17,19,13,16,20,16,
+ 19,15,18,21,17,20,19,19,21,20,21,15,18,21,17,20,
+ 19,21,21,21,21, 9,12,16,12,16,11,14,18,14,18,15,
+ 17,20,17,20,12,14,18,14,18,16,17,21,19,21,13,15,
+ 19,16,18,15,18,21,18,20,19,21,21,18,21,16,18,20,
+ 18,20,19,21,21,21,20, 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,
+ 7, 9,12, 9,11, 9,11,13,11,13,12,14,17,14,17, 9,
+ 11,13,11,13,11,13,18,14,17, 9,12,15,12,15,12,14,
+ 17,14,18,15,18,19,19,20,12,13,17,14,18,15,17,19,
+ 19,20, 7, 9,11, 9,12, 9,11,14,11,14,12,14,17,14,
+ 17, 9,11,14,11,13,12,14,18,13,16, 9,12,15,12,15,
+ 12,14,18,14,17,16,18,20,18,20,12,14,17,14,18,16,
+ 18,20,17,20, 7, 9,13, 9,13, 9,12,16,12,16,13,15,
+ 21,16,20, 9,12,16,12,15,13,16,18,16,21, 9,12,15,
+ 12,16,12,14,17,14,17,15,18,21,17,20,11,14,17,14,
+ 18,15,17,20,18,21,13,15,19,16,19,15,17,20,18,21,
+ 18,20,21,21,21,15,17,20,18,21,20,19,21,21,21, 9,
+ 12,16,12,15,12,14,18,14,18,15,18,20,18,21,11,14,
+ 18,14,19,16,18,19,17,21,13,16,18,16,19,15,18,21,
+ 19,21,19,19,21,21,21,15,17,20,17,20,19,21,20,20,
+ 20,
};
static float _vq_quantthresh_res0_128_1024_3[] = {
1.2 +30 -30 vorbis/lib/books/res0_128_1024_4.vqh
Index: res0_128_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_4.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_1024_4.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_1024_4.vqh 2000/11/17 11:47:20 1.2
@@ -28,45 +28,45 @@
};
static 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,
+ 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, 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,
- 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,
+ 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, 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,
+ 15,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, 9,10,12,10,12, 7, 7,10, 7,10, 7, 8,10, 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,
+ 14,11,13,12,14,15,13,16, 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,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,
+ 13, 9,10,12,10,12,10,11,13,11,13,12,13,15,13,15,
+ 10,11,13,11,14,12,13,16,13,16, 8, 9,11, 9,11, 9,
+ 10,12,10,12,11,12,15,12,15, 9,10,12,10,12,11,12,
+ 15,12,15, 9,10,12,10,12,10,11,13,11,13,12,14,15,
+ 13,16,10,11,13,11,13,12,14,16,13,16,11,12,15,12,
+ 14,12,13,16,13,17,15,15,17,16,18,12,13,16,13,16,
+ 15,16,19,16,17, 9,10,12,10,12,10,11,14,11,13,12,
+ 14,15,13,16,10,11,13,11,13,12,13,15,14,16,11,12,
+ 14,12,15,12,13,16,13,16,14,15,18,15,17,12,13,16,
+ 14,16,14,16,18,16,18, 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,
+ 8,11, 9,11,10,11,13,11,14, 9,10,12,10,12,10,11,
+ 13,11,13,12,14,16,13,15,10,11,13,11,13,12,13,15,
+ 13,16, 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,
+ 10,11,13,11,13,12,13,16,13,15,10,11,13,11,13,12,
+ 13,16,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,13,14, 9,10,12,
+ 10,12,10,11,14,11,13,12,13,16,13,16,10,11,13,11,
+ 13,12,13,17,14,17,11,13,15,12,15,12,13,16,13,16,
+ 15,15,19,16,18,12,13,16,13,16,14,15,16,16,18, 9,
+ 10,12,10,12,10,11,13,11,14,12,14,15,14,16,10,11,
+ 13,11,13,12,13,16,13,15,11,12,14,12,15,12,13,16,
+ 14,16,15,16,17,16,17,12,13,16,13,16,15,16,18,15,
16,
};
1.2 +2 -2 vorbis/lib/books/res0_128_1024_5.vqh
Index: res0_128_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_5.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_1024_5.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_1024_5.vqh 2000/11/17 11:47:20 1.2
@@ -31,8 +31,8 @@
static 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,
+ 11,10, 8,11,11, 6, 9,11,12, 9,11,12, 4, 6, 8, 8,
+ 6, 8, 8, 6, 8,11,10, 8,11,11, 6, 9,11,12, 9,11,
12,
};
1.2 +2 -2 vorbis/lib/books/res0_128_1024_6.vqh
Index: res0_128_1024_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_6.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_1024_6.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_1024_6.vqh 2000/11/17 11:47:20 1.2
@@ -31,8 +31,8 @@
static 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,
+ 8, 9, 7, 8, 9, 6, 8, 9,11, 8,10,11, 4, 5, 6, 7,
+ 5, 6, 7, 5, 6, 8, 9, 7, 8, 9, 6, 8,10,11, 8, 9,
11,
};
1.2 +1 -1 vorbis/lib/books/res0_128_1024_7.vqh
Index: res0_128_1024_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_7.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_1024_7.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_1024_7.vqh 2000/11/17 11:47:20 1.2
@@ -36,7 +36,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,
+ 8,10,11,10, 8,10,11,11, 6, 8,10,11,12, 8,10,11,
12,
};
1.2 +11 -11 vorbis/lib/books/res0_128_1024_8.vqh
Index: res0_128_1024_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_8.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_1024_8.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_1024_8.vqh 2000/11/17 11:47:20 1.2
@@ -36,17 +36,17 @@
};
static 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,
+ 2, 4, 5, 6, 7, 6, 8, 4, 5, 6, 7, 6, 8, 4, 6, 7,
+ 8, 8, 8,10, 6, 7, 8, 8, 8,10, 6, 7, 9, 9,10,10,
+ 11, 7, 9, 9,10,10,11, 6, 8,10,10,10,10,11, 8,10,
+ 10,10,10,11, 7, 9,11,11,11,11,12, 9,11,11,11,11,
+ 12, 7, 9,11,11,12,12,13, 9,11,11,12,12,13, 9,11,
+ 13,13,13,14,14,11,13,13,13,14,15, 4, 6, 7, 8, 8,
+ 8,10, 6, 7, 8, 8, 8,10, 6, 8, 9, 9,10,10,11, 8,
+ 9, 9,10,10,11, 7, 8,10,10,10,10,11, 8,10,10,10,
+ 10,11, 7, 9,11,11,11,11,12, 9,11,11,11,11,12, 7,
+ 9,11,11,11,12,13, 9,11,11,11,12,13, 9,11,13,13,
+ 13,13,15,11,13,13,13,14,14,
};
static float _vq_quantthresh_res0_128_1024_8[] = {
1.2 +3 -3 vorbis/lib/books/res0_128_1024_9.vqh
Index: res0_128_1024_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_9.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_1024_9.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_1024_9.vqh 2000/11/17 11:47:20 1.2
@@ -60,9 +60,9 @@
};
static 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,
+ 2, 4, 4, 4, 4, 5, 6, 6, 7, 7, 8, 9,10,11,12,13,
+ 14,14,16, 3, 4, 4, 4, 5, 5, 6, 7, 7, 8, 9,10,11,
+ 12,13,14,15,16,
};
static float _vq_quantthresh_res0_128_1024_9[] = {
1.2 +7 -7 vorbis/lib/books/res0_128_1024aux.vqh
Index: res0_128_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024aux.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_1024aux.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_1024aux.vqh 2000/11/17 11:47:20 1.2
@@ -20,13 +20,13 @@
#include "codebook.h"
static 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,
+ 2, 6,11,10,14,11,14,12,13,16, 5, 3, 5, 6, 9, 8,
+ 10, 9,11,14,10, 5, 4, 5, 7, 9, 9,11,13,15, 9, 5,
+ 5, 5, 7, 7, 8, 8,10,14,13, 8, 7, 7, 6, 8, 7, 9,
+ 11,16, 9, 7, 8, 7, 8, 7, 8, 8,10,13,13, 9, 8, 7,
+ 7, 8, 7, 7, 9,14,10, 8, 9, 7, 8, 7, 7, 6, 8,12,
+ 10, 9,10, 9, 9, 8, 8, 7, 8,11,11,10,10, 9, 8, 8,
+ 7, 6, 7,10,
};
static static_codebook _huff_book_res0_128_1024aux = {
1.2 +2 -2 vorbis/lib/books/res0_128_128_1.vqh
Index: res0_128_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_1.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_128_1.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_128_1.vqh 2000/11/17 11:47:21 1.2
@@ -29,8 +29,8 @@
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,
+ 10,13,13,10,13,13, 5, 8, 8, 8,10,10, 8,10,11, 8,
+ 11,10,10,12,13,10,12,13, 8,10,10,11,13,13,10,13,
12,
};
1.2 +35 -35 vorbis/lib/books/res0_128_128_2.vqh
Index: res0_128_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_2.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_128_2.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_128_2.vqh 2000/11/17 11:47:21 1.2
@@ -28,44 +28,44 @@
};
static long _vq_lengthlist_res0_128_128_2[] = {
- 2, 4, 6, 4, 6, 5, 7, 9, 7, 9, 7,10,12, 9,13, 5,
+ 2, 4, 6, 4, 6, 4, 7, 9, 7, 9, 7,10,14,10,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,
+ 12, 9,12,10,12,14,12,15, 7, 9,12, 9,12,10,12,14,
+ 12,14, 7,10,13,10,14, 9,12,14,12,14,12,15,15,15,
+ 15,10,12,15,12,15,13,15,15,15,15, 5, 7,10, 7,10,
+ 7, 9,12, 9,13, 9,13,15,12,15, 7,10,13,10,11,10,
+ 12,15,12,15, 7,10,14,10,15,10,11,15,13,14,14,14,
+ 15,14,15, 9,13,15,12,14,13,14,15,14,15, 5, 7, 9,
+ 8,10, 7,10,13,10,11,10,12,14,13,15, 7,10,13,10,
+ 13,10,13,15,12,14, 7,10,13,10,11,10,12,14,12,14,
+ 12,14,15,14,15, 9,11,15,12,14,12,14,15,14,15, 9,
+ 12,15,12,15,11,15,15,14,15,14,15,15,15,15,13,13,
+ 15,14,15,15,15,15,15,15, 7,10,12,10,12, 9,11,14,
+ 12,14,12,13,15,14,15, 9,11,14,12,15,12,15,15,14,
+ 15,10,12,15,12,14,12,14,15,13,15,15,15,15,14,15,
+ 13,14,15,14,15,15,15,15,15,15, 7,10,13, 9,14,10,
+ 12,13,13,14,13,15,15,14,15,10,12,15,13,15,14,15,
+ 15,15,15,10,12,15,12,15,12,14,15,13,14,15,15,15,
+ 15,15,11,14,15,15,15,14,15,15,15,15,13,14,15,15,
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,15,15,10,12,15,13,15,12,13,15,14,15,15,
+ 15,15,15,15,12,14,15,14,15,14,14,15,14,15,14,14,
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, 5, 7,10, 7,10, 7,10,13,10,
+ 12,10,13,15,13,14, 7,10,12,10,13,10,12,15,13,15,
+ 7, 9,14,10,12, 9,11,15,12,14,12,14,15,15,15, 9,
+ 12,15,13,15,12,14,15,15,14,10,12,15,12,14,12,13,
+ 15,14,15,14,15,15,15,15,12,15,15,14,15,15,14,15,
+ 15,15, 7,10,13,10,13,10,12,14,12,14,13,14,15,14,
+ 14,10,12,13,12,15,12,14,15,15,15,10,12,15,13,15,
+ 12,14,15,14,15,15,15,15,15,15,12,14,15,15,15,15,
+ 14,15,15,15, 7,10,14, 9,15,10,12,15,12,15,14,15,
+ 15,14,15,10,12,15,12,15,15,14,15,14,15,10,12,15,
+ 13,15,12,14,15,14,15,15,15,15,15,15,13,13,15,13,
+ 15,15,15,15,15,15,13,14,15,15,15,14,15,15,14,15,
+ 15,15,15,15,15,14,15,15,15,15,15,15,15,15,15,10,
+ 12,15,12,15,13,15,15,15,15,15,15,15,15,15,12,14,
+ 15,14,15,14,15,15,15,15,15,14,15,15,15,14,15,15,
15,15,15,15,15,15,15,14,15,15,15,15,15,15,15,15,
15,
};
1.2 +6 -6 vorbis/lib/books/res0_128_128_3.vqh
Index: res0_128_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_3.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_128_3.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_128_3.vqh 2000/11/17 11:47:21 1.2
@@ -32,12 +32,12 @@
};
static 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,
+ 1, 4, 6, 6, 7, 4, 6, 6, 7, 4, 6, 8, 9, 9, 6, 8,
+ 9, 9, 7, 9,10,12,11, 9,11,12,13, 7,10,13,14,15,
+ 10,13,13,15, 8,12,13,15,14,12,13,15,15, 4, 6, 8,
+ 8, 9, 6, 8, 8, 9, 6, 9,11,12,12, 9,11,12,12, 6,
+ 10,12,14,12,10,12,13,13, 8,12,14,15,15,12,15,13,
+ 13,
};
static float _vq_quantthresh_res0_128_128_3[] = {
1.2 +11 -11 vorbis/lib/books/res0_128_128_4.vqh
Index: res0_128_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_4.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_128_4.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_128_4.vqh 2000/11/17 11:47:21 1.2
@@ -36,17 +36,17 @@
};
static 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,
+ 3, 3, 5, 6, 6, 6, 6, 3, 5, 6, 6, 6, 6, 4, 5, 7,
+ 8, 8, 7, 8, 5, 7, 8, 8, 7, 7, 7, 8,10,10,11,11,
+ 10, 8,10,10,11,10,11,10,10,12,12,13,13,13,11,12,
+ 13,15,13,13,11,13,16,16,15,15,14,13,15,15,17,15,
+ 17,11,16,16,17,17,17,16,15,16,17,17,17,17,12,16,
+ 17,17,17,17,17,16,17,17,17,17,17, 4, 5, 7, 7, 7,
+ 7, 8, 5, 7, 7, 8, 7, 7, 7, 8,10,11,10,10,11, 8,
+ 10,11,11,10,11, 9,11,12,13,14,12,13,11,12,13,13,
+ 13,13,11,14,13,16,16,17,15,13,15,15,15,14,15,12,
+ 15,16,17,17,17,17,14,17,15,15,17,16,13,16,16,16,
+ 16,16,16,16,15,16,16,16,16,
};
static float _vq_quantthresh_res0_128_128_4[] = {
1.2 +71 -48 vorbis/lib/books/res0_128_128_5.vqh
Index: res0_128_128_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_5.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_128_5.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_128_5.vqh 2000/11/17 11:47:21 1.2
@@ -20,78 +20,101 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_128_5[] = {
- 56,
- 57,
- 58,
- 59,
- 61,
- 64,
- 67,
- 70,
- 73,
- 76,
- 80,
- 84,
- 87,
- 91,
- 95,
- 99,
+ 102,
103,
+ 104,
+ 105,
107,
- 112,
+ 110,
+ 113,
+ 116,
+ 119,
+ 122,
+ 126,
+ 130,
+ 133,
+ 137,
+ 141,
+ 145,
+ 149,
+ 153,
+ 158,
+ 163,
+ 168,
+ 173,
+ 174,
+ 180,
+ 186,
+ 192,
+ 198,
+ 204,
+ 101,
+ 100,
+ 99,
+ 97,
+ 94,
+ 91,
+ 88,
+ 85,
+ 82,
+ 78,
+ 74,
+ 71,
+ 67,
+ 63,
+ 59,
55,
- 54,
- 53,
51,
- 48,
- 45,
- 42,
- 39,
+ 46,
+ 41,
36,
- 32,
- 28,
- 25,
- 21,
- 17,
- 13,
- 9,
- 5,
+ 31,
+ 30,
+ 24,
+ 18,
+ 12,
+ 6,
0,
};
static 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,
+ 1, 3, 4, 6, 6, 6, 7, 7, 7, 8, 9,11,12,13,15,18,
+ 18,18,18,17,17,17,17,17,17,17,17,17, 3, 5, 6, 6,
+ 6, 7, 7, 7, 8, 8,11,12,13,15,17,17,17,17,17,17,
+ 17,17,17,17,17,17,17,
};
static 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,
+ -99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
+ -58.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, 58.5, 63.5, 68.5,
+ 71.5, 75, 81, 87, 93, 99,
};
static 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,
+ 54, 53, 52, 51, 50, 49, 48, 47,
+ 46, 45, 44, 43, 42, 41, 40, 39,
+ 38, 37, 36, 35, 34, 33, 32, 31,
+ 30, 29, 28, 0, 1, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27,
};
static encode_aux_threshmatch _vq_auxt_res0_128_128_5 = {
_vq_quantthresh_res0_128_128_5,
_vq_quantmap_res0_128_128_5,
- 37,
- 37
+ 55,
+ 55
};
static static_codebook _vq_book_res0_128_128_5 = {
- 1, 37,
+ 1, 55,
_vq_lengthlist_res0_128_128_5,
- 1, -524550144, 1611661312, 7, 0,
+ 1, -522616832, 1611661312, 8, 0,
_vq_quantlist_res0_128_128_5,
NULL,
&_vq_auxt_res0_128_128_5,
1.2 +3 -3 vorbis/lib/books/res0_128_128aux.vqh
Index: res0_128_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128aux.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_128_128aux.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_128aux.vqh 2000/11/17 11:47:21 1.2
@@ -20,9 +20,9 @@
#include "codebook.h"
static 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,
+ 4, 9,11,11,14,15, 3, 2, 6, 9,14,15, 6, 6, 8,10,
+ 14,15, 7, 7, 9, 9,11,15, 8, 3, 6, 8,11,13, 6, 2,
+ 4, 7,11,14,
};
static static_codebook _huff_book_res0_128_128aux = {
1.2 +3 -3 vorbis/lib/books/res0_160_1024_1.vqh
Index: res0_160_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_1.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_1024_1.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_1024_1.vqh 2000/11/17 11:47:21 1.2
@@ -28,9 +28,9 @@
static long _vq_lengthlist_res0_160_1024_1[] = {
1, 4, 4, 4, 8, 8, 4, 8, 8, 4, 8, 8, 8,12,12, 8,
12,12, 5, 8, 8, 8,12,12, 9,12,12, 5, 8, 8, 8,12,
- 12, 8,12,12, 8,12,12,12,16,16,12,16,16, 9,12,12,
- 12,16,16,13,16,16, 5, 8, 8, 8,12,12, 9,12,12, 8,
- 12,12,12,16,16,12,16,16, 9,12,12,12,16,16,13,16,
+ 12, 9,12,12, 8,12,12,12,16,16,12,16,16, 8,12,12,
+ 12,16,16,12,16,16, 5, 8, 8, 8,12,12, 9,12,12, 8,
+ 12,12,12,16,15,12,16,16, 9,12,12,13,16,17,13,17,
16,
};
1.2 +31 -31 vorbis/lib/books/res0_160_1024_3.vqh
Index: res0_160_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_3.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_1024_3.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_1024_3.vqh 2000/11/17 11:47:21 1.2
@@ -30,43 +30,43 @@
static long _vq_lengthlist_res0_160_1024_3[] = {
3, 5, 7, 5, 7, 5, 6, 9, 6, 9, 7, 9,12, 9,13, 5,
6, 9, 6, 9, 7, 9,12, 9,12, 5, 6, 9, 6, 9, 6, 8,
- 11, 8,11, 9,11,15,11,15, 7, 8,11, 8,11, 9,11,14,
- 11,14, 7, 9,12, 9,13, 9,11,14,11,15,13,15,19,15,
- 19, 9,11,15,11,15,13,15,18,16,18, 5, 6, 9, 7, 9,
+ 11, 8,11, 9,11,14,11,15, 7, 8,11, 8,11, 9,11,14,
+ 11,15, 7, 9,12, 9,13, 9,11,14,11,15,13,15,18,15,
+ 19, 9,11,15,11,15,13,15,19,15,18, 5, 6, 9, 7, 9,
7, 8,11, 8,11, 9,11,15,11,15, 7, 8,11, 8,11, 9,
- 11,15,11,15, 7, 9,13, 9,13, 9,11,15,11,15,13,15,
- 18,15,18, 9,11,15,11,15,13,15,17,16,17, 5, 7, 9,
- 7, 9, 6, 8,11, 8,11, 9,11,15,11,15, 7, 8,11, 8,
+ 11,15,11,15, 7, 9,12, 9,13, 9,11,15,11,15,13,15,
+ 19,15,17, 9,11,15,11,15,13,15,18,15,18, 5, 6, 9,
+ 7, 9, 7, 8,11, 8,11, 9,11,15,11,15, 7, 8,11, 8,
11, 9,11,15,11,15, 6, 8,11, 8,11, 8,10,13,10,13,
- 11,13,16,13,16, 8,10,13,10,13,11,13,17,13,17, 9,
- 11,15,11,15,11,13,17,13,17,15,17,19,17,19,11,13,
- 18,13,16,15,17,20,18,18, 7, 8,11, 8,11, 8,10,13,
+ 11,13,16,13,17, 8,10,13,10,13,11,13,16,13,17, 9,
+ 11,15,11,15,11,13,17,13,17,15,17,18,17,20,11,13,
+ 17,13,17,15,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, 9,11,15,11,15,11,13,17,13,16,15,17,19,17,19,
- 11,13,16,13,18,15,17,19,18,20, 7, 9,13, 9,12, 9,
- 11,15,11,15,12,15,19,15,18, 9,11,15,11,15,13,15,
- 18,15,20, 9,11,15,11,15,11,13,17,13,17,15,18,19,
- 18,19,11,13,17,13,18,15,16,20,17,19,13,15,19,15,
- 19,15,17,19,17,19,18,19,19,19,20,15,17,19,18,20,
- 20,19,20,20,19, 9,11,15,11,15,11,13,17,13,17,15,
- 17,20,17,20,11,13,17,13,18,15,16,20,16,20,13,15,
- 18,15,18,14,17,20,17,19,19,20,20,20,20,15,17,19,
- 17,20,18,20,19,20,20, 5, 7, 9, 7, 9, 7, 8,11, 8,
- 11, 9,11,14,11,15, 7, 8,11, 8,11, 9,11,15,11,15,
+ 11,13,17,13,17,15,18,19,17,20, 7, 9,13, 9,13, 9,
+ 11,15,11,15,12,15,19,15,18, 9,11,15,11,15,12,15,
+ 18,15,18, 9,11,15,11,15,11,13,17,13,17,15,17,19,
+ 18,20,11,13,17,13,17,15,16,20,18,19,13,15,19,15,
+ 18,15,17,18,17,19,18,18,19,19,20,15,17,19,17,20,
+ 20,20,20,20,20, 9,11,15,11,15,11,13,18,13,17,15,
+ 17,19,17,20,11,13,17,13,17,15,16,20,17,19,13,16,
+ 18,15,18,14,18,19,17,19,18,20,20,20,20,16,18,19,
+ 18,20,18,19,20,20,20, 5, 7, 9, 7, 9, 7, 8,11, 8,
+ 11, 9,11,15,11,14, 7, 8,11, 8,11, 9,11,15,11,15,
7, 8,11, 8,11, 8,10,13,10,13,11,13,17,13,17, 8,
- 10,13,10,13,11,13,16,13,17, 9,11,15,11,15,11,13,
- 17,13,18,15,17,19,17,20,11,13,16,13,17,15,17,20,
+ 10,13,10,13,11,13,17,13,17, 9,11,15,11,15,11,13,
+ 17,13,18,15,17,20,18,20,11,13,17,13,17,15,16,20,
17,19, 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, 9,11,15,11,15,
- 11,13,17,13,18,16,17,19,17,20,11,13,17,13,17,15,
- 17,19,17,18, 7, 9,13, 9,13, 9,11,15,11,15,12,15,
- 18,15,19, 9,11,15,11,15,13,15,18,15,18, 9,11,15,
- 11,15,11,13,17,13,17,15,18,19,17,19,11,13,17,13,
- 17,15,17,20,17,20,13,15,19,15,19,15,17,20,17,20,
- 19,20,20,20,20,15,17,19,17,20,19,19,20,19,20, 9,
- 11,15,11,15,11,13,18,13,17,15,17,19,17,20,11,13,
- 17,13,17,15,17,19,17,20,13,15,17,15,18,15,17,20,
- 17,20,19,19,20,20,20,15,18,20,17,18,18,19,19,20,
+ 16, 8,10,13,10,13,11,13,17,13,16, 9,11,15,11,15,
+ 11,13,17,13,17,16,17,19,17,20,11,13,16,13,17,15,
+ 17,19,17,19, 7, 9,13, 9,13, 9,11,15,11,15,13,15,
+ 18,15,19, 9,11,15,11,15,13,15,19,15,18, 9,11,15,
+ 11,15,11,13,17,13,17,15,18,19,17,20,11,13,17,13,
+ 17,15,16,20,18,20,13,15,18,15,18,15,17,20,17,20,
+ 19,20,20,20,20,15,17,20,17,19,19,19,20,19,20, 9,
+ 11,15,11,15,11,13,17,13,17,15,17,19,17,19,11,13,
+ 17,13,17,15,17,20,17,20,13,15,17,15,18,15,17,20,
+ 17,20,19,20,20,20,20,15,17,20,17,20,18,19,19,19,
20,
};
1.2 +18 -18 vorbis/lib/books/res0_160_1024_4.vqh
Index: res0_160_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_4.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_1024_4.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_1024_4.vqh 2000/11/17 11:47:21 1.2
@@ -30,43 +30,43 @@
static long _vq_lengthlist_res0_160_1024_4[] = {
5, 6, 8, 6, 8, 6, 7, 9, 7, 9, 8, 9,11, 9,11, 6,
7, 9, 7, 9, 8, 9,11, 9,11, 6, 7, 9, 7, 9, 7, 7,
- 9, 7,10, 9, 9,12,10,12, 7, 7, 9, 7, 9, 9, 9,12,
+ 9, 7,10, 9, 9,11,10,12, 7, 7, 9, 7,10, 9,10,11,
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, 9, 7, 9, 9,10,12, 9,12, 7, 7, 9, 7, 9, 9,
+ 7, 7, 9, 7, 9, 9,10,12,10,11, 7, 7, 9, 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, 9, 7,
- 10, 9,10,12,10,12, 7, 7,10, 7,10, 7, 8,10, 8,10,
- 10,10,12,10,12, 7, 8,10, 8,10,10,10,13,10,13, 9,
+ 9, 9,10,12,10,12, 7, 7,10, 7,10, 7, 8,10, 8,10,
+ 10,10,12,10,13, 7, 8,10, 8,10,10,10,13,10,13, 9,
10,12,10,12,10,10,13,10,13,12,12,14,13,15,10,10,
13,10,13,12,13,15,13,15, 7, 7,10, 7,10, 7, 8,10,
- 8,10,10,10,13,10,12, 7, 8,10, 8,10,10,10,13,10,
- 13, 9,10,12,10,12,10,10,13,10,13,12,13,15,12,14,
+ 8,10,10,10,13,10,12, 7, 8,10, 8,10,10,10,12,10,
+ 12, 9,10,12,10,12,10,10,13,10,13,12,13,15,12,14,
10,10,13,11,13,12,13,15,13,15, 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, 9,10,12,10,12,10,10,13,10,13,12,12,15,
13,15,10,10,13,10,13,12,13,15,13,14,11,12,14,12,
- 14,12,13,14,13,15,14,14,16,15,16,12,13,15,13,15,
- 14,15,17,15,17, 9,10,12,10,12,10,11,13,10,13,12,
- 13,15,13,14,10,10,13,10,13,12,13,15,13,15,11,12,
- 14,12,14,12,12,15,12,14,14,15,16,14,16,12,13,14,
- 13,15,14,15,17,14,17, 6, 7, 9, 7, 9, 7, 7, 9, 7,
+ 14,12,12,14,13,15,14,14,16,15,16,12,13,15,13,15,
+ 14,15,17,15,16, 9,10,12,10,12,10,10,13,10,13,12,
+ 13,15,12,15,10,10,13,10,13,12,13,15,13,15,11,12,
+ 14,12,14,12,12,15,12,14,14,14,16,14,16,12,12,15,
+ 13,15,14,15,17,15,16, 6, 7, 9, 7, 9, 7, 7, 9, 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,12,10,13, 7,
+ 7, 7,10, 7,10, 7, 8,10, 8,10,10,10,12,10,12, 7,
8,10, 8,10,10,10,12,10,13, 9,10,12,10,12,10,10,
- 13,10,13,12,13,15,13,15,10,10,13,10,13,12,12,14,
+ 13,10,13,12,13,14,13,15,10,10,13,10,13,12,12,14,
13,15, 7, 7,10, 7,10, 7, 8,10, 8,10,10,10,13,10,
13, 7, 8,10, 8,10,10,11,13,10,12, 9,10,12,10,12,
- 10,10,13,11,13,12,13,15,13,15,10,10,13,10,13,12,
+ 10,10,13,10,13,12,13,14,12,14,10,10,13,10,13,12,
13,15,12,14, 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, 9,10,12,
- 10,12,10,10,13,10,13,12,13,14,13,15,10,10,13,10,
+ 10,12,10,10,13,10,13,12,13,15,13,15,10,10,13,10,
13,12,13,15,13,15,11,12,14,12,14,12,13,15,13,15,
- 14,15,17,14,16,12,12,14,13,15,14,14,16,15,16, 9,
- 10,12,10,12,10,10,13,11,13,12,13,14,13,15,10,10,
+ 14,15,16,14,16,12,12,15,13,15,14,14,16,15,16, 9,
+ 10,12,10,12,10,10,13,10,13,12,13,15,13,15,10,10,
13,10,13,12,13,15,13,15,11,12,14,12,14,12,13,15,
- 13,15,14,15,17,15,17,12,13,15,13,15,14,15,17,14,
+ 13,15,14,15,17,15,16,12,13,15,13,14,14,15,17,14,
16,
};
1.2 +3 -3 vorbis/lib/books/res0_160_1024_5.vqh
Index: res0_160_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_5.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_1024_5.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_1024_5.vqh 2000/11/17 11:47:21 1.2
@@ -31,9 +31,9 @@
static long _vq_lengthlist_res0_160_1024_5[] = {
1, 4, 6, 6, 4, 6, 6, 4, 5, 8, 8, 6, 8, 8, 6, 8,
- 11,11, 8,11,11, 7, 8,11,13, 9,12,13, 4, 6, 8, 8,
- 6, 8, 8, 6, 8,11,11, 8,11,11, 7, 9,11,13, 9,12,
- 13,
+ 10,11, 8,11,11, 7, 9,11,12, 9,11,12, 4, 6, 8, 8,
+ 6, 8, 8, 6, 8,11,11, 8,10,11, 7, 9,11,12, 9,11,
+ 12,
};
static float _vq_quantthresh_res0_160_1024_5[] = {
1.2 +3 -3 vorbis/lib/books/res0_160_1024_6.vqh
Index: res0_160_1024_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_6.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_1024_6.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_1024_6.vqh 2000/11/17 11:47:21 1.2
@@ -30,9 +30,9 @@
};
static long _vq_lengthlist_res0_160_1024_6[] = {
- 3, 4, 5, 6, 4, 5, 6, 4, 4, 6, 7, 4, 6, 7, 5, 6,
- 7, 9, 6, 8, 9, 6, 7, 9,10, 7, 9,10, 4, 4, 6, 7,
- 5, 6, 7, 5, 6, 8, 9, 6, 8, 9, 7, 7, 9,10, 7, 9,
+ 3, 4, 5, 7, 4, 5, 7, 4, 4, 6, 7, 4, 6, 7, 5, 6,
+ 8, 9, 6, 8, 9, 7, 7, 9,10, 7, 9,10, 4, 4, 6, 7,
+ 4, 6, 7, 5, 6, 8, 9, 6, 8, 9, 7, 7, 9,10, 8, 9,
10,
};
1.2 +1 -1 vorbis/lib/books/res0_160_1024_7.vqh
Index: res0_160_1024_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_7.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_1024_7.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_1024_7.vqh 2000/11/17 11:47:21 1.2
@@ -32,7 +32,7 @@
};
static long _vq_lengthlist_res0_160_1024_7[] = {
- 2, 4, 5, 6, 6, 4, 5, 6, 7, 4, 5, 7, 7, 8, 5, 7,
+ 2, 4, 5, 6, 7, 4, 5, 6, 6, 4, 5, 7, 7, 8, 5, 7,
7, 8, 6, 7, 8, 9, 9, 7, 8, 9, 9, 7, 8, 9,10,10,
8, 9,10,10, 7, 8,10,11,11, 8,10,11,11, 4, 5, 7,
7, 8, 5, 7, 7, 8, 6, 7, 8, 9, 9, 7, 8, 9, 9, 7,
1.2 +11 -11 vorbis/lib/books/res0_160_1024_8.vqh
Index: res0_160_1024_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_8.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_1024_8.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_1024_8.vqh 2000/11/17 11:47:21 1.2
@@ -36,17 +36,17 @@
};
static long _vq_lengthlist_res0_160_1024_8[] = {
- 2, 4, 6, 6, 6, 7, 8, 4, 6, 6, 6, 7, 8, 5, 6, 7,
- 7, 7, 8,10, 6, 7, 7, 8, 8, 9, 6, 7, 8, 8, 9, 9,
- 11, 7, 8, 8, 9, 9,11, 7, 8, 9, 9, 9,10,11, 8, 9,
- 9, 9,10,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,14,11,12,12,12,13,14, 5, 6, 7, 7, 8,
- 8,10, 6, 7, 7, 8, 8,10, 6, 7, 8, 8, 9, 9,11, 7,
- 8, 8, 9, 9,11, 7, 8, 9, 9, 9,10,11, 8, 9, 9, 9,
- 10,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,13,14,11,12,12,12,12,14,
+ 2, 4, 6, 6, 6, 7, 8, 4, 6, 6, 6, 7, 8, 4, 6, 7,
+ 7, 8, 8,10, 6, 7, 7, 8, 8,10, 6, 7, 8, 9, 9, 9,
+ 11, 7, 8, 9, 9, 9,11, 7, 8, 9, 9,10,10,12, 8, 9,
+ 9,10,10,12, 7, 9,10,10,11,11,12, 9,10,10,11,11,
+ 13, 8, 9,11,11,12,13,14, 9,11,11,12,13,14, 9,11,
+ 13,13,13,14,15,11,13,13,14,14,15, 4, 6, 7, 7, 8,
+ 8,10, 6, 7, 7, 8, 8,10, 6, 7, 8, 9, 9, 9,11, 7,
+ 8, 9, 9,10,11, 7, 8, 9, 9,10,10,12, 8, 9, 9,10,
+ 10,12, 7, 9,10,10,11,11,12, 9,10,11,11,11,12, 8,
+ 9,11,11,12,13,14, 9,11,11,12,12,14, 9,11,13,13,
+ 14,14,15,11,13,13,13,14,15,
};
static float _vq_quantthresh_res0_160_1024_8[] = {
1.2 +3 -3 vorbis/lib/books/res0_160_1024_9.vqh
Index: res0_160_1024_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024_9.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_1024_9.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_1024_9.vqh 2000/11/17 11:47:21 1.2
@@ -60,9 +60,9 @@
};
static long _vq_lengthlist_res0_160_1024_9[] = {
- 2, 3, 4, 4, 4, 5, 6, 6, 8,11,13,14,15,16,16,17,
- 18,19,20, 3, 4, 4, 4, 5, 7, 6, 9,10,13,14,16,16,
- 17,18,19,19,20,
+ 2, 3, 4, 4, 4, 5, 6, 6, 7, 8, 9,10,11,12,13,13,
+ 16,16,18, 3, 4, 4, 5, 5, 6, 6, 7, 8, 9,10,11,12,
+ 13,14,16,17,18,
};
static float _vq_quantthresh_res0_160_1024_9[] = {
1.2 +5 -5 vorbis/lib/books/res0_160_1024aux.vqh
Index: res0_160_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_1024aux.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_1024aux.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_1024aux.vqh 2000/11/17 11:47:21 1.2
@@ -22,11 +22,11 @@
static long _huff_lengthlist_res0_160_1024aux[] = {
2, 7,12,11,15,11,14,11,12,15, 5, 4, 7, 7, 9, 9,
10,10,11,13,10, 6, 5, 6, 6, 9, 8,10,12,14, 9, 6,
- 6, 6, 6, 8, 7, 8,10,13,13, 8, 6, 6, 4, 8, 5, 8,
- 10,14, 9, 8, 9, 7, 8, 8, 8, 8,10,13,13, 9, 8, 7,
- 5, 8, 5, 6, 8,12,10, 9, 9, 7, 7, 7, 6, 5, 6,10,
- 10, 9,10, 9, 9, 8, 7, 6, 5, 8,12,11,13,11,12,11,
- 10, 8, 6, 9,
+ 6, 6, 6, 7, 8, 8,10,13,13, 8, 6, 6, 5, 7, 5, 7,
+ 10,14, 9, 8, 8, 7, 7, 7, 7, 8, 9,13,13, 9, 8, 7,
+ 5, 7, 5, 6, 8,13,10, 9, 9, 7, 7, 7, 6, 5, 7,10,
+ 10,10,11, 9, 9, 8, 7, 6, 6, 9,11,10,12,10,10, 9,
+ 8, 7, 5, 7,
};
static static_codebook _huff_book_res0_160_1024aux = {
1.2 +2 -2 vorbis/lib/books/res0_160_128_1.vqh
Index: res0_160_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128_1.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_128_1.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_128_1.vqh 2000/11/17 11:47:21 1.2
@@ -28,9 +28,9 @@
static long _vq_lengthlist_res0_160_128_1[] = {
2, 4, 4, 4, 6, 6, 4, 6, 6, 5, 7, 6, 6, 8, 8, 6,
8, 8, 5, 6, 7, 6, 8, 8, 6, 8, 8, 5, 7, 7, 7, 9,
- 9, 7, 8, 8, 7, 9, 9, 8,10,11, 9,10,10, 7, 9, 9,
+ 9, 7, 8, 8, 7, 9, 9, 8,10,11, 9,10,10, 7, 8, 9,
8,11,10, 9,10,10, 5, 7, 7, 7, 8, 8, 7, 9, 9, 7,
- 9, 8, 9,10,10, 8, 9,10, 7, 9, 9, 9,10,10, 9,10,
+ 9, 8, 9,10,10, 9, 9,10, 7, 9, 9, 9,10,10, 9,10,
10,
};
1.2 +38 -38 vorbis/lib/books/res0_160_128_2.vqh
Index: res0_160_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128_2.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_128_2.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_128_2.vqh 2000/11/17 11:47:21 1.2
@@ -28,45 +28,45 @@
};
static long _vq_lengthlist_res0_160_128_2[] = {
- 3, 5, 7, 5, 7, 5, 6, 8, 6, 8, 7, 9,12, 9,11, 5,
- 6, 8, 6, 8, 7, 9,11, 9,11, 5, 6, 9, 6, 9, 6, 7,
- 10, 8,10, 9,10,13,10,14, 7, 8,10, 8,10, 9,10,13,
- 10,13, 8, 9,13, 9,12, 9,11,13,11,13,12,13,17,13,
- 15, 9,11,13,10,13,12,14,15,14,16, 5, 6, 9, 7, 9,
- 6, 8,10, 8,10, 9,10,13,10,13, 6, 8,10, 8,10, 9,
- 10,13,10,12, 8, 9,12, 9,13, 9,11,13,11,13,12,14,
- 16,13,16, 9,11,14,11,13,12,14,16,13,15, 6, 7, 9,
- 7, 9, 7, 8,11, 8,11, 9,11,13,11,14, 7, 8,10, 8,
+ 3, 5, 7, 5, 6, 5, 6, 8, 6, 8, 7, 9,12, 9,11, 5,
+ 6, 8, 6, 8, 7, 9,11, 9,11, 5, 6, 9, 6, 9, 6, 8,
+ 10, 8,10, 9,10,13,10,13, 7, 8,10, 8,10, 9,10,12,
+ 11,13, 8, 9,13, 9,13, 9,11,14,11,13,12,13,17,13,
+ 16, 9,11,13,11,13,12,14,16,13,15, 5, 6, 9, 7, 9,
+ 6, 8,10, 8,10, 9,10,13,10,13, 7, 8,10, 8,10, 9,
+ 10,13,10,12, 8, 9,12, 9,13, 9,11,13,10,13,12,13,
+ 15,13,15, 9,11,15,10,13,13,13,16,13,15, 6, 7, 9,
+ 7, 9, 7, 8,11, 8,10, 9,11,14,11,14, 7, 8,10, 8,
10, 9,10,13,10,13, 7, 8,11, 8,10, 8, 9,11, 9,12,
- 11,11,14,12,14, 8, 9,12, 9,12,11,12,14,12,15,10,
- 11,13,11,14,11,11,15,12,14,14,14,17,15,17,11,12,
- 15,12,15,13,15,17,15,17, 7, 8,10, 8,11, 8, 9,12,
- 9,11,11,12,15,11,13, 8, 9,11, 9,12,11,12,14,12,
- 14,10,10,13,11,14,11,12,15,12,14,14,14,17,14,16,
- 11,12,14,13,16,14,15,17,15,17, 8,10,13,10,13,10,
- 11,14,11,14,13,14,16,14,17,10,11,14,11,14,12,14,
- 15,15,16,10,11,14,11,15,11,12,16,13,15,15,16,17,
- 16,17,11,12,15,12,15,15,15,17,14,17,13,13,16,13,
- 16,13,14,17,14,17,17,16,17,16,16,14,15,17,15,16,
- 17,17,16,17,17,10,11,15,11,15,11,12,14,12,14,14,
- 17,16,15,16,11,12,14,12,15,15,15,16,17,16,13,14,
- 16,14,16,14,16,16,14,16,17,16,17,17,16,15,15,17,
- 15,17,16,17,17,16,17, 6, 7, 9, 7, 9, 7, 8,10, 8,
- 10, 9,10,13,10,13, 7, 8,11, 8,11, 9,11,13,11,14,
- 7, 8,10, 8,10, 8, 9,12, 9,12,11,12,14,12,15, 8,
- 9,12, 9,12,11,11,14,12,15,10,11,13,11,14,11,12,
- 15,12,16,13,16,16,14,17,10,12,16,13,15,14,14,15,
- 15,16, 7, 8,11, 8,11, 8, 9,11, 9,12,10,12,16,12,
- 15, 8, 9,12, 9,12,11,12,15,11,14,10,11,13,11,14,
- 11,12,15,12,14,13,14,16,15,17,11,12,16,12,15,14,
- 17,17,14,16, 8,10,13,10,13,10,11,14,11,13,13,14,
- 16,14,16,10,11,14,11,14,13,14,17,14,16,10,11,16,
- 11,14,11,12,16,12,15,14,16,17,15,17,11,12,15,12,
- 16,14,14,16,15,17,13,15,16,14,16,14,15,16,15,16,
- 17,16,16,16,16,14,15,17,16,17,15,17,17,16,17,10,
- 11,14,11,15,11,12,15,12,15,14,15,17,16,16,11,13,
- 15,12,16,13,16,17,15,17,13,15,16,13,15,14,15,16,
- 15,16,15,17,17,17,17,14,15,17,15,17,15,16,16,16,
+ 11,11,13,12,15, 8, 9,12, 9,12,11,12,14,12,15,10,
+ 11,13,11,13,10,11,14,12,14,13,13,16,15,17,11,12,
+ 15,12,15,13,14,15,15,16, 7, 8,10, 8,11, 8, 9,12,
+ 9,11,11,12,15,11,13, 8, 9,12, 9,12,11,11,15,12,
+ 14,10,11,13,11,14,11,12,16,12,14,14,14,16,14,16,
+ 11,12,14,12,15,13,15,17,15,17, 8,10,12,10,12,10,
+ 11,13,11,14,13,14,17,13,17,10,11,13,11,13,12,14,
+ 14,14,15,10,11,14,11,14,11,12,16,12,15,14,14,17,
+ 15,17,11,12,14,12,14,14,15,17,14,17,12,13,16,14,
+ 16,14,14,17,14,17,16,16,17,17,17,13,14,17,15,16,
+ 17,17,17,16,17,10,11,15,11,15,11,12,14,12,14,14,
+ 17,17,15,16,11,12,15,12,15,15,15,17,15,16,13,14,
+ 15,14,15,13,15,17,15,16,17,17,17,17,17,14,15,17,
+ 14,17,15,17,17,16,17, 6, 7, 9, 7, 9, 7, 8,10, 8,
+ 10, 9,10,13,11,13, 7, 8,11, 8,11, 9,10,13,11,13,
+ 7, 8,10, 8,10, 8, 9,12, 9,12,11,12,14,12,14, 8,
+ 9,11, 9,12,11,11,14,12,15,10,11,13,11,13,11,12,
+ 15,12,15,13,14,16,14,17,10,11,15,12,15,13,13,15,
+ 14,16, 7, 8,10, 8,10, 8, 9,12, 9,12,11,12,14,12,
+ 14, 8, 9,12, 9,12,11,12,14,11,14, 9,11,13,11,14,
+ 11,12,14,12,14,13,14,16,14,17,10,12,15,12,14,13,
+ 15,17,14,17, 9,10,13,10,13,10,11,14,11,13,13,13,
+ 15,13,15,10,11,14,11,14,13,13,16,13,15,10,11,15,
+ 11,14,11,12,15,13,15,14,15,16,15,17,11,12,14,12,
+ 15,14,14,17,15,17,12,14,16,13,15,14,14,16,15,17,
+ 17,17,17,16,17,14,14,17,16,16,15,17,17,15,17,10,
+ 11,14,11,15,11,12,15,12,15,14,15,17,15,17,11,13,
+ 15,12,15,13,16,17,14,17,12,15,15,13,16,15,15,16,
+ 15,15,15,17,17,17,17,13,14,17,14,17,15,17,16,15,
17,
};
1.2 +5 -5 vorbis/lib/books/res0_160_128_3.vqh
Index: res0_160_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128_3.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_128_3.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_128_3.vqh 2000/11/17 11:47:21 1.2
@@ -32,11 +32,11 @@
};
static long _vq_lengthlist_res0_160_128_3[] = {
- 2, 3, 6, 6, 8, 3, 6, 6, 7, 4, 5, 7, 8, 8, 5, 7,
- 8, 8, 6, 7, 9,10,10, 7, 9,10,11, 7, 8,10,11,12,
- 9,11,12,12, 9,11,13,14,13,11,13,14,14, 4, 5, 7,
- 8, 9, 5, 7, 8, 8, 6, 7, 9,10,10, 7, 9,10,10, 7,
- 9,10,11,12, 9,11,12,12, 9,11,13,15,14,11,13,14,
+ 2, 3, 6, 6, 8, 3, 5, 6, 8, 4, 5, 7, 8,10, 5, 7,
+ 8,10, 6, 7, 9,10,13, 7, 9,10,12, 7, 8,11,13,14,
+ 8,11,13,16, 9,11,13,15,15,11,12,14,15, 4, 5, 7,
+ 8,10, 5, 7, 8,10, 6, 7,10,10,13, 7,10,11,12, 7,
+ 8,11,12,14, 8,11,13,14, 9,11,13,14,16,11,13,15,
15,
};
1.2 +11 -11 vorbis/lib/books/res0_160_128_4.vqh
Index: res0_160_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128_4.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_128_4.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_128_4.vqh 2000/11/17 11:47:21 1.2
@@ -36,17 +36,17 @@
};
static long _vq_lengthlist_res0_160_128_4[] = {
- 3, 4, 5, 6, 6, 6, 7, 4, 5, 6, 6, 6, 7, 4, 5, 6,
- 7, 7, 7, 8, 5, 6, 6, 7, 7, 8, 7, 7, 8, 8, 8, 9,
- 10, 7, 8, 8, 8, 9,10, 9, 9,10,10,10,10,12, 9,10,
- 10,10,10,12,11,11,13,13,12,13,14,11,12,13,12,13,
- 14,12,14,15,15,14,15,17,13,14,16,16,16,17,14,17,
- 18,18,17,18,18,16,18,16,18,18,18, 4, 5, 6, 7, 7,
- 7, 8, 5, 6, 6, 7, 7, 8, 7, 7, 8, 8, 8, 9,10, 7,
- 8, 8, 8, 9,10, 9, 9,10,10,10,10,12, 9,10,10,10,
- 11,12,11,11,13,13,12,13,14,12,12,13,12,13,14,12,
- 14,15,16,15,15,18,13,15,15,15,15,17,14,15,16,18,
- 17,16,18,15,17,17,17,17,18,
+ 3, 4, 5, 6, 6, 6, 7, 4, 5, 6, 6, 6, 6, 4, 5, 6,
+ 7, 7, 7, 7, 5, 6, 7, 7, 7, 7, 7, 7, 8, 9, 9, 9,
+ 9, 7, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11, 9,10,
+ 10,10,10,11,10,11,13,13,13,12,13,11,13,13,13,13,
+ 13,11,12,14,16,15,16,15,13,17,14,16,15,16,12,17,
+ 17,17,17,16,17,14,16,16,17,17,17, 4, 5, 6, 7, 7,
+ 7, 7, 5, 6, 7, 7, 7, 7, 7, 7, 8, 9, 9, 9, 9, 7,
+ 8, 9, 9, 8, 9, 9, 9,10,11,11,10,11, 9,10,10,11,
+ 11,10,11,11,13,13,13,13,12,11,12,14,13,12,13,11,
+ 13,16,15,14,15,17,13,14,14,16,14,16,13,15,16,17,
+ 17,17,17,14,15,16,16,16,16,
};
static float _vq_quantthresh_res0_160_128_4[] = {
1.2 +71 -48 vorbis/lib/books/res0_160_128_5.vqh
Index: res0_160_128_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128_5.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_128_5.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_128_5.vqh 2000/11/17 11:47:21 1.2
@@ -20,78 +20,101 @@
#include "codebook.h"
static long _vq_quantlist_res0_160_128_5[] = {
- 56,
- 57,
- 58,
- 59,
- 61,
- 64,
- 67,
- 70,
- 73,
- 76,
- 80,
- 84,
- 87,
- 91,
- 95,
- 99,
+ 102,
103,
+ 104,
+ 105,
107,
- 112,
+ 110,
+ 113,
+ 116,
+ 119,
+ 122,
+ 126,
+ 130,
+ 133,
+ 137,
+ 141,
+ 145,
+ 149,
+ 153,
+ 158,
+ 163,
+ 168,
+ 173,
+ 174,
+ 180,
+ 186,
+ 192,
+ 198,
+ 204,
+ 101,
+ 100,
+ 99,
+ 97,
+ 94,
+ 91,
+ 88,
+ 85,
+ 82,
+ 78,
+ 74,
+ 71,
+ 67,
+ 63,
+ 59,
55,
- 54,
- 53,
51,
- 48,
- 45,
- 42,
- 39,
+ 46,
+ 41,
36,
- 32,
- 28,
- 25,
- 21,
- 17,
- 13,
- 9,
- 5,
+ 31,
+ 30,
+ 24,
+ 18,
+ 12,
+ 6,
0,
};
static long _vq_lengthlist_res0_160_128_5[] = {
- 2, 2, 4, 5, 6, 7, 8, 7, 8,10,14,16,16,17,15,17,
- 16,16,16, 2, 4, 6, 6, 7, 8, 7, 9,11,13,14,16,16,
- 16,15,16,16,16,
+ 2, 2, 4, 5, 6, 7, 7, 7, 8, 9,10,12,14,15,18,19,
+ 19,19,19,19,19,19,19,19,19,19,19,19, 2, 5, 5, 6,
+ 7, 7, 7, 8, 9, 9,11,14,15,18,18,19,19,19,19,19,
+ 19,19,19,19,19,19,18,
};
static float _vq_quantthresh_res0_160_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,
+ -99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
+ -58.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, 58.5, 63.5, 68.5,
+ 71.5, 75, 81, 87, 93, 99,
};
static long _vq_quantmap_res0_160_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,
+ 54, 53, 52, 51, 50, 49, 48, 47,
+ 46, 45, 44, 43, 42, 41, 40, 39,
+ 38, 37, 36, 35, 34, 33, 32, 31,
+ 30, 29, 28, 0, 1, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27,
};
static encode_aux_threshmatch _vq_auxt_res0_160_128_5 = {
_vq_quantthresh_res0_160_128_5,
_vq_quantmap_res0_160_128_5,
- 37,
- 37
+ 55,
+ 55
};
static static_codebook _vq_book_res0_160_128_5 = {
- 1, 37,
+ 1, 55,
_vq_lengthlist_res0_160_128_5,
- 1, -524550144, 1611661312, 7, 0,
+ 1, -522616832, 1611661312, 8, 0,
_vq_quantlist_res0_160_128_5,
NULL,
&_vq_auxt_res0_160_128_5,
1.2 +3 -3 vorbis/lib/books/res0_160_128aux.vqh
Index: res0_160_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_160_128aux.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_160_128aux.vqh 2000/11/08 13:16:28 1.1
+++ res0_160_128aux.vqh 2000/11/17 11:47:21 1.2
@@ -20,9 +20,9 @@
#include "codebook.h"
static long _huff_lengthlist_res0_160_128aux[] = {
- 5,10,13,12,13,14, 3, 3, 5, 8,13,14, 4, 4, 6, 8,
- 14,14, 6, 6, 6, 7, 9,11, 8, 4, 2, 4, 8,11, 9, 5,
- 5, 5,10,13,
+ 4,10,13,13,13,15, 3, 3, 5, 8,12,13, 4, 4, 6, 8,
+ 15,14, 6, 6, 7, 8,10,13, 8, 5, 4, 5, 9,11, 6, 3,
+ 3, 4, 9,11,
};
static static_codebook _huff_book_res0_160_128aux = {
1.2 +25 -25 vorbis/lib/books/res0_192_1024_2.vqh
Index: res0_192_1024_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_2.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_1024_2.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_1024_2.vqh 2000/11/17 11:47:21 1.2
@@ -28,45 +28,45 @@
};
static long _vq_lengthlist_res0_192_1024_2[] = {
- 4, 5, 7, 5, 7, 5, 6, 9, 7, 9, 7, 9,11, 9,11, 5,
- 7, 9, 7, 9, 7, 9,11, 9,11, 5, 7, 9, 7, 9, 7, 8,
+ 4, 5, 7, 5, 7, 5, 6, 9, 6, 9, 7, 9,11, 9,11, 5,
+ 6, 9, 7, 9, 7, 9,11, 9,11, 5, 7, 9, 7, 9, 7, 8,
10, 8,10, 9,10,12,10,12, 7, 8,10, 8,10, 9,10,12,
- 10,12, 7, 9,11, 9,11, 9,10,12,10,12,11,12,14,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, 5, 7, 9, 7, 9,
7, 8,10, 8,10, 9,10,12,10,12, 7, 8,10, 8,10, 9,
- 10,12,10,12, 7, 9,11, 9,11, 9,10,12,10,12,11,12,
- 14,12,14, 9,10,12,10,12,11,12,14,12,13, 5, 7, 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, 5, 7, 9,
7, 9, 7, 8,10, 8,10, 9,10,12,10,12, 7, 8,10, 8,
- 10, 9,10,12,10,12, 7, 8,10, 8,10, 8, 8,10, 9,11,
- 10,11,13,11,13, 8, 9,11, 9,11,10,11,13,11,13, 9,
- 10,12,10,12,10,11,13,11,13,12,13,14,13,15,10,11,
+ 10, 9,10,12,10,12, 7, 8,10, 8,10, 8, 8,11, 9,11,
+ 10,11,12,11,13, 8, 9,11, 9,11,10,11,12,11,13, 9,
+ 10,12,10,12,10,11,13,11,13,12,12,14,13,15,10,11,
13,11,13,12,13,15,13,15, 7, 8,10, 8,10, 8, 9,11,
9,11,10,11,13,11,12, 8, 9,11, 9,11,10,11,13,11,
- 13, 9,10,12,10,12,10,11,13,11,13,12,13,14,12,14,
- 10,11,13,11,13,12,13,15,13,15, 7, 9,11, 9,11, 9,
+ 13, 9,10,12,10,12,10,11,13,11,13,12,13,14,13,14,
+ 10,11,13,11,13,12,13,15,13,15, 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, 9,10,12,10,12,10,11,13,11,13,12,13,14,
- 13,15,10,11,13,11,13,12,13,15,13,14,11,12,14,12,
+ 13,15,10,11,13,11,13,12,13,14,13,14,11,12,14,12,
14,12,13,14,13,15,14,14,16,15,16,12,13,15,13,15,
- 14,15,16,15,16, 9,10,12,10,12,10,11,13,11,13,12,
- 13,15,13,14,10,11,13,11,13,12,13,15,13,14,11,12,
- 14,12,14,12,13,15,13,15,14,14,17,14,16,12,13,15,
+ 14,15,16,14,16, 9,10,12,10,12,10,11,13,11,13,12,
+ 13,15,13,14,10,11,13,11,13,12,13,14,13,14,11,12,
+ 14,12,14,12,13,15,13,14,14,15,16,14,16,12,13,15,
13,15,14,15,16,15,16, 5, 7, 9, 7, 9, 7, 8,10, 8,
10, 9,10,12,10,12, 7, 8,10, 8,10, 9,10,12,10,12,
7, 8,10, 8,10, 8, 9,11, 9,11,10,11,13,11,13, 8,
9,11, 9,11,10,11,13,11,13, 9,10,12,10,12,10,11,
- 13,11,13,12,13,15,13,14,10,11,13,11,13,12,13,14,
- 13,15, 7, 8,10, 8,10, 8, 9,11, 9,11,10,11,13,11,
- 13, 8, 9,11, 9,11,10,11,13,11,13, 9,10,12,10,12,
- 10,11,13,11,13,12,13,14,13,15,10,11,13,11,13,12,
- 13,15,12,14, 7, 9,11, 9,11, 9,10,12,10,12,11,12,
+ 13,11,13,12,13,14,13,15,10,11,13,11,13,12,13,14,
+ 13,14, 7, 8,10, 8,10, 8, 9,11, 9,11,10,11,13,11,
+ 13, 8, 9,11, 9,11,10,11,13,11,12, 9,10,12,10,12,
+ 10,11,13,11,13,12,13,14,13,14,10,11,13,11,13,12,
+ 13,14,12,14, 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, 9,10,12,
- 10,12,10,11,13,11,13,12,13,14,13,14,10,11,13,11,
- 13,12,13,14,13,15,11,12,14,12,14,12,13,15,13,15,
- 14,15,16,14,16,12,13,14,13,15,14,14,15,15,16, 9,
- 10,12,10,12,10,11,13,11,13,12,13,15,13,14,10,11,
- 13,11,13,12,13,15,13,15,11,12,14,12,14,12,13,15,
- 13,15,14,14,16,15,17,12,13,14,13,14,14,15,16,14,
+ 10,12,10,11,13,11,13,12,13,15,13,14,10,11,13,11,
+ 13,12,13,14,13,15,11,12,14,12,14,12,13,15,13,14,
+ 14,15,16,15,16,12,13,14,13,15,14,14,16,15,16, 9,
+ 10,12,10,12,10,11,13,11,13,12,13,14,13,15,10,11,
+ 13,11,13,12,13,15,13,14,11,12,14,12,14,12,13,15,
+ 13,15,14,14,16,15,16,12,13,15,13,14,14,14,16,14,
16,
};
1.2 +6 -6 vorbis/lib/books/res0_192_1024_3.vqh
Index: res0_192_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_3.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_1024_3.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_1024_3.vqh 2000/11/17 11:47:21 1.2
@@ -32,12 +32,12 @@
};
static long _vq_lengthlist_res0_192_1024_3[] = {
- 3, 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 6, 7, 9, 5, 6,
- 7, 9, 5, 6, 7, 8,10, 6, 7, 8,10, 6, 7, 8, 9,10,
- 7, 8, 9,10, 8, 9,10,10,12, 9,10,11,12, 4, 5, 6,
- 7, 9, 5, 6, 7, 9, 5, 6, 7, 8,10, 6, 7, 8,10, 6,
- 7, 8, 9,10, 7, 8, 9,10, 8, 9,10,11,12, 9,10,10,
- 12,
+ 3, 4, 5, 6, 8, 4, 5, 6, 8, 4, 5, 6, 7, 8, 5, 6,
+ 7, 9, 5, 6, 7, 8, 9, 6, 7, 8, 9, 6, 7, 8, 9,10,
+ 7, 8, 9,10, 8, 9,10,10,11, 9,10,10,11, 4, 5, 6,
+ 7, 9, 5, 6, 7, 9, 5, 6, 7, 8, 9, 6, 7, 8, 9, 6,
+ 7, 8, 9,10, 7, 8, 9,10, 8, 9,10,10,11, 9,10,10,
+ 11,
};
static float _vq_quantthresh_res0_192_1024_3[] = {
1.2 +11 -11 vorbis/lib/books/res0_192_1024_4.vqh
Index: res0_192_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_4.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_1024_4.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_1024_4.vqh 2000/11/17 11:47:21 1.2
@@ -36,17 +36,17 @@
};
static long _vq_lengthlist_res0_192_1024_4[] = {
- 3, 4, 6, 6, 6, 7, 8, 4, 6, 6, 6, 7, 8, 5, 6, 7,
- 7, 7, 8,10, 6, 7, 7, 7, 8,10, 6, 7, 7, 8, 8, 9,
- 11, 7, 7, 8, 8, 9,11, 6, 7, 8, 8, 8, 9,11, 7, 8,
- 8, 8, 9,11, 7, 8, 8, 8, 9, 9,11, 8, 8, 8, 9, 9,
- 11, 7, 8, 9, 9,10,11,12, 8, 9, 9,10,11,12, 9,10,
- 11,12,12,13,14,10,11,12,12,13,14, 5, 6, 7, 7, 7,
- 8,10, 6, 7, 7, 7, 8,10, 6, 7, 8, 8, 8, 9,11, 7,
- 7, 8, 8, 9,11, 6, 7, 8, 8, 8, 9,11, 7, 8, 8, 8,
- 9,11, 7, 8, 8, 8, 9, 9,11, 8, 8, 9, 9, 9,11, 7,
- 8, 9, 9,10,11,12, 8, 9, 9,10,11,12, 9,10,11,12,
- 12,12,14,10,11,12,12,12,14,
+ 3, 5, 6, 6, 6, 7, 8, 5, 6, 6, 6, 7, 8, 5, 6, 6,
+ 7, 7, 8, 9, 6, 6, 7, 7, 8, 9, 6, 7, 7, 8, 8, 9,
+ 11, 7, 7, 8, 8, 9,10, 6, 7, 8, 8, 8, 9,11, 7, 8,
+ 8, 8, 9,11, 7, 7, 8, 8, 8, 9,11, 7, 8, 8, 8, 9,
+ 11, 7, 8, 9, 9, 9,10,12, 8, 9, 9,10,10,12, 9,10,
+ 11,11,11,12,13,10,11,11,11,12,13, 5, 6, 6, 7, 7,
+ 8,10, 6, 7, 7, 7, 8, 9, 6, 7, 7, 8, 8, 9,10, 7,
+ 7, 8, 8, 9,10, 6, 7, 8, 8, 8, 9,11, 7, 8, 8, 8,
+ 9,11, 7, 7, 8, 8, 8, 9,11, 7, 8, 8, 9, 9,11, 7,
+ 8, 9, 9, 9,10,12, 8, 9, 9, 9,10,12, 9,10,11,11,
+ 11,12,13,10,11,11,11,12,13,
};
static float _vq_quantthresh_res0_192_1024_4[] = {
1.2 +71 -48 vorbis/lib/books/res0_192_1024_5.vqh
Index: res0_192_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024_5.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_1024_5.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_1024_5.vqh 2000/11/17 11:47:21 1.2
@@ -20,78 +20,101 @@
#include "codebook.h"
static long _vq_quantlist_res0_192_1024_5[] = {
- 56,
- 57,
- 58,
- 59,
- 61,
- 64,
- 67,
- 70,
- 73,
- 76,
- 80,
- 84,
- 87,
- 91,
- 95,
- 99,
+ 102,
103,
+ 104,
+ 105,
107,
- 112,
+ 110,
+ 113,
+ 116,
+ 119,
+ 122,
+ 126,
+ 130,
+ 133,
+ 137,
+ 141,
+ 145,
+ 149,
+ 153,
+ 158,
+ 163,
+ 168,
+ 173,
+ 174,
+ 180,
+ 186,
+ 192,
+ 198,
+ 204,
+ 101,
+ 100,
+ 99,
+ 97,
+ 94,
+ 91,
+ 88,
+ 85,
+ 82,
+ 78,
+ 74,
+ 71,
+ 67,
+ 63,
+ 59,
55,
- 54,
- 53,
51,
- 48,
- 45,
- 42,
- 39,
+ 46,
+ 41,
36,
- 32,
- 28,
- 25,
- 21,
- 17,
- 13,
- 9,
- 5,
+ 31,
+ 30,
+ 24,
+ 18,
+ 12,
+ 6,
0,
};
static long _vq_lengthlist_res0_192_1024_5[] = {
- 2, 3, 4, 4, 4, 5, 7, 6, 8,10,12,13,14,14,15,17,
- 19,20,20, 3, 4, 4, 4, 5, 7, 6, 7, 9,12,13,15,15,
- 17,18,19,18,19,
+ 2, 3, 4, 4, 4, 5, 7, 6, 9,10,11,13,13,14,14,15,
+ 17,17,18,19,20,21,21,21,20,21,21,21, 3, 4, 4, 4,
+ 5, 6, 6, 9,10,11,12,13,13,15,16,17,17,21,21,21,
+ 21,21,21,21,21,21,21,
};
static float _vq_quantthresh_res0_192_1024_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,
+ -99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
+ -58.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, 58.5, 63.5, 68.5,
+ 71.5, 75, 81, 87, 93, 99,
};
static long _vq_quantmap_res0_192_1024_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,
+ 54, 53, 52, 51, 50, 49, 48, 47,
+ 46, 45, 44, 43, 42, 41, 40, 39,
+ 38, 37, 36, 35, 34, 33, 32, 31,
+ 30, 29, 28, 0, 1, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27,
};
static encode_aux_threshmatch _vq_auxt_res0_192_1024_5 = {
_vq_quantthresh_res0_192_1024_5,
_vq_quantmap_res0_192_1024_5,
- 37,
- 37
+ 55,
+ 55
};
static static_codebook _vq_book_res0_192_1024_5 = {
- 1, 37,
+ 1, 55,
_vq_lengthlist_res0_192_1024_5,
- 1, -524550144, 1611661312, 7, 0,
+ 1, -522616832, 1611661312, 8, 0,
_vq_quantlist_res0_192_1024_5,
NULL,
&_vq_auxt_res0_192_1024_5,
1.2 +3 -3 vorbis/lib/books/res0_192_1024aux.vqh
Index: res0_192_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_1024aux.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_1024aux.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_1024aux.vqh 2000/11/17 11:47:21 1.2
@@ -20,9 +20,9 @@
#include "codebook.h"
static long _huff_lengthlist_res0_192_1024aux[] = {
- 2, 7,11,10,13,15, 5, 3, 6, 7,11,15, 9, 5, 4, 5,
- 10,14, 9, 6, 4, 2, 6,11,10, 9, 9, 5, 5, 8,12,11,
- 11, 8, 7, 9,
+ 3, 7,10, 9,11,13, 5, 3, 5, 7,10,13, 9, 5, 4, 4,
+ 9,12, 8, 6, 4, 2, 6,10, 9, 9, 8, 5, 4, 7,11,11,
+ 10, 7, 5, 7,
};
static static_codebook _huff_book_res0_192_1024aux = {
1.2 +3 -3 vorbis/lib/books/res0_192_128_1.vqh
Index: res0_192_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128_1.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_128_1.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_128_1.vqh 2000/11/17 11:47:21 1.2
@@ -28,9 +28,9 @@
static long _vq_lengthlist_res0_192_128_1[] = {
1, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 7,
8, 8, 5, 7, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 9,10,
- 10, 8, 9, 9, 9,10, 9,10,10,11,10,11,11, 9, 9,10,
- 9,11,10,10,11,11, 7, 8, 8, 8, 9, 9, 9,10,10, 9,
- 10, 9,11,11,10,10,10,11, 9, 9,10,10,11,11, 9,11,
+ 9, 8, 9, 9, 9,10, 9, 9,10,11,10,11,11, 9, 9,10,
+ 10,11,10,10,11,11, 7, 8, 8, 8, 9, 9, 9,10,10, 9,
+ 10, 9,10,11,11,10,10,11, 9, 9,10,10,11,11,10,11,
10,
};
1.2 +35 -35 vorbis/lib/books/res0_192_128_2.vqh
Index: res0_192_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128_2.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_128_2.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_128_2.vqh 2000/11/17 11:47:21 1.2
@@ -31,42 +31,42 @@
4, 5, 6, 5, 6, 5, 6, 7, 6, 7, 7, 8,10, 8,10, 5,
6, 7, 6, 8, 8, 8,10, 8,10, 6, 7, 8, 7, 8, 7, 7,
9, 7, 9, 9, 9,11, 9,11, 7, 7, 9, 7, 9, 9, 9,11,
- 10,11, 9, 9,11, 9,11, 9,10,12,10,12,11,12,13,12,
- 13, 9,10,12,10,12,11,12,13,12,13, 6, 7, 8, 7, 8,
- 7, 7, 9, 7, 9, 9,10,12, 9,11, 7, 7, 9, 7, 9, 9,
- 10,11, 9,11, 8, 9,11, 9,11, 9,10,12,10,12,11,12,
- 13,12,13, 9,10,12,10,12,11,12,13,12,13, 7, 7, 9,
- 7, 9, 7, 8,10, 8,10, 9,10,12,10,12, 7, 8,10, 8,
- 10, 9,10,12,10,12, 7, 8,10, 8,10, 8, 8,10, 9,11,
- 10,10,12,11,13, 8, 9,10, 9,10,10,11,12,11,12,10,
- 10,12,10,12,10,10,12,11,13,12,11,13,12,14,10,11,
- 13,11,13,12,12,14,13,15, 8, 8,10, 8,10, 8, 9,11,
- 8,10,10,11,12,10,12, 8, 9,10, 9,10,10,11,13,11,
- 12,10,10,12,10,12,10,11,13,11,12,12,13,15,11,13,
- 10,11,13,11,13,12,12,14,12,15, 9,10,12,10,12,10,
- 11,13,11,12,12,12,14,12,13,10,10,12,11,12,11,12,
- 14,12,14,10,11,12,10,12,11,11,13,11,13,12,13,14,
+ 9,11, 8, 9,11, 9,11, 9,10,12,10,11,11,11,13,12,
+ 13, 9,10,12,10,11,11,11,13,12,13, 6, 7, 8, 7, 8,
+ 7, 7, 9, 7, 9, 9,10,11, 9,11, 7, 7, 9, 7, 9, 9,
+ 9,11, 9,11, 8, 9,11, 9,11, 9,10,12,10,12,11,12,
+ 13,11,13, 9,10,12,10,12,11,11,13,12,13, 7, 7, 9,
+ 7, 9, 7, 8,10, 8,10, 9,10,12,10,11, 7, 8,10, 8,
+ 10, 9,10,11,10,12, 8, 8,10, 8,10, 8, 8,10, 9,11,
+ 10,10,12,11,13, 8, 9,10, 8,10,10,10,12,11,12,10,
+ 10,12,10,12,10,10,12,11,12,12,11,13,12,14,10,11,
+ 13,11,12,12,12,14,12,14, 8, 8,10, 8,10, 8, 9,10,
+ 9,10,10,11,12,10,12, 8, 9,10, 9,11,10,11,13,11,
+ 12,10,10,12,10,12,10,11,13,11,12,11,13,14,11,13,
+ 10,11,13,11,12,12,13,14,12,14, 9,10,12,10,12,10,
+ 11,12,11,12,12,13,14,13,13,10,10,12,10,12,11,12,
+ 14,12,14,10,11,12,11,12,11,11,13,11,13,12,13,14,
13,14,11,11,13,11,12,13,13,14,13,14,12,12,14,12,
- 14,12,13,14,13,15,14,14,14,14,16,12,13,15,13,14,
- 13,14,16,15,16,10,11,12,11,12,11,11,13,11,12,12,
- 13,16,13,14,11,11,13,11,13,13,13,14,13,15,12,12,
- 14,12,14,12,13,15,12,14,14,14,15,14,17,13,13,14,
- 13,15,14,15,14,15,15, 7, 7, 9, 7, 9, 7, 8, 9, 8,
- 10, 9,10,12,10,12, 7, 8,10, 8,10, 9,10,11,10,12,
- 8, 8,10, 8,10, 8, 9,11, 9,10,10,11,13,10,12, 8,
- 8,10, 9,11,10,10,12,11,13,10,10,12,10,12,10,11,
- 13,11,12,12,12,15,12,15,10,10,12,11,12,12,12,13,
- 13,14, 8, 8,10, 8,10, 8, 9,10, 9,11,10,11,12,11,
- 12, 8, 9,10, 8,10,10,11,12,10,12,10,10,12,10,12,
- 11,11,12,11,13,12,13,14,12,14,10,11,12,10,12,12,
- 12,16,12,13, 9,10,12,10,12,10,10,12,10,12,12,12,
- 13,12,13,10,11,12,11,13,12,12,14,12,14,10,11,12,
- 10,12,11,11,13,11,13,12,13,14,13,15,11,11,13,11,
- 13,12,13,14,13,15,12,12,14,12,13,13,13,15,13,14,
- 14,15,16,15,17,12,12,14,13,14,14,14,15,14,16,10,
- 11,12,10,12,11,11,13,11,13,12,13,14,13,14,11,11,
- 13,11,13,12,13,14,13,14,12,13,14,13,14,13,13,14,
- 14,15,14,14,16,15,15,12,13,14,12,14,13,14,16,14,
+ 14,12,13,14,12,15,14,13,14,14,15,12,13,14,13,14,
+ 14,14,15,15,16,10,11,12,11,12,11,11,13,11,12,13,
+ 13,14,13,14,11,11,13,11,13,13,13,14,13,14,12,13,
+ 14,12,14,12,13,15,12,14,14,15,16,13,15,13,13,15,
+ 13,15,15,14,16,15,15, 7, 7, 9, 7, 9, 7, 8, 9, 8,
+ 10, 9,10,11,10,11, 8, 8,10, 8,10,10,10,11,10,11,
+ 8, 8,10, 8,10, 8, 9,11, 9,10,10,10,12,11,12, 8,
+ 8,10, 9,10,10,11,12,11,13,10,10,12,10,12,10,11,
+ 13,11,12,12,13,14,12,15,10,10,13,11,12,12,11,13,
+ 13,14, 8, 8,10, 8,10, 8, 9,10, 9,10,10,11,12,10,
+ 12, 8, 9,10, 8,11,10,11,13,10,12,10,10,12,10,12,
+ 11,11,12,11,13,12,12,14,12,14,10,11,13,10,12,12,
+ 12,15,11,13, 9,10,12,10,12,10,10,12,11,12,12,12,
+ 13,12,13,10,10,12,11,13,12,12,14,12,14,10,11,12,
+ 10,12,11,11,13,11,13,12,13,15,13,15,11,11,13,11,
+ 13,12,13,14,13,15,12,12,14,12,13,12,13,15,13,15,
+ 14,14,17,16,15,12,12,14,13,14,14,14,15,14,17,10,
+ 10,12,11,12,11,11,13,11,12,12,12,14,13,15,11,11,
+ 13,11,13,12,13,14,13,14,13,13,14,12,14,13,13,14,
+ 13,15,15,14,16,14,16,12,13,15,13,14,14,14,16,14,
15,
};
1.2 +5 -5 vorbis/lib/books/res0_192_128_3.vqh
Index: res0_192_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128_3.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_128_3.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_128_3.vqh 2000/11/17 11:47:21 1.2
@@ -32,11 +32,11 @@
};
static long _vq_lengthlist_res0_192_128_3[] = {
- 3, 4, 5, 6, 8, 4, 5, 6, 8, 4, 4, 6, 7, 9, 4, 6,
- 7, 9, 5, 6, 7, 9,10, 6, 7, 9,10, 7, 7, 9,10,12,
- 7, 9,10,12, 9,10,11,13,14,10,11,12,14, 4, 5, 6,
- 7, 9, 5, 6, 7, 9, 5, 6, 7, 9,10, 6, 8, 9,10, 7,
- 7, 9,10,12, 7, 9,10,12, 9,10,11,13,14,10,11,12,
+ 3, 4, 5, 6, 8, 4, 5, 6, 8, 4, 4, 6, 7,10, 4, 6,
+ 7,10, 5, 6, 7, 9,11, 6, 7, 8,11, 7, 7, 9,10,12,
+ 7, 9,10,12, 9,10,11,12,14,10,11,12,14, 4, 5, 6,
+ 7,10, 5, 6, 7,10, 5, 6, 7, 9,11, 6, 7, 9,11, 7,
+ 7, 9,10,13, 7, 9,10,12, 9,10,11,12,14,10,11,13,
14,
};
1.2 +11 -11 vorbis/lib/books/res0_192_128_4.vqh
Index: res0_192_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128_4.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_128_4.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_128_4.vqh 2000/11/17 11:47:21 1.2
@@ -36,17 +36,17 @@
};
static long _vq_lengthlist_res0_192_128_4[] = {
- 5, 5, 5, 5, 6, 6, 8, 5, 5, 5, 6, 6, 8, 5, 6, 6,
- 6, 6, 7, 8, 6, 6, 6, 6, 6, 8, 6, 7, 7, 7, 7, 7,
- 8, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 7, 8, 9, 8, 8,
- 8, 8, 8, 9, 9, 9,10, 9, 9,10,11,10,10,10, 9,10,
- 11,11,11,12,12,12,12,14,11,12,12,12,13,14,13,14,
- 15,14,15,14,17,13,15,15,15,14,18, 5, 6, 6, 6, 6,
- 7, 8, 6, 6, 6, 6, 6, 8, 6, 7, 7, 7, 7, 7, 9, 7,
- 7, 7, 7, 7, 9, 8, 8, 8, 8, 8, 8, 9, 8, 8, 8, 8,
- 8, 9, 9,10,10,10, 9,10,11,10,10,10, 9,10,11,11,
- 11,12,12,12,13,15,11,12,12,12,13,14,13,14,15,15,
- 16,16,16,14,15,15,15,15,18,
+ 5, 5, 6, 6, 6, 6, 7, 5, 6, 6, 6, 6, 7, 5, 6, 6,
+ 6, 6, 6, 7, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7,
+ 8, 7, 7, 7, 7, 7, 8, 7, 8, 8, 8, 7, 8, 9, 8, 8,
+ 8, 7, 8, 9, 9, 9,10, 9, 9, 9,10, 9,10, 9, 9, 9,
+ 10,10,11,12,12,11,12,13,11,12,12,12,12,13,12,14,
+ 14,14,14,14,14,13,14,14,14,15,15, 5, 6, 6, 6, 6,
+ 6, 7, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 7,
+ 7, 7, 7, 7, 8, 7, 8, 8, 8, 7, 8, 9, 8, 8, 8, 7,
+ 8, 9, 9, 9,10, 9, 9, 9,10, 9, 9, 9, 9, 9,10,10,
+ 11,12,12,11,12,13,11,12,12,12,12,12,13,14,14,14,
+ 14,14,15,13,14,14,14,14,15,
};
static float _vq_quantthresh_res0_192_128_4[] = {
1.2 +71 -48 vorbis/lib/books/res0_192_128_5.vqh
Index: res0_192_128_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128_5.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_128_5.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_128_5.vqh 2000/11/17 11:47:21 1.2
@@ -20,78 +20,101 @@
#include "codebook.h"
static long _vq_quantlist_res0_192_128_5[] = {
- 56,
- 57,
- 58,
- 59,
- 61,
- 64,
- 67,
- 70,
- 73,
- 76,
- 80,
- 84,
- 87,
- 91,
- 95,
- 99,
+ 102,
103,
+ 104,
+ 105,
107,
- 112,
+ 110,
+ 113,
+ 116,
+ 119,
+ 122,
+ 126,
+ 130,
+ 133,
+ 137,
+ 141,
+ 145,
+ 149,
+ 153,
+ 158,
+ 163,
+ 168,
+ 173,
+ 174,
+ 180,
+ 186,
+ 192,
+ 198,
+ 204,
+ 101,
+ 100,
+ 99,
+ 97,
+ 94,
+ 91,
+ 88,
+ 85,
+ 82,
+ 78,
+ 74,
+ 71,
+ 67,
+ 63,
+ 59,
55,
- 54,
- 53,
51,
- 48,
- 45,
- 42,
- 39,
+ 46,
+ 41,
36,
- 32,
- 28,
- 25,
- 21,
- 17,
- 13,
- 9,
- 5,
+ 31,
+ 30,
+ 24,
+ 18,
+ 12,
+ 6,
0,
};
static long _vq_lengthlist_res0_192_128_5[] = {
- 2, 3, 3, 4, 4, 6, 8, 7, 9,10,13,15,16,17,18,18,
- 17,18,18, 3, 4, 4, 4, 6, 8, 7, 8,11,13,14,15,15,
- 17,16,17,17,17,
+ 3, 3, 3, 4, 4, 5, 7, 6, 9,11,13,14,16,18,18,20,
+ 20,19,20,20,19,19,19,19,19,19,19,19, 3, 3, 4, 4,
+ 5, 6, 6, 8,10,13,14,15,16,18,19,18,19,18,19,19,
+ 19,19,19,19,19,19,19,
};
static float _vq_quantthresh_res0_192_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,
+ -99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
+ -58.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, 58.5, 63.5, 68.5,
+ 71.5, 75, 81, 87, 93, 99,
};
static long _vq_quantmap_res0_192_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,
+ 54, 53, 52, 51, 50, 49, 48, 47,
+ 46, 45, 44, 43, 42, 41, 40, 39,
+ 38, 37, 36, 35, 34, 33, 32, 31,
+ 30, 29, 28, 0, 1, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27,
};
static encode_aux_threshmatch _vq_auxt_res0_192_128_5 = {
_vq_quantthresh_res0_192_128_5,
_vq_quantmap_res0_192_128_5,
- 37,
- 37
+ 55,
+ 55
};
static static_codebook _vq_book_res0_192_128_5 = {
- 1, 37,
+ 1, 55,
_vq_lengthlist_res0_192_128_5,
- 1, -524550144, 1611661312, 7, 0,
+ 1, -522616832, 1611661312, 8, 0,
_vq_quantlist_res0_192_128_5,
NULL,
&_vq_auxt_res0_192_128_5,
1.2 +3 -3 vorbis/lib/books/res0_192_128aux.vqh
Index: res0_192_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_192_128aux.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_192_128aux.vqh 2000/11/08 13:16:28 1.1
+++ res0_192_128aux.vqh 2000/11/17 11:47:21 1.2
@@ -20,9 +20,9 @@
#include "codebook.h"
static long _huff_lengthlist_res0_192_128aux[] = {
- 9,12,12,12,16,16, 4, 6, 9,10,14,15, 3, 3, 4, 7,
- 14,14, 4, 4, 5, 5,11,12,10, 9, 4, 2, 7,10,12,11,
- 6, 4, 8,11,
+ 10,12,13,12,15,15, 5, 6, 8, 9,13,15, 4, 3, 4, 6,
+ 12,15, 4, 4, 4, 5,12,13, 9, 9, 5, 2, 7,10,11,10,
+ 5, 3, 7,10,
};
static static_codebook _huff_book_res0_192_128aux = {
1.2 +25 -25 vorbis/lib/books/res0_256_1024_1.vqh
Index: res0_256_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_1.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_1024_1.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_1024_1.vqh 2000/11/17 11:47:21 1.2
@@ -31,42 +31,42 @@
2, 4, 8, 4, 8, 5, 7,10, 7,10, 9,10,12,10,12, 5,
7,10, 7,10, 9,10,12,10,12, 5, 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,13,10,13,10,11,13,11,13,13,13,15,13,
+ 11,13, 9,10,12,10,13,10,11,13,11,13,13,13,15,13,
15,10,11,13,11,13,13,13,15,14,15, 5, 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,13,10,11,13,11,13,13,14,
- 15,13,15,10,11,13,11,13,13,14,15,14,15, 5, 7,10,
+ 11,13,11,13, 9,10,13,10,13,10,11,13,11,13,13,13,
+ 15,13,15,11,11,13,11,13,13,14,15,13,15, 5, 7,10,
7,10, 7, 8,11, 8,11,10,11,13,11,13, 7, 8,11, 8,
- 11,10,11,13,11,13, 7, 9,11, 8,11, 8,10,12,10,12,
+ 11,10,11,13,11,13, 7, 9,11, 9,11, 9,10,12,10,12,
11,12,14,12,14, 9,10,12,10,12,11,12,14,12,14,10,
- 11,13,12,13,11,12,14,12,14,13,14,16,14,16,11,12,
- 14,12,14,14,14,16,14,16, 7, 9,11, 9,11, 9,10,12,
+ 11,14,11,13,11,12,14,12,14,13,14,16,14,16,11,12,
+ 14,12,14,14,14,16,14,16, 7, 8,11, 9,11, 9,10,12,
10,12,11,12,14,12,14, 9,10,12,10,12,11,12,14,12,
- 14,11,11,13,11,13,11,12,15,12,14,14,14,16,14,15,
- 12,12,14,12,14,14,14,16,14,16, 9,11,13,10,13,11,
- 12,14,12,14,13,14,15,14,15,10,11,14,12,13,13,14,
- 15,14,15,10,12,14,11,13,11,12,14,12,14,14,14,16,
- 14,16,12,12,14,12,14,14,14,16,14,16,13,14,15,14,
+ 14,11,11,13,11,13,11,12,14,12,14,14,14,16,14,16,
+ 12,12,14,12,14,14,14,16,14,16, 9,11,13,11,13,11,
+ 11,13,11,13,13,13,15,14,15,10,11,13,12,14,13,14,
+ 15,14,16,10,12,13,11,13,11,12,14,12,14,14,14,16,
+ 14,16,12,12,14,12,14,14,14,16,14,16,13,13,15,14,
15,14,14,16,14,16,15,16,17,16,17,14,14,16,14,16,
- 16,16,17,16,17,11,11,13,11,14,11,12,14,12,14,13,
+ 16,16,18,16,17,10,11,13,12,14,11,12,14,12,14,14,
14,16,14,16,12,12,14,12,14,14,14,16,14,16,13,14,
- 15,14,16,14,14,16,14,16,16,16,17,16,17,14,14,16,
+ 15,14,16,14,14,16,14,16,15,17,17,16,17,14,14,16,
14,16,15,16,17,16,17, 5, 7,10, 7,10, 7, 8,11, 8,
- 11,10,11,13,11,13, 7, 9,11, 9,11,10,11,13,11,13,
+ 11,10,11,13,11,13, 7, 8,11, 9,11,10,11,13,11,13,
7, 9,11, 9,11, 9,10,12,10,12,11,12,14,12,14, 9,
- 10,12,10,12,11,12,14,12,14,10,11,13,11,14,12,12,
+ 10,12,10,12,11,12,14,12,14,10,11,14,11,13,11,12,
14,12,14,14,14,15,14,16,11,12,14,12,14,14,14,16,
14,16, 7, 9,11, 9,11, 9,10,12,10,12,11,12,14,12,
- 14, 9,10,12,10,12,11,12,14,12,14,11,11,13,12,13,
- 12,12,14,12,14,14,14,16,14,16,11,12,14,12,14,13,
- 14,16,14,15, 9,10,13,11,13,11,11,13,11,14,13,14,
- 15,14,15,11,11,14,11,14,13,14,15,14,15,10,12,14,
- 12,14,11,12,15,12,14,14,14,16,14,16,12,12,14,12,
- 14,14,14,16,14,16,13,14,15,14,16,14,14,16,15,16,
- 15,16,18,16,17,14,14,16,14,17,16,16,17,16,17,10,
- 11,13,12,14,12,12,14,12,14,14,14,16,14,16,12,12,
- 14,12,14,14,14,16,14,16,13,14,15,14,15,14,14,16,
- 14,16,16,16,18,16,17,14,14,16,15,16,15,16,17,16,
+ 14, 9,10,12,10,12,11,12,14,12,14,11,11,13,11,14,
+ 12,12,14,13,14,14,14,16,14,16,11,12,14,12,14,13,
+ 14,16,14,15, 9,11,13,11,13,11,11,13,11,14,13,14,
+ 15,14,15,11,12,14,12,14,13,14,15,14,15,10,12,13,
+ 11,14,11,12,14,12,14,14,14,16,14,16,11,12,14,12,
+ 14,14,14,16,14,16,13,14,16,14,15,14,14,16,14,16,
+ 15,16,18,16,18,13,14,16,14,16,15,16,17,16,18,10,
+ 12,14,12,14,12,12,14,12,14,14,14,16,14,16,12,12,
+ 14,12,14,14,14,16,14,16,13,14,16,14,15,14,14,16,
+ 14,16,16,16,18,16,17,14,15,16,14,16,15,16,18,16,
17,
};
1.2 +4 -4 vorbis/lib/books/res0_256_1024_2.vqh
Index: res0_256_1024_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_2.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_1024_2.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_1024_2.vqh 2000/11/17 11:47:21 1.2
@@ -32,11 +32,11 @@
};
static long _vq_lengthlist_res0_256_1024_2[] = {
- 3, 4, 5, 6, 8, 4, 6, 6, 8, 4, 5, 6, 7, 8, 5, 6,
- 7, 8, 6, 6, 7, 7, 9, 6, 7, 7, 9, 6, 7, 8, 8, 9,
+ 3, 4, 6, 6, 8, 4, 6, 6, 8, 4, 5, 6, 7, 8, 5, 6,
+ 7, 8, 6, 6, 7, 7, 9, 6, 7, 7, 9, 6, 7, 7, 8, 9,
7, 8, 8, 9, 8, 8, 9, 9,10, 8, 9, 9,10, 4, 5, 6,
- 7, 8, 5, 6, 7, 8, 6, 6, 7, 7, 9, 6, 7, 8, 9, 6,
- 7, 8, 8, 9, 7, 8, 8, 9, 8, 8, 9, 9,10, 8, 9, 9,
+ 7, 8, 5, 6, 7, 8, 6, 6, 7, 7, 9, 6, 7, 7, 9, 6,
+ 7, 7, 8, 9, 7, 7, 8, 9, 8, 8, 9, 9,10, 8, 9, 9,
10,
};
1.2 +24 -18 vorbis/lib/books/res0_256_1024_3.vqh
Index: res0_256_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_3.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_1024_3.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_1024_3.vqh 2000/11/17 11:47:21 1.2
@@ -22,12 +22,14 @@
static long _vq_quantlist_res0_256_1024_3[] = {
14,
15,
+ 16,
17,
19,
22,
25,
28,
13,
+ 12,
11,
9,
6,
@@ -36,38 +38,42 @@
};
static long _vq_lengthlist_res0_256_1024_3[] = {
- 4, 5, 6, 7, 7, 9,10, 5, 6, 7, 7, 9,10, 5, 5, 6,
- 6, 7, 9,11, 5, 6, 6, 7, 9,11, 6, 6, 6, 7, 8, 9,
- 11, 6, 6, 7, 8, 9,11, 7, 6, 7, 7, 8,10,12, 7, 7,
- 7, 8,10,12, 8, 8, 8, 8, 9,11,13, 8, 8, 8, 9,11,
- 13, 9, 9,10,10,11,12,14, 9,10,10,11,12,14,11,11,
- 11,12,13,14,15,11,12,12,13,14,15, 5, 5, 6, 6, 7,
- 9,11, 5, 6, 6, 7, 9,11, 6, 6, 6, 7, 8, 9,11, 6,
- 6, 7, 8, 9,11, 7, 6, 7, 7, 8,10,12, 7, 7, 7, 8,
- 10,12, 8, 8, 8, 8, 9,11,12, 8, 8, 8, 9,11,13, 9,
- 9, 9,10,11,12,14, 9,10,10,11,12,14,11,11,12,12,
- 13,14,15,11,12,12,13,14,15,
+ 4, 6, 6, 6, 7, 8, 9,11, 6, 6, 6, 7, 8, 9,11, 6,
+ 6, 7, 7, 7, 8,10,11, 6, 7, 7, 7, 8,10,11, 6, 7,
+ 7, 7, 7, 8,10,12, 7, 7, 7, 7, 8,10,12, 7, 7, 7,
+ 7, 7, 8,10,12, 7, 7, 7, 7, 8,10,12, 7, 7, 7, 7,
+ 7, 8,10,12, 7, 7, 7, 7, 8,10,12, 8, 8, 8, 8, 8,
+ 9,11,13, 8, 8, 8, 8,10,11,13, 9,10,10,10,10,11,
+ 13,14,10,10,10,10,11,13,14,11,12,12,12,12,13,15,
+ 16,12,12,12,12,13,15,16, 6, 6, 7, 7, 7, 8,10,11,
+ 6, 7, 7, 7, 8,10,11, 6, 7, 7, 7, 7, 8,10,12, 7,
+ 7, 7, 7, 8,10,12, 7, 7, 7, 7, 7, 8,10,12, 7, 7,
+ 7, 7, 8,10,12, 7, 7, 7, 7, 7, 8,10,12, 7, 7, 7,
+ 7, 8,10,12, 8, 8, 8, 8, 8, 9,11,13, 8, 8, 8, 8,
+ 9,11,13, 9,10,10,10,10,11,13,14,10,10,10,10,11,
+ 13,14,11,12,12,12,12,13,14,16,12,12,12,12,13,14,
+ 16,
};
static float _vq_quantthresh_res0_256_1024_3[] = {
- -12.5, -9.5, -6.5, -4, -2, -0.5, 0.5, 2,
- 4, 6.5, 9.5, 12.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,
};
static long _vq_quantmap_res0_256_1024_3[] = {
- 12, 11, 10, 9, 8, 7, 0, 1,
- 2, 3, 4, 5, 6,
+ 14, 13, 12, 11, 10, 9, 8, 0,
+ 1, 2, 3, 4, 5, 6, 7,
};
static encode_aux_threshmatch _vq_auxt_res0_256_1024_3 = {
_vq_quantthresh_res0_256_1024_3,
_vq_quantmap_res0_256_1024_3,
- 13,
- 13
+ 15,
+ 15
};
static static_codebook _vq_book_res0_256_1024_3 = {
- 2, 169,
+ 2, 225,
_vq_lengthlist_res0_256_1024_3,
1, -528744448, 1611661312, 5, 0,
_vq_quantlist_res0_256_1024_3,
1.2 +28 -28 vorbis/lib/books/res0_256_1024_4.vqh
Index: res0_256_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_4.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_1024_4.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_1024_4.vqh 2000/11/17 11:47:21 1.2
@@ -44,34 +44,34 @@
};
static long _vq_lengthlist_res0_256_1024_4[] = {
- 4, 5, 6, 7, 7, 8, 9, 8, 9,11,13, 5, 6, 7, 7, 8,
- 9, 8, 9,11,12, 5, 5, 6, 7, 7, 8,10, 9,10,12,13,
- 5, 6, 7, 7, 8,10, 9,10,12,13, 6, 6, 7, 7, 8, 9,
- 10,10,11,13,15, 6, 7, 7, 8, 9,10,10,11,12,14, 7,
- 7, 8, 8, 9,10,11,10,12,13,15, 7, 7, 8, 9,10,11,
- 10,12,13,15, 7, 8, 8, 9, 9,10,11,11,12,14,15, 8,
- 8, 9, 9,10,11,11,12,14,15, 8, 9, 9,10,10,11,12,
- 12,13,14,16, 9, 9,10,10,11,12,12,13,14,16, 9,10,
- 11,11,12,13,14,13,14,16,17,10,11,11,12,13,14,13,
- 15,15,17, 9, 9,10,11,12,13,14,14,16,17,19, 9,10,
- 11,12,12,13,14,16,16,19,10,11,12,13,13,14,15,16,
- 17,18,20,11,12,13,13,14,15,16,17,17,19,11,13,14,
- 14,15,16,17,17,17,19,18,13,14,15,15,16,17,18,18,
- 18,20,13,15,16,17,17,19,19,19,21,21,20,15,16,18,
- 17,19,19,19,20,20,21, 5, 5, 6, 7, 7, 8,10, 9,10,
- 12,14, 5, 6, 7, 8, 8,10, 9,10,12,14, 6, 6, 7, 7,
- 8, 9,10,10,11,13,15, 6, 7, 7, 8, 9,10,10,11,13,
- 14, 7, 7, 7, 8, 9,10,11,10,12,14,16, 7, 8, 8, 9,
- 10,11,10,12,13,15, 7, 8, 8, 9, 9,10,11,11,12,14,
- 16, 8, 8, 9, 9,10,11,11,12,14,15, 8, 9, 9,10,10,
- 11,12,12,13,15,16, 9, 9,10,10,11,12,12,13,14,16,
- 9,10,11,11,12,13,14,13,14,16,17,10,11,11,12,13,
- 14,13,14,16,16, 9, 9,10,11,12,12,13,15,15,17,19,
- 9,10,11,11,12,13,14,15,16,18,10,11,12,13,13,14,
- 15,16,17,18,19,11,12,13,13,14,15,16,16,18,20,11,
- 13,14,15,15,16,17,17,19,19,19,13,14,15,15,15,17,
- 17,19,18,21,13,15,16,18,17,19,19,18,19,21,21,15,
- 16,17,17,19,19,20,19,20,20,
+ 4, 5, 6, 7, 7, 8, 9, 8, 9,10,11, 5, 6, 7, 7, 8,
+ 9, 8, 9,10,11, 5, 6, 6, 7, 8, 8, 9, 9, 9,10,11,
+ 5, 6, 7, 8, 8, 9, 9, 9,10,11, 6, 6, 7, 8, 8, 9,
+ 10, 9,10,11,12, 6, 7, 8, 8, 9,10, 9,10,11,12, 7,
+ 7, 8, 8, 9, 9,10,10,10,11,12, 7, 8, 8, 9, 9,10,
+ 10,10,11,12, 8, 8, 8, 9, 9,10,10,10,11,12,13, 8,
+ 8, 9, 9,10,10,10,11,12,13, 9, 9, 9,10,10,11,11,
+ 11,11,12,13, 9, 9,10,10,11,11,11,11,12,13, 9,10,
+ 10,10,11,11,11,12,12,13,14,10,10,10,11,11,12,12,
+ 12,13,14, 9, 9,10,10,11,11,12,12,12,13,14, 9,10,
+ 10,11,11,12,12,12,13,14,10,10,11,11,11,12,12,13,
+ 13,13,15,10,11,11,12,12,12,13,13,13,14,11,11,11,
+ 12,12,12,13,13,13,14,15,11,12,12,12,13,13,13,14,
+ 14,15,12,12,13,13,13,14,14,14,14,15,16,12,13,13,
+ 14,14,14,15,15,15,16, 5, 5, 6, 7, 8, 8, 9, 9, 9,
+ 10,11, 6, 6, 7, 8, 8, 9, 9, 9,10,11, 6, 6, 7, 8,
+ 8, 9,10, 9,10,11,12, 6, 7, 8, 8, 9,10, 9,10,11,
+ 12, 7, 7, 8, 8, 9, 9,10,10,10,11,12, 7, 8, 8, 9,
+ 9,10,10,10,11,12, 8, 8, 8, 9, 9,10,10,10,11,12,
+ 13, 8, 8, 9, 9,10,10,10,11,12,13, 9, 9, 9,10,10,
+ 11,11,11,11,12,13, 9, 9,10,10,11,11,11,11,12,13,
+ 9,10,10,10,11,11,12,12,12,13,14,10,10,10,11,11,
+ 12,12,12,12,14, 9, 9,10,10,11,11,12,12,12,13,14,
+ 9,10,10,11,11,12,12,13,13,14,10,10,11,11,11,12,
+ 12,13,13,13,15,10,11,11,11,12,12,13,13,13,14,11,
+ 11,12,12,12,12,13,13,13,14,15,11,12,12,12,13,13,
+ 13,13,14,15,12,12,13,13,13,14,14,14,15,15,16,12,
+ 13,13,13,14,14,14,15,15,16,
};
static float _vq_quantthresh_res0_256_1024_4[] = {
1.2 +71 -48 vorbis/lib/books/res0_256_1024_5.vqh
Index: res0_256_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024_5.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_1024_5.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_1024_5.vqh 2000/11/17 11:47:21 1.2
@@ -20,78 +20,101 @@
#include "codebook.h"
static long _vq_quantlist_res0_256_1024_5[] = {
- 56,
- 57,
- 58,
- 59,
- 61,
- 64,
- 67,
- 70,
- 73,
- 76,
- 80,
- 84,
- 87,
- 91,
- 95,
- 99,
+ 102,
103,
+ 104,
+ 105,
107,
- 112,
+ 110,
+ 113,
+ 116,
+ 119,
+ 122,
+ 126,
+ 130,
+ 133,
+ 137,
+ 141,
+ 145,
+ 149,
+ 153,
+ 158,
+ 163,
+ 168,
+ 173,
+ 174,
+ 180,
+ 186,
+ 192,
+ 198,
+ 204,
+ 101,
+ 100,
+ 99,
+ 97,
+ 94,
+ 91,
+ 88,
+ 85,
+ 82,
+ 78,
+ 74,
+ 71,
+ 67,
+ 63,
+ 59,
55,
- 54,
- 53,
51,
- 48,
- 45,
- 42,
- 39,
+ 46,
+ 41,
36,
- 32,
- 28,
- 25,
- 21,
- 17,
- 13,
- 9,
- 5,
+ 31,
+ 30,
+ 24,
+ 18,
+ 12,
+ 6,
0,
};
static long _vq_lengthlist_res0_256_1024_5[] = {
- 1, 4, 4, 5, 5, 5, 6, 7, 9, 9,10,11, 7, 8, 9,10,
- 10,11, 9, 4, 5, 5, 5, 5, 6, 7, 9, 9,10,11, 7, 8,
- 9,10,10,11, 9,
+ 3, 4, 4, 4, 4, 4, 5, 5, 6, 6, 7, 8, 7, 8, 9,11,
+ 11,12,13,13,14,15,15,15,15,16,17,16, 4, 4, 4, 4,
+ 4, 5, 5, 6, 6, 6, 8, 7, 8, 9,10,11,12,12,13,14,
+ 16,16,15,17,17,18,18,
};
static float _vq_quantthresh_res0_256_1024_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,
+ -99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
+ -58.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, 58.5, 63.5, 68.5,
+ 71.5, 75, 81, 87, 93, 99,
};
static long _vq_quantmap_res0_256_1024_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,
+ 54, 53, 52, 51, 50, 49, 48, 47,
+ 46, 45, 44, 43, 42, 41, 40, 39,
+ 38, 37, 36, 35, 34, 33, 32, 31,
+ 30, 29, 28, 0, 1, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27,
};
static encode_aux_threshmatch _vq_auxt_res0_256_1024_5 = {
_vq_quantthresh_res0_256_1024_5,
_vq_quantmap_res0_256_1024_5,
- 37,
- 37
+ 55,
+ 55
};
static static_codebook _vq_book_res0_256_1024_5 = {
- 1, 37,
+ 1, 55,
_vq_lengthlist_res0_256_1024_5,
- 1, -524550144, 1611661312, 7, 0,
+ 1, -522616832, 1611661312, 8, 0,
_vq_quantlist_res0_256_1024_5,
NULL,
&_vq_auxt_res0_256_1024_5,
1.2 +3 -3 vorbis/lib/books/res0_256_1024aux.vqh
Index: res0_256_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_1024aux.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_1024aux.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_1024aux.vqh 2000/11/17 11:47:21 1.2
@@ -20,9 +20,9 @@
#include "codebook.h"
static long _huff_lengthlist_res0_256_1024aux[] = {
- 3, 6,11,11,12,15, 5, 3, 6, 8,11,15, 9, 4, 3, 4,
- 9,15, 9, 7, 4, 2, 6,12,11,10, 7, 4, 6,12,12,13,
- 12,10,11,15,
+ 3, 7,10,10,12,14, 5, 3, 6, 8,10,14, 9, 5, 3, 4,
+ 8,14, 9, 6, 4, 2, 6,12,10, 8, 7, 4, 6,12,11,11,
+ 9, 6, 7,14,
};
static static_codebook _huff_book_res0_256_1024aux = {
1.2 +40 -40 vorbis/lib/books/res0_256_128_1.vqh
Index: res0_256_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128_1.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_128_1.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_128_1.vqh 2000/11/17 11:47:21 1.2
@@ -28,46 +28,46 @@
};
static long _vq_lengthlist_res0_256_128_1[] = {
- 1, 4, 7, 4, 7, 5, 6, 8, 6, 8, 9,10,11,10,11, 5,
- 6, 9, 6, 8, 9,10,11,10,11, 6, 7, 9, 7, 9, 8, 9,
- 10, 9,10,11,11,12,11,13, 8, 8,10, 9,10,11,11,12,
- 11,13,10,11,12,11,13,12,12,12,12,13,14,13,15,14,
- 15,11,12,14,12,13,13,13,16,14,15, 6, 7, 9, 7, 9,
- 8, 9,10, 9,10,10,11,12,11,13, 8, 9,11, 9,10,11,
- 11,12,11,12,11,11,13,11,12,11,12,14,12,13,14,13,
- 15,14,17,12,13,13,12,13,14,14,15,14,14, 8, 9,11,
- 9,11, 9,10,12,10,11,12,13,15,13,13, 9,10,12,10,
- 11,12,12,14,12,13,10,10,12,10,12,11,11,13,11,13,
- 13,13,14,14,14,11,12,13,11,12,13,13,14,14,14,13,
- 13,14,14,15,13,14,16,13,14,15,14,15,15,15,14,14,
- 15,13,15,14,17,15,14,17, 9,10,12,11,13,11,11,13,
- 11,12,13,13,14,13,13,11,11,13,11,13,13,14,14,13,
- 14,13,13,14,13,14,13,13,14,15,15,15,15,15,14,15,
- 13,13,17,13,15,15,14,15,16,15,11,13,15,13,13,14,
- 14,15,14,17,15,15,17,15,17,13,14,15,14,14,15,14,
- 16,15,16,13,14,15,14,15,14,15,15,15,15,15,17,17,
- 17,17,14,14,15,15,16,15,16,17,15,15,16,16,16,15,
- 16,14,14,15,15,16,17,16,17,16,17,16,17,16,17,17,
- 17,17,16,17,17,14,14,15,14,15,15,14,15,15,16,16,
- 15,16,17,16,14,14,15,14,16,15,16,16,17,16,15,15,
- 17,16,16,15,16,16,15,17,17,16,17,15,15,15,17,16,
- 16,16,17,17,17,17,17, 8, 9,11, 9,11, 9,10,11,10,
- 12,12,13,13,12,13,10,10,12,10,12,12,13,13,12,14,
- 10,11,12,10,12,11,11,13,11,13,13,13,14,13,14,11,
- 11,13,11,13,13,12,14,14,14,13,13,14,13,14,14,14,
- 14,13,15,14,16,16,16,15,13,14,15,14,15,14,14,15,
- 14,15,10,10,12,11,12,11,11,12,11,13,13,13,14,13,
- 15,11,12,13,11,13,13,14,15,13,14,13,13,14,13,14,
- 13,13,15,14,15,14,15,14,15,15,13,14,15,14,17,14,
- 15,17,14,15,12,13,15,13,15,14,14,15,14,15,15,16,
- 16,14,15,14,14,15,14,14,15,16,17,16,17,13,14,15,
- 14,15,14,16,15,14,15,15,15,17,16,16,15,15,15,15,
- 17,15,15,17,17,17,15,15,15,15,17,16,17,17,15,15,
- 17,17,15,16,17,15,17,17,15,15,17,15,15,17,17,13,
- 14,15,15,16,14,14,14,15,17,17,17,16,15,17,15,14,
- 16,15,16,17,16,16,16,17,15,16,17,15,16,15,15,15,
- 16,17,16,16,17,17,17,15,17,17,15,17,17,17,17,16,
- 17,
+ 3, 5, 7, 5, 8, 5, 6, 9, 7, 8, 8, 9,11, 9,10, 5,
+ 6, 9, 7, 9, 7, 9, 9,10,10, 5, 7, 9, 7, 9, 6, 7,
+ 10, 8, 9,10,10,11,10,12, 7, 8, 9, 8, 9, 9, 9,11,
+ 10,13, 9, 9,13, 9,10, 9, 9,10,10,12,11,11,12,10,
+ 12, 9, 9,11,10,12,12,10,12,11,12, 5, 7, 9, 7, 9,
+ 7, 8,10, 7,10, 9, 9,11, 9,12, 7, 8, 9, 7,10, 8,
+ 9,11,10,11, 8,10,12, 9,12, 9,12,10,11,10,11,12,
+ 13,11,13, 9,10,13,12,13,11,12,13,11,11, 6, 7, 9,
+ 8,12, 8, 8,10, 8, 9, 9,10,13,12,12, 8, 8,10, 8,
+ 12,10,10,11,12,12, 8, 9,11, 9,10, 8, 9,12, 9,11,
+ 9,11,13,11,11, 9,10,13, 9,11,10,11,12,10,12,10,
+ 13,10,10,13,10,11,11,12,12,13,13,12,13,13,11,11,
+ 11,10,13,13,11,13,13,13, 7, 8,10, 9,10, 8, 9,11,
+ 9,11,10,13,11,10,12, 8,10,11, 9,11,11,10,13,11,
+ 12,10,11,12,11,11,10,11,13,10,13,13,13,13,13,12,
+ 11,10,12,10,11,13,11,13,12,13,10,12,12,10,11,11,
+ 11,12,11,13,11,12,13,13,13, 9,12,13,10,13,13,11,
+ 13,11,13,11,12,13,12,13,10,11,13,12,11,10,11,13,
+ 13,13,12,13,12,11,13,11,13,13,11,13,12,11,13,13,
+ 13,13,13,13,13,12,13,13,13,13,13,12,12,13,13,13,
+ 13,13,13,13,13,10,10,13,11,13,13,12,12,11,12,13,
+ 12,13,13,13,11,11,13,13,12,12,13,13,11,13,11,12,
+ 13,13,13,11,13,13,11,13,13,13,13,13,13,12,13,12,
+ 13,13,13,13,13,13,13, 6, 8, 9, 8,10, 7, 9,10, 8,
+ 9,10,10,11, 9,11, 7, 8,11, 9,10,10,11,13,11,12,
+ 8, 9, 9, 8,10, 9, 8,10, 9,10,11,10,12,10,11, 9,
+ 8,10, 9,11,10,10,12,11,11,10,11,11,11,11,10,11,
+ 12,11,11,12,10,11,12,11,10,12,11,10,11,10,11,12,
+ 12,12, 8, 9,11, 9,10, 9, 9,11,10,10,10,11,11,12,
+ 12, 8, 9,11, 9,11,10,11,11,11,12,10,11,11,11,11,
+ 10,12,12,12,11,11,12,12,11,12, 9,11,12,10,12,11,
+ 11,11,12,11, 9, 9,11,10,12,11,11,12,10,12,10,12,
+ 12,12,12,10,11,12,10,12,11,11,12,12,12,10,12,11,
+ 10,12,10,11,12,11,12,11,12,12,11,12,11,12,12,11,
+ 12,11,12,12,12,12,11,11,11,11,12,11,12,11,12,11,
+ 12,11,12,11,12,11,11,12,12,11,11,11,11,12,12,10,
+ 10,12,11,11,10,11,11,11,12,12,11,12,12,11,10,11,
+ 12,12,11,12,12,12,12,12,12,12,11,11,12,12,11,12,
+ 12,12,12,12,12,12,12,11,12,12,12,12,12,11,12,12,
+ 12,
};
static float _vq_quantthresh_res0_256_128_1[] = {
1.2 +6 -6 vorbis/lib/books/res0_256_128_2.vqh
Index: res0_256_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128_2.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_128_2.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_128_2.vqh 2000/11/17 11:47:21 1.2
@@ -32,12 +32,12 @@
};
static long _vq_lengthlist_res0_256_128_2[] = {
- 3, 4, 5, 5, 6, 4, 4, 5, 6, 5, 5, 6, 6, 7, 5, 6,
- 6, 7, 6, 7, 7, 7, 8, 7, 7, 7, 8, 8, 8, 8, 8, 9,
- 8, 8, 8, 9, 9,10,10,10,11,10,10,10,11, 5, 5, 6,
- 6, 7, 5, 6, 6, 7, 6, 7, 7, 8, 8, 7, 7, 7, 8, 8,
- 8, 8, 8, 9, 8, 8, 8, 9, 9,10,10,10,10, 9,10,10,
- 10,
+ 4, 4, 5, 5, 6, 5, 5, 5, 6, 5, 5, 6, 6, 7, 5, 6,
+ 6, 7, 6, 6, 7, 7, 8, 6, 7, 7, 8, 7, 7, 7, 7, 8,
+ 7, 7, 8, 8, 8, 8, 9, 9, 9, 8, 8, 8, 9, 5, 5, 6,
+ 6, 7, 5, 6, 6, 7, 6, 6, 7, 7, 8, 6, 7, 7, 8, 7,
+ 7, 7, 8, 8, 7, 7, 7, 8, 8, 8, 8, 9, 9, 8, 8, 9,
+ 9,
};
static float _vq_quantthresh_res0_256_128_2[] = {
1.2 +24 -18 vorbis/lib/books/res0_256_128_3.vqh
Index: res0_256_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128_3.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_128_3.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_128_3.vqh 2000/11/17 11:47:21 1.2
@@ -22,12 +22,14 @@
static long _vq_quantlist_res0_256_128_3[] = {
14,
15,
+ 16,
17,
19,
22,
25,
28,
13,
+ 12,
11,
9,
6,
@@ -36,38 +38,42 @@
};
static long _vq_lengthlist_res0_256_128_3[] = {
- 5, 5, 6, 6, 7, 8,10, 5, 6, 6, 7, 8,10, 6, 6, 6,
- 6, 7, 8,10, 6, 6, 6, 7, 8,10, 7, 6, 6, 6, 7, 8,
- 10, 6, 6, 6, 7, 8, 9, 7, 7, 7, 7, 7, 8,10, 7, 7,
- 7, 7, 8,10, 8, 8, 8, 8, 8, 9,10, 8, 8, 8, 8, 9,
- 10,10, 9, 9, 9, 9,10,11, 9, 9, 9, 9,10,12,11,11,
- 11,11,11,12,13,11,11,11,11,12,13, 6, 6, 6, 6, 7,
- 8, 9, 6, 6, 6, 7, 8, 9, 7, 6, 6, 6, 7, 8,10, 6,
- 6, 6, 7, 8, 9, 7, 7, 7, 7, 7, 8,10, 7, 7, 7, 7,
- 8,10, 8, 8, 8, 8, 8, 9,10, 8, 8, 8, 8, 9,10,10,
- 9, 9, 9, 9,10,12, 9, 9, 9, 9,10,11,11,11,11,11,
- 11,12,13,11,11,11,11,12,13,
+ 6, 6, 7, 6, 6, 7, 8,10, 6, 7, 6, 6, 7, 8,10, 7,
+ 7, 7, 7, 7, 7, 9,10, 7, 7, 7, 7, 7, 9,10, 7, 7,
+ 7, 7, 7, 8, 9,11, 7, 7, 7, 7, 8, 9,11, 7, 7, 7,
+ 7, 7, 7, 9,10, 7, 7, 7, 7, 7, 9,10, 7, 7, 7, 7,
+ 7, 7, 9,10, 7, 7, 7, 7, 7, 9,10, 8, 8, 8, 8, 8,
+ 8,10,11, 8, 8, 8, 8, 8,10,11,10,10,10, 9, 9,10,
+ 11,13,10,10, 9, 9,10,11,13,11,11,12,11,11,12,13,
+ 14,11,12,11,11,12,13,14, 7, 7, 7, 7, 7, 7, 9,10,
+ 7, 7, 7, 7, 7, 9,10, 7, 7, 7, 7, 7, 8, 9,11, 7,
+ 7, 7, 7, 8, 9,11, 7, 7, 7, 7, 7, 7, 9,10, 7, 7,
+ 7, 7, 7, 9,10, 7, 7, 7, 7, 7, 7, 9,10, 7, 7, 7,
+ 7, 7, 9,10, 8, 8, 8, 8, 8, 8,10,11, 8, 8, 8, 8,
+ 8,10,11,10,10,10, 9, 9,10,11,13,10,10, 9, 9,10,
+ 11,13,11,12,12,11,11,12,13,14,11,12,11,11,12,13,
+ 14,
};
static float _vq_quantthresh_res0_256_128_3[] = {
- -12.5, -9.5, -6.5, -4, -2, -0.5, 0.5, 2,
- 4, 6.5, 9.5, 12.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,
};
static long _vq_quantmap_res0_256_128_3[] = {
- 12, 11, 10, 9, 8, 7, 0, 1,
- 2, 3, 4, 5, 6,
+ 14, 13, 12, 11, 10, 9, 8, 0,
+ 1, 2, 3, 4, 5, 6, 7,
};
static encode_aux_threshmatch _vq_auxt_res0_256_128_3 = {
_vq_quantthresh_res0_256_128_3,
_vq_quantmap_res0_256_128_3,
- 13,
- 13
+ 15,
+ 15
};
static static_codebook _vq_book_res0_256_128_3 = {
- 2, 169,
+ 2, 225,
_vq_lengthlist_res0_256_128_3,
1, -528744448, 1611661312, 5, 0,
_vq_quantlist_res0_256_128_3,
1.2 +28 -28 vorbis/lib/books/res0_256_128_4.vqh
Index: res0_256_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128_4.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_128_4.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_128_4.vqh 2000/11/17 11:47:21 1.2
@@ -44,34 +44,34 @@
};
static long _vq_lengthlist_res0_256_128_4[] = {
- 7, 7, 7, 7, 7, 8, 9, 9,10,12,14, 7, 7, 7, 7, 8,
- 9, 9,10,12,14, 7, 7, 6, 7, 7, 7, 8, 9,10,12,14,
- 6, 6, 7, 7, 7, 8, 9,10,12,14, 7, 7, 6, 7, 7, 7,
- 8, 9,10,12,14, 7, 7, 7, 7, 7, 8, 9,10,12,13, 7,
- 7, 7, 7, 7, 8, 9, 9,10,12,15, 7, 7, 7, 7, 8, 9,
- 9,10,12,14, 8, 8, 7, 7, 7, 8, 9,10,11,13,15, 8,
- 7, 7, 7, 8, 9, 9,11,13,14, 9, 8, 8, 8, 9, 9,10,
- 11,12,13,16, 9, 8, 8, 8, 9,10,11,12,14,16,10,10,
- 10,10,10,11,11,12,13,14,16,10,10,10,10,11,11,12,
- 13,15,16,11,10,10,10,10,11,12,13,14,16,17,10,10,
- 10,10,11,12,13,15,15,16,12,11,11,11,11,12,13,14,
- 15,17,18,11,12,11,12,12,13,14,15,16,19,13,12,13,
- 13,13,13,14,15,15,19,17,12,13,13,13,15,14,15,17,
- 17,19,14,14,14,15,14,15,17,17,18,19,19,14,14,14,
- 15,15,16,18,16,17,19, 7, 7, 7, 7, 7, 7, 9, 9,10,
- 12,14, 7, 6, 7, 7, 7, 8, 9,10,12,14, 7, 7, 7, 7,
- 7, 7, 9, 9,10,12,14, 7, 6, 6, 7, 7, 8, 9,10,12,
- 14, 7, 7, 7, 7, 7, 8, 9, 9,11,12,14, 7, 7, 7, 7,
- 8, 9, 9,10,12,14, 8, 7, 7, 7, 7, 8, 9,10,11,12,
- 15, 8, 7, 7, 7, 8, 9, 9,11,12,14, 9, 9, 8, 8, 8,
- 9,10,11,12,13,16, 9, 8, 8, 9, 9,10,10,12,13,14,
- 10,10,10,10,10,10,12,12,13,15,17,10,10,10,10,10,
- 12,12,13,14,16,11,10,10,10,10,11,12,13,14,17,18,
- 10,10,10,10,11,12,13,15,16,18,12,11,11,11,12,12,
- 13,14,15,15,17,11,11,11,12,12,13,14,16,16,19,13,
- 13,13,13,13,14,15,15,15,19,19,13,13,13,13,14,14,
- 15,16,17,17,14,13,14,14,14,15,17,18,16,19,18,14,
- 14,15,14,15,15,16,18,17,18,
+ 7, 7, 7, 7, 7, 8, 9, 9,10,10,11, 7, 7, 7, 7, 8,
+ 9, 9,10,10,11, 7, 7, 6, 7, 7, 8, 8, 9, 9,10,11,
+ 7, 6, 7, 7, 8, 8, 9, 9,10,11, 7, 7, 7, 7, 7, 8,
+ 8, 9, 9,10,11, 7, 7, 7, 7, 7, 8, 9, 9,10,11, 7,
+ 7, 7, 7, 7, 8, 9, 9,10,10,11, 7, 7, 7, 7, 8, 8,
+ 9, 9,10,11, 8, 8, 7, 7, 7, 8, 9, 9,10,10,11, 8,
+ 7, 7, 7, 8, 9, 9,10,10,11, 9, 9, 8, 8, 8, 9,10,
+ 10,11,11,12, 9, 8, 8, 8, 9,10,10,11,11,12,10,10,
+ 10,10,10,10,11,12,12,12,14,10,10, 9,10,10,11,12,
+ 12,13,14,11,10,10,10,11,11,12,13,13,15,16,10,10,
+ 10,11,11,13,13,14,14,15,12,12,11,12,12,13,13,14,
+ 15,15,19,11,12,12,12,12,14,15,16,16,18,13,13,13,
+ 13,13,14,14,16,15,17,17,13,13,13,13,14,15,16,17,
+ 17,18,15,14,15,14,14,15,16,17,19,19,19,14,14,14,
+ 16,16,16,16,16,17,18, 7, 7, 7, 7, 7, 8, 8, 9, 9,
+ 10,11, 7, 7, 7, 7, 8, 8, 9, 9,10,11, 7, 7, 6, 7,
+ 7, 7, 8, 9, 9,10,11, 7, 6, 7, 7, 7, 8, 9, 9,10,
+ 11, 7, 7, 7, 7, 7, 8, 8, 9,10,10,11, 7, 7, 7, 7,
+ 8, 8, 9, 9,10,11, 8, 8, 7, 7, 7, 8, 9, 9,10,10,
+ 11, 8, 7, 7, 7, 8, 9, 9,10,10,11, 9, 9, 9, 8, 9,
+ 9,10,10,11,12,12, 9, 8, 8, 8, 9,10,10,11,11,12,
+ 10,10,10,10,10,10,11,12,12,13,14,10,10,10,10,10,
+ 11,12,12,13,13,11,10,10,10,11,11,12,13,13,14,15,
+ 10,10,10,11,11,12,13,13,14,15,12,11,11,12,12,13,
+ 13,14,15,16,17,12,12,12,12,13,13,14,15,15,17,13,
+ 12,13,13,14,14,15,16,16,16,19,13,13,13,13,13,15,
+ 16,16,17,18,14,14,14,14,15,15,15,16,18,19,18,14,
+ 15,15,15,15,16,16,17,17,18,
};
static float _vq_quantthresh_res0_256_128_4[] = {
1.2 +71 -48 vorbis/lib/books/res0_256_128_5.vqh
Index: res0_256_128_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128_5.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_128_5.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_128_5.vqh 2000/11/17 11:47:21 1.2
@@ -20,78 +20,101 @@
#include "codebook.h"
static long _vq_quantlist_res0_256_128_5[] = {
- 56,
- 57,
- 58,
- 59,
- 61,
- 64,
- 67,
- 70,
- 73,
- 76,
- 80,
- 84,
- 87,
- 91,
- 95,
- 99,
+ 102,
103,
+ 104,
+ 105,
107,
- 112,
+ 110,
+ 113,
+ 116,
+ 119,
+ 122,
+ 126,
+ 130,
+ 133,
+ 137,
+ 141,
+ 145,
+ 149,
+ 153,
+ 158,
+ 163,
+ 168,
+ 173,
+ 174,
+ 180,
+ 186,
+ 192,
+ 198,
+ 204,
+ 101,
+ 100,
+ 99,
+ 97,
+ 94,
+ 91,
+ 88,
+ 85,
+ 82,
+ 78,
+ 74,
+ 71,
+ 67,
+ 63,
+ 59,
55,
- 54,
- 53,
51,
- 48,
- 45,
- 42,
- 39,
+ 46,
+ 41,
36,
- 32,
- 28,
- 25,
- 21,
- 17,
- 13,
- 9,
- 5,
+ 31,
+ 30,
+ 24,
+ 18,
+ 12,
+ 6,
0,
};
static long _vq_lengthlist_res0_256_128_5[] = {
- 3, 3, 4, 4, 4, 5, 5, 6, 7, 8, 9,10, 7, 8, 9,10,
- 11,11,10, 3, 4, 4, 4, 4, 5, 6, 7, 8, 9,10, 7, 8,
- 9,11,10,11,10,
+ 4, 4, 4, 4, 3, 4, 5, 6, 7, 7, 8, 9, 8, 8, 9, 9,
+ 10,10,11,11,13,13,14,13,13,14,14,12, 4, 4, 4, 3,
+ 4, 5, 5, 7, 7, 8, 9, 7, 8, 9, 9,10,10,11,11,12,
+ 13,13,13,14,14,14,12,
};
static float _vq_quantthresh_res0_256_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,
+ -99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
+ -58.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, 58.5, 63.5, 68.5,
+ 71.5, 75, 81, 87, 93, 99,
};
static long _vq_quantmap_res0_256_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,
+ 54, 53, 52, 51, 50, 49, 48, 47,
+ 46, 45, 44, 43, 42, 41, 40, 39,
+ 38, 37, 36, 35, 34, 33, 32, 31,
+ 30, 29, 28, 0, 1, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27,
};
static encode_aux_threshmatch _vq_auxt_res0_256_128_5 = {
_vq_quantthresh_res0_256_128_5,
_vq_quantmap_res0_256_128_5,
- 37,
- 37
+ 55,
+ 55
};
static static_codebook _vq_book_res0_256_128_5 = {
- 1, 37,
+ 1, 55,
_vq_lengthlist_res0_256_128_5,
- 1, -524550144, 1611661312, 7, 0,
+ 1, -522616832, 1611661312, 8, 0,
_vq_quantlist_res0_256_128_5,
NULL,
&_vq_auxt_res0_256_128_5,
1.2 +3 -3 vorbis/lib/books/res0_256_128aux.vqh
Index: res0_256_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_256_128aux.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_256_128aux.vqh 2000/11/08 13:16:28 1.1
+++ res0_256_128aux.vqh 2000/11/17 11:47:22 1.2
@@ -20,9 +20,9 @@
#include "codebook.h"
static long _huff_lengthlist_res0_256_128aux[] = {
- 9,12,14,16,16,16, 6, 7,11,12,12,16, 5, 3, 5, 9,
- 11,14, 5, 3, 3, 3, 5,11, 9, 7, 7, 2, 4, 9,14,11,
- 11, 7, 8,11,
+ 10,13,16,16,16,16,13,10,11,16,13,12,16, 9, 6, 7,
+ 11,12,15, 9, 4, 2, 6,11,11, 9, 5, 2, 4, 8,10, 9,
+ 8, 2, 5, 9,
};
static static_codebook _huff_book_res0_256_128aux = {
1.2 +2 -2 vorbis/lib/books/res0_96_1024_1.vqh
Index: res0_96_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_1.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_1024_1.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_1024_1.vqh 2000/11/17 11:47:22 1.2
@@ -29,8 +29,8 @@
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,
+ 11,15,15,11,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,12,15,
15,
};
1.2 +40 -40 vorbis/lib/books/res0_96_1024_3.vqh
Index: res0_96_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_3.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_1024_3.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_1024_3.vqh 2000/11/17 11:47:22 1.2
@@ -28,46 +28,46 @@
};
static 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,
+ 2, 5, 7, 5, 7, 5, 7, 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, 8,11, 9,11,15,11,15, 7, 8,11, 8,11,10,11,15,
+ 11,15, 7, 9,11, 9,11, 9,11,15,11,15,13,15,17,15,
+ 18, 9,11,15,11,15,13,15,17,16,18, 5, 7, 9, 7, 9,
+ 7, 8,11, 8,11,10,11,15,11,15, 7, 8,11, 8,11,10,
+ 12,15,11,15, 7, 9,12, 9,11,10,11,15,11,15,13,15,
+ 18,15,18,10,11,15,11,15,13,15,18,15,18, 5, 7, 9,
+ 7, 9, 7, 8,11, 8,11, 9,11,15,11,16, 7, 8,11, 8,
+ 11, 9,11,15,11,15, 7, 8,11, 9,11, 8,10,13,10,13,
+ 11,13,16,13,17, 9,10,13,10,13,11,13,17,13,18,10,
+ 12,15,12,15,11,13,17,13,18,16,16,18,17,19,12,13,
+ 18,13,17,16,17,19,18,20, 7, 8,11, 9,11, 9,10,13,
+ 10,13,12,13,17,13,17, 8,10,13,10,13,12,13,17,13,
+ 17,10,12,15,12,15,11,13,17,13,17,15,17,20,17,18,
+ 12,13,16,13,17,16,18,21,17,21, 7, 9,12, 9,12, 9,
+ 12,16,12,16,12,15,19,16,18, 9,12,16,12,15,12,16,
+ 20,15,20,10,12,15,12,16,12,13,17,14,18,15,17,19,
+ 18,21,12,13,18,13,17,15,18,19,17,19,14,16,18,16,
+ 18,15,16,18,17,20,18,20,19,21,21,16,18,20,18,20,
+ 20,21,21,21,20,10,12,16,12,15,11,14,17,13,18,16,
+ 18,20,18,19,12,13,18,13,18,15,18,19,17,19,14,16,
+ 19,16,20,15,18,19,17,21,18,20,21,19,21,15,18,21,
+ 19,21,19,20,19,20,21, 5, 7, 9, 7, 9, 7, 8,11, 8,
+ 11, 9,11,15,11,15, 7, 8,11, 9,11, 9,11,16,12,15,
+ 7, 9,11, 9,11, 8,10,13,10,13,12,13,17,13,16, 9,
+ 10,13,10,13,11,13,16,14,17,10,12,15,12,15,12,14,
+ 17,13,17,16,18,21,17,19,11,13,16,13,17,15,17,18,
+ 17,19, 7, 9,11, 9,12, 8,10,13,10,13,12,14,17,13,
+ 17, 9,10,13,10,13,12,13,17,13,17,10,12,16,12,15,
+ 12,13,17,13,18,15,18,19,18,20,11,13,17,13,17,15,
+ 17,20,16,17, 7,10,12,10,12, 9,12,15,12,16,12,15,
+ 18,15,18, 9,12,16,12,15,12,16,18,16,20,10,12,16,
+ 12,16,12,13,17,13,17,15,19,21,17,21,12,13,17,14,
+ 17,16,17,18,18,20,14,16,19,16,20,16,18,20,18,19,
+ 18,18,20,19,20,16,17,20,18,19,18,18,19,19,21,10,
+ 12,15,12,16,12,14,17,14,18,16,18,20,18,21,12,14,
+ 18,13,17,15,18,20,17,20,14,16,19,16,19,16,18,19,
+ 18,20,20,21,20,19,21,15,17,19,18,19,18,19,21,17,
+ 20,
};
static float _vq_quantthresh_res0_96_1024_3[] = {
1.2 +32 -32 vorbis/lib/books/res0_96_1024_4.vqh
Index: res0_96_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_4.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_1024_4.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_1024_4.vqh 2000/11/17 11:47:22 1.2
@@ -29,45 +29,45 @@
static 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,
+ 6, 9, 6, 9, 8, 9,11, 9,11, 6, 7, 9, 6, 9, 6, 7,
+ 10, 7, 9, 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,13,
+ 15, 9,10,12,10,12,11,12,15,12,15, 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, 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,
+ 15,12,14, 9,10,12,10,12,11,12,14,12,15, 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, 9,10,12,10,12, 7, 7,10, 7,10, 7, 8,10, 8,11,
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,
+ 10,13,10,13,10,10,13,11,13,12,13,15,13,15,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,
+ 8,10,10,11,13,11,13, 7, 8,10, 8,11,10,11,13,11,
+ 13, 9,10,12,10,12,10,11,13,11,13,12,13,17,13,15,
+ 10,11,14,11,14,12,13,16,13,15, 8, 9,11, 9,11, 9,
+ 10,12,10,13,12,13,15,13,15, 9,10,12,10,12,11,13,
+ 15,13,15, 9,10,12,10,12,10,11,13,11,13,13,14,15,
+ 14,16,10,11,14,11,13,13,14,16,13,16,12,13,15,13,
+ 15,13,13,16,14,16,15,15,16,16,18,13,14,16,14,16,
+ 15,16,18,16,18, 9,10,13,10,12,10,11,13,11,14,13,
+ 14,16,13,16,10,11,14,11,14,13,14,16,14,16,12,13,
+ 15,13,15,13,14,16,13,16,15,15,16,15,16,13,14,15,
+ 14,16,15,16,16,17,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,
+ 7, 7,10, 7,10, 7, 8,10, 8,11,10,11,13,11,13, 7,
+ 8,10, 8,11,10,11,13,11,13, 9,10,12,10,13,10,11,
+ 14,11,13,12,13,15,14,15,10,11,14,11,13,12,13,15,
+ 13,16, 7, 7,10, 7,10, 7, 8,10, 8,10,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,
+ 10,11,13,11,14,13,14,15,14,15,10,11,13,11,13,13,
+ 14,15,13,15, 8, 9,11, 9,11, 9,10,12,10,12,12,13,
+ 15,13,15, 9,10,13,10,12,12,13,15,13,15, 9,10,12,
+ 10,12,10,11,14,11,13,13,14,16,13,16,10,11,13,11,
+ 14,13,14,16,14,16,12,13,15,13,15,13,14,17,14,16,
+ 15,17,17,16,17,13,13,15,13,16,15,15,17,16,17, 9,
+ 10,13,10,13,10,11,14,11,14,13,13,15,13,15,10,11,
+ 14,11,13,13,14,16,13,16,12,13,15,13,15,13,14,15,
+ 14,16,15,16,17,16,18,13,14,16,14,17,15,16,17,15,
+ 16,
};
static float _vq_quantthresh_res0_96_1024_4[] = {
1.2 +6 -6 vorbis/lib/books/res0_96_1024_5.vqh
Index: res0_96_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_5.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_1024_5.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_1024_5.vqh 2000/11/17 11:47:22 1.2
@@ -32,12 +32,12 @@
};
static 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,
+ 2, 3, 5, 6, 8, 4, 5, 6, 8, 4, 5, 7, 7, 9, 5, 7,
+ 7, 9, 6, 7, 8, 9,10, 7, 8, 9,11, 7, 8, 9,10,12,
+ 8, 9,10,12, 9,10,11,12,13,10,11,12,13, 4, 5, 7,
+ 8, 9, 5, 7, 7, 9, 6, 7, 8, 9,10, 7, 8, 9,10, 7,
+ 8, 9,10,12, 8, 9,10,12, 9,10,11,12,13,10,11,12,
+ 13,
};
static float _vq_quantthresh_res0_96_1024_5[] = {
1.2 +11 -11 vorbis/lib/books/res0_96_1024_6.vqh
Index: res0_96_1024_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_6.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_1024_6.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_1024_6.vqh 2000/11/17 11:47:22 1.2
@@ -36,17 +36,17 @@
};
static 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,
+ 3, 4, 5, 6, 8, 7,10, 4, 5, 6, 8, 7, 9, 4, 5, 6,
+ 7, 8, 9,11, 5, 6, 7, 8, 8,11, 6, 6, 7, 8, 9,10,
+ 12, 6, 7, 8, 9,10,12, 7, 8, 8, 9,10,11,13, 8, 8,
+ 9,10,11,13, 8, 9,10,10,12,12,15, 9,10,10,12,12,
+ 15, 8, 9,10,11,12,14,16, 9,10,10,11,13,16,10,11,
+ 12,13,15,16,19,11,12,13,14,17,19, 4, 5, 6, 7, 8,
+ 9,11, 5, 6, 7, 8, 8,11, 6, 7, 7, 8, 9,10,12, 7,
+ 7, 8, 9,10,12, 7, 8, 8, 9,10,11,14, 8, 8, 9,10,
+ 11,13, 8, 9, 9,10,12,12,15, 9, 9,10,11,12,14, 8,
+ 9,10,10,12,14,17, 9,10,10,11,14,16,10,11,12,13,
+ 14,16,18,11,12,13,14,16,17,
};
static float _vq_quantthresh_res0_96_1024_6[] = {
1.2 +69 -46 vorbis/lib/books/res0_96_1024_7.vqh
Index: res0_96_1024_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024_7.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_1024_7.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_1024_7.vqh 2000/11/17 11:47:22 1.2
@@ -20,76 +20,99 @@
#include "codebook.h"
static long _vq_quantlist_res0_96_1024_7[] = {
- 56,
- 57,
- 59,
- 61,
- 64,
- 67,
- 70,
- 73,
- 76,
- 80,
- 84,
- 87,
- 91,
- 95,
- 99,
+ 102,
103,
+ 105,
107,
- 112,
+ 110,
+ 113,
+ 116,
+ 119,
+ 122,
+ 126,
+ 130,
+ 133,
+ 137,
+ 141,
+ 145,
+ 149,
+ 153,
+ 158,
+ 163,
+ 168,
+ 173,
+ 174,
+ 180,
+ 186,
+ 192,
+ 198,
+ 204,
+ 101,
+ 99,
+ 97,
+ 94,
+ 91,
+ 88,
+ 85,
+ 82,
+ 78,
+ 74,
+ 71,
+ 67,
+ 63,
+ 59,
55,
- 53,
51,
- 48,
- 45,
- 42,
- 39,
+ 46,
+ 41,
36,
- 32,
- 28,
- 25,
- 21,
- 17,
- 13,
- 9,
- 5,
+ 31,
+ 30,
+ 24,
+ 18,
+ 12,
+ 6,
0,
};
static 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,
+ 1, 3, 4, 5, 7, 9,11, 6, 8,10,12,15,15,15,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16, 3, 4, 5, 7, 9,
+ 11, 6, 8,10,13,14,15,16,15,16,16,16,16,16,16,16,
+ 16,16,16,16,16,
};
static 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,
+ -99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
+ -58.5, -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, 58.5, 63.5, 68.5, 71.5, 75,
+ 81, 87, 93, 99,
};
static 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,
+ 52, 51, 50, 49, 48, 47, 46, 45,
+ 44, 43, 42, 41, 40, 39, 38, 37,
+ 36, 35, 34, 33, 32, 31, 30, 29,
+ 28, 27, 0, 1, 2, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26,
};
static encode_aux_threshmatch _vq_auxt_res0_96_1024_7 = {
_vq_quantthresh_res0_96_1024_7,
_vq_quantmap_res0_96_1024_7,
- 35,
- 35
+ 53,
+ 53
};
static static_codebook _vq_book_res0_96_1024_7 = {
- 1, 35,
+ 1, 53,
_vq_lengthlist_res0_96_1024_7,
- 1, -524550144, 1611661312, 7, 0,
+ 1, -522616832, 1611661312, 8, 0,
_vq_quantlist_res0_96_1024_7,
NULL,
&_vq_auxt_res0_96_1024_7,
1.2 +4 -4 vorbis/lib/books/res0_96_1024aux.vqh
Index: res0_96_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_1024aux.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_1024aux.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_1024aux.vqh 2000/11/17 11:47:22 1.2
@@ -20,10 +20,10 @@
#include "codebook.h"
static 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,
+ 2, 6,10,10,14,11,14,18, 4, 3, 4, 6, 9, 8,12,18,
+ 9, 4, 4, 6, 7, 9,14,18, 8, 5, 5, 5, 7, 6,11,16,
+ 13, 9, 6, 6, 6, 7,12,19, 8, 7, 7, 5, 6, 5, 9,14,
+ 11,10, 9, 8, 8, 6,10,15,14,13,14,11,12,11,14,19,
};
static static_codebook _huff_book_res0_96_1024aux = {
1.2 +6 -6 vorbis/lib/books/res0_96_128_1.vqh
Index: res0_96_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128_1.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_128_1.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_128_1.vqh 2000/11/17 11:47:22 1.2
@@ -26,12 +26,12 @@
};
static 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,
+ 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,
+ 10, 8,10,11, 8,10,10,10,12,14,10,13,13, 8,10,10,
+ 10,13,13,10,13,13, 5, 8, 8, 8,10,10, 8,10,11, 8,
+ 10,10,10,13,13,10,13,14, 8,10,10,11,13,13,10,13,
+ 13,
};
static float _vq_quantthresh_res0_96_128_1[] = {
1.2 +44 -44 vorbis/lib/books/res0_96_128_2.vqh
Index: res0_96_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128_2.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_128_2.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_128_2.vqh 2000/11/17 11:47:22 1.2
@@ -20,58 +20,58 @@
#include "codebook.h"
static long _vq_quantlist_res0_96_128_2[] = {
+ 2,
3,
4,
- 6,
- 2,
+ 1,
0,
};
static 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,
+ 2, 4, 6, 4, 6, 5, 7, 9, 7, 9, 7,10,13, 9,14, 5,
+ 7, 9, 7, 9, 7,10,12,10,13, 5, 7,10, 7,10, 7,10,
+ 12,10,11,10,13,15,12,15, 7, 9,12,10,12,10,12,15,
+ 12,15, 7,10,13,10,14,10,12,15,12,14,14,15,14,15,
+ 15,10,12,14,14,15,14,15,15,15,15, 5, 7,10, 7,10,
+ 7,10,12,10,12,10,13,15,12,14, 7,10,12,10,11,10,
+ 12,14,11,14, 7,10,14,10,15,10,12,15,14,15,14,15,
+ 15,14,15,10,13,15,12,15,14,15,15,15,15, 4, 7,10,
+ 7, 9, 7,10,13,10,11,10,13,14,13,15, 7,10,12,10,
+ 12,10,14,15,12,14, 7, 9,13,10,11,10,12,14,11,15,
+ 12,15,15,14,15, 9,11,14,13,14,12,13,14,15,15, 9,
+ 12,15,12,15,11,14,15,14,15,15,15,15,15,15,13,14,
+ 15,13,15,15,15,15,15,15, 7,10,12,10,12, 9,12,14,
+ 13,14,13,14,15,14,15, 9,11,13,13,15,13,15,14,15,
+ 15,10,12,15,12,15,14,14,14,15,14,15,15,15,15,15,
+ 13,13,15,14,15,14,15,15,15,15, 7, 9,14,10,14,10,
+ 12,15,13,15,14,15,15,15,15,10,12,15,12,15,15,14,
+ 15,15,15, 9,12,15,12,15,12,15,15,15,15,15,15,15,
+ 15,14,11,15,15,14,15,15,15,15,15,15,12,14,15,14,
+ 15,13,15,15,15,15,15,15,15,15,15,15,14,15,15,15,
+ 15,15,15,15,15,10,12,14,12,14,13,15,13,13,15,15,
+ 15,15,15,15,13,15,15,15,15,15,15,15,15,15,13,15,
+ 15,15,15,14,15,15,15,15,15,15,15,15,15,14,15,15,
+ 15,15,15,15,15,15,15, 5, 7,11, 7,10, 7,10,13,10,
+ 12,11,13,15,13,13, 7,10,12,10,12,10,13,15,13,15,
+ 7, 9,13, 9,12, 9,12,13,12,13,13,14,15,15,15, 9,
+ 11,14,12,15,12,13,15,14,15,10,12,15,12,15,13,13,
+ 15,14,15,14,15,15,15,15,12,15,15,14,15,14,13,15,
+ 15,15, 7,10,13,10,13,10,12,13,12,13,13,15,15,14,
+ 14,10,12,14,12,14,13,13,15,14,15,10,12,15,13,15,
+ 12,15,14,14,15,15,15,15,15,15,12,15,15,13,14,15,
+ 15,15,15,15, 7,10,15, 9,14,10,12,15,12,13,14,15,
+ 15,14,15,10,12,13,13,14,15,14,15,15,15, 9,12,15,
+ 12,15,11,14,15,15,15,15,15,15,15,15,12,13,15,13,
+ 15,15,15,15,15,15,14,13,15,13,15,14,15,15,14,15,
+ 15,15,15,15,15,13,14,15,15,15,15,15,15,15,15, 9,
+ 12,15,12,15,14,14,15,14,15,15,15,15,15,15,12,15,
+ 15,13,15,15,14,15,15,15,14,15,15,15,15,15,15,15,
+ 15,15,15,15,15,15,15,14,15,15,15,15,15,15,15,15,
+ 15,
};
static float _vq_quantthresh_res0_96_128_2[] = {
- -2, -0.5, 0.5, 2,
+ -1.5, -0.5, 0.5, 1.5,
};
static long _vq_quantmap_res0_96_128_2[] = {
@@ -88,7 +88,7 @@
static static_codebook _vq_book_res0_96_128_2 = {
4, 625,
_vq_lengthlist_res0_96_128_2,
- 1, -533200896, 1611661312, 3, 0,
+ 1, -533725184, 1611661312, 3, 0,
_vq_quantlist_res0_96_128_2,
NULL,
&_vq_auxt_res0_96_128_2,
1.2 +13 -13 vorbis/lib/books/res0_96_128_3.vqh
Index: res0_96_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128_3.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_128_3.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_128_3.vqh 2000/11/17 11:47:22 1.2
@@ -20,28 +20,28 @@
#include "codebook.h"
static long _vq_quantlist_res0_96_128_3[] = {
- 8,
- 9,
- 11,
- 13,
- 16,
- 7,
5,
+ 6,
+ 7,
+ 8,
+ 10,
+ 4,
3,
+ 2,
0,
};
static 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,
+ 2, 3, 5, 6, 6, 3, 6, 6, 6, 4, 5, 7, 7, 7, 5, 7,
+ 7, 7, 7, 8,10,11,10, 9,10,11,10, 9,10,13,13,13,
+ 11,12,12,13,10,13,14,15,14,13,15,15,16, 4, 5, 7,
+ 8, 7, 5, 7, 7, 7, 7, 8,10,10,10, 8,10,11,10, 9,
+ 10,12,13,12,11,13,13,13,11,13,15,15,14,13,14,14,
16,
};
static float _vq_quantthresh_res0_96_128_3[] = {
- -6.5, -4, -2, -0.5, 0.5, 2, 4, 6.5,
+ -4, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 4,
};
static long _vq_quantmap_res0_96_128_3[] = {
@@ -59,7 +59,7 @@
static static_codebook _vq_book_res0_96_128_3 = {
2, 81,
_vq_lengthlist_res0_96_128_3,
- 1, -529530880, 1611661312, 5, 0,
+ 1, -531365888, 1611661312, 4, 0,
_vq_quantlist_res0_96_128_3,
NULL,
&_vq_auxt_res0_96_128_3,
1.2 +29 -49 vorbis/lib/books/res0_96_128_4.vqh
Index: res0_96_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128_4.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_128_4.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_128_4.vqh 2000/11/17 11:47:22 1.2
@@ -20,76 +20,56 @@
#include "codebook.h"
static 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,
+ 11,
+ 12,
13,
+ 14,
+ 16,
+ 19,
+ 22,
+ 10,
9,
- 5,
+ 8,
+ 6,
+ 3,
0,
};
static 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,
+ 2, 4, 5, 6, 6, 6, 8, 3, 5, 6, 6, 6, 7, 4, 5, 7,
+ 8, 8, 8, 9, 5, 7, 7, 8, 7, 9, 8, 8,10,11,11,11,
+ 12, 8,10,11,11,11,13,10,11,13,14,14,14,15,11,12,
+ 14,14,14,15,13,14,15,16,18,16,17,14,15,18,16,16,
+ 18,13,17,17,16,18,18,18,16,17,18,18,18,18,14,18,
+ 18,18,18,18,18,18,18,18,18,18,18, 4, 5, 7, 7, 8,
+ 8, 9, 5, 7, 7, 8, 7, 9, 8, 9,10,11,11,11,12, 8,
+ 10,11,11,11,13,10,11,12,13,13,14,16,11,13,13,13,
+ 14,15,13,14,16,16,17,16,18,14,15,17,17,15,18,13,
+ 17,17,17,18,18,18,16,17,17,18,18,18,15,18,18,18,
+ 18,18,18,18,17,18,18,18,17,
};
static 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,
+ -9.5, -6.5, -4, -2.5, -1.5, -0.5, 0.5, 1.5,
+ 2.5, 4, 6.5, 9.5,
};
static 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,
+ 12, 11, 10, 9, 8, 7, 0, 1,
+ 2, 3, 4, 5, 6,
};
static encode_aux_threshmatch _vq_auxt_res0_96_128_4 = {
_vq_quantthresh_res0_96_128_4,
_vq_quantmap_res0_96_128_4,
- 35,
- 35
+ 13,
+ 13
};
static static_codebook _vq_book_res0_96_128_4 = {
- 1, 35,
+ 2, 169,
_vq_lengthlist_res0_96_128_4,
- 1, -524550144, 1611661312, 7, 0,
+ 1, -529137664, 1611661312, 5, 0,
_vq_quantlist_res0_96_128_4,
NULL,
&_vq_auxt_res0_96_128_4,
1.2 +4 -3 vorbis/lib/books/res0_96_128aux.vqh
Index: res0_96_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_96_128aux.vqh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res0_96_128aux.vqh 2000/11/08 06:08:13 1.1
+++ res0_96_128aux.vqh 2000/11/17 11:47:22 1.2
@@ -20,12 +20,13 @@
#include "codebook.h"
static 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,
+ 4, 9,12,12,16,16, 2, 3, 8,10,16,15, 6, 7,10,11,
+ 14,16, 7, 3, 6, 7,12,13, 5, 2, 4, 7,13,15, 9, 6,
+ 8,12,15,15,
};
static static_codebook _huff_book_res0_96_128aux = {
- 2, 25,
+ 2, 36,
_huff_lengthlist_res0_96_128aux,
0, 0, 0, 0, 0,
NULL,
1.1 vorbis/lib/books/res0_350_1024_1.vqh
Index: res0_350_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_350_1024_1_VQH_
#define _V_res0_350_1024_1_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_350_1024_1[] = {
2,
3,
4,
1,
0,
};
tatic long _vq_lengthlist_res0_350_1024_1[] = {
2, 5, 8, 5, 8, 5, 7, 9, 7, 9, 9,10,11,10,11, 5,
7, 9, 7, 9, 9,10,12,10,11, 5, 7, 9, 7, 9, 7, 8,
10, 8,10,10,11,12,11,12, 7, 8,10, 8,10,10,11,12,
11,12, 9,10,12,10,12,10,11,13,11,13,12,13,14,13,
14,10,11,13,11,13,12,13,15,13,14, 6, 7,10, 7,10,
7, 8,10, 8,10,10,11,12,11,12, 7, 8,10, 8,10,10,
11,12,11,12, 9,10,12,10,12,10,11,13,11,13,12,13,
14,13,14,10,11,13,11,12,12,13,14,13,14, 5, 7,10,
7,10, 7, 8,10, 8,10,10,11,12,11,13, 7, 8,11, 8,
10,10,11,12,11,12, 7, 8,11, 8,11, 8, 9,11, 9,11,
11,12,13,12,14, 8, 9,11, 9,12,11,12,13,12,13,10,
11,13,11,13,11,12,13,12,13,13,14,14,14,15,11,12,
13,12,13,13,13,15,14,15, 7, 8,11, 8,11, 8, 9,11,
9,11,11,12,13,11,13, 8, 9,11,10,11,11,12,13,12,
13,10,11,13,11,13,11,12,13,12,14,13,13,15,14,15,
11,12,13,12,14,13,13,14,13,15, 9,10,12,10,12,10,
11,13,11,13,12,13,15,13,15,10,11,13,11,13,13,13,
14,13,15,10,11,13,11,13,11,12,14,12,13,13,14,15,
14,15,11,12,14,12,13,13,13,15,14,15,12,13,15,13,
14,13,13,15,14,15,15,15,15,15,16,13,14,15,14,15,
15,16,17,15,16,10,11,13,11,13,11,12,13,12,13,13,
14,15,13,15,11,12,14,12,13,13,14,15,13,15,12,13,
14,13,15,13,13,15,14,15,14,15,16,15,16,13,14,15,
14,15,15,15,17,15,16, 5, 7,10, 7,10, 7, 8,10, 8,
10,10,11,12,11,12, 7, 8,10, 8,11,10,11,13,11,13,
7, 8,11, 8,11, 8, 9,11, 9,11,11,12,13,11,13, 9,
9,11,10,11,11,12,13,12,13,10,11,13,11,13,11,12,
13,12,13,13,13,15,13,15,11,12,14,12,13,13,13,14,
13,15, 7, 9,11, 8,11, 8, 9,12, 9,11,11,12,14,12,
13, 8,10,11, 9,11,11,12,13,12,13,10,11,13,11,13,
11,12,14,12,14,13,13,15,13,15,11,12,13,12,13,13,
13,15,13,15, 9,10,12,10,12,10,11,13,11,13,12,13,
14,13,14,10,11,13,11,13,12,13,14,13,15,10,11,13,
11,13,11,12,13,12,13,13,14,15,14,15,11,12,14,12,
13,13,13,15,14,15,12,13,14,13,14,13,13,15,14,15,
15,16,16,15,15,13,14,15,14,16,15,16,16,15,17,10,
11,13,11,13,11,12,13,12,13,13,14,15,13,15,11,12,
14,12,13,13,13,15,14,15,12,13,14,13,15,13,13,15,
14,14,15,15,16,15,16,13,13,15,13,15,15,15,17,14,
16,
};
tatic float _vq_quantthresh_res0_350_1024_1[] = {
-1.5, -0.5, 0.5, 1.5,
};
tatic long _vq_quantmap_res0_350_1024_1[] = {
4, 3, 0, 1, 2,
};
tatic encode_aux_threshmatch _vq_auxt_res0_350_1024_1 = {
_vq_quantthresh_res0_350_1024_1,
_vq_quantmap_res0_350_1024_1,
5,
5
};
tatic static_codebook _vq_book_res0_350_1024_1 = {
4, 625,
_vq_lengthlist_res0_350_1024_1,
1, -533725184, 1611661312, 3, 0,
_vq_quantlist_res0_350_1024_1,
NULL,
&_vq_auxt_res0_350_1024_1,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_1024_2.vqh
Index: res0_350_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_350_1024_2_VQH_
#define _V_res0_350_1024_2_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_350_1024_2[] = {
5,
6,
7,
8,
10,
4,
3,
2,
0,
};
tatic long _vq_lengthlist_res0_350_1024_2[] = {
4, 5, 6, 6, 7, 5, 6, 6, 7, 5, 5, 6, 6, 7, 5, 6,
6, 7, 6, 6, 6, 7, 8, 6, 6, 7, 8, 6, 6, 7, 7, 8,
6, 7, 7, 8, 7, 7, 8, 8, 9, 7, 8, 8, 9, 5, 5, 6,
6, 7, 5, 6, 6, 7, 6, 6, 7, 7, 8, 6, 6, 7, 8, 6,
6, 7, 7, 8, 6, 7, 7, 8, 7, 7, 8, 8, 9, 7, 8, 8,
9,
};
tatic float _vq_quantthresh_res0_350_1024_2[] = {
-4, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 4,
};
tatic long _vq_quantmap_res0_350_1024_2[] = {
8, 7, 6, 5, 0, 1, 2, 3,
4,
};
tatic encode_aux_threshmatch _vq_auxt_res0_350_1024_2 = {
_vq_quantthresh_res0_350_1024_2,
_vq_quantmap_res0_350_1024_2,
9,
9
};
tatic static_codebook _vq_book_res0_350_1024_2 = {
2, 81,
_vq_lengthlist_res0_350_1024_2,
1, -531365888, 1611661312, 4, 0,
_vq_quantlist_res0_350_1024_2,
NULL,
&_vq_auxt_res0_350_1024_2,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_1024_3.vqh
Index: res0_350_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_350_1024_3_VQH_
#define _V_res0_350_1024_3_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_350_1024_3[] = {
14,
15,
16,
17,
19,
22,
25,
28,
13,
12,
11,
9,
6,
3,
0,
};
tatic long _vq_lengthlist_res0_350_1024_3[] = {
5, 6, 6, 6, 7, 8, 9,11, 6, 6, 6, 7, 8, 9,11, 6,
6, 7, 6, 7, 8,10,11, 6, 7, 7, 7, 8,10,11, 6, 7,
7, 7, 7, 8,10,12, 7, 7, 7, 7, 8,10,12, 6, 7, 7,
7, 7, 8,10,12, 7, 7, 7, 7, 8,10,12, 7, 7, 7, 7,
7, 8,10,12, 7, 7, 7, 7, 8,10,12, 8, 8, 8, 8, 8,
9,11,12, 8, 8, 8, 8, 9,11,12,10,10,10,10,10,11,
12,14,10,10,10,10,11,12,14,11,12,12,12,12,13,14,
15,12,12,12,12,13,14,15, 6, 6, 7, 6, 7, 8,10,11,
6, 7, 7, 7, 8,10,11, 6, 7, 7, 7, 7, 8,10,12, 7,
7, 7, 7, 8,10,12, 6, 7, 7, 7, 7, 8,10,12, 7, 7,
7, 7, 8,10,12, 7, 7, 7, 7, 7, 8,10,12, 7, 7, 7,
7, 8,10,12, 8, 8, 8, 8, 8, 9,11,12, 8, 8, 8, 8,
9,11,13,10,10,10,10,10,11,12,14,10,10,10,10,11,
12,14,11,12,12,12,12,13,14,15,12,12,12,12,13,14,
15,
};
tatic float _vq_quantthresh_res0_350_1024_3[] = {
-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,
};
tatic long _vq_quantmap_res0_350_1024_3[] = {
14, 13, 12, 11, 10, 9, 8, 0,
1, 2, 3, 4, 5, 6, 7,
};
tatic encode_aux_threshmatch _vq_auxt_res0_350_1024_3 = {
_vq_quantthresh_res0_350_1024_3,
_vq_quantmap_res0_350_1024_3,
15,
15
};
tatic static_codebook _vq_book_res0_350_1024_3 = {
2, 225,
_vq_lengthlist_res0_350_1024_3,
1, -528744448, 1611661312, 5, 0,
_vq_quantlist_res0_350_1024_3,
NULL,
&_vq_auxt_res0_350_1024_3,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_1024_4.vqh
Index: res0_350_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_350_1024_4_VQH_
#define _V_res0_350_1024_4_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_350_1024_4[] = {
28,
29,
31,
33,
36,
39,
42,
45,
48,
52,
56,
27,
25,
23,
20,
17,
14,
11,
8,
4,
0,
};
tatic long _vq_lengthlist_res0_350_1024_4[] = {
5, 5, 6, 7, 8, 9, 9, 9,10,10,11, 6, 6, 7, 8, 8,
9, 9,10,10,11, 6, 6, 6, 7, 7, 8, 9, 9,10,10,12,
6, 6, 7, 7, 8, 9, 9,10,10,11, 6, 6, 7, 7, 8, 8,
9, 9,10,11,12, 6, 7, 7, 8, 8, 9, 9,10,11,12, 7,
7, 7, 7, 8, 9,10,10,10,11,13, 7, 7, 7, 8, 9, 9,
10,10,11,13, 8, 8, 8, 8, 8, 9,10,10,11,12,13, 8,
8, 8, 8, 9,10,10,11,12,13, 9, 8, 9, 9, 9,10,11,
11,12,12,14, 8, 9, 9, 9,10,10,11,12,12,14,10, 9,
9,10,10,11,11,12,12,13,14, 9, 9,10,10,11,11,12,
12,13,14, 9, 9,10,10,10,11,12,12,13,14,15, 9,10,
10,10,11,12,13,13,14,15,10,10,10,11,11,12,12,13,
14,14,15,10,10,11,11,12,12,13,13,14,15,11,11,11,
12,12,13,13,14,14,15,16,11,11,12,12,13,13,14,14,
14,15,12,12,13,13,13,14,15,15,15,16,17,12,13,13,
13,14,14,15,15,16,16, 6, 6, 6, 7, 7, 8, 9, 9,10,
10,12, 6, 6, 7, 7, 8, 9, 9,10,10,11, 6, 6, 7, 7,
8, 8, 9, 9,10,11,12, 6, 7, 7, 8, 8, 9, 9,10,11,
12, 7, 7, 7, 7, 8, 9, 9,10,10,11,13, 7, 7, 7, 8,
9, 9,10,10,11,12, 8, 8, 8, 8, 8, 9,10,10,11,12,
13, 8, 8, 8, 8, 9,10,10,11,12,13, 9, 8, 9, 9, 9,
10,11,11,12,12,13, 9, 9, 9, 9,10,11,11,12,12,14,
10, 9, 9,10,10,11,11,12,12,13,14, 9, 9,10,10,11,
11,12,12,13,14, 9, 9,10,10,10,11,12,13,13,14,15,
9,10,10,10,11,12,13,13,14,15,10,10,10,11,11,12,
12,13,14,14,15,10,11,11,11,12,12,13,13,14,15,11,
11,11,12,12,13,13,14,14,15,16,11,11,12,12,13,13,
14,14,14,16,12,12,13,13,13,14,15,15,15,16,16,12,
13,13,13,14,14,15,15,16,17,
};
tatic float _vq_quantthresh_res0_350_1024_4[] = {
-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,
};
tatic long _vq_quantmap_res0_350_1024_4[] = {
20, 19, 18, 17, 16, 15, 14, 13,
12, 11, 0, 1, 2, 3, 4, 5,
6, 7, 8, 9, 10,
};
tatic encode_aux_threshmatch _vq_auxt_res0_350_1024_4 = {
_vq_quantthresh_res0_350_1024_4,
_vq_quantmap_res0_350_1024_4,
21,
21
};
tatic static_codebook _vq_book_res0_350_1024_4 = {
2, 441,
_vq_lengthlist_res0_350_1024_4,
1, -526647296, 1611661312, 6, 0,
_vq_quantlist_res0_350_1024_4,
NULL,
&_vq_auxt_res0_350_1024_4,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_1024_5.vqh
Index: res0_350_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_350_1024_5_VQH_
#define _V_res0_350_1024_5_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_350_1024_5[] = {
102,
103,
104,
105,
107,
110,
113,
116,
119,
122,
126,
130,
133,
137,
141,
145,
149,
153,
158,
163,
168,
173,
174,
180,
186,
192,
198,
204,
101,
100,
99,
97,
94,
91,
88,
85,
82,
78,
74,
71,
67,
63,
59,
55,
51,
46,
41,
36,
31,
30,
24,
18,
12,
6,
0,
};
tatic long _vq_lengthlist_res0_350_1024_5[] = {
3, 4, 5, 4, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, 8, 9,
9, 9,10,10,11,12,12,12,12,13,13, 9, 4, 5, 4, 4,
4, 5, 5, 5, 6, 6, 7, 7, 7, 8, 9, 9, 9,10,10,11,
12,12,11,12,12,12, 9,
};
tatic float _vq_quantthresh_res0_350_1024_5[] = {
-99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
-58.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, 58.5, 63.5, 68.5,
71.5, 75, 81, 87, 93, 99,
};
tatic long _vq_quantmap_res0_350_1024_5[] = {
54, 53, 52, 51, 50, 49, 48, 47,
46, 45, 44, 43, 42, 41, 40, 39,
38, 37, 36, 35, 34, 33, 32, 31,
30, 29, 28, 0, 1, 2, 3, 4,
5, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27,
};
tatic encode_aux_threshmatch _vq_auxt_res0_350_1024_5 = {
_vq_quantthresh_res0_350_1024_5,
_vq_quantmap_res0_350_1024_5,
55,
55
};
tatic static_codebook _vq_book_res0_350_1024_5 = {
1, 55,
_vq_lengthlist_res0_350_1024_5,
1, -522616832, 1611661312, 8, 0,
_vq_quantlist_res0_350_1024_5,
NULL,
&_vq_auxt_res0_350_1024_5,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_1024aux.vqh
Index: res0_350_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_350_1024aux_VQH_
#define _V_res0_350_1024aux_VQH_
#include "codebook.h"
tatic long _huff_lengthlist_res0_350_1024aux[] = {
8,12,15,14,15,14,10, 7, 9, 9,11,12,12, 7, 3, 4,
8,11,12, 8, 3, 1, 6, 9,12,10, 8, 5, 5, 8,14,11,
10, 6, 5, 6,
};
tatic static_codebook _huff_book_res0_350_1024aux = {
2, 36,
_huff_lengthlist_res0_350_1024aux,
0, 0, 0, 0, 0,
NULL,
NULL,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_128_1.vqh
Index: res0_350_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_350_128_1_VQH_
#define _V_res0_350_128_1_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_350_128_1[] = {
2,
3,
4,
1,
0,
};
tatic long _vq_lengthlist_res0_350_128_1[] = {
3, 6,10, 7, 9, 6, 8,10, 9,11,11, 9,11,10,11, 6,
8, 9, 9,10, 9,10,11,10,11, 6,11,11, 9,11, 8, 9,
11, 9,11, 9,11,11,10,11, 7, 9,11, 9,10, 9, 9,11,
10,11, 8, 8,11,10,11,11,10,11,11,11,11,10,10,10,
10,10, 9,10,10,10,10,10,10,10,10, 7, 8, 8, 8, 9,
8, 8,10, 9, 9, 9,10,10,10,10, 9, 8,10, 9, 9, 9,
9,10, 9,10, 9,10,10,10,10,10,10,10,10,10,10,10,
10,10,10,10,10,10,10,10,10,10,10,10,10, 6, 8, 9,
8,10, 8, 8,10,10,10,10,10,10, 9,10, 9,10,10, 9,
9, 9,10,10,10,10, 8, 9,10, 9,10, 9, 9,10, 9,10,
9,10,10, 9,10, 9,10,10, 9,10,10,10,10, 9,10, 9,
10,10, 9,10, 9,10,10,10,10,10, 9,10, 9,10,10,10,
10,10,10,10,10,10,10,10, 7, 9,10, 9,10, 8,10,10,
10,10, 9,10,10,10,10, 9, 9,10, 9,10, 9, 9,10,10,
10, 9,10, 9,10,10,10,10,10,10,10,10,10,10,10,10,
10,10,10,10,10,10,10,10,10,10, 8,10,10,10,10, 9,
10,10,10,10,10,10,10,10,10, 9,10, 9,10,10,10,10,
10,10,10, 9,10,10,10,10,10,10,10,10,10, 9,10,10,
10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,10,
10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
10,10,10,10,10,10,10,10, 9,10,10,10,10, 9,10,10,
10,10,10,10,10,10,10, 7,10,10, 9, 9, 9, 8, 9, 9,
10,10,10,10, 9,10, 8, 9,10, 8,10,10, 9,10,10,10,
9, 8,10, 9,10, 9,10,10, 9,10, 9,10, 9, 9,10, 9,
10,10,10,10,10,10,10, 9,10, 9,10,10,10,10,10, 9,
10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
10,10, 8,10,10,10,10, 9, 9,10,10,10, 9,10,10,10,
10, 9, 8, 9,10,10, 9,10,10,10,10,10,10,10,10,10,
10,10,10,10,10,10,10,10,10,10, 8,10,10,10,10, 9,
10,10,10,10, 8, 9,10,10,10,10,10,10,10,10,10,10,
10,10,10, 9,10,10,10,10,10,10,10,10,10, 9,10,10,
10,10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,
10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
10,10,10,10, 9,10,10,10,10,10,10,10,10,10,10,10,
10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
10,
};
tatic float _vq_quantthresh_res0_350_128_1[] = {
-1.5, -0.5, 0.5, 1.5,
};
tatic long _vq_quantmap_res0_350_128_1[] = {
4, 3, 0, 1, 2,
};
tatic encode_aux_threshmatch _vq_auxt_res0_350_128_1 = {
_vq_quantthresh_res0_350_128_1,
_vq_quantmap_res0_350_128_1,
5,
5
};
tatic static_codebook _vq_book_res0_350_128_1 = {
4, 625,
_vq_lengthlist_res0_350_128_1,
1, -533725184, 1611661312, 3, 0,
_vq_quantlist_res0_350_128_1,
NULL,
&_vq_auxt_res0_350_128_1,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_128_2.vqh
Index: res0_350_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_350_128_2_VQH_
#define _V_res0_350_128_2_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_350_128_2[] = {
5,
6,
7,
8,
10,
4,
3,
2,
0,
};
tatic long _vq_lengthlist_res0_350_128_2[] = {
4, 5, 5, 5, 6, 5, 5, 5, 6, 5, 6, 6, 6, 6, 6, 6,
6, 6, 7, 6, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 7, 8, 5, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 7,
8,
};
tatic float _vq_quantthresh_res0_350_128_2[] = {
-4, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 4,
};
tatic long _vq_quantmap_res0_350_128_2[] = {
8, 7, 6, 5, 0, 1, 2, 3,
4,
};
tatic encode_aux_threshmatch _vq_auxt_res0_350_128_2 = {
_vq_quantthresh_res0_350_128_2,
_vq_quantmap_res0_350_128_2,
9,
9
};
tatic static_codebook _vq_book_res0_350_128_2 = {
2, 81,
_vq_lengthlist_res0_350_128_2,
1, -531365888, 1611661312, 4, 0,
_vq_quantlist_res0_350_128_2,
NULL,
&_vq_auxt_res0_350_128_2,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_128_3.vqh
Index: res0_350_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_350_128_3_VQH_
#define _V_res0_350_128_3_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_350_128_3[] = {
14,
15,
16,
17,
19,
22,
25,
28,
13,
12,
11,
9,
6,
3,
0,
};
tatic long _vq_lengthlist_res0_350_128_3[] = {
6, 6, 7, 6, 6, 7, 8,10, 6, 7, 6, 6, 7, 8,10, 7,
7, 7, 7, 7, 7, 9,10, 7, 7, 7, 7, 7, 9,10, 7, 7,
7, 7, 7, 8, 9,11, 7, 7, 7, 7, 8, 9,11, 7, 7, 7,
7, 7, 7, 9,10, 7, 7, 7, 7, 7, 9,10, 7, 7, 7, 7,
7, 7, 9,10, 7, 7, 7, 7, 7, 9,10, 8, 8, 8, 8, 8,
8,10,11, 8, 8, 8, 8, 8,10,11,10,10,10, 9, 9,10,
11,12,10,10, 9, 9,10,11,13,11,12,12,11,11,12,13,
14,11,12,11,11,12,13,14, 7, 7, 7, 7, 7, 7, 9,10,
7, 7, 7, 7, 7, 9,10, 7, 7, 7, 7, 7, 8, 9,11, 7,
7, 7, 7, 8, 9,11, 7, 7, 7, 7, 7, 7, 9,10, 7, 7,
7, 7, 7, 9,10, 7, 7, 7, 7, 7, 7, 9,10, 7, 7, 7,
7, 7, 9,10, 8, 8, 8, 8, 8, 8,10,11, 8, 8, 8, 8,
8,10,11,10,10,10, 9, 9,10,11,12,10,10, 9, 9,10,
11,13,11,12,12,11,11,12,13,14,11,12,11,11,12,13,
14,
};
tatic float _vq_quantthresh_res0_350_128_3[] = {
-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,
};
tatic long _vq_quantmap_res0_350_128_3[] = {
14, 13, 12, 11, 10, 9, 8, 0,
1, 2, 3, 4, 5, 6, 7,
};
tatic encode_aux_threshmatch _vq_auxt_res0_350_128_3 = {
_vq_quantthresh_res0_350_128_3,
_vq_quantmap_res0_350_128_3,
15,
15
};
tatic static_codebook _vq_book_res0_350_128_3 = {
2, 225,
_vq_lengthlist_res0_350_128_3,
1, -528744448, 1611661312, 5, 0,
_vq_quantlist_res0_350_128_3,
NULL,
&_vq_auxt_res0_350_128_3,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_128_4.vqh
Index: res0_350_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_350_128_4_VQH_
#define _V_res0_350_128_4_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_350_128_4[] = {
28,
29,
31,
33,
36,
39,
42,
45,
48,
52,
56,
27,
25,
23,
20,
17,
14,
11,
8,
4,
0,
};
tatic long _vq_lengthlist_res0_350_128_4[] = {
7, 7, 7, 7, 7, 8, 9, 9, 9,10,11, 7, 7, 7, 7, 8,
9, 9, 9,10,11, 7, 7, 7, 7, 7, 8, 8, 9, 9,10,11,
7, 7, 7, 7, 8, 8, 9, 9,10,10, 7, 7, 7, 7, 7, 8,
8, 8, 9,10,10, 7, 7, 7, 7, 8, 8, 8, 9,10,10, 7,
7, 7, 7, 7, 8, 8, 9, 9,10,10, 7, 7, 7, 7, 8, 8,
9, 9,10,10, 8, 8, 7, 8, 8, 8, 9, 9, 9,10,11, 8,
7, 7, 8, 8, 9, 9, 9,10,11, 9, 9, 8, 8, 8, 9, 9,
10,10,11,11, 9, 8, 8, 9, 9, 9,10,10,10,11,10,10,
9, 9, 9,10,10,10,11,11,12,10, 9, 9, 9,10,10,11,
11,11,12,11,10,10,10,10,10,11,11,12,12,13,10,10,
10,10,11,11,11,12,12,13,11,11,11,11,11,11,12,12,
12,12,14,11,11,11,11,11,12,12,12,12,13,12,12,12,
12,12,12,13,13,13,14,14,12,12,12,12,12,13,13,13,
13,14,14,13,13,13,13,13,14,14,15,15,16,14,13,14,
13,14,14,14,14,16,15, 7, 7, 7, 7, 7, 8, 8, 8, 9,
10,11, 7, 7, 7, 7, 8, 8, 8, 9,10,10, 7, 7, 7, 7,
7, 8, 8, 8, 9,10,10, 7, 7, 7, 7, 8, 8, 8, 9,10,
11, 8, 7, 7, 7, 7, 8, 8, 9, 9,10,11, 7, 7, 7, 7,
8, 8, 9, 9,10,10, 8, 8, 7, 7, 8, 8, 9, 9,10,10,
11, 8, 7, 8, 8, 8, 9, 9, 9,10,11, 9, 9, 8, 8, 9,
9,10,10,10,11,11, 9, 8, 8, 9, 9, 9,10,10,10,11,
10,10, 9, 9, 9,10,10,11,11,11,12,10, 9, 9, 9,10,
10,11,11,11,12,10,10,10,10,10,10,11,11,11,12,13,
10,10,10,10,10,11,11,11,12,13,11,11,11,11,11,11,
12,12,12,13,13,11,11,11,11,11,11,12,12,12,13,12,
12,12,12,12,12,13,13,13,13,14,12,12,12,12,12,12,
13,13,14,14,13,13,13,13,14,13,14,14,15,14,16,13,
13,13,14,14,14,15,14,15,16,
};
tatic float _vq_quantthresh_res0_350_128_4[] = {
-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,
};
tatic long _vq_quantmap_res0_350_128_4[] = {
20, 19, 18, 17, 16, 15, 14, 13,
12, 11, 0, 1, 2, 3, 4, 5,
6, 7, 8, 9, 10,
};
tatic encode_aux_threshmatch _vq_auxt_res0_350_128_4 = {
_vq_quantthresh_res0_350_128_4,
_vq_quantmap_res0_350_128_4,
21,
21
};
tatic static_codebook _vq_book_res0_350_128_4 = {
2, 441,
_vq_lengthlist_res0_350_128_4,
1, -526647296, 1611661312, 6, 0,
_vq_quantlist_res0_350_128_4,
NULL,
&_vq_auxt_res0_350_128_4,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_128_5.vqh
Index: res0_350_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_350_128_5_VQH_
#define _V_res0_350_128_5_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_350_128_5[] = {
102,
103,
104,
105,
107,
110,
113,
116,
119,
122,
126,
130,
133,
137,
141,
145,
149,
153,
158,
163,
168,
173,
174,
180,
186,
192,
198,
204,
101,
100,
99,
97,
94,
91,
88,
85,
82,
78,
74,
71,
67,
63,
59,
55,
51,
46,
41,
36,
31,
30,
24,
18,
12,
6,
0,
};
tatic long _vq_lengthlist_res0_350_128_5[] = {
4, 4, 5, 4, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9,
10,10,11,12,12,13,13,13,13,14,14,12, 4, 5, 4, 4,
4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 9,10,10,11,11,12,
13,13,13,13,14,14,12,
};
tatic float _vq_quantthresh_res0_350_128_5[] = {
-99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
-58.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, 58.5, 63.5, 68.5,
71.5, 75, 81, 87, 93, 99,
};
tatic long _vq_quantmap_res0_350_128_5[] = {
54, 53, 52, 51, 50, 49, 48, 47,
46, 45, 44, 43, 42, 41, 40, 39,
38, 37, 36, 35, 34, 33, 32, 31,
30, 29, 28, 0, 1, 2, 3, 4,
5, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27,
};
tatic encode_aux_threshmatch _vq_auxt_res0_350_128_5 = {
_vq_quantthresh_res0_350_128_5,
_vq_quantmap_res0_350_128_5,
55,
55
};
tatic static_codebook _vq_book_res0_350_128_5 = {
1, 55,
_vq_lengthlist_res0_350_128_5,
1, -522616832, 1611661312, 8, 0,
_vq_quantlist_res0_350_128_5,
NULL,
&_vq_auxt_res0_350_128_5,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_350_128aux.vqh
Index: res0_350_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_350_128aux_VQH_
#define _V_res0_350_128aux_VQH_
#include "codebook.h"
tatic long _huff_lengthlist_res0_350_128aux[] = {
8,16,14,14,16,15,15,15,15,15,15,11,14,15,12, 8,
11,10,11,14, 5, 2, 6,10,11,12, 6, 3, 3, 7,10, 9,
7, 2, 3, 5,
};
tatic static_codebook _huff_book_res0_350_128aux = {
2, 36,
_huff_lengthlist_res0_350_128aux,
0, 0, 0, 0, 0,
NULL,
NULL,
NULL,
0
};
#endif
1.1 vorbis/lib/books/res0_96_128_5.vqh
Index: res0_96_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_96_128_5_VQH_
#define _V_res0_96_128_5_VQH_
#include "codebook.h"
tatic long _vq_quantlist_res0_96_128_5[] = {
102,
103,
104,
105,
107,
110,
113,
116,
119,
122,
126,
130,
133,
137,
141,
145,
149,
153,
158,
163,
168,
173,
174,
180,
186,
192,
198,
204,
101,
100,
99,
97,
94,
91,
88,
85,
82,
78,
74,
71,
67,
63,
59,
55,
51,
46,
41,
36,
31,
30,
24,
18,
12,
6,
0,
};
tatic long _vq_lengthlist_res0_96_128_5[] = {
1, 3, 4, 6, 6, 8,10, 6, 9,12,14,15,15,15,15,15,
15,15,15,15,15,15,15,15,15,15,15,15, 3, 4, 5, 6,
8,10, 6, 9,12,13,15,15,15,15,15,15,15,15,15,14,
14,14,14,14,14,14,14,
};
tatic float _vq_quantthresh_res0_96_128_5[] = {
-99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
-58.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, 58.5, 63.5, 68.5,
71.5, 75, 81, 87, 93, 99,
};
tatic long _vq_quantmap_res0_96_128_5[] = {
54, 53, 52, 51, 50, 49, 48, 47,
46, 45, 44, 43, 42, 41, 40, 39,
38, 37, 36, 35, 34, 33, 32, 31,
30, 29, 28, 0, 1, 2, 3, 4,
5, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27,
};
tatic encode_aux_threshmatch _vq_auxt_res0_96_128_5 = {
_vq_quantthresh_res0_96_128_5,
_vq_quantmap_res0_96_128_5,
55,
55
};
tatic static_codebook _vq_book_res0_96_128_5 = {
1, 55,
_vq_lengthlist_res0_96_128_5,
1, -522616832, 1611661312, 8, 0,
_vq_quantlist_res0_96_128_5,
NULL,
&_vq_auxt_res0_96_128_5,
NULL,
0
};
#endif
1.6 +16 -16 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mode_A.h 2000/11/14 00:07:57 1.5
+++ mode_A.h 2000/11/17 11:47:38 1.6
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.5 2000/11/14 00:07:57 xiphmont Exp $
+ last mod: $Id: mode_A.h,v 1.6 2000/11/17 11:47:38 xiphmont Exp $
********************************************************************/
@@ -80,20 +80,20 @@
},
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*/
+ {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*63*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*88*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*125*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-18.,-28.,-28.,-28.}, /*175*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-18.,-28.,-28.,-28.}, /*250*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-18.,-28.,-28.,-28.}, /*350*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-28.,-28.,-28.,-28.}, /*500*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*700*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1400*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2400*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*4000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*5600*/
{ -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*/
@@ -123,7 +123,7 @@
100.,
- -0., -.006 /* attack/decay control */
+ -0., -.004 /* attack/decay control */
};
1.2 +28 -24 vorbis/lib/modes/mode_AA.h
Index: mode_AA.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_AA.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mode_AA.h 2000/11/08 06:08:16 1.1
+++ mode_AA.h 2000/11/17 11:47:38 1.2
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_AA.h,v 1.1 2000/11/08 06:08:16 xiphmont Exp $
+ last mod: $Id: mode_AA.h,v 1.2 2000/11/17 11:47:38 xiphmont Exp $
********************************************************************/
@@ -27,12 +27,14 @@
#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_128_5.vqh"
+
+#include "books/res0_96_1024aux.vqh"
#include "books/res0_96_1024_1.vqh"
#include "books/res0_96_1024_2.vqh"
@@ -80,17 +82,17 @@
{{-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.,-18.,-20.}, /*175*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*250*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*350*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*500*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*700*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1400*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2800*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*4000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*5600*/
{ -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*/
@@ -118,7 +120,7 @@
{ 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10.}, /*16000*/
},
- 100.,
+ 95.,
-0., -.004 /* attack/decay control */
};
@@ -128,18 +130,19 @@
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}};
+static vorbis_info_residue0 _residue_set0AA={0,128, 32,6,2,
+ {0,1,1,1,1,1},
+ {4,5,6,7,8},
+
+ {0,99999,9999,9999,9999},
+ {99,1.5,2.5,6.5,12.5},
+ {5,5,5,5,5},
+ {99,99,99,99,99}};
+
static 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},
+ {9,10,11,12,13,14,15},
{0,9,9999,21,9999,
9999,9999,9999},
@@ -158,7 +161,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 15, 1,
+ 2, 2, 1, 2, 2, 16, 1,
/* modes */
{&_mode_set0AA,&_mode_set1AA},
/* maps */
@@ -180,6 +183,7 @@
&_vq_book_res0_96_128_2,
&_vq_book_res0_96_128_3,
&_vq_book_res0_96_128_4,
+ &_vq_book_res0_96_128_5,
&_vq_book_res0_96_1024_1,
&_vq_book_res0_96_1024_2,
1.5 +17 -17 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mode_B.h 2000/11/08 13:16:33 1.4
+++ mode_B.h 2000/11/17 11:47:38 1.5
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_B.h,v 1.4 2000/11/08 13:16:33 xiphmont Exp $
+ last mod: $Id: mode_B.h,v 1.5 2000/11/17 11:47:38 xiphmont Exp $
********************************************************************/
@@ -74,26 +74,26 @@
{-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.,-75.,-80.,-90.,-100.}, /*8000*/
+ {-30.,-30.,-35.,-35.,-40.,-50.,-60.,-70.,-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*/
},
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*/
+ {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*63*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*88*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*125*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-28.,-28.,-28.}, /*175*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-28.,-28.,-28.}, /*250*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-28.,-28.,-28.}, /*350*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-28.,-28.,-28.}, /*500*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*700*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1400*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2800*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*4000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*5600*/
{ -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*/
@@ -123,7 +123,7 @@
110.,
- -0., -.005 /* attack/decay control */
+ -3., -.004 /* attack/decay control */
};
/* with GNUisms, this could be short and readable. Oh well */
1.5 +102 -21 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mode_C.h 2000/11/08 13:16:33 1.4
+++ mode_C.h 2000/11/17 11:47:38 1.5
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_C.h,v 1.4 2000/11/08 13:16:33 xiphmont Exp $
+ last mod: $Id: mode_C.h,v 1.5 2000/11/17 11:47:38 xiphmont Exp $
********************************************************************/
@@ -41,7 +41,7 @@
#include "books/res0_192_1024_4.vqh"
#include "books/res0_192_1024_5.vqh"
-static vorbis_info_psy _psy_set_C={
+static vorbis_info_psy _psy_set_C0={
1,/*athp*/
0,/*decayp*/
1,/*smoothp*/
@@ -54,6 +54,87 @@
/* 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 */
+ 0,/* tonemaskp */
+ /* 0 10 20 30 40 50 60 70 80 90 100 */
+ {{-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*63*/
+ {-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*88*/
+ {-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*125*/
+ {-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*175*/
+ {-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*250*/
+ {-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*350*/
+ {-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*500*/
+ {-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*700*/
+ {-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*1000*/
+ {-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*1400*/
+ {-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*2000*/
+ {-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*2800*/
+ {-30.,-35.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*4000*/
+ {-30.,-30.,-35.,-40.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*5600*/
+ {-30.,-30.,-35.,-35.,-50.,-60.,-70.,-80.,-90.,-100.,-110.}, /*8000*/
+ {-30.,-30.,-35.,-33.,-45.,-55.,-65.,-75.,-85.,-100.,-110.}, /*11500*/
+ {-30.,-28.,-30.,-32.,-45.,-55.,-65.,-75.,-85.,-100.,-110.}, /*16000*/
+ },
+
+ 1,/* peakattp */
+ {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*63*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*88*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*125*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-28.,-28.,-28.}, /*175*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-28.,-28.,-28.}, /*250*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-28.,-28.,-28.}, /*350*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-28.,-28.,-28.}, /*500*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*700*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1400*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2800*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*4000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*5600*/
+ { -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*/
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*700*/
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*1000*/
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-199.,-199.,-199.,-199.}, /*1400*/
+
+ { 0., -4., -4., -4., -6., -6., -6., -6., -6., -6., -6.}, /*2000*/
+ { 0., -3., -4., -4., -4., -5., -6., -6., -6., -6., -6.}, /*2800*/
+ { 0., -2., -2., -2., -2., -2., -2., -2., -4., -4., -4.}, /*4000*/
+ { 0., -0., -0., -0., -0., -2., -2., -2., -2., -2., -2.}, /*5600*/
+ { 0., 0., 0., 0., 0., 0., 0., 0., 0., -2., -4.}, /*8000*/
+ { 2., 2., 2., 2., 2., 2., 0., 0., 0., 0., 0.}, /*11500*/
+ { 2., 2., 2., 2., 2., 4., 4., 4., 4., 4., 4.}, /*16000*/
+ },
+
+ 100.,
+
+ -6., -.006 /* attack/decay control */
+};
+
+static vorbis_info_psy _psy_set_C1={
+ 1,/*athp*/
+ 0,/*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*/
@@ -76,20 +157,20 @@
},
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*/
+ {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-28.,-28.}, /*63*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-28.,-28.}, /*88*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-28.,-28.}, /*125*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-18.,-18.,-20.}, /*175*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-18.,-18.,-20.}, /*250*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-18.,-18.,-20.}, /*350*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-18.,-18.,-20.}, /*500*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*700*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1400*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2800*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*4000*/
+ { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*5600*/
{ -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*/
@@ -117,7 +198,7 @@
{ 2., 2., 2., 2., 2., 4., 4., 4., 4., 4., 4.}, /*16000*/
},
- 100.,
+ 110.,
-6., -.006 /* attack/decay control */
};
@@ -144,8 +225,8 @@
{5,5,5,5,5},
{99,99,99,99,99}};
-static vorbis_info_mapping0 _mapping_set0C={1, {0,0}, {0}, {0}, {0}, {0}};
-static vorbis_info_mapping0 _mapping_set1C={1, {0,0}, {0}, {1}, {1}, {0}};
+static vorbis_info_mapping0 _mapping_set0C={1, {0,0}, {0}, {0}, {0}, {1}};
+static vorbis_info_mapping0 _mapping_set1C={1, {0,0}, {0}, {1}, {1}, {1}};
static vorbis_info_mode _mode_set0C={0,0,0,0};
static vorbis_info_mode _mode_set1C={1,0,0,1};
@@ -155,7 +236,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 14, 1,
+ 2, 2, 1, 2, 2, 14, 2,
/* modes */
{&_mode_set0C,&_mode_set1C},
/* maps */
@@ -187,7 +268,7 @@
},
/* psy */
- {&_psy_set_C},
+ {&_psy_set_C0,&_psy_set_C1},
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
256, 24, 6, -96.
};
1.6 +58 -12 vorbis/lib/modes/mode_D.h
Index: mode_D.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_D.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mode_D.h 2000/11/14 00:07:57 1.5
+++ mode_D.h 2000/11/17 11:47:38 1.6
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_D.h,v 1.5 2000/11/14 00:07:57 xiphmont Exp $
+ last mod: $Id: mode_D.h,v 1.6 2000/11/17 11:47:38 xiphmont Exp $
********************************************************************/
@@ -43,7 +43,7 @@
#include "books/res0_256_1024_4.vqh"
#include "books/res0_256_1024_5.vqh"
-static vorbis_info_psy _psy_set_256 ={
+static vorbis_info_psy _psy_set_D0 ={
1,/*athp*/
0,/*decayp*/
1,/*smoothp*/
@@ -56,9 +56,55 @@
/* 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 */
+ 0,/* tonemaskp */
+ /* 0 10 20 30 40 50 60 70 80 90 100 */
+ {{0}},
+
+ 1,/* peakattp */
+ {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*63*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*88*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*125*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*175*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*250*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*350*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*500*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*700*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*1000*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*1400*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*2000*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*2800*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*4000*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*5600*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*8000*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*11500*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*16000*/
+ },
+
+ 0,/*noisemaskp */
+ /* 0 10 20 30 40 50 60 70 80 90 100 */
+ {{0}},
+
+ 110.,
+
+ -0., -.004 /* attack/decay control */
+};
+static vorbis_info_psy _psy_set_D1 ={
+ 1,/*athp*/
+ 0,/*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 */
{{-40.,-40.,-40.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*63*/
+ {-40.,-40.,-40.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*88*/
{-40.,-40.,-40.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*125*/
{-40.,-40.,-40.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*175*/
{-40.,-40.,-40.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*250*/
@@ -77,13 +123,13 @@
},
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*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*175*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*250*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*350*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*500*/
+ {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*63*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*88*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*125*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*175*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*250*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*350*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*500*/
{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*700*/
{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*1000*/
{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*1400*/
@@ -128,7 +174,7 @@
{99,99,99,99,99}};
static vorbis_info_mapping0 _mapping_set0_256={1, {0,0}, {0}, {0}, {0}, {0}};
-static vorbis_info_mapping0 _mapping_set1_256={1, {0,0}, {0}, {1}, {1}, {0}};
+static vorbis_info_mapping0 _mapping_set1_256={1, {0,0}, {0}, {1}, {1}, {1}};
static vorbis_info_mode _mode_set0_256={0,0,0,0};
static vorbis_info_mode _mode_set1_256={1,0,0,1};
@@ -138,7 +184,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 14, 1,
+ 2, 2, 1, 2, 2, 14, 2,
/* modes */
{&_mode_set0_256,&_mode_set1_256},
/* maps */
@@ -170,7 +216,7 @@
},
/* psy */
- {&_psy_set_256},
+ {&_psy_set_D0,&_psy_set_D1},
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
256, 24, 6, -96.
};
1.3 +46 -44 vorbis/lib/modes/mode_E.h
Index: mode_E.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_E.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mode_E.h 2000/11/06 00:07:24 1.2
+++ mode_E.h 2000/11/17 11:47:38 1.3
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_E.h,v 1.2 2000/11/06 00:07:24 xiphmont Exp $
+ last mod: $Id: mode_E.h,v 1.3 2000/11/17 11:47:38 xiphmont Exp $
********************************************************************/
@@ -28,19 +28,20 @@
#include "books/lsp12_0.vqh"
#include "books/lsp30_0.vqh"
-#include "books/resaux0_128a_350.vqh"
-#include "books/resaux0_1024a_350.vqh"
+#include "books/res0_350_128aux.vqh"
+#include "books/res0_350_1024aux.vqh"
-#include "books/res0_128a_350_1.vqh"
-#include "books/res0_128a_350_2.vqh"
-#include "books/res0_128a_350_3.vqh"
-#include "books/res0_128a_350_4.vqh"
-#include "books/res0_128a_350_5.vqh"
-#include "books/res0_1024a_350_1.vqh"
-#include "books/res0_1024a_350_2.vqh"
-#include "books/res0_1024a_350_3.vqh"
-#include "books/res0_1024a_350_4.vqh"
-#include "books/res0_1024a_350_5.vqh"
+#include "books/res0_350_128_1.vqh"
+#include "books/res0_350_128_2.vqh"
+#include "books/res0_350_128_3.vqh"
+#include "books/res0_350_128_4.vqh"
+#include "books/res0_350_128_5.vqh"
+
+#include "books/res0_350_1024_1.vqh"
+#include "books/res0_350_1024_2.vqh"
+#include "books/res0_350_1024_3.vqh"
+#include "books/res0_350_1024_4.vqh"
+#include "books/res0_350_1024_5.vqh"
static vorbis_info_psy _psy_set_E ={
1,/*athp*/
@@ -60,23 +61,23 @@
{{0}},
1,/* peakattp */
- {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*63*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*88*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*125*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*175*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*250*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*350*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*500*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*700*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*1000*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*1400*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*2000*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*2800*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*4000*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*5600*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*8000*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*11500*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-24.}, /*16000*/
+ {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-30.}, /*63*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-30.}, /*88*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-30.}, /*125*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-30.}, /*175*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-30.}, /*250*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-30.}, /*350*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-30.}, /*500*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-28.}, /*700*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-28.}, /*1000*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-28.}, /*1400*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-28.}, /*2000*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-28.}, /*2800*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-28.}, /*4000*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-28.}, /*5600*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-28.}, /*8000*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-28.}, /*11500*/
+ {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-24.,-28.}, /*16000*/
},
0,/*noisemaskp */
@@ -97,7 +98,7 @@
{4,5,6,7,8},
{0,9999,9999,9999,9999},
- {99,2.5,7,13.5,27.5},
+ {99,2.5,6.5,15.5,29.5},
{5,5,5,5,5},
{99,99,99,99,99}};
@@ -106,7 +107,7 @@
{9,10,11,12,13},
{0,9999,9999,9999,9999},
- {99,2.5,7,13.5,27.5},
+ {99,2.5,6.5,15.5,29.5},
{5,5,5,5,5},
{99,99,99,99,99}};
@@ -136,19 +137,20 @@
{&_vq_book_lsp12_0, /* 0 */
&_vq_book_lsp30_0, /* 1 */
- &_huff_book_resaux0_128a_350,
- &_huff_book_resaux0_1024a_350,
+ &_huff_book_res0_350_128aux,
+ &_huff_book_res0_350_1024aux,
- &_vq_book_res0_128a_350_1,
- &_vq_book_res0_128a_350_2,
- &_vq_book_res0_128a_350_3,
- &_vq_book_res0_128a_350_4,
- &_vq_book_res0_128a_350_5,
- &_vq_book_res0_1024a_350_1,
- &_vq_book_res0_1024a_350_2,
- &_vq_book_res0_1024a_350_3,
- &_vq_book_res0_1024a_350_4,
- &_vq_book_res0_1024a_350_5,
+ &_vq_book_res0_350_128_1,
+ &_vq_book_res0_350_128_2,
+ &_vq_book_res0_350_128_3,
+ &_vq_book_res0_350_128_4,
+ &_vq_book_res0_350_128_5,
+
+ &_vq_book_res0_350_1024_1,
+ &_vq_book_res0_350_1024_2,
+ &_vq_book_res0_350_1024_3,
+ &_vq_book_res0_350_1024_4,
+ &_vq_book_res0_350_1024_5,
},
/* psy */
--- >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