[xiph-cvs] cvs commit: vorbis/vq 44c0.vqs
Monty
xiphmont at xiph.org
Mon Dec 31 18:27:48 PST 2001
xiphmont 01/12/31 18:27:46
Modified: examples Tag: monty_branch_rc4 encoder_example.c
include/vorbis Tag: monty_branch_rc4 vorbisenc.h
lib Tag: monty_branch_rc4 backends.h block.c
codec_internal.h floor1.c info.c mapping0.c psy.c
psy.h res0.c vorbisenc.c
lib/books/coupled Tag: monty_branch_rc4 _44c0_long.vqh
_44c0_s0_p1_0.vqh _44c0_s0_p2_0.vqh
_44c0_s0_p3_0.vqh _44c0_s0_p4_0.vqh
_44c0_s0_p4_1.vqh _44c0_s0_p5_0.vqh
_44c0_s0_p6_0.vqh _44c0_s0_p7_0.vqh
_44c0_s0_p7_1.vqh _44c0_s0_p7_2.vqh
_44c0_s1_p5_0.vqh _44c0_s1_p6_0.vqh
_44c0_s1_p7_0.vqh _44c0_s1_p7_1.vqh
_44c0_s1_p7_2.vqh _44c0_s2_p6_0.vqh
_44c0_s2_p7_0.vqh _44c0_s2_p7_1.vqh
_44c0_s2_p7_2.vqh _44c0_s3_p7_0.vqh
_44c0_s3_p7_1.vqh _44c0_s3_p7_2.vqh _44c0_short.vqh
lib/modes Tag: monty_branch_rc4 floor_44.h psych_44.h
residue_44.h
vq Tag: monty_branch_rc4 44c0.vqs
Log:
this commit is broken, but I want no chance of losing changes.
Incremental to CVS
Revision Changes Path
No revision
No revision
1.34.2.1 +2 -2 vorbis/examples/encoder_example.c
Index: encoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/encoder_example.c,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -r1.34 -r1.34.2.1
--- encoder_example.c 2001/12/23 11:59:22 1.34
+++ encoder_example.c 2002/01/01 02:27:20 1.34.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.34 2001/12/23 11:59:22 xiphmont Exp $
+ last mod: $Id: encoder_example.c,v 1.34.2.1 2002/01/01 02:27:20 xiphmont Exp $
********************************************************************/
@@ -97,8 +97,8 @@
/* (quality mode .4: 44kHz stereo coupled, roughly 128kbps VBR) */
vorbis_info_init(&vi);
- vorbis_encode_init_vbr(&vi,1,44100,.4);
- /*vorbis_encode_init(&vi,2,44100,-1,128000,-1);*/
+ vorbis_encode_init_vbr(&vi,2,44100,.0);
+ //vorbis_encode_init(&vi,2,44100,84000,96000,-1);
/* add a comment */
vorbis_comment_init(&vc);
No revision
No revision
1.8.2.1 +75 -2 vorbis/include/vorbis/vorbisenc.h
Index: vorbisenc.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/include/vorbis/vorbisenc.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- vorbisenc.h 2001/12/20 01:00:25 1.8
+++ vorbisenc.h 2002/01/01 02:27:21 1.8.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: vorbis encode-engine setup
- last mod: $Id: vorbisenc.h,v 1.8 2001/12/20 01:00:25 segher Exp $
+ last mod: $Id: vorbisenc.h,v 1.8.2.1 2002/01/01 02:27:21 xiphmont Exp $
********************************************************************/
@@ -57,8 +57,81 @@
extern int vorbis_encode_setup_init(vorbis_info *vi);
-extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
+extern int vorbis_encode_ctl(vorbis_info *vi,int number,int setp,void *arg);
+ typedef struct {
+ int short_block_p;
+ int long_block_p;
+ int impulse_block_p;
+ } vectl_block_arg;
+
+#define VECTL_BLOCK 0x1
+
+ typedef struct {
+ double short_lowpass_kHz;
+ double long_lowpass_kHz;
+ } vectl_lowpass_arg;
+
+#define VECTL_PSY_LOWPASS 0x2
+
+ typedef struct {
+ int stereo_couple_p;
+ int stereo_point_dB_mode;
+ double stereo_point_kHz_short;
+ double stereo_point_kHz_long;
+ } vectl_stereo_arg;
+
+#define VECTL_PSY_STEREO 0x3
+
+ typedef struct {
+ double ath_float_dB;
+ double ath_fixed_dB;
+ } vectl_ath_arg;
+
+#define VECTL_PSY_ATH 0x4
+
+ typedef struct {
+ double maxdB_track_decay;
+ } vectl_amp_arg;
+
+#define VECTL_PSY_AMPTRACK 0x5
+
+ typedef struct {
+ double trigger_q;
+ double tonemask_q[4];
+ double tonepeak_q[4];
+ double noise_q[4];
+ } vectl_mask_arg;
+
+#define VECTL_PSY_MASK_Q 0x6
+
+ typedef struct {
+ int noise_normalize_p;
+ double noise_normalize_weight;
+ double noise_normalize_thresh;
+ } vectl_noisenorm_arg;
+
+#define VECTL_PSY_NOISENORM 0x7
+
+typedef struct {
+ double avg_min;
+ double avg_max;
+ double avg_window_time;
+ double avg_window_center;
+ double avg_slew_downmax;
+ double avg_slew_upmax;
+ int avg_noisetrack_p;
+
+ double limit_min;
+ double limit_max;
+ double limit_window_time;
+
+ int stereo_backfill_p;
+ int residue_backfill_p;
+
+} vectl_bitrate_arg;
+
+#define VECTL_BITRATE 0x100
#ifdef __cplusplus
No revision
No revision
1.12.2.1 +2 -3 vorbis/lib/backends.h
Index: backends.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/backends.h,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- backends.h 2001/12/20 01:00:26 1.12
+++ backends.h 2002/01/01 02:27:23 1.12.2.1
@@ -12,7 +12,7 @@
function: libvorbis backend and mapping structures; needed for
static mode headers
- last mod: $Id: backends.h,v 1.12 2001/12/20 01:00:26 segher Exp $
+ last mod: $Id: backends.h,v 1.12.2.1 2002/01/01 02:27:23 xiphmont Exp $
********************************************************************/
@@ -128,7 +128,7 @@
void (*free_info) (vorbis_info_residue *);
void (*free_look) (vorbis_look_residue *);
long **(*class) (struct vorbis_block *,vorbis_look_residue *,
- float **,int *,int);
+ float **,float **,int *,int);
int (*forward) (struct vorbis_block *,vorbis_look_residue *,
float **,float **,int *,int,int,long **,ogg_uint32_t *);
int (*inverse) (struct vorbis_block *,vorbis_look_residue *,
@@ -148,7 +148,6 @@
int booklist[256]; /* list of second stage books */
/* encode-only heuristic settings */
- float entmax[64]; /* book entropy threshholds*/
float ampmax[64]; /* book amp threshholds*/
int subgrp[64]; /* book heuristic subgroup size */
int blimit[64]; /* subgroup position limits */
1.55.2.1 +12 -5 vorbis/lib/block.c
Index: block.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/block.c,v
retrieving revision 1.55
retrieving revision 1.55.2.1
diff -u -r1.55 -r1.55.2.1
--- block.c 2001/12/23 11:53:52 1.55
+++ block.c 2002/01/01 02:27:23 1.55.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.55 2001/12/23 11:53:52 xiphmont Exp $
+ last mod: $Id: block.c,v 1.55.2.1 2002/01/01 02:27:23 xiphmont Exp $
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -477,6 +477,7 @@
/* do the deltas, envelope shaping, pre-echo and determine the size of
the next block on which to continue analysis */
+#include<stdio.h>
int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb){
int i;
vorbis_info *vi=v->vi;
@@ -538,15 +539,21 @@
}
if(v->W){
- if(!v->lW || !v->nW)
+ if(!v->lW || !v->nW){
vbi->blocktype=BLOCKTYPE_TRANSITION;
- else
+ fprintf(stderr,"-");
+ }else{
vbi->blocktype=BLOCKTYPE_LONG;
+ fprintf(stderr,"_");
+ }
}else{
- if(_ve_envelope_mark(v))
+ if(_ve_envelope_mark(v)){
vbi->blocktype=BLOCKTYPE_IMPULSE;
- else
+ fprintf(stderr,"|");
+ }else{
vbi->blocktype=BLOCKTYPE_PADDING;
+ fprintf(stderr,".");
+ }
}
vb->vd=v;
1.12.2.1 +8 -2 vorbis/lib/codec_internal.h
Index: codec_internal.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/codec_internal.h,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- codec_internal.h 2001/12/20 01:00:26 1.12
+++ codec_internal.h 2002/01/01 02:27:23 1.12.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: libvorbis codec headers
- last mod: $Id: codec_internal.h,v 1.12 2001/12/20 01:00:26 segher Exp $
+ last mod: $Id: codec_internal.h,v 1.12.2.1 2002/01/01 02:27:23 xiphmont Exp $
********************************************************************/
@@ -118,7 +118,13 @@
double trigger_quality;
highlevel_block blocktype[4]; /* impulse, padding, trans, long */
-
+
+ /* noise normalization for low bitrate */
+ int normalize_noise_p;
+ float normalize_noise_minimum_upgrade;
+ float normalize_noise_unit_weight;
+
+ int set_in_stone;
} highlevel_encode_setup;
/* codec_setup_info contains all the setup information specific to the
1.19.2.1 +3 -3 vorbis/lib/floor1.c
Index: floor1.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/floor1.c,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- floor1.c 2001/12/19 23:13:33 1.19
+++ floor1.c 2002/01/01 02:27:23 1.19.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: floor backend 1 implementation
- last mod: $Id: floor1.c,v 1.19 2001/12/19 23:13:33 segher Exp $
+ last mod: $Id: floor1.c,v 1.19.2.1 2002/01/01 02:27:23 xiphmont Exp $
********************************************************************/
@@ -84,10 +84,10 @@
static void floor1_free_look(vorbis_look_floor *i){
vorbis_look_floor1 *look=(vorbis_look_floor1 *)i;
if(look){
- /*fprintf(stderr,"floor 1 bit usage %f:%f (%f total)\n",
+ fprintf(stderr,"floor 1 bit usage %f:%f (%f total)\n",
(float)look->phrasebits/look->frames,
(float)look->postbits/look->frames,
- (float)(look->postbits+look->phrasebits)/look->frames);*/
+ (float)(look->postbits+look->phrasebits)/look->frames);
memset(look,0,sizeof(*look));
_ogg_free(look);
1.51.2.1 +2 -2 vorbis/lib/info.c
Index: info.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/info.c,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -r1.51 -r1.51.2.1
--- info.c 2001/12/20 01:00:27 1.51
+++ info.c 2002/01/01 02:27:23 1.51.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.51 2001/12/20 01:00:27 segher Exp $
+ last mod: $Id: info.c,v 1.51.2.1 2002/01/01 02:27:23 xiphmont Exp $
********************************************************************/
@@ -416,7 +416,7 @@
}
static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){
- char temp[]="Xiphophorus libVorbis I 20011217";
+ char temp[]="Xiphophorus libVorbis I 20020107";
int bytes = strlen(temp);
/* preamble */
1.43.2.1 +45 -7 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -u -r1.43 -r1.43.2.1
--- mapping0.c 2001/12/20 01:00:27 1.43
+++ mapping0.c 2002/01/01 02:27:23 1.43.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.43 2001/12/20 01:00:27 segher Exp $
+ last mod: $Id: mapping0.c,v 1.43.2.1 2002/01/01 02:27:23 xiphmont Exp $
********************************************************************/
@@ -419,10 +419,11 @@
/* partition based prequantization and channel coupling */
/* Steps in prequant and coupling:
- classify by |mag| across all pcm vectors
-
down-couple/down-quantize from perfect residue -> quantized vector
+ classify by |mag| of perfect res and |mag| of quant
+ across all pcm vectors
+
do{
encode quantized vector; add encoded values to 'so-far' vector
more? [not yet at bitrate/not yet at target]
@@ -469,9 +470,9 @@
/* initial down-quantized coupling */
+ /* this assumes all or nothing coupling right now. it should pass
+ through any channels left uncoupled, but it doesn't do that now */
if(info->coupling_steps==0){
- /* this assumes all or nothing coupling right now. it should pass
- through any channels left uncoupled, but it doesn't do that now */
for(i=0;i<vi->channels;i++){
float *lpcm=pcm[i];
float *lqua=quantized[i];
@@ -490,7 +491,6 @@
for(i=0;i<vi->channels;i++)
_analysis_output("quant",seq+i,quantized[i],n/2,1,0);
-
/* classify, by submap */
@@ -515,9 +515,14 @@
chcounter+=ch_in_bundle;
classifications[i]=look->residue_func[i]->
- class(vb,look->residue_look[i],pcmbundle[i],zerobundle[i],chbundle[i]);
+ class(vb,look->residue_look[i],pcmbundle[i],qbundle[i],
+ zerobundle[i],chbundle[i]);
}
+ for(i=0;i<vi->channels;i++)
+ _analysis_output("nquant",seq+i,quantized[i],n/2,1,0);
+
+
/* actual encoding loop; we pack all the iterations to collect
management data */
@@ -534,6 +539,38 @@
}
i++;
+
+#ifdef TRAIN_RES
+ /* this is sanity checking *highly specific* to current encoder
+ convention. This is only to be enabled during training data
+ collection and testing */
+
+ /* first pass: normal unit-encode, second pass is stereo
+ backfill (unit encode), third pass is 1/3 encode, fourth is
+ 1/9 encode. No submaps. */
+ for(j=0;j<vi->channels;j++){
+ int k;
+ for(k=0;k<n/2;k++){
+ switch(i){
+ case 1:case 2:
+ if(fabs(quantized[j][k])>.5)
+ fprintf(stderr,">>>%d+%d:%d/%d(%f) ",seq+j,i,j,k,quantized[j][k]);
+ break;
+ case 3:
+ if(fabs(quantized[j][k])>.1667)
+ fprintf(stderr,">>>%d+%d:%d/%d(%f) ",seq+j,i,j,k,quantized[j][k]);
+ break;
+ case 4:
+ if(fabs(quantized[j][k])>.0556)
+ fprintf(stderr,">>>%d+%d:%d/%d(%f) ",seq+j,i,j,k,quantized[j][k]);
+ break;
+ }
+ }
+ }
+
+
+#endif
+
if(i<quant_passes){
/* down-couple/down-quantize from perfect-'so-far' ->
@@ -663,6 +700,7 @@
int submap=info->chmuxlist[i];
look->floor_func[submap]->
inverse2(vb,look->floor_look[submap],floormemo[i],pcm);
+ _analysis_output("final",seq++,pcm,n/2,1,1);
}
/* transform the PCM data; takes PCM vector, vb; modifies PCM vector */
1.64.2.2 +34 -37 vorbis/lib/psy.c
Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.64.2.1
retrieving revision 1.64.2.2
diff -u -r1.64.2.1 -r1.64.2.2
--- psy.c 2001/12/27 08:09:33 1.64.2.1
+++ psy.c 2002/01/01 02:27:24 1.64.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.64.2.1 2001/12/27 08:09:33 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.64.2.2 2002/01/01 02:27:24 xiphmont Exp $
********************************************************************/
@@ -942,7 +942,7 @@
int passno){
int i,j,k,n=p->n;
- vorbis_info_psy *info=p->vi;
+ vorbis_info_psy *info=p->vi;
/* perform any requested channel coupling */
for(i=0;i<vi->coupling_steps;i++){
@@ -1013,45 +1013,42 @@
}
void psy_normalize_noise(vorbis_block *vb,float *pcm,int n){
- /* sort in ascending order */
- int i;
- float **index=alloca(n*sizeof(*index));
- float acc=0,qacc=0;
-
- for(i=0;i<n;i++)index[i]=pcm+i;
- qsort(index,n,sizeof(*index),apsort);
-
- for(i=0;i<n;i++)acc+=fabs(pcm[i]);
- for(i=0;i<n;i++){
- float qval=rint(*index[i]);
-
- if(qval!=0.f){
- qacc+=fabs(qval);
- }else{
- if(fabs(*index[i])<.1f)break;
- if(*index[i]<0){
- qacc+=1.f;
- *index[i]= -1.;
+ vorbis_dsp_state *vd=vb->vd;
+ vorbis_info *vi=vd->vi;
+ codec_setup_info *ci=vi->codec_setup;
+ highlevel_encode_setup *hi=&ci->hi;
+
+ if(hi->normalize_noise_p){
+ /* sort in decending order */
+ int i;
+ float **index=alloca(n*sizeof(*index));
+ float acc=0,qacc=0;
+
+ for(i=0;i<n;i++)index[i]=pcm+i;
+ qsort(index,n,sizeof(*index),apsort);
+
+ for(i=0;i<n;i++)acc+=fabs(pcm[i]);
+ for(i=0;i<n;i++){
+ float qval=rint(*index[i]);
+
+ if(qval!=0.f){
+ qacc+=fabs(qval);
}else{
- qacc+=1.f;
- *index[i]=1.;
+ if(fabs(*index[i])<hi->normalize_noise_minimum_upgrade)break;
+ if(*index[i]<0){
+ qacc+=hi->normalize_noise_unit_weight;
+ *index[i]= -1.;
+ }else{
+ qacc+=hi->normalize_noise_unit_weight;
+ *index[i]= 1.;
+ }
+ if(qacc>acc)break;
}
- if(qacc>acc)break;
+
}
-
- }
- for(;i<n;i++){
- *index[i]=0.;
+ for(;i<n;i++){
+ *index[i]=0.;
+ }
}
-
}
-
-
-
-
-
-
-
-
-
1.27.2.2 +4 -2 vorbis/lib/psy.h
Index: psy.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.h,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -r1.27.2.1 -r1.27.2.2
--- psy.h 2001/12/27 08:09:33 1.27.2.1
+++ psy.h 2002/01/01 02:27:24 1.27.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.27.2.1 2001/12/27 08:09:33 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.27.2.2 2002/01/01 02:27:24 xiphmont Exp $
********************************************************************/
@@ -92,7 +92,7 @@
float preecho_minenergy;
float ampmax_att_per_sec;
-
+
/* delay caching... how many samples to keep around prior to our
current block to aid in analysis? */
int delaycache;
@@ -155,9 +155,11 @@
int passno);
extern float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd);
+
extern void psy_normalize_noise(vorbis_block *vb,float *pcm,int n);
#endif
+
1.44.2.1 +90 -94 vorbis/lib/res0.c
Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -u -r1.44 -r1.44.2.1
--- res0.c 2001/12/21 15:05:30 1.44
+++ res0.c 2002/01/01 02:27:24 1.44.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.44 2001/12/21 15:05:30 segher Exp $
+ last mod: $Id: res0.c,v 1.44.2.1 2002/01/01 02:27:24 xiphmont Exp $
********************************************************************/
@@ -30,6 +30,7 @@
#include "codebook.h"
#include "misc.h"
#include "os.h"
+#include "psy.h"
#ifdef TRAIN_RES
#include <stdio.h>
@@ -56,11 +57,14 @@
#ifdef TRAIN_RES
long *training_data[8][64];
+ long training_bits[8][64];
float training_max[8][64];
float training_min[8][64];
+ long training_count[64];
int longp;
float tmin;
float tmax;
+
#endif
} vorbis_look_residue0;
@@ -85,12 +89,13 @@
if(i){
vorbis_look_residue0 *look=(vorbis_look_residue0 *)i;
+ vorbis_info_residue0 *info=look->info;
#ifdef TRAIN_RES
{
int j,k,l;
for(j=0;j<look->parts;j++){
- fprintf(stderr,"partition %d: ",j);
+ fprintf(stderr,"partition %d [%ld]: ",j,look->training_count[j]);
for(k=0;k<8;k++)
if(look->training_data[k][j]){
char buffer[80];
@@ -119,31 +124,26 @@
(float)look->phrasebits/look->frames,
(float)look->postbits/look->frames,
(float)(look->postbits+look->phrasebits)/look->frames);
-#endif
-
- /*vorbis_info_residue0 *info=look->info;
-
- fprintf(stderr,
- "%ld frames encoded in %ld phrasebits and %ld residue bits "
- "(%g/frame) \n",look->frames,look->phrasebits,
- look->resbitsflat,
- (look->phrasebits+look->resbitsflat)/(float)look->frames);
-
for(j=0;j<look->parts;j++){
- long acc=0;
- fprintf(stderr,"\t[%d] == ",j);
- for(k=0;k<look->stages;k++)
- if((info->secondstages[j]>>k)&1){
- fprintf(stderr,"%ld,",look->resbits[j][k]);
- acc+=look->resbits[j][k];
- }
-
- fprintf(stderr,":: (%ld vals) %1.2fbits/sample\n",look->resvals[j],
- acc?(float)acc/(look->resvals[j]*info->grouping):0);
+ int k;
+ long acc=0;
+ fprintf(stderr,"\t[%d] == ",j);
+ for(k=0;k<look->stages;k++)
+ if((info->secondstages[j]>>k)&1){
+ fprintf(stderr,"%ld,",look->training_bits[k][j]);
+ acc+=look->training_bits[k][j];
+ }
+
+ fprintf(stderr,":: (%ld vals) %1.2fbits/sample\n",
+ look->training_count[j],
+ (float)acc/look->training_count[j]);
}
- fprintf(stderr,"\n");*/
+ fprintf(stderr,"\n");
+#endif
+
+
for(j=0;j<look->parts;j++)
if(look->partbooks[j])_ogg_free(look->partbooks[j]);
_ogg_free(look->partbooks);
@@ -301,75 +301,44 @@
return(look);
}
+/* almost the simplest possible subvector classification; by max
+ amplitude/position. Assumes forst pass is quantized to unit steps */
-#if 0
-/* does not guard against invalid settings; eg, a subn of 16 and a
- subgroup request of 32. Max subn of 128 */
-static int _interleaved_testhack(float *vec,int n,vorbis_look_residue0 *look,
- int auxparts,int auxpartnum){
- vorbis_info_residue0 *info=look->info;
- int i,j=0;
- float max,localmax=0.f;
- float temp[128];
- float entropy[8];
+/* broken out for specific encoding tasks */
- /* setup */
- for(i=0;i<n;i++)temp[i]=fabs(vec[i]);
+static int _testhack(float *vec,float *q,int n,
+ vorbis_look_residue0 *look,
+ int auxparts,int auxpartnum){
+ vorbis_info_residue0 *info=look->info;
+ int i;
+ float max=0.f;
- /* handle case subgrp==1 outside */
for(i=0;i<n;i++)
- if(temp[i]>localmax)localmax=temp[i];
- max=localmax;
-
- for(i=0;i<n;i++)temp[i]=rint(temp[i]);
+ if(max<fabs(vec[i]))max=fabs(vec[i]);
- while(1){
- entropy[j]=localmax;
- n>>=1;
- if(!n)break;
- j++;
-
- for(i=0;i<n;i++){
- temp[i]+=temp[i+n];
- }
- localmax=0.f;
- for(i=0;i<n;i++)
- if(temp[i]>localmax)localmax=temp[i];
- }
-
for(i=0;i<auxparts-1;i++)
if(auxpartnum<info->blimit[i] &&
- entropy[info->subgrp[i]]<=info->entmax[i] &&
max<=info->ampmax[i])
break;
return(i);
}
-#endif
-
-static int _testhack(float *vec,int n,vorbis_look_residue0 *look,
+static int _testhack_stereo_res2(float *vec,float *q,int n,
+ vorbis_look_residue0 *look,
int auxparts,int auxpartnum){
vorbis_info_residue0 *info=look->info;
int i;
float max=0.f;
- float temp[128];
- float entropy=0.f;
-
- /* setup */
- for(i=0;i<n;i++)temp[i]=fabs(vec[i]);
-
- for(i=0;i<n;i++)
- if(temp[i]>max)max=temp[i];
- for(i=0;i<n;i++)temp[i]=rint(temp[i]);
-
- for(i=0;i<n;i++)
- entropy+=temp[i];
-
+ for(i=0;i<n;i+=2){
+ if(max<fabs(vec[i]))max=fabs(vec[i]);
+ if(max<fabs(vec[i+1]))max=fabs(vec[i+1]);
+ if(max<fabs(q[i]))max=fabs(q[i]);
+ }
+
for(i=0;i<auxparts-1;i++)
if(auxpartnum<info->blimit[i] &&
- entropy<=info->entmax[i] &&
max<=info->ampmax[i])
break;
@@ -415,8 +384,9 @@
}
static long **_01class(vorbis_block *vb,vorbis_look_residue *vl,
- float **in,int ch,
- int (*classify)(float *,int,vorbis_look_residue0 *,
+ float **in,float **q,int ch,
+ int (*classify)(float *,float *,int,
+ vorbis_look_residue0 *,
int,int)){
long i,j;
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
@@ -440,13 +410,16 @@
}
for(i=0;i<partvals;i++){
- for(j=0;j<ch;j++)
- /* do the partition decision based on the 'entropy'
- int the block */
+ for(j=0;j<ch;j++){
+
+ psy_normalize_noise(vb,q[j]+i*samples_per_partition+info->begin,
+ samples_per_partition);
+
partword[j][i]=
classify(in[j]+i*samples_per_partition+info->begin,
+ q[j]+i*samples_per_partition+info->begin,
samples_per_partition,look,possible_partitions,i);
-
+ }
}
#ifdef TRAIN_RES
@@ -471,10 +444,11 @@
}
static long **_2class(vorbis_block *vb,vorbis_look_residue *vl,
- float **in,int ch,
- int (*classify)(float *,int,vorbis_look_residue0 *,
+ float **in,float **q,int ch,
+ int (*classify)(float *,float *,int,
+ vorbis_look_residue0 *,
int,int)){
- long i,j,k,l;
+ long i,j,k,l,jj,ll;
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
vorbis_info_residue0 *info=look->info;
@@ -486,6 +460,7 @@
int partvals=n/samples_per_partition;
long **partword=_vorbis_block_alloc(vb,sizeof(*partword));
float *work=alloca(sizeof(*work)*samples_per_partition);
+ float *qwork=alloca(sizeof(*qwork)*samples_per_partition);
#ifdef TRAIN_RES
FILE *of;
@@ -495,9 +470,10 @@
partword[0]=_vorbis_block_alloc(vb,n*ch/samples_per_partition*sizeof(*partword[0]));
memset(partword[0],0,n*ch/samples_per_partition*sizeof(*partword[0]));
- for(i=0,j=0,k=0,l=info->begin;i<partvals;i++){
+ for(i=0,jj=j=0,k=0,ll=l=info->begin;i<partvals;i++){
for(k=0;k<samples_per_partition;k++){
work[k]=in[j][l];
+ qwork[k]=q[j][l];
j++;
if(j>=ch){
j=0;
@@ -505,11 +481,20 @@
}
}
- partword[0][i]=
- classify(work,samples_per_partition,look,possible_partitions,i);
+ psy_normalize_noise(vb,qwork,samples_per_partition);
+ partword[0][i]=
+ classify(work,qwork,samples_per_partition,look,possible_partitions,i);
- }
+ for(k=0;k<samples_per_partition;k++){
+ q[jj][ll]=qwork[k];
+ jj++;
+ if(jj>=ch){
+ jj=0;
+ ll++;
+ }
+ }
+ }
#ifdef TRAIN_RES
look->longp=vb->W;
@@ -603,7 +588,13 @@
qptr[bin++]=oggpack_bits(&vb->opb);
for(j=0;j<ch;j++){
- if(s==0)resvals[partword[j][i]]+=samples_per_partition;
+ if(s==0){
+
+#ifdef TRAIN_RES
+ look->training_count[partword[j][i]]+=samples_per_partition;
+#endif
+ }
+
if(info->secondstages[partword[j][i]]&(1<<s)){
codebook *statebook=look->partbooks[partword[j][i]][s];
if(statebook){
@@ -627,8 +618,10 @@
ret=encode(&vb->opb,in[j]+offset,samples_per_partition,
statebook,accumulator);
+#ifdef TRAIN_RES
look->postbits+=ret;
- resbits[partword[j][i]]+=ret;
+ look->training_bits[s][partword[j][i]]+=ret;
+#endif
}
}
}
@@ -713,7 +706,7 @@
/* residue 0 and 1 are just slight variants of one another. 0 is
interleaved, 1 is not */
long **res0_class(vorbis_block *vb,vorbis_look_residue *vl,
- float **in,int *nonzero,int ch){
+ float **in,float **q,int *nonzero,int ch){
/* we encode only the nonzero parts of a bundle */
int i,used=0;
for(i=0;i<ch;i++)
@@ -721,7 +714,7 @@
in[used++]=in[i];
if(used)
/*return(_01class(vb,vl,in,used,_interleaved_testhack));*/
- return(_01class(vb,vl,in,used,_testhack));
+ return(_01class(vb,vl,in,q,used,_testhack));
else
return(0);
}
@@ -798,13 +791,13 @@
}
long **res1_class(vorbis_block *vb,vorbis_look_residue *vl,
- float **in,int *nonzero,int ch){
+ float **in,float **q,int *nonzero,int ch){
int i,used=0;
for(i=0;i<ch;i++)
if(nonzero[i])
in[used++]=in[i];
if(used)
- return(_01class(vb,vl,in,used,_testhack));
+ return(_01class(vb,vl,in,q,used,_testhack));
else
return(0);
}
@@ -822,13 +815,13 @@
}
long **res2_class(vorbis_block *vb,vorbis_look_residue *vl,
- float **in,int *nonzero,int ch){
+ float **in,float **q,int *nonzero,int ch){
int i,used=0;
for(i=0;i<ch;i++)
if(nonzero[i])
in[used++]=in[i];
if(used)
- return(_2class(vb,vl,in,used,_testhack));
+ return(_2class(vb,vl,in,q,used,_testhack_stereo_res2));
else
return(0);
}
@@ -855,11 +848,14 @@
if(used){
int ret=_01forward(vb,vl,&work,1,pass,partword,_encodepart,stats);
/* update the sofar vector */
+ /* update the quantized pcm vector */
for(i=0;i<ch;i++){
float *pcm=in[i];
float *sofar=out[i];
- for(j=0,k=i;j<n;j++,k+=ch)
+ for(j=0,k=i;j<n;j++,k+=ch){
sofar[j]+=pcm[j]-work[k];
+ pcm[j]=work[k];
+ }
}
return(ret);
1.33.2.1 +293 -28 vorbis/lib/vorbisenc.c
Index: vorbisenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisenc.c,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -r1.33 -r1.33.2.1
--- vorbisenc.c 2001/12/23 11:53:53 1.33
+++ vorbisenc.c 2002/01/01 02:27:25 1.33.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.33 2001/12/23 11:53:53 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.33.2.1 2002/01/01 02:27:25 xiphmont Exp $
********************************************************************/
@@ -41,7 +41,7 @@
static_codebook *books_residue_backfill[5][10][2];
} vorbis_residue_template;
-static double stereo_threshholds[]={0.0, 2.5, 4.5, 8.5, 16.5};
+static double stereo_threshholds[]={0.5, 2.5, 4.5, 8.5, 16.5};
typedef struct vp_adjblock{
int block[P_BANDS][P_LEVELS];
@@ -411,11 +411,7 @@
memcpy(r,in[iq].res[block],sizeof(*r));
if(ci->residues<=block)ci->residues=block+1;
- if(block){
- r->grouping=32;
- }else{
- r->grouping=16;
- }
+ r->grouping=32;
/* for uncoupled, we use type 1, else type 2 */
if(coupled_p){
@@ -614,12 +610,17 @@
codec_setup_info *ci=vi->codec_setup;
highlevel_encode_setup *hi=&ci->hi;
+ if(!hi->impulse_block_p)
+ /* write over the impulse settings */
+ memcpy(&hi->blocktype[0],&hi->blocktype[1],sizeof(hi->blocktype[0]));
+
+
ret|=vorbis_encode_floor_setup(vi,hi->base_quality_short,0,
- _floor_44_128_books,_floor_44_128,
- 0,1,1,2,2,2,2,2,2,2,2);
+ _floor_44_128_books,_floor_44_128,
+ 0,1,1,2,2,2,2,2,2,2,2);
ret|=vorbis_encode_floor_setup(vi,hi->base_quality_long,1,
_floor_44_1024_books,_floor_44_1024,
- 0,0,0,0,0,0,0,0,0,0,0);
+ 0,0,1,1,1,1,1,1,1,1,1);
ret|=vorbis_encode_global_psych_setup(vi,hi->trigger_quality,_psy_global_44,
0., 1., 1.5, 2., 2., 2., 2., 2., 2., 2., 2.);
@@ -745,7 +746,9 @@
}
ret|=vorbis_encode_lowpass_setup(vi,hi->lowpass_kHz[0],0);
ret|=vorbis_encode_lowpass_setup(vi,hi->lowpass_kHz[1],1);
-
+
+ hi->set_in_stone=1;
+
if(ret)
vorbis_info_clear(vi);
return(ret);
@@ -876,6 +879,11 @@
hi->lowpass_kHz[1]=
_psy_lowpass_44[iq]*(1.-dq)+_psy_lowpass_44[iq+1]*dq;
+ /* set a few bitrate management conventions, but don't enable
+ management */
+ ci->bi.avgfloat_initial=4.0;
+ ci->bi.avgfloat_minimum=2.3;
+
/* set bitrate approximation */
vi->bitrate_nominal=vbr_to_approx_bitrate(vi->channels,hi->stereo_couple_p,
base_quality,vi->rate);
@@ -938,23 +946,26 @@
return ret;
}
- /* adjust to make management's life easier. Use the ctl() interface
- once it's implemented */
+ /* adjust to make management's life easier */
{
- codec_setup_info *ci=vi->codec_setup;
- highlevel_encode_setup *hi=&ci->hi;
-
- /* backfills */
- hi->stereo_backfill_p=1;
- hi->residue_backfill_p=1;
-
- /* no impulse blocks */
- hi->impulse_block_p=0;
- /* de-rate stereo */
- if(hi->stereo_point_dB && hi->stereo_couple_p && channels==2){
- hi->stereo_point_dB++;
- if(hi->stereo_point_dB>3)hi->stereo_point_dB=3;
+ vectl_stereo_arg stereo;
+ vectl_block_arg block;
+ vectl_bitrate_arg bitrate;
+
+ vorbis_encode_ctl(vi,VECTL_BITRATE,0,&bitrate);
+ vorbis_encode_ctl(vi,VECTL_BLOCK,0,&block);
+ vorbis_encode_ctl(vi,VECTL_STEREO,0,&stereo);
+
+ bitrate.stereo_backfill_p=1;
+ bitrate.residue_backfill_p=1;
+
+ block.impulse_block_p=0;
+
+ if(stereo.stereo_couple_p && channels==2){
+ stereo.stereo_point_dB_mode++;
+ if(stereo.stereo_point_dB_mode>3)stereo.stereo_point_dB_mode=3;
}
+
/* slug the vbr noise setting*/
hi->blocktype[0].noise_bias_quality-=.1;
if(hi->blocktype[0].noise_bias_quality<0.)
@@ -1006,7 +1017,261 @@
vorbis_info_clear(vi);
return(ret);
}
+
+int vorbis_encode_ctl(vorbis_info *vi,int number,int setp,void *arg){
+ codec_setup_info *ci=vi->codec_setup;
+ highlevel_encode_setup *hi=&ci->hi;
+
+ if(setp && hi->set_in_stone)return(OV_EINVAL);
+
+ switch(number){
+ case VECTL_BLOCK:
+ if(setp){
+ vectl_block_arg *varg=(vectl_block_arg *)arg;
+ if(!varg->short_block_p && !varg->long_block_p)return(OV_EINVAL);
+
+ hi->short_block_p=varg->short_block_p;
+ hi->long_block_p=varg->long_block_p;
+ hi->impulse_block_p=varg->impulse_block_p;
+ }else{
+ vectl_block_arg *varg=(vectl_block_arg *)arg;
+
+ varg->short_block_p=hi->short_block_p;
+ varg->long_block_p=hi->long_block_p;
+ varg->impulse_block_p=hi->impulse_block_p;
+ }
+ break;
+
+ case VECTL_PSY_LOWPASS:
+ if(setp){
+ vectl_lowpass_arg *varg=(vectl_lowpass_arg *)arg;
+ hi->lowpass_kHz[0]=varg->short_lowpass_kHz;
+ hi->lowpass_kHz[1]=varg->long_lowpass_kHz;
+ }else{
+ vectl_lowpass_arg *varg=(vectl_lowpass_arg *)arg;
+ varg->short_lowpass_kHz=hi->lowpass_kHz[0];
+ varg->long_lowpass_kHz=hi->lowpass_kHz[1];
+ }
+ break;
+
+ case VECTL_PSY_STEREO:
+ if(setp){
+ vectl_stereo_arg *varg=(vectl_stereo_arg *)arg;
+
+ if(varg->stereo_point_dB_mode<0)return(OV_EINVAL);
+ if(varg->stereo_point_dB_mode>3)return(OV_EINVAL);
+
+ hi->stereo_point_kHz[0]=varg->stereo_point_kHz_short;
+ hi->stereo_point_kHz[1]=varg->stereo_point_kHz_long;
+ hi->stereo_point_dB=varg->stereo_point_dB_mode;
+ hi->stereo_couple_p=varg->stereo_couple_p;
+ }else{
+ vectl_stereo_arg *varg=(vectl_stereo_arg *)arg;
+
+ varg->stereo_point_kHz_short=hi->stereo_point_kHz[0];
+ varg->stereo_point_kHz_long=hi->stereo_point_kHz[1];
+ varg->stereo_point_dB_mode=hi->stereo_point_dB;
+ varg->stereo_couple_p=hi->stereo_couple_p;
+ }
+ break;
+
+ case VECTL_PSY_ATH:
+ {
+ vectl_ath_arg *varg=(vectl_ath_arg *)arg;
+ if(setp){
+ hi->ath_floating_dB=varg->ath_float_dB;
+ hi->ath_fixed_dB=varg->ath_fixed_dB;
+ }else{
+ varg->ath_float_dB=hi->ath_floating_dB;
+ varg->ath_fixed_dB=hi->ath_fixed_dB;
+ }
+ }
+ break;
+
+ case VECTL_PSY_AMPTRACK:
+ if(setp){
+ vectl_amp_arg *varg=(vectl_amp_arg *)arg;
+ hi->residue_backfill_p=varg->maxdB_track_decay;
+ }else{
+ vectl_amp_arg *varg=(vectl_amp_arg *)arg;
+ varg->maxdB_track_decay=hi->residue_backfill_p;
+ }
+ break;
+
+ case VECTL_PSY_MASK_Q:
+ if(setp){
+ int i;
+ vectl_mask_arg *varg=(vectl_mask_arg *)arg;
+
+ if(varg->trigger_q<0.)return(OV_EINVAL);
+ if(varg->trigger_q>1.)return(OV_EINVAL);
+ for(i=0;i<4;i++){
+ if(varg->tonemask_q[i]<0.)return(OV_EINVAL);
+ if(varg->tonemask_q[i]>1.)return(OV_EINVAL);
+ if(varg->tonepeak_q[i]<0.)return(OV_EINVAL);
+ if(varg->tonepeak_q[i]>1.)return(OV_EINVAL);
+ if(varg->noise_q[i]<0.)return(OV_EINVAL);
+ if(varg->noise_q[i]>1.)return(OV_EINVAL);
+ }
+
+ hi->trigger_quality=varg->trigger_q;
+ for(i=0;i<4;i++){
+ hi->blocktype[i].tone_mask_quality=varg->tonemask_q[i];
+ hi->blocktype[i].tone_peaklimit_quality=varg->tonepeak_q[i];
+ hi->blocktype[i].noise_bias_quality=varg->noise_q[i];
+ hi->blocktype[i].noise_compand_quality=varg->noise_q[i];
+ }
+ }else{
+ int i;
+ vectl_mask_arg *varg=(vectl_mask_arg *)arg;
+
+ varg->trigger_q=hi->trigger_quality;
+ for(i=0;i<4;i++){
+ varg->tonemask_q[i]=hi->blocktype[i].tone_mask_quality;
+ varg->tonepeak_q[i]=hi->blocktype[i].tone_peaklimit_quality;
+ varg->noise_q[i]=hi->blocktype[i].noise_bias_quality;
+ varg->noise_q[i]=hi->blocktype[i].noise_compand_quality;
+ }
+ }
+ break;
+
+ case VECTL_PSY_NOISENORM:
+ if(setp){
+ vectl_noisenorm_arg *varg=(vectl_noisenorm_arg *)arg;
+ if(varg->noise_normalize_weight<0.)return(OV_EINVAL);
+ if(varg->noise_normalize_weight>4.)return(OV_EINVAL);
+ if(varg->noise_normalize_thresh<0.)return(OV_EINVAL);
+ if(varg->noise_normalize_thresh>.5)return(OV_EINVAL);
+
+ hi->normalize_noise_p=varg->noise_normalize_p;
+ hi->normalize_noise_unit_weight=varg->noise_normalize_weight;
+ hi->normalize_noise_minimum_upgrade=varg->noise_normalize_thresh;
+ }else{
+ vectl_noisenorm_arg *varg=(vectl_noisenorm_arg *)arg;
+ hi->normalize_noise_p=varg->noise_normalize_p;
+ hi->normalize_noise_unit_weight=varg->noise_normalize_weight;
+ hi->normalize_noise_minimum_upgrade=varg->noise_normalize_thresh;
+ }
+ break;
+
+ case VECTL_BITRATE:
+ if(setp){
+ vectl_bitrate_arg *varg=(vectl_bitrate_arg *)arg;
+
+ if(varg->avg_min>0. && varg->avg_max>0. &&
+ varg->avg_min>varg->avg_max)return(OV_EINVAL);
+ if(varg->avg_window_time>20)return(OV_EINVAL);
+ if(varg->avg_window_time>0. && varg->avg_window_time<.1)
+ return(OV_EINVAL);
+ if(varg->avg_window_center<0.)return(OV_EINVAL);
+ if(varg->avg_window_center>1.)return(OV_EINVAL);
+
+ if(varg->limit_min>0. && varg->limit_max>0. &&
+ varg->limit_min>varg->limit_max)return(OV_EINVAL);
+ if(varg->limit_window_time>20)return(OV_EINVAL);
+ if(varg->limit_window_time>0. && varg->limit_window_time<.1)
+ return(OV_EINVAL);
+
+ if(varg->avg_slew_downmax>0.)return(OV_EINVAL);
+ if(varg->avg_slew_upmax<0.)return(OV_EINVAL);
-int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg){
- return(OV_EIMPL);
+ ci->bi.queue_avg_time=hi->avg_window_time;
+ ci->bi.queue_avg_center=hi->avg_window_center;
+ ci->bi.queue_minmax_time=hi->limit_window_time;
+ ci->bi.queue_avgmin=hi->avg_min;
+ ci->bi.queue_avgmax=hi->avg_max;
+ ci->bi.queue_hardmin=hi->limit_min;
+ ci->bi.queue_hardmax=hi->limit_max;
+
+ ci->bi.avgfloat_initial=_bm_default.avgfloat_initial;
+ ci->bi.avgfloat_minimum=_bm_default.avgfloat_minimum;
+ ci->bi.avgfloat_downslew_max=hi->avg_slew_downmax;
+ ci->bi.avgfloat_upslew_max=hi->avg_slew_upmax;
+
+ if(hi->avg_noisetrack_p){
+ ci->bi.avgfloat_noise_lowtrigger=
+ _bm_default.avgfloat_noise_lowtrigger;
+ ci->bi.avgfloat_noise_hightrigger=
+ _bm_default.avgfloat_noise_hightrigger;
+ ci->bi.avgfloat_noise_minval=-6.;
+ ci->bi.avgfloat_noise_maxval=_bm_max_noise_offset[(int)approx_vbr];
+ }else{
+ ci->bi.avgfloat_noise_lowtrigger=-1.f;
+ ci->bi.avgfloat_noise_hightrigger=9999.f;
+ ci->bi.avgfloat_noise_minval=0.f;
+ ci->bi.avgfloat_noise_maxval=0.f;
+ }
+
+ hi->stereo_backfill_p=varg->stereo_backfill_p;
+ hi->residue_backfill_p=varg->residue_backfill_p;
+ }else{
+ vectl_bitrate_arg *varg=(vectl_bitrate_arg *)arg;
+
+ varg->stereo_backfill_p=hi->stereo_backfill_p;
+ varg->residue_backfill_p=hi->residue_backfill_p;
+ varg->avg_min=ci->bi.queue_avgmin;
+ varg->avg_max=ci->bi.queue_avgmax;
+ varg->avg_window_time=ci->bi.queue_avg_time;
+ varg->avg_window_center=ci->bi.queue_avg_center;
+ varg->avg_slew_downmax=ci->bi.avgfloat_downslew_max;
+ varg->avg_slew_upmax=ci->bi.avgfloat_upslew_max;
+
+ if(ci->bi.avgfloat_noise_minval!=0. ||
+ ci->bi.avgfloat_noise_maxval!=0.)
+ varg->avg_noisetrack_p=1;
+ else
+ varg->avg_noisetrack_p=0;
+
+ varg->limit_min=ci->bi.queue_hardmin;
+ varg->limit_max=ci->bi.queue_hardmax;
+ varg->limit_window_time=ci->bi.queue_minmax_time;
+
+ varg->stereo_backfill_p=hi->stereo_backfill_p;
+ varg->residue_backfill_p=hi->residue_backfill_p;
+ }
+ break;
+
+ default:
+ return(OV_EIMPL);
+ }
+
+ /* update base_quality_short and base_quality_long */
+ {
+ double max_short=0.;
+ double max_long=0.;
+
+ if(hi->impulse_block_p){
+ if(max_short<hi->blocktype[0].tone_mask_quality)
+ max_short=hi->blocktype[0].tone_mask_quality;
+ if(max_short<hi->blocktype[0].tone_peaklimit_quality)
+ max_short=hi->blocktype[0].tone_peaklimit_quality;
+ if(max_short<hi->blocktype[0].noise_bias_quality)
+ max_short=hi->blocktype[0].noise_bias_quality;
+ }
+ if(max_short<hi->blocktype[1].tone_mask_quality)
+ max_short=hi->blocktype[1].tone_mask_quality;
+ if(max_short<hi->blocktype[1].tone_peaklimit_quality)
+ max_short=hi->blocktype[1].tone_peaklimit_quality;
+ if(max_short<hi->blocktype[1].noise_bias_quality)
+ max_short=hi->blocktype[1].noise_bias_quality;
+
+ if(max_long<hi->blocktype[2].tone_mask_quality)
+ max_long=hi->blocktype[2].tone_mask_quality;
+ if(max_long<hi->blocktype[2].tone_peaklimit_quality)
+ max_long=hi->blocktype[2].tone_peaklimit_quality;
+ if(max_long<hi->blocktype[2].noise_bias_quality)
+ max_long=hi->blocktype[2].noise_bias_quality;
+
+ if(max_long<hi->blocktype[3].tone_mask_quality)
+ max_long=hi->blocktype[3].tone_mask_quality;
+ if(max_long<hi->blocktype[3].tone_peaklimit_quality)
+ max_long=hi->blocktype[3].tone_peaklimit_quality;
+ if(max_long<hi->blocktype[3].noise_bias_quality)
+ max_long=hi->blocktype[3].noise_bias_quality;
+
+ hi->base_quality_long=max_long;
+ hi->base_quality_short=max_short;
+ }
+
+ return(0);
}
No revision
No revision
1.5.2.1 +4 -4 vorbis/lib/books/coupled/_44c0_long.vqh
Index: _44c0_long.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_long.vqh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- _44c0_long.vqh 2001/12/19 01:08:18 1.5
+++ _44c0_long.vqh 2002/01/01 02:27:31 1.5.2.1
@@ -19,10 +19,10 @@
#include "codebook.h"
static long _huff_lengthlist__44c0_long[] = {
- 3, 8, 9,10,11, 4, 8,12, 7, 3, 5, 8,10, 5, 8,14,
- 8, 4, 6, 7,10, 8,10,15, 8, 6, 6, 6, 8,11,12,15,
- 9, 8, 7, 6, 4,13,15,13, 4,18,18,18,18, 2, 6,13,
- 8,17,17,17,17, 6, 8,13,12,16,14,12,10,13,14,15,
+ 4, 9,10,11,13, 6, 9,15, 8, 3, 6, 7, 9, 5, 9,13,
+ 8, 5, 6, 7, 8, 8,11,15, 9, 6, 6, 6, 8,12,12,15,
+ 10, 7, 7, 7, 5,16,16,10, 6,16,16,16,16, 1, 7,13,
+ 10,16,16,16,16, 7, 9,13,14,12,12,11, 6,13,14,11,
};
static static_codebook _huff_book__44c0_long = {
1.5.2.1 +15 -15 vorbis/lib/books/coupled/_44c0_s0_p1_0.vqh
Index: _44c0_s0_p1_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p1_0.vqh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- _44c0_s0_p1_0.vqh 2001/12/19 01:08:18 1.5
+++ _44c0_s0_p1_0.vqh 2002/01/01 02:27:31 1.5.2.1
@@ -27,34 +27,34 @@
};
static long _vq_lengthlist__44c0_s0_p1_0[] = {
- 1, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
- 8, 9, 0, 0, 0, 0, 0, 0, 0, 6, 8, 7, 0, 0, 0, 9,
- 9, 0, 0, 0, 9, 9, 0, 0, 0,12,12, 0, 0, 0, 0, 0,
- 0, 0, 5, 7, 8, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0,
- 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 6, 6, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
+ 8, 8, 0, 0, 0, 0, 0, 0, 0, 6, 9, 8, 0, 0, 0, 9,
+ 8, 0, 0, 0, 9, 8, 0, 0, 0,12,11, 0, 0, 0, 0, 0,
+ 0, 0, 6, 8, 9, 0, 0, 0, 8, 9, 0, 0, 0, 8, 9, 0,
+ 0, 0,11,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 8, 0, 0,
- 0, 8, 8, 0, 0, 0,11,10, 0, 0, 0, 0, 0, 0, 0, 5,
- 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
- 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 7, 0, 0,
+ 0, 7, 8, 0, 0, 0,11, 9, 0, 0, 0, 0, 0, 0, 0, 5,
+ 8, 9, 0, 0, 0, 7, 8, 0, 0, 0, 8, 7, 0, 0, 0,10,
+ 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
- 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 5, 9, 9, 0,
- 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,11,10, 0, 0,
+ 0, 0, 0, 5, 9, 8, 0, 0, 0, 8, 7, 0, 0, 0, 8, 7,
+ 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5, 8, 9, 0,
+ 0, 0, 7, 8, 0, 0, 0, 7, 8, 0, 0, 0,10,10, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 9,12,12, 0, 0, 0,10,11, 0, 0, 0,10,11, 0, 0, 0,
- 12,12, 0, 0, 0, 0, 0, 0, 0, 9,12,12, 0, 0, 0,11,
- 11, 0, 0, 0,11,10, 0, 0, 0,12,12, 0, 0, 0, 0, 0,
+ 8,11,12, 0, 0, 0,10,10, 0, 0, 0,10,11, 0, 0, 0,
+ 12,11, 0, 0, 0, 0, 0, 0, 0, 8,12,11, 0, 0, 0,10,
+ 10, 0, 0, 0,11,10, 0, 0, 0,11,12, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1.5.2.1 +4 -4 vorbis/lib/books/coupled/_44c0_s0_p2_0.vqh
Index: _44c0_s0_p2_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p2_0.vqh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- _44c0_s0_p2_0.vqh 2001/12/19 01:08:18 1.5
+++ _44c0_s0_p2_0.vqh 2002/01/01 02:27:31 1.5.2.1
@@ -31,11 +31,11 @@
};
static long _vq_lengthlist__44c0_s0_p2_0[] = {
- 1, 4, 4, 7, 6, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0,
- 0, 0, 0, 4, 4, 7, 7, 0, 0, 0, 0, 0, 6, 6, 8, 8,
+ 1, 4, 4, 7, 7, 0, 0, 0, 0, 0, 4, 4, 6, 7, 0, 0,
+ 0, 0, 0, 4, 4, 7, 7, 0, 0, 0, 0, 0, 6, 6, 7, 7,
0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
- 8, 9, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
- 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 9, 9, 0, 0, 0, 0, 0, 0, 0,10, 9, 0, 0, 0, 0, 0,
+ 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
};
1.5.2.1 +15 -15 vorbis/lib/books/coupled/_44c0_s0_p3_0.vqh
Index: _44c0_s0_p3_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p3_0.vqh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- _44c0_s0_p3_0.vqh 2001/12/19 01:08:18 1.5
+++ _44c0_s0_p3_0.vqh 2002/01/01 02:27:31 1.5.2.1
@@ -39,22 +39,22 @@
};
static long _vq_lengthlist__44c0_s0_p3_0[] = {
- 1, 4, 4, 6, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 5, 5, 7, 7, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5, 5, 7, 7, 7, 8, 9, 9, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 6, 6, 7, 7, 8, 8,10,10, 0, 0, 0, 0,
+ 1, 4, 4, 7, 7, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 5, 5, 7, 7, 8, 7, 9, 9, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 4, 4, 7, 7, 8, 8, 9, 9, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7, 7, 8, 8, 8, 8, 9, 9, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,10,10, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 9, 9,10,10, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9,11,11,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,11,
- 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,
- 11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
- 10,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 11,11,12,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9,10,10, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9,10,10, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,10,10,11,11,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,11,
+ 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,
+ 11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,
+ 11,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 12,11,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
1.5.2.1 +48 -35 vorbis/lib/books/coupled/_44c0_s0_p4_0.vqh
Index: _44c0_s0_p4_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p4_0.vqh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- _44c0_s0_p4_0.vqh 2001/12/19 01:08:18 1.5
+++ _44c0_s0_p4_0.vqh 2002/01/01 02:27:31 1.5.2.1
@@ -19,62 +19,75 @@
#include "codebook.h"
static long _vq_quantlist__44c0_s0_p4_0[] = {
- 7,
- 6,
- 8,
- 5,
- 9,
- 4,
- 10,
- 3,
- 11,
2,
- 12,
1,
- 13,
+ 3,
0,
- 14,
+ 4,
};
static long _vq_lengthlist__44c0_s0_p4_0[] = {
- 1, 3, 3, 6, 6,10,10,13,14,19,19,19,19,19,19, 5,
- 5, 5, 8, 8,11,11,14,14,19,19,19,19,19,19, 6, 5,
- 5, 8, 8,11,11,14,15,19,19,19,19,19,19,19, 8, 8,
- 10,10,12,13,15,15,19,19,19,19,19,19,19, 8, 8,10,
- 10,13,13,14,15,19,19,19,19,19,19,19,11,12,10,11,
- 13,14,16,16,19,19,19,19,19,19,19,13,12,11,10,13,
- 14,16,16,19,19,19,19,19,19,19,19,19,13,13,14,14,
- 18,17,19,19,19,19,19,19,19,19,19,13,13,14,14,18,
- 18,19,19,19,19,19,19,19,19,19,16,18,13,15,16,17,
- 19,19,19,19,19,19,19,19,19,19,17,14,12,17,15,19,
- 19,19,19,19,19,19,19,19,19,19,13,16,16,17,19,19,
- 19,19,19,19,19,19,19,19,19,17,12,17,15,19,19,19,
- 19,19,19,19,19,19,19,19,15,19,13,18,19,19,19,19,
- 19,19,19,19,19,19,19,19,16,19,15,19,19,19,19,19,
- 19,
+ 1, 4, 4, 0, 0, 6, 6, 7, 0, 0, 6, 7, 6, 0, 0, 0,
+ 8,12, 0, 0, 0,13, 7, 0, 0, 4, 7, 6, 0, 0,10,10,
+ 9, 0, 0,10,10,10, 0, 0, 0, 0,12, 0, 0, 0,12,12,
+ 0, 0, 4, 7, 6, 0, 0,10, 9,10, 0, 0,11,10,10, 0,
+ 0, 0,13,14, 0, 0, 0,13,12, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,10,10,
+ 0, 0,10,13,11, 0, 0,10,11,11, 0, 0, 0,12, 0, 0,
+ 0, 0, 0,12, 0, 0, 7,10,10, 0, 0,13,11,11, 0, 0,
+ 11,10,11, 0, 0, 0,14, 0, 0, 0, 0,13,13, 0, 0, 7,
+ 10,10, 0, 0,12,12,11, 0, 0,11,10,11, 0, 0, 0,12,
+ 0, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,10,10, 0, 0,10,
+ 11,11, 0, 0,10, 0,11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 7,11,10, 0, 0,11,10,11, 0, 0,13,12,12,
+ 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 7,12,11, 0,
+ 0,10,10,11, 0, 0,11,12,12, 0, 0, 0,12,14, 0, 0,
+ 0,13,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 12,12,13, 0, 0,14,13,12, 0, 0, 0, 0,11, 0, 0, 0,
+ 0, 0, 0, 0, 0,14, 0, 0, 0,11,14,12, 0, 0,14,14,
+ 13, 0, 0, 0,12,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,13,
+ 0, 0,14, 0,13, 0, 0,13,13, 0, 0, 0, 0,12,14, 0,
+ 0, 0, 0, 0, 0, 0,12,13, 0, 0, 0, 0,13,14, 0, 0,
+ 14,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
};
static float _vq_quantthresh__44c0_s0_p4_0[] = {
- -45.5, -38.5, -31.5, -24.5, -17.5, -10.5, -3.5, 3.5,
- 10.5, 17.5, 24.5, 31.5, 38.5, 45.5,
+ -31.5, -10.5, 10.5, 31.5,
};
static long _vq_quantmap__44c0_s0_p4_0[] = {
- 13, 11, 9, 7, 5, 3, 1, 0,
- 2, 4, 6, 8, 10, 12, 14,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt__44c0_s0_p4_0 = {
_vq_quantthresh__44c0_s0_p4_0,
_vq_quantmap__44c0_s0_p4_0,
- 15,
- 15
+ 5,
+ 5
};
static static_codebook _44c0_s0_p4_0 = {
- 2, 225,
+ 4, 625,
_vq_lengthlist__44c0_s0_p4_0,
- 1, -524779520, 1616642048, 4, 0,
+ 1, -525008896, 1620377600, 3, 0,
_vq_quantlist__44c0_s0_p4_0,
NULL,
&_vq_auxt__44c0_s0_p4_0,
1.4.2.1 +55 -13 vorbis/lib/books/coupled/_44c0_s0_p4_1.vqh
Index: _44c0_s0_p4_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p4_1.vqh,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- _44c0_s0_p4_1.vqh 2001/12/19 01:08:18 1.4
+++ _44c0_s0_p4_1.vqh 2002/01/01 02:27:31 1.4.2.1
@@ -19,41 +19,83 @@
#include "codebook.h"
static long _vq_quantlist__44c0_s0_p4_1[] = {
+ 10,
+ 9,
+ 11,
+ 8,
+ 12,
+ 7,
+ 13,
+ 6,
+ 14,
+ 5,
+ 15,
+ 4,
+ 16,
3,
+ 17,
2,
- 4,
+ 18,
1,
- 5,
+ 19,
0,
- 6,
+ 20,
};
static long _vq_lengthlist__44c0_s0_p4_1[] = {
- 2, 4, 4, 5, 5, 6, 6, 8, 5, 5, 6, 6, 6, 6, 8, 5,
- 5, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 8, 8, 8, 6,
- 6, 6, 6, 8, 8, 8, 7, 7, 7, 7, 8, 8, 8, 6, 6, 7,
- 7,
+ 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,
+ 10,10,10,10,10,13, 5, 5, 6, 6, 8, 8, 8, 8, 9, 9,
+ 9, 9,10,10,10,10,10,10,10,10,12, 5, 5, 6, 6, 8,
+ 7, 8, 8, 9, 8, 9, 9,10,10,10,10,10,10,10,10,14,
+ 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,
+ 11,11,11,10,13,12,13, 7, 7, 8, 8, 9, 9, 9, 9,10,
+ 10,10,10,10,11,11,11,10,11,13,13,13, 8, 8, 8, 8,
+ 9, 9, 9, 9,10,10,10,10,11,10,11,11,11,11,14,13,
+ 13, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,11,11,11,11,
+ 11,11,11,13,13,13, 9, 8, 9, 9, 9, 9,10,10,10,10,
+ 11,11,11,11,11,11,11,11,14,13,15,14,14, 9, 9,10,
+ 9,10,10,10,10,11,11,11,11,11,11,11,11,14,14,13,
+ 14,13, 9, 9,10,10,10,10,10,11,11,11,11,11,11,11,
+ 11,11,14,13,14,13,14, 9, 9,10,10,10,10,10,11,11,
+ 11,11,11,11,11,11,11,13,13,13,14,14,10,10,10,10,
+ 10,10,11,11,11,11,11,11,11,11,11,11,14,14,14,14,
+ 13,14,15,10,10,10,10,11,11,11,11,11,11,11,11,11,
+ 11,13,13,14,14,14,14,14,10,10,11,11,11,11,11,11,
+ 11,12,11,11,11,11,15,14,14,14,15,15,14,10, 9,10,
+ 10,11,11,11,11,11,11,11,11,11,11,14,13,14,14,14,
+ 13,14,10,11,11,11,11,11,11,11,11,11,12,11,12,11,
+ 14,14,14,14,15,14,15,14,14,11,10,11,11,11,11,11,
+ 11,11,11,11,11,14,14,15,14,15,14,14,14,14,11,11,
+ 12,11,11,11,11,11,11,12,12,12,14,14,14,14,14,14,
+ 14,15,14,11,11,11,11,11,11,11,11,11,12,11,11,15,
+ 15,14,15,15,14,15,14,14,11,12,11,11,11,11,11,11,
+ 11,11,12,11,14,14,14,14,15,14,14,14,14,14,14,11,
+ 11,11,11,11,11,11,11,12,11,
};
static float _vq_quantthresh__44c0_s0_p4_1[] = {
- -2.5, -1.5, -0.5, 0.5, 1.5, 2.5,
+ -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5,
+ -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5,
+ 6.5, 7.5, 8.5, 9.5,
};
static long _vq_quantmap__44c0_s0_p4_1[] = {
- 5, 3, 1, 0, 2, 4, 6,
+ 19, 17, 15, 13, 11, 9, 7, 5,
+ 3, 1, 0, 2, 4, 6, 8, 10,
+ 12, 14, 16, 18, 20,
};
static encode_aux_threshmatch _vq_auxt__44c0_s0_p4_1 = {
_vq_quantthresh__44c0_s0_p4_1,
_vq_quantmap__44c0_s0_p4_1,
- 7,
- 7
+ 21,
+ 21
};
static static_codebook _44c0_s0_p4_1 = {
- 2, 49,
+ 2, 441,
_vq_lengthlist__44c0_s0_p4_1,
- 1, -533200896, 1611661312, 3, 0,
+ 1, -529268736, 1611661312, 5, 0,
_vq_quantlist__44c0_s0_p4_1,
NULL,
&_vq_auxt__44c0_s0_p4_1,
1.2.2.1 +40 -40 vorbis/lib/books/coupled/_44c0_s0_p5_0.vqh
Index: _44c0_s0_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p5_0.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s0_p5_0.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s0_p5_0.vqh 2002/01/01 02:27:31 1.2.2.1
@@ -27,46 +27,46 @@
};
static long _vq_lengthlist__44c0_s0_p5_0[] = {
- 1, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
- 8, 8, 0, 0, 0, 0, 0, 0, 0, 5, 8, 8, 0, 0, 0, 9,
- 9, 0, 0, 0, 9, 9, 0, 0, 0,13,13, 0, 0, 0, 0, 0,
- 0, 0, 6, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0,
- 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 8, 0, 0,
- 0, 8, 8, 0, 0, 0,11,10, 0, 0, 0, 0, 0, 0, 0, 5,
- 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
- 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 5, 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
- 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5, 9, 9, 0,
- 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,10, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 8,13,13, 0, 0, 0,10,11, 0, 0, 0,10,11, 0, 0, 0,
- 11,11, 0, 0, 0, 0, 0, 0, 0, 8,13,13, 0, 0, 0,11,
- 10, 0, 0, 0,11,10, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
+ 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,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,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,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,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, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9,
};
static float _vq_quantthresh__44c0_s0_p5_0[] = {
1.2.2.1 +19 -19 vorbis/lib/books/coupled/_44c0_s0_p6_0.vqh
Index: _44c0_s0_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p6_0.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s0_p6_0.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s0_p6_0.vqh 2002/01/01 02:27:31 1.2.2.1
@@ -39,25 +39,25 @@
};
static long _vq_lengthlist__44c0_s0_p6_0[] = {
- 1, 4, 4, 7, 7,10,10,12,12, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 4, 4, 7, 7,10,10,12,12, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 4, 4, 7, 7,10,10,12,12, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 7, 6, 7, 7,11,11,13,13, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 7, 7,11,11,13,13, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,11,11,14,14, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9,11,11,14,14, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,11,12,12,14,14,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,14,
- 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,
- 15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,
- 13,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 14,15,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0,16,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,15,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8,
};
static float _vq_quantthresh__44c0_s0_p6_0[] = {
1.2.2.1 +48 -14 vorbis/lib/books/coupled/_44c0_s0_p7_0.vqh
Index: _44c0_s0_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s0_p7_0.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s0_p7_0.vqh 2002/01/01 02:27:31 1.2.2.1
@@ -19,41 +19,75 @@
#include "codebook.h"
static long _vq_quantlist__44c0_s0_p7_0[] = {
- 3,
2,
- 4,
1,
- 5,
+ 3,
0,
- 6,
+ 4,
};
static long _vq_lengthlist__44c0_s0_p7_0[] = {
- 1, 3, 3,11,11,11,11, 3, 6, 7,11,11,11,11, 4, 8,
- 7,11,11,11,11,11,11, 9,10,11,11,11,11,11,11,11,
- 11,11,11,11,11,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,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,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,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,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, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9,
};
static float _vq_quantthresh__44c0_s0_p7_0[] = {
- -167.5, -100.5, -33.5, 33.5, 100.5, 167.5,
+ -157.5, -52.5, 52.5, 157.5,
};
static long _vq_quantmap__44c0_s0_p7_0[] = {
- 5, 3, 1, 0, 2, 4, 6,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt__44c0_s0_p7_0 = {
_vq_quantthresh__44c0_s0_p7_0,
_vq_quantmap__44c0_s0_p7_0,
- 7,
- 7
+ 5,
+ 5
};
static static_codebook _44c0_s0_p7_0 = {
- 2, 49,
+ 4, 625,
_vq_lengthlist__44c0_s0_p7_0,
- 1, -520544256, 1624293376, 3, 0,
+ 1, -520470528, 1624915968, 3, 0,
_vq_quantlist__44c0_s0_p7_0,
NULL,
&_vq_auxt__44c0_s0_p7_0,
1.2.2.1 +48 -64 vorbis/lib/books/coupled/_44c0_s0_p7_1.vqh
Index: _44c0_s0_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s0_p7_1.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s0_p7_1.vqh 2002/01/01 02:27:31 1.2.2.1
@@ -19,91 +19,75 @@
#include "codebook.h"
static long _vq_quantlist__44c0_s0_p7_1[] = {
- 11,
- 10,
- 12,
- 9,
- 13,
- 8,
- 14,
- 7,
- 15,
- 6,
- 16,
- 5,
- 17,
- 4,
- 18,
- 3,
- 19,
2,
- 20,
1,
- 21,
+ 3,
0,
- 22,
+ 4,
};
static long _vq_lengthlist__44c0_s0_p7_1[] = {
- 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10,11,11,12,11,12,
- 12,10,10,10,10,11,10, 5, 5, 5, 7, 7, 9, 9,10,11,
- 13,12,12,12,12,12,12,12,11,11,10,11,10,11,15, 6,
- 5, 7, 7, 9, 9,11,11,11,11,12,11,13,11,12,12,10,
- 10,10,10,10,10,15, 7, 7, 8, 8,10,10,11,12,15,14,
- 14,14,15,14,14,15,11,11,11,11,12,11,14, 8, 7, 8,
- 8,11,10,12,12,12,13,12,12,14,14,15,15,11,11,11,
- 13,10,11,15,11,11, 8, 9,10,10,12,11,13,14,14,15,
- 14,15,15,15,11,12,11,11,11,13,15,15,15, 9, 9,10,
- 10,13,12,13,13,13,15,15,14,15,14,12,11,10,12,12,
- 12,15,15,15,11, 9,11,11,11,11,13,15,15,15,15,15,
- 13,15,11,12,12,11,15,12,15,14,15,10,11,10,11,12,
- 12,13,12,15,15,14,15,15,13,11,12,11,12,13,12,15,
- 15,15,14,14,12,10,13,12,12,14,15,13,15,14,15,15,
- 11,11,11,12,12,13,15,15,15,15,14,11,12,13,12,12,
- 13,15,14,15,14,15,14,10,12,10,12,13,13,15,15,15,
- 15,15,13,14,13,12,13,13,14,13,15,15,13,15,12,11,
- 10,11,12,13,15,15,15,15,15,15,13,13,12,15,14,14,
- 15,15,13,15,15,10,11,11,11,12,15,15,15,15,15,15,
- 15,14,14,15,14,13,14,14,15,14,15,14,13,11,11,11,
- 12,12,15,15,15,15,15,15,15,13,15,13,13,15,15,15,
- 15,15,15,11,13,12,12,12,13,15,15,15,15,15,15,15,
- 14,13,15,15,14,13,15,15,15,14,12,11,15,11,13,12,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,14,15,
- 14,12,12,11,13,12,13,15,15,14,15,15,15,15,15,15,
- 15,15,15,14,15,15,15,15,13,10,14,11,13,14,15,15,
- 15,15,15,15,15,15,15,13,15,15,15,14,15,15,14,12,
- 12,12,12,13,13,15,15,15,14,15,14,15,15,15,15,15,
- 15,15,15,15,14,15,12,13,13,13,13,12,15,15,15,15,
- 15,15,15,15,15,15,15,15,14,15,14,15,14,13,12,12,
- 13,15,13,15,15,15,15,15,15,15,15,15,14,15,15,15,
- 13,15,13,14,13,13,13,13,14,15,15,15,15,15,14,15,
- 15,15,15,14,15,15,14,14,15,15,15,12,13,12,12,14,
- 14,
+ 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,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,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,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,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, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9,
};
static float _vq_quantthresh__44c0_s0_p7_1[] = {
- -31.5, -28.5, -25.5, -22.5, -19.5, -16.5, -13.5, -10.5,
- -7.5, -4.5, -1.5, 1.5, 4.5, 7.5, 10.5, 13.5,
- 16.5, 19.5, 22.5, 25.5, 28.5, 31.5,
+ -31.5, -10.5, 10.5, 31.5,
};
static long _vq_quantmap__44c0_s0_p7_1[] = {
- 21, 19, 17, 15, 13, 11, 9, 7,
- 5, 3, 1, 0, 2, 4, 6, 8,
- 10, 12, 14, 16, 18, 20, 22,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt__44c0_s0_p7_1 = {
_vq_quantthresh__44c0_s0_p7_1,
_vq_quantmap__44c0_s0_p7_1,
- 23,
- 23
+ 5,
+ 5
};
static static_codebook _44c0_s0_p7_1 = {
- 2, 529,
+ 4, 625,
_vq_lengthlist__44c0_s0_p7_1,
- 1, -525303808, 1614282752, 5, 0,
+ 1, -525008896, 1620377600, 3, 0,
_vq_quantlist__44c0_s0_p7_1,
NULL,
&_vq_auxt__44c0_s0_p7_1,
1.2.2.1 +57 -13 vorbis/lib/books/coupled/_44c0_s0_p7_2.vqh
Index: _44c0_s0_p7_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s0_p7_2.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s0_p7_2.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s0_p7_2.vqh 2002/01/01 02:27:31 1.2.2.1
@@ -19,39 +19,83 @@
#include "codebook.h"
static long _vq_quantlist__44c0_s0_p7_2[] = {
+ 10,
+ 9,
+ 11,
+ 8,
+ 12,
+ 7,
+ 13,
+ 6,
+ 14,
+ 5,
+ 15,
+ 4,
+ 16,
+ 3,
+ 17,
+ 2,
+ 18,
1,
+ 19,
0,
- 2,
+ 20,
};
static long _vq_lengthlist__44c0_s0_p7_2[] = {
- 2, 5, 5, 7, 6, 6, 7, 6, 6, 5, 6, 6, 7, 7, 7, 7,
- 7, 7, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,
- 8, 8, 8, 8, 6, 7, 7, 8, 7, 7, 7, 7, 7, 6, 7, 7,
- 7, 7, 7, 8, 7, 7, 7, 7, 8, 8, 8, 8, 7, 8, 8, 6,
- 7, 7, 7, 7, 7, 7, 6, 7, 6, 7, 7, 8, 7, 7, 8, 7,
- 7,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8,
};
static float _vq_quantthresh__44c0_s0_p7_2[] = {
- -0.5, 0.5,
+ -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5,
+ -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5,
+ 6.5, 7.5, 8.5, 9.5,
};
static long _vq_quantmap__44c0_s0_p7_2[] = {
- 1, 0, 2,
+ 19, 17, 15, 13, 11, 9, 7, 5,
+ 3, 1, 0, 2, 4, 6, 8, 10,
+ 12, 14, 16, 18, 20,
};
static encode_aux_threshmatch _vq_auxt__44c0_s0_p7_2 = {
_vq_quantthresh__44c0_s0_p7_2,
_vq_quantmap__44c0_s0_p7_2,
- 3,
- 3
+ 21,
+ 21
};
static static_codebook _44c0_s0_p7_2 = {
- 4, 81,
+ 2, 441,
_vq_lengthlist__44c0_s0_p7_2,
- 1, -535822336, 1611661312, 2, 0,
+ 1, -529268736, 1611661312, 5, 0,
_vq_quantlist__44c0_s0_p7_2,
NULL,
&_vq_auxt__44c0_s0_p7_2,
1.5.2.1 +408 -3 vorbis/lib/books/coupled/_44c0_s1_p5_0.vqh
Index: _44c0_s1_p5_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s1_p5_0.vqh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- _44c0_s1_p5_0.vqh 2001/12/19 01:08:18 1.5
+++ _44c0_s1_p5_0.vqh 2002/01/01 02:27:31 1.5.2.1
@@ -25,11 +25,416 @@
};
static long _vq_lengthlist__44c0_s1_p5_0[] = {
- 1, 3, 3, 0, 0, 0, 0, 0, 0, 3, 6, 6, 0, 0, 0, 0,
- 0, 0, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
+ 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 5, 8, 8, 0, 0, 0, 0, 0, 0, 7,10,10, 0, 0, 0,
+ 0, 0, 0, 7, 9,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 5, 8, 7, 0, 0, 0, 0, 0, 0, 7,10, 9, 0, 0,
+ 0, 0, 0, 0, 8,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 8, 0, 0, 0, 0,
+ 0, 0, 8,10,10, 0, 0, 0, 0, 0, 0, 8,10,10, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,10,10, 0, 0, 0,
+ 0, 0, 0,10,10,12, 0, 0, 0, 0, 0, 0,10,12,12, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,10,10, 0, 0,
+ 0, 0, 0, 0, 9,12,10, 0, 0, 0, 0, 0, 0,10,12,12,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 5, 7, 8, 0, 0, 0, 0, 0, 0, 8,10,10, 0, 0,
+ 0, 0, 0, 0, 8,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 7,10,10, 0, 0, 0, 0, 0, 0,10,12,12, 0,
+ 0, 0, 0, 0, 0, 9,10,12, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7,10,10, 0, 0, 0, 0, 0, 0,10,12,12,
+ 0, 0, 0, 0, 0, 0, 9,12,10, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
};
@@ -49,7 +454,7 @@
};
static static_codebook _44c0_s1_p5_0 = {
- 4, 81,
+ 8, 6561,
_vq_lengthlist__44c0_s1_p5_0,
1, -535822336, 1611661312, 2, 0,
_vq_quantlist__44c0_s1_p5_0,
1.4.2.1 +19 -19 vorbis/lib/books/coupled/_44c0_s1_p6_0.vqh
Index: _44c0_s1_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s1_p6_0.vqh,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- _44c0_s1_p6_0.vqh 2001/12/19 01:08:18 1.4
+++ _44c0_s1_p6_0.vqh 2002/01/01 02:27:31 1.4.2.1
@@ -39,25 +39,25 @@
};
static long _vq_lengthlist__44c0_s1_p6_0[] = {
- 1, 3, 2, 4, 5, 8, 9,11,11, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 9, 9,11,11, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 9, 9,11,11, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,10,10,12,12, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,12,12, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,12,13, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,12,12, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,13,13,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,13,
- 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,11,
- 13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
- 12,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 13,13,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0,15,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8,
};
static float _vq_quantthresh__44c0_s1_p6_0[] = {
1.2.2.1 +4 -4 vorbis/lib/books/coupled/_44c0_s1_p7_0.vqh
Index: _44c0_s1_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s1_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s1_p7_0.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s1_p7_0.vqh 2002/01/01 02:27:31 1.2.2.1
@@ -29,10 +29,10 @@
};
static long _vq_lengthlist__44c0_s1_p7_0[] = {
- 1, 3, 3,11,11,11,11, 3, 6, 7,11,11,11,11, 4, 8,
- 7,11,11,11,11,11,11, 9,10,11,11,11,11,11,11,11,
- 11,11,11,11,11,10,10,10,10,10,10,10,10,10,10,10,
- 10,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5,
};
static float _vq_quantthresh__44c0_s1_p7_0[] = {
1.2.2.1 +34 -34 vorbis/lib/books/coupled/_44c0_s1_p7_1.vqh
Index: _44c0_s1_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s1_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s1_p7_1.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s1_p7_1.vqh 2002/01/01 02:27:32 1.2.2.1
@@ -45,40 +45,40 @@
};
static long _vq_lengthlist__44c0_s1_p7_1[] = {
- 1, 4, 4, 6, 6, 8, 8, 9, 9,10, 9,11,11,11,11,12,
- 11, 9, 9, 9,10,10,10, 6, 5, 6, 7, 7, 9, 9,10,10,
- 12,11,12,12,12,12,12,12,10,11,10,11,10,11,15, 6,
- 5, 7, 7, 9, 9,11,10,11,11,12,11,12,11,12,12,10,
- 10,10,10,10, 9,15, 7, 7, 8, 8,10,10,11,12,15,13,
- 13,13,15,13,13,14,11,11,11,11,12,11,13, 8, 7, 8,
- 8,11,10,11,12,12,12,12,12,13,13,14,14,11,11,10,
- 12,10,10,14,11,10, 8, 8,10, 9,12,11,12,13,13,14,
- 13,14,14,14,11,11,11,11,10,13,14,14,14, 9, 9, 9,
- 10,12,12,12,13,13,14,14,13,14,13,12,11,10,12,12,
- 12,14,14,14,10, 9,11,10,11,10,12,14,14,14,14,14,
- 13,14,11,12,12,11,14,12,14,13,14,10,10,10,11,12,
- 12,13,12,14,14,13,14,14,13,11,11,11,12,13,12,14,
- 14,14,13,13,11,10,12,12,12,13,14,13,14,13,14,14,
- 11,11,11,12,12,12,14,14,14,14,13,11,12,12,12,12,
- 13,14,13,14,13,14,13,10,12,10,11,13,13,14,14,14,
- 14,14,13,13,13,12,12,13,13,13,14,14,13,14,12,11,
- 10,10,12,12,14,14,14,14,14,14,13,12,12,14,13,13,
- 14,14,13,14,14,10,11,11,11,12,14,14,14,14,14,14,
- 14,13,13,14,13,13,13,13,14,13,14,13,13,11,11,10,
- 11,12,14,14,14,14,14,14,14,13,14,12,13,14,14,14,
- 14,14,14,11,13,12,12,12,12,14,14,14,14,14,14,14,
- 13,13,14,14,13,13,14,14,14,13,12,11,14,11,13,12,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,13,14,
- 13,12,12,11,13,12,12,14,14,13,14,14,14,14,14,14,
- 14,14,14,13,14,14,14,14,12,10,13,10,12,13,14,14,
- 14,14,14,14,14,14,14,13,14,14,14,13,14,14,13,12,
- 12,12,12,12,12,14,14,14,13,14,13,14,14,14,14,14,
- 14,14,14,14,13,14,12,12,12,13,13,12,14,14,14,14,
- 14,14,14,14,14,14,14,14,13,14,13,14,13,12,11,12,
- 12,14,13,14,14,14,14,14,14,14,14,14,13,14,14,14,
- 13,14,13,13,13,13,13,13,13,14,14,14,14,14,13,14,
- 14,14,14,13,14,14,13,13,14,14,14,12,13,12,12,14,
- 14,
+ 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, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9,
};
static float _vq_quantthresh__44c0_s1_p7_1[] = {
1.2.2.1 +6 -6 vorbis/lib/books/coupled/_44c0_s1_p7_2.vqh
Index: _44c0_s1_p7_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s1_p7_2.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s1_p7_2.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s1_p7_2.vqh 2002/01/01 02:27:32 1.2.2.1
@@ -25,12 +25,12 @@
};
static long _vq_lengthlist__44c0_s1_p7_2[] = {
- 2, 5, 5, 7, 6, 7, 7, 6, 7, 5, 5, 5, 7, 7, 7, 7,
- 7, 7, 5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,
- 8, 7, 8, 8, 7, 7, 7, 8, 7, 7, 8, 7, 8, 7, 7, 7,
- 8, 8, 7, 7, 7, 8, 7, 7, 7, 7, 8, 8, 7, 8, 8, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 7, 8, 8,
- 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6,
};
static float _vq_quantthresh__44c0_s1_p7_2[] = {
1.5.2.1 +1 -1 vorbis/lib/books/coupled/_44c0_s2_p6_0.vqh
Index: _44c0_s2_p6_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s2_p6_0.vqh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- _44c0_s2_p6_0.vqh 2001/12/19 01:08:18 1.5
+++ _44c0_s2_p6_0.vqh 2002/01/01 02:27:32 1.5.2.1
@@ -31,7 +31,7 @@
};
static long _vq_lengthlist__44c0_s2_p6_0[] = {
- 1, 3, 2, 4, 5, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+ 1, 3, 2, 4, 5, 7, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1.4.2.1 +4 -4 vorbis/lib/books/coupled/_44c0_s2_p7_0.vqh
Index: _44c0_s2_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s2_p7_0.vqh,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- _44c0_s2_p7_0.vqh 2001/12/19 01:08:18 1.4
+++ _44c0_s2_p7_0.vqh 2002/01/01 02:27:32 1.4.2.1
@@ -29,10 +29,10 @@
};
static long _vq_lengthlist__44c0_s2_p7_0[] = {
- 1, 3, 3,11,11,11,11, 3, 6, 7,11,11,11,11, 4, 8,
- 7,11,11,11,11,11,11, 9,10,11,11,11,11,11,11,11,
- 11,11,11,11,11,10,10,10,10,10,10,10,10,10,10,10,
- 10,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5,
};
static float _vq_quantthresh__44c0_s2_p7_0[] = {
1.2.2.1 +34 -34 vorbis/lib/books/coupled/_44c0_s2_p7_1.vqh
Index: _44c0_s2_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s2_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s2_p7_1.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s2_p7_1.vqh 2002/01/01 02:27:32 1.2.2.1
@@ -45,40 +45,40 @@
};
static long _vq_lengthlist__44c0_s2_p7_1[] = {
- 1, 4, 4, 6, 6, 8, 8, 9, 9,10, 9,11,10,11,11,12,
- 11, 9, 9, 9,10,10,10, 6, 5, 6, 7, 7, 9, 9,10,10,
- 12,11,12,12,12,12,12,12,10,11,10,11,10,11,15, 6,
- 5, 7, 7, 9, 9,11,10,11,11,12,11,12,11,12,12,10,
- 10,10, 9,10, 9,15, 7, 8, 8, 8,10,10,11,12,15,13,
- 13,13,15,13,13,14,11,11,11,11,12,11,13, 8, 7, 8,
- 8,11,10,11,12,12,12,12,12,13,13,14,14,11,11,10,
- 12,10,10,14,12,11, 8, 8,10, 9,12,11,12,13,13,14,
- 13,14,14,14,11,11,11,11,10,13,14,14,14, 8, 9, 9,
- 10,12,12,12,13,13,14,14,13,14,13,12,11,10,12,12,
- 12,14,14,14,10, 9,11,10,11,10,12,14,14,14,14,14,
- 13,14,11,12,12,11,14,12,14,13,14,10,10,10,11,12,
- 12,13,12,14,14,13,14,14,13,11,11,11,12,13,12,14,
- 14,14,13,13,11,10,12,12,12,13,14,13,14,13,14,14,
- 11,11,11,12,12,12,14,14,14,14,13,11,12,12,12,12,
- 13,14,13,14,13,14,13,10,12,10,11,13,13,14,14,14,
- 14,14,13,13,13,12,12,13,13,13,14,14,13,14,12,11,
- 10,10,12,12,14,14,14,14,14,14,13,12,12,14,13,13,
- 14,14,13,14,14,10,11,11,11,12,14,14,14,14,14,14,
- 14,13,13,14,13,13,13,13,14,13,14,13,13,11,11,10,
- 11,12,14,14,14,14,14,14,14,13,14,12,13,14,14,14,
- 14,14,14,11,13,12,12,12,12,14,14,14,14,14,14,14,
- 13,13,14,14,13,13,14,14,14,13,12,11,14,10,13,12,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,13,14,
- 13,12,12,11,13,11,12,14,14,13,14,14,14,14,14,14,
- 14,14,14,13,14,14,14,14,12,10,13,10,12,13,14,14,
- 14,14,14,14,14,14,14,13,14,14,14,13,14,14,13,12,
- 12,11,12,12,12,14,14,14,13,14,13,14,14,14,14,14,
- 14,14,14,14,13,14,12,12,12,13,13,11,14,14,14,14,
- 14,14,14,14,14,14,14,14,13,14,13,14,13,12,11,12,
- 12,14,13,14,14,14,14,14,14,14,14,14,13,14,14,14,
- 13,14,13,13,13,13,13,13,13,14,14,14,14,14,13,14,
- 14,14,14,13,14,14,13,13,14,14,14,12,13,12,12,14,
- 14,
+ 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, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9,
};
static float _vq_quantthresh__44c0_s2_p7_1[] = {
1.2.2.1 +6 -6 vorbis/lib/books/coupled/_44c0_s2_p7_2.vqh
Index: _44c0_s2_p7_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s2_p7_2.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s2_p7_2.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s2_p7_2.vqh 2002/01/01 02:27:32 1.2.2.1
@@ -25,12 +25,12 @@
};
static long _vq_lengthlist__44c0_s2_p7_2[] = {
- 2, 5, 4, 7, 6, 7, 7, 6, 7, 5, 5, 5, 7, 7, 7, 7,
- 7, 7, 5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,
- 8, 8, 8, 8, 7, 7, 7, 8, 8, 7, 8, 7, 8, 7, 7, 7,
- 8, 8, 8, 8, 7, 8, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 7, 8, 8,
- 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6,
};
static float _vq_quantthresh__44c0_s2_p7_2[] = {
1.2.2.1 +4 -4 vorbis/lib/books/coupled/_44c0_s3_p7_0.vqh
Index: _44c0_s3_p7_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s3_p7_0.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s3_p7_0.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s3_p7_0.vqh 2002/01/01 02:27:32 1.2.2.1
@@ -29,10 +29,10 @@
};
static long _vq_lengthlist__44c0_s3_p7_0[] = {
- 1, 3, 3,11,11,11,11, 3, 6, 7,11,11,11,11, 4, 8,
- 7,11,11,11,11,11,11, 9,10,11,11,11,11,11,11,11,
- 11,11,11,11,11,10,10,10,10,10,10,10,10,10,10,10,
- 10,
+ 1, 3, 3,10,10,12,12, 6, 4, 6,11,10,12,12, 6, 6,
+ 4,10,10,12,12,12, 6,12,12,11,12,12,12,11, 5,12,
+ 9,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+ 11,
};
static float _vq_quantthresh__44c0_s3_p7_0[] = {
1.2.2.1 +33 -33 vorbis/lib/books/coupled/_44c0_s3_p7_1.vqh
Index: _44c0_s3_p7_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s3_p7_1.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s3_p7_1.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s3_p7_1.vqh 2002/01/01 02:27:32 1.2.2.1
@@ -45,39 +45,39 @@
};
static long _vq_lengthlist__44c0_s3_p7_1[] = {
- 1, 4, 4, 5, 5, 8, 8, 9, 9,10, 9,11,11,12,11,12,
- 11, 9, 9, 9,10,11,10, 6, 5, 6, 8, 8, 9, 9,10,10,
- 12,11,12,12,12,12,12,12,10,11,10,11,10,11,15, 6,
- 5, 8, 8, 9, 9,11,10,11,11,12,11,12,11,12,12,10,
- 10,10,10,10, 9,15, 7, 8, 8, 8,10,10,11,12,14,13,
- 13,13,14,13,13,14,11,11,11,11,12,11,13, 8, 8, 8,
- 8,11,10,11,12,12,12,12,12,13,13,14,14,11,11,10,
- 12,10,10,14,12,11, 9, 9,10,10,12,11,12,13,13,14,
- 13,14,14,14,11,11,11,11,10,13,14,14,14, 9, 9, 9,
- 10,12,12,12,13,13,14,14,13,14,13,12,11,10,12,12,
- 12,14,14,14,11, 9,11,10,11,10,12,14,14,14,14,14,
- 13,14,11,12,12,11,14,12,14,13,14,10,11,10,11,12,
- 12,13,12,14,14,13,14,14,13,11,11,11,12,13,12,14,
- 14,14,14,13,12,10,12,12,12,13,14,13,14,13,14,14,
- 11,11,11,12,12,12,14,14,14,14,13,11,12,12,12,12,
- 13,14,13,14,13,14,13,10,12,10,11,13,13,14,14,14,
- 14,14,13,13,13,12,12,13,13,13,14,14,13,14,12,11,
- 10,10,12,12,14,14,14,14,14,14,13,12,12,14,13,13,
- 14,14,13,14,14,10,11,11,11,12,14,14,14,14,14,14,
- 14,13,13,14,13,13,13,13,14,13,14,13,13,11,11,10,
- 11,12,14,14,14,14,14,14,14,13,14,12,13,14,14,14,
- 14,14,14,11,13,12,12,12,12,14,14,14,14,14,14,14,
- 13,13,14,14,13,13,14,14,14,13,12,11,14,11,13,12,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,13,14,
- 13,12,12,11,13,12,12,14,14,13,14,14,14,14,14,14,
- 14,14,14,13,14,14,14,14,12,10,13,10,12,13,14,14,
- 14,14,14,14,14,14,14,13,14,14,14,13,14,14,13,12,
- 12,12,12,12,12,14,14,14,13,14,13,14,14,14,14,14,
- 14,14,14,14,13,14,12,12,12,13,13,12,14,14,14,14,
- 14,14,14,14,14,14,14,14,13,14,13,14,13,12,12,12,
- 12,14,13,14,14,14,14,14,14,14,14,14,13,14,14,14,
- 13,14,13,13,13,13,13,13,13,14,14,14,14,14,13,14,
- 14,14,14,13,14,14,13,13,14,14,14,12,13,12,12,14,
+ 1, 4, 4, 6, 6, 8, 7, 8, 8, 9, 9,10,10,10,10,11,
+ 10,10,10,10,10,11,11, 6, 6, 6, 7, 8, 9, 9, 9, 9,
+ 10,10,11,11,11,11,12,11,10,11,10,11,12,11,14, 6,
+ 6, 8, 7, 8, 9, 9, 9,10,10,11,11,10,11,11,11,10,
+ 10,10,10,11,11,15, 7, 8, 8, 8, 9, 9,10,10,11,11,
+ 12,12,11,12,12,12,11,11,11,11,12,12,15, 8, 7, 8,
+ 7, 9, 9,10,10,11,11,11,11,12,11,11,12,11,11,11,
+ 11,12,12,14,10,10, 8, 8,10,10,10,11,11,12,11,12,
+ 12,12,12,15,12,13,11,11,12,12,15,15,16, 8, 8,10,
+ 10,11,11,11,11,11,12,11,12,11,12,11,12,11,12,12,
+ 12,15,15,15, 9, 9, 9,10,11,11,11,11,12,12,12,12,
+ 13,14,13,12,12,12,12,13,15,15,16, 9, 9, 9, 9,11,
+ 11,12,12,11,12,11,13,12,13,12,13,12,12,13,13,15,
+ 13,14,12,12,10,10,11,11,12,11,13,12,13,12,13,12,
+ 13,13,12,13,14,13,14,14,14,16,15,10,10,11,11,12,
+ 12,12,12,11,12,12,13,14,13,13,12,13,13,16,15,15,
+ 14,15,11,11,12,11,12,11,13,13,13,12,12,13,13,13,
+ 13,12,13,13,15,14,16,15,16,11,11,11,11,11,11,11,
+ 13,12,13,12,13,13,13,13,12,14,13,16,16,16,16,14,
+ 13,13,12,11,12,12,13,12,13,12,14,13,12,12,13,13,
+ 14,12,14,16,15,15,14,14,15,10,10,12,12,12,13,11,
+ 13,12,13,13,13,13,14,13,14,14,14,14,14,13,14,13,
+ 11,12,13,12,13,12,14,12,13,13,14,13,13,14,14,13,
+ 14,14,15,14,15,14,14,11,12,13,13,11,13,11,13,14,
+ 13,12,12,13,13,14,13,14,14,16,13,13,13,14,13,14,
+ 13,12,13,12,13,13,14,13,13,13,13,12,14,14,14,14,
+ 14,16,16,14,13,14,14,13,13,12,13,13,13,13,13,14,
+ 13,14,13,14,13,14,15,15,13,13,12,14,14,14,13,12,
+ 14,13,13,13,14,13,13,13,14,15,14,13,14,14,14,14,
+ 14,13,14,13,13,13,13,13,14,13,13,13,14,13,14,13,
+ 14,14,13,14,14,14,14,13,12,13,14,13,15,13,14,13,
+ 15,13,14,13,14,14,14,14,15,14,14,14,14,14,14,13,
+ 14,13,13,13,13,13,15,14,14,14,14,14,14,13,14,14,
14,
};
1.2.2.1 +5 -5 vorbis/lib/books/coupled/_44c0_s3_p7_2.vqh
Index: _44c0_s3_p7_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_s3_p7_2.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- _44c0_s3_p7_2.vqh 2001/12/19 01:08:18 1.2
+++ _44c0_s3_p7_2.vqh 2002/01/01 02:27:32 1.2.2.1
@@ -25,11 +25,11 @@
};
static long _vq_lengthlist__44c0_s3_p7_2[] = {
- 2, 4, 4, 7, 6, 7, 8, 7, 7, 5, 5, 5, 8, 7, 7, 7,
- 7, 7, 4, 5, 5, 7, 8, 7, 8, 7, 7, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 7, 7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 8,
- 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7,
- 7, 7, 7, 8, 7, 7, 7, 8, 7, 7, 7, 8, 8, 8, 8, 8,
+ 3, 5, 5, 7, 6, 6, 7, 6, 6, 5, 5, 6, 7, 7, 7, 7,
+ 7, 7, 5, 6, 5, 7, 7, 7, 7, 7, 6, 7, 7, 8, 7, 8,
+ 7, 8, 7, 8, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7,
+ 7, 7, 6, 7, 6, 7, 7, 8, 7, 7, 7, 7, 7, 8, 7, 6,
+ 6, 7, 7, 7, 7, 7, 6, 7, 6, 7, 6, 7, 7, 7, 7, 6,
7,
};
1.5.2.1 +4 -4 vorbis/lib/books/coupled/_44c0_short.vqh
Index: _44c0_short.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/_44c0_short.vqh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- _44c0_short.vqh 2001/12/19 01:08:18 1.5
+++ _44c0_short.vqh 2002/01/01 02:27:32 1.5.2.1
@@ -19,10 +19,10 @@
#include "codebook.h"
static long _huff_lengthlist__44c0_short[] = {
- 6,16,16,16,16, 5, 8,12,12,15,14,15,15, 5, 4, 9,
- 10,14,15,15,15, 4, 5,10, 8,15,15,15,15, 6, 6,10,
- 9, 5, 4, 4, 5, 8, 9,11, 5,15,15,15,15, 2, 4,11,
- 7,15,15,15,15, 3, 5,10,12, 9, 8, 8, 9, 9,10,11,
+ 10,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13,11,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13, 5, 4, 8, 2,13,13,13,13, 2, 5, 9,
+ 5,13,13,13,13, 3, 5, 9,11,13,13,13,12, 5, 3, 6,
};
static static_codebook _huff_book__44c0_short = {
No revision
No revision
1.2.4.1 +45 -3 vorbis/lib/modes/floor_44.h
Index: floor_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/floor_44.h,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- floor_44.h 2001/12/12 09:45:55 1.2
+++ floor_44.h 2002/01/01 02:27:42 1.2.4.1
@@ -11,7 +11,7 @@
********************************************************************
function: key floor settings for 44.1/48kHz
- last mod: $Id: floor_44.h,v 1.2 2001/12/12 09:45:55 xiphmont Exp $
+ last mod: $Id: floor_44.h,v 1.2.4.1 2002/01/01 02:27:42 xiphmont Exp $
********************************************************************/
@@ -51,6 +51,19 @@
#include "books/floor/line_128x19_2sub2.vqh"
#include "books/floor/line_128x19_2sub3.vqh"
+#include "books/floor/line_1024x19_class0.vqh"
+#include "books/floor/line_1024x19_class1.vqh"
+#include "books/floor/line_1024x19_class2.vqh"
+
+#include "books/floor/line_1024x19_0sub0.vqh"
+#include "books/floor/line_1024x19_0sub1.vqh"
+#include "books/floor/line_1024x19_1sub1.vqh"
+#include "books/floor/line_1024x19_1sub2.vqh"
+#include "books/floor/line_1024x19_1sub3.vqh"
+#include "books/floor/line_1024x19_2sub1.vqh"
+#include "books/floor/line_1024x19_2sub2.vqh"
+#include "books/floor/line_1024x19_2sub3.vqh"
+
#include "books/floor/line_1024x31_class0.vqh"
#include "books/floor/line_1024x31_class1.vqh"
#include "books/floor/line_1024x31_class2.vqh"
@@ -110,6 +123,20 @@
_floor_44_128x19_books,
};
+static static_codebook *_floor_44_1024x19_books[]={
+ &_huff_book_line_1024x19_class0,
+ &_huff_book_line_1024x19_class1,
+ &_huff_book_line_1024x19_class2,
+
+ &_huff_book_line_1024x19_0sub0,
+ &_huff_book_line_1024x19_0sub1,
+ &_huff_book_line_1024x19_1sub1,
+ &_huff_book_line_1024x19_1sub2,
+ &_huff_book_line_1024x19_1sub3,
+ &_huff_book_line_1024x19_2sub1,
+ &_huff_book_line_1024x19_2sub2,
+ &_huff_book_line_1024x19_2sub3,
+};
static static_codebook *_floor_44_1024x31_books[]={
&_huff_book_line_1024x31_class0,
&_huff_book_line_1024x31_class1,
@@ -128,7 +155,8 @@
&_huff_book_line_1024x31_3sub3,
};
-static static_codebook **_floor_44_1024_books[1]={
+static static_codebook **_floor_44_1024_books[2]={
+ _floor_44_1024x19_books,
_floor_44_1024x31_books
};
@@ -167,8 +195,22 @@
-1 /* lowpass */
}
};
+
+static vorbis_info_floor1 _floor_44_1024[2]={
+ {
+ 6,{0,1,1, 2,2,2},{4,3,3},{1,2,2},{0,1,2},
+ {{3,4},{-1,5,6,7},{-1,8,9,10}},
+ 2,{0,1024,
-static vorbis_info_floor1 _floor_44_1024[1]={
+ 32,112,211,387,
+
+ 8,4,16, 64,48,88, 162,136,185, 282,243,329, 553,460,672},
+
+ 60,30,400,
+ 20,8,1,18.,
+ 20,600,
+ -1 /* lowpass */
+ },
{
10,{0,1,2,2,2,2,2, 3,3,3},{3,4,3,3},{1,1,2,2},{0,1,2,3},
{{4,5},{6,7},{-1,8,9,10},{-1,11,12,13}},
1.7.2.2 +30 -25 vorbis/lib/modes/psych_44.h
Index: psych_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/psych_44.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- psych_44.h 2001/12/27 08:07:30 1.7.2.1
+++ psych_44.h 2002/01/01 02:27:42 1.7.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: psych_44.h,v 1.7.2.1 2001/12/27 08:07:30 xiphmont Exp $
+ last mod: $Id: psych_44.h,v 1.7.2.2 2002/01/01 02:27:42 xiphmont Exp $
********************************************************************/
@@ -21,19 +21,25 @@
static vorbis_info_psy_global _psy_global_44[3]={
{8, /* lines per eighth octave */
- /*{990.f,990.f,990.f,990.f}, {-990.f,-990.f,-990.f,-990.f}, -90.f,
- {0.f,0.f,0.f,0.f}, {-0.f,-0.f,-0.f,-0.f}, -90.f,*/
+ //{990.f,990.f,990.f,990.f}, {-990.f,-990.f,-990.f,-990.f}, -90.f,
+ //{0.f,0.f,0.f,0.f}, {-0.f,-0.f,-0.f,-0.f}, -90.f,
{30.f,30.f,30.f,34.f}, {-990.f,-990.f,-990.f,-990.f}, -90.f,
- -6.f, 0,
+ -6.f,
+ 1,.2,1.4,
+ 0,
},
{8, /* lines per eighth octave */
/*{990.f,990.f,990.f,990.f}, {-990.f,-990.f,-990.f,-990.f}, -90.f,*/
{26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
- -6.f, 0,
+ -6.f,
+ 0,0.,0.,
+ 0,
},
{8, /* lines per eighth octave */
{26.f,26.f,26.f,30.f}, {-26.f,-26.f,-26.f,-30.f}, -90.f,
- -6.f, 0,
+ -6.f,
+ 0,0.,0.,
+ 0,
}
};
@@ -75,12 +81,11 @@
24.f,25.f,26.f,27.f,28.f,29.f,30.f, 31.f, /* 31dB */
32.f,33.f,34.f,35.f,36.f,37.f,38.f, 39.f, /* 39dB */
},
- /* mode_Z nominal */
{
0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, /* 7dB */
- 8.f, 9.f,10.f,11.f,12.f,12.f,13.f, 13.f, /* 15dB */
- 13.f,14.f,14.f,14.f,15.f,15.f,15.f, 15.f, /* 23dB */
- 16.f,16.f,17.f,17.f,17.f,18.f,18.f, 19.f, /* 31dB */
+ 8.f, 9.f,10.f,11.f,12.f,13.f,12.f, 12.f, /* 15dB */
+ 11.f,11.f,10.f,10.f,11.f,12.f,13.f, 14.f, /* 23dB */
+ 15.f,15.f,16.f,16.f,17.f,17.f,18.f, 18.f, /* 31dB */
19.f,19.f,20.f,21.f,22.f,23.f,24.f, 25.f, /* 39dB */
},
/* mode A */
@@ -102,11 +107,11 @@
{ 10, 10, 5, }, /* 125 */
{ 10, 10, 5, },
{ 10, 10, 5, }, /* 250 */
- { 10, 10, 5, },
- { 10, 10, 5, }, /* 500 */
{ 10, 10, 5, },
- { 0, }, /* 1000 */
- { 0, },
+ { 10, 10, 5, 5, 5, 3, 3, 3, 3, 3, }, /* 500*/
+ { 10, 10, 5, 5, 5, 3, 3, 3, 3, 3, },
+ { 10, 10, 5, 5, 5, 3, 3, 3, 3, 3, }, /* 1000*/
+ { 10, 10, 5, 5, 5, 5, 5, 5, 5, 5, 5},
{ 13, 13, 10, 10, 10, 10, 10, 10, 10, 10, 10}, /* 2000 */
{ 13, 13, 10, 10, 10, 10, 10, 10, 10, 10, 10},
@@ -236,10 +241,10 @@
{ 0, 0, 0, 0,-10,-10,-10,-10,-10,-10,-10}, /*250*/
{ 0, 0, 0, 0,-10,-10,-10,-10,-10,-10,-10},
{ 5, 5, 5, 0, -5, -5, -5, -5, -5, -5, -5}, /*500*/
- { 5, 5, 5, 0, -5, -5, -5, -5, -5, -5, -5},
+ { 5, 5, 5, },
- { 5, 5, 5, }, /*1000*/
- { 5, 5, 5, },
+ { 10, 10, 5, 5, 5, }, /*1000*/
+ { 10, 10, 5, 5, 5, 5, 5, 5, 5, 5, 5},
{ 13, 13, 10, 10, 10, 10, 10, 10, 10, 10, 10}, /* 2000 */
{ 13, 13, 10, 10, 10, 10, 10, 10, 10, 10, 10},
@@ -410,10 +415,10 @@
{-14,-20,-20,-20,-26,-32,-32,-32,-32,-32,-40},/*63*/
{-14,-20,-20,-20,-26,-32,-32,-32,-32,-32,-40},
{-14,-20,-20,-20,-26,-32,-32,-32,-32,-32,-40},/*125*/
- {-14,-20,-20,-20,-20,-20,-20,-30,-32,-32,-40},
- {-14,-20,-20,-20,-20,-20,-20,-30,-32,-32,-40},/*250*/
- {-14,-20,-20,-20,-20,-20,-20,-24,-32,-32,-40},
- {-14,-20,-20,-20,-20,-20,-20,-24,-32,-32,-40},/*500*/
+ {-14,-20,-20,-20,-26,-30,-30,-30,-32,-32,-40},
+ {-14,-20,-20,-20,-26,-30,-30,-30,-32,-32,-40},/*250*/
+ {-14,-20,-20,-20,-26,-30,-30,-30,-32,-32,-40},
+ {-14,-20,-20,-20,-26,-30,-30,-30,-32,-32,-40},/*500*/
{-10,-10,-10,-10,-14,-16,-20,-24,-26,-32,-40},
{-10,-10,-10,-10,-14,-16,-20,-24,-22,-32,-40},/*1000*/
{-10,-10,-10,-10,-14,-16,-20,-24,-22,-32,-40},
@@ -489,7 +494,7 @@
static int _psy_noisebias_long[11][17]={
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-20,-20,-20,-20,-20,-18,-16, -8, -6, -2, 2, 2, 3, 3, 4, 4, 10},
+ {-20,-20,-20,-20,-20,-18,-16, -8, -6, -2, 0, 2, 2, 5, 5, 6, 12},
{-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -2, -2, 1, 1, 2, 2, 4},
{-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, -1, -1, 0, 1, 2},
{-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, -1, -1, 0, 1, 2},
@@ -523,7 +528,7 @@
static int _psy_noisebias_other[11][17]={
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-26,-26,-26,-26,-26,-22,-18,-12, -6, -2, 2, 2, 3, 3, 4, 4, 10},
+ {-26,-26,-26,-26,-26,-22,-18,-12, -6, -2, 0, 2, 2, 5, 5, 6, 12},
{-26,-26,-26,-26,-26,-22,-20,-14,-10, -2, -2, -2, 1, 1, 2, 2, 4},
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, -3, -3, -1, -1, 0, 1, 2},
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -1, -1, 0, 1, 2},
@@ -539,7 +544,7 @@
};
static int _psy_noiseguards_short[33]={
- 2,2,-1,
+ 4,4,-1,
4,4,-1,
4,4,15,
4,4,15,
@@ -592,7 +597,7 @@
static vorbis_info_psy _psy_info_template={
{-1},-110.,-140.,
/* tonemask att,guard,suppr,curves peakattp,curvelimitp,peaksettings*/
- 0.f, -40.f,-40.f, {{{0.}}}, 1, 0, {{{0.}}},
+ 0.f, -40.f,-40.f, {{{0.}}}, 1, 0, {{{0.}}},
/*noisemaskp,supp, low/high window, low/hi guard, minimum */
1, -0.f, .5f, .5f, 0,0,0,
1.11.2.1 +2 -7 vorbis/lib/modes/residue_44.h
Index: residue_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/residue_44.h,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- residue_44.h 2001/12/23 11:53:54 1.11
+++ residue_44.h 2002/01/01 02:27:43 1.11.2.1
@@ -11,14 +11,14 @@
********************************************************************
function: toplevel residue templates for 32/44.1/48kHz
- last mod: $Id: residue_44.h,v 1.11 2001/12/23 11:53:54 xiphmont Exp $
+ last mod: $Id: residue_44.h,v 1.11.2.1 2002/01/01 02:27:43 xiphmont Exp $
********************************************************************/
#include "vorbis/codec.h"
#include "backends.h"
-static bitrate_manager_info _bm_44_default={
+static bitrate_manager_info _bm_default={
/* progressive coding and bitrate controls */
4.,.0,
2., 0, 0,
@@ -51,7 +51,6 @@
0,-1, -1, 8,-1,
{0},
{-1},
- {9999, 9999, 9999, 9999, 9999, 9999, 9999},
{ .5, 1.5, 2.5, 4.5, 26.5, 1.5, 4.5},
{0},
{ 99, -1, -1, -1, -1, 99, 99}
@@ -61,7 +60,6 @@
0,-1, -1, 8,-1,
{0},
{-1},
- {9999, 9999, 9999, 9999, 9999, 9999, 9999},
{ .5, 1.5, 2.5, 4.5, 28.5, 1.5, 4.5},
{0},
{ 99, -1, -1, -1, -1, 99, 99}
@@ -81,7 +79,6 @@
/* 0 1 2 3 4 5 6 7 8 9 */
{0},
{-1},
- {9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
{ .5, 1.5, 1.5, 2.5, 2.5, 4.5, 4.5, 16.5, 42.5},
{0},
{ 99, -1, 99, -1, 99, -1, 99, 99, 99}
@@ -102,7 +99,6 @@
/* 0 1 2 3 4 5 6 7 8 9 */
{0},
{-1},
- {9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
{ .5, 8.5, 42.5, 1.5, 2.5, 4.5, 8.5, 16.5, 56.5},
{0},
{ 99, -1, -1, 99, 99, 99, 99, 99, 99}
@@ -113,7 +109,6 @@
/* 0 1 2 3 4 5 6 7 8 9 */
{0},
{-1},
- {9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
{ .5, 8.5, 42.5, 1.5, 2.5, 4.5, 8.5, 16.5, 59.5},
{0},
{ 99, -1, -1, 99, 99, 99, 99, 99, 99}
No revision
No revision
1.2.2.1 +31 -14 vorbis/vq/44c0.vqs
Index: 44c0.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/44c0.vqs,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- 44c0.vqs 2001/12/19 01:10:28 1.2
+++ 44c0.vqs 2002/01/01 02:27:45 1.2.2.1
@@ -1,14 +1,14 @@
-cp 44c0_s0/resaux_short.vqd _44c0_short.vqd
-cp 44c0_s0/resaux_long.vqd _44c0_long.vqd
+cp 44c0_s3/resaux_short.vqd _44c0_short.vqd
+cp 44c0_s3/resaux_long.vqd _44c0_long.vqd
GO
>_44c0s noninterleaved
-haux _44c0_short.vqd 0,12,2
+haux _44c0_short.vqd 0,6,2
>_44c0 noninterleaved
-haux _44c0_long.vqd 0,44,2
+haux _44c0_long.vqd 0,42,2
#iter 0
@@ -20,22 +20,39 @@
# 2 . .
# 4 . . . . . .
-:_s0_p1_0 44c0_s0/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_s0_p2_0 44c0_s0/res_part2_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_s0_p3_0 44c0_s0/res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
-:_s0_p4_0 44c0_s0/res_part4_pass0.vqd, 2, nonseq, 0 +- 7 14 21 28 35 42 49
-:_s0_p4_1 44c0_s0/res_part4_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3
+:_s0_p1_0 44c0_s3/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_s0_p2_0 44c0_s3/res_part2_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_s0_p3_0 44c0_s3/res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_s0_p4_0 44c0_s3/res_part4_pass0.vqd, 4, nonseq cull, 0 +- 21 42
+:_s0_p4_1 44c0_s3/res_part4_pass1.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
+
:_s0_p5_0 44c0_s0/res_part5_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_s1_p5_0 44c0_s1/res_part5_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_s1_p5_0 44c0_s3/res_part5_pass2.vqd, 8, nonseq cull, 0 +- 1
:_s0_p6_0 44c0_s0/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
:_s1_p6_0 44c0_s1/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
-:_s2_p6_0 44c0_s2/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_s2_p6_0 44c0_s3/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+
+
+:_s0_p7_0 44c0_s0/res_part7_pass0.vqd, 4, nonseq, 0 +- 105 210
+:_s0_p7_1 44c0_s0/res_part7_pass1.vqd, 4, nonseq, 0 +- 21 42
+:_s0_p7_2 44c0_s0/res_part7_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
+
+:_s1_p7_0 44c0_s1/res_part7_pass0.vqd, 4, nonseq, 0 +- 105 210
+:_s1_p7_1 44c0_s1/res_part7_pass1.vqd, 4, nonseq, 0 +- 21 42
+:_s1_p7_2 44c0_s1/res_part7_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
+
+:_s2_p7_0 44c0_s2/res_part7_pass0.vqd, 4, nonseq, 0 +- 105 210
+:_s2_p7_1 44c0_s2/res_part7_pass1.vqd, 4, nonseq, 0 +- 21 42
+:_s2_p7_2 44c0_s2/res_part7_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
+
+:_s3_p7_0 44c0_s3/res_part7_pass0.vqd, 4, nonseq, 0 +- 105 210
+:_s3_p7_1 44c0_s3/res_part7_pass1.vqd, 4, nonseq, 0 +- 21 42
+:_s3_p7_2 44c0_s3/res_part7_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
+
+
-:_s0_p7_0 44c0_s0/res_part7_pass0.vqd, 2, nonseq, 0 +- 67 134 201
-:_s0_p7_1 44c0_s0/res_part7_pass1.vqd, 2, nonseq, 0 +- 3 6 9 12 15 18 21 24 27 30 33
-:_s0_p7_2 44c0_s0/res_part7_pass2.vqd, 4, nonseq, 0 +- 1
:_s1_p7_0 44c0_s1/res_part7_pass0.vqd, 2, nonseq, 0 +- 67 134 201
:_s1_p7_1 44c0_s1/res_part7_pass1.vqd, 2, nonseq, 0 +- 3 6 9 12 15 18 21 24 27 30 33
--- >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