[xiph-cvs] cvs commit: vorbis/vq res_44c_A.vqs res_44c_Z.vqs
Monty
xiphmont at xiph.org
Mon Oct 8 21:34:58 PDT 2001
xiphmont 01/10/08 21:34:56
Modified: examples Tag: branch_monty_20011009 encoder_example.c
lib Tag: branch_monty_20011009 backends.h block.c
codec_internal.h mapping0.c psy.h res0.c
lib/books Tag: branch_monty_20011009 line_1024x31_0sub0.vqh
line_1024x31_0sub1.vqh line_1024x31_1sub0.vqh
line_1024x31_1sub1.vqh line_1024x31_2sub1.vqh
line_1024x31_2sub2.vqh line_1024x31_2sub3.vqh
line_1024x31_3sub1.vqh line_1024x31_3sub2.vqh
line_1024x31_3sub3.vqh line_1024x31_class0.vqh
line_1024x31_class1.vqh line_1024x31_class2.vqh
line_1024x31_class3.vqh line_128x7_0sub0.vqh
line_128x7_1sub1.vqh line_128x7_1sub2.vqh
line_128x7_1sub3.vqh line_128x7_2sub1.vqh
line_128x7_2sub2.vqh line_128x7_2sub3.vqh
line_128x7_class1.vqh line_128x7_class2.vqh
res_44c_A_128aux.vqh res_44c_Z_1024aux.vqh
res_44c_Z_128aux.vqh res_Zc_1.vqh res_Zc_2.vqh
res_Zc_3.vqh res_Zc_5.vqh res_Zc_6.vqh res_Zc_7.vqh
res_Zc_8.vqh res_Zc_9.vqh res_Zc_9a.vqh
res_Zc_9b.vqh
lib/modes Tag: branch_monty_20011009 mode_44c_A.h
mode_44c_Z.h
vq Tag: branch_monty_20011009 res_44c_A.vqs
res_44c_Z.vqs
Log:
bitrate management engine first commit. Still at least one bug/not
well tested.
Monty
Revision Changes Path
No revision
No revision
1.27.2.1 +2 -1 vorbis/examples/encoder_example.c
Index: encoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/encoder_example.c,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -r1.27 -r1.27.2.1
--- encoder_example.c 2001/09/19 01:17:00 1.27
+++ encoder_example.c 2001/10/09 04:34:44 1.27.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.27 2001/09/19 01:17:00 cwolf Exp $
+ last mod: $Id: encoder_example.c,v 1.27.2.1 2001/10/09 04:34:44 xiphmont Exp $
********************************************************************/
@@ -22,6 +22,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <time.h>
#include <math.h>
#include <vorbis/vorbisenc.h>
No revision
No revision
1.10.4.1 +2 -3 vorbis/lib/backends.h
Index: backends.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/backends.h,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -r1.10 -r1.10.4.1
--- backends.h 2001/08/13 01:36:56 1.10
+++ backends.h 2001/10/09 04:34:45 1.10.4.1
@@ -12,7 +12,7 @@
function: libvorbis backend and mapping structures; needed for
static mode headers
- last mod: $Id: backends.h,v 1.10 2001/08/13 01:36:56 xiphmont Exp $
+ last mod: $Id: backends.h,v 1.10.4.1 2001/10/09 04:34:45 xiphmont Exp $
********************************************************************/
@@ -130,7 +130,7 @@
long **(*class) (struct vorbis_block *,vorbis_look_residue *,
float **,int *,int);
int (*forward) (struct vorbis_block *,vorbis_look_residue *,
- float **,float **,int *,int,int,long **);
+ float **,float **,int *,int,int,long **,double,ogg_uint32_t *);
int (*inverse) (struct vorbis_block *,vorbis_look_residue *,
float **,int *,int);
} vorbis_func_residue;
@@ -152,7 +152,6 @@
float ampmax[64]; /* book amp threshholds*/
int subgrp[64]; /* book heuristic subgroup size */
int blimit[64]; /* subgroup position limits */
- int passlimit[32]; /* iteration limit per couple/quant pass */
} vorbis_info_residue0;
/* Mapping backend generic *****************************************/
1.50.2.1 +25 -1 vorbis/lib/block.c
Index: block.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/block.c,v
retrieving revision 1.50
retrieving revision 1.50.2.1
diff -u -r1.50 -r1.50.2.1
--- block.c 2001/10/02 00:14:30 1.50
+++ block.c 2001/10/09 04:34:45 1.50.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.50 2001/10/02 00:14:30 segher Exp $
+ last mod: $Id: block.c,v 1.50.2.1 2001/10/09 04:34:45 xiphmont Exp $
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -267,6 +267,27 @@
/* Initialize the envelope state storage */
b->ve=_ogg_calloc(1,sizeof(*b->ve));
_ve_envelope_init(b->ve,vi);
+
+ /* compute bitrate tracking setup, allocate circular packet size queue */
+ {
+ codec_setup_info *ci=vi->codec_setup;
+ /* first find the max possible needed queue size */
+ long maxpackets=(max(ci->bitrate_bound_queuetime,
+ ci->bitrate_avg_queuetime)*
+ vi->rate+(ci->blocksizes[0]-1))/ci->blocksizes[0]+1;
+ long eighths=8*ci->passlimit[ci->coupling_passes-1];
+ if(ci->bitrate_queue_loweravg<=0. && ci->bitrate_queue_upperavg<=0.)eighths=0;
+
+ b->bitrate_queue_size=maxpackets;
+ b->bitrate_eighths=eighths;
+ b->bitrate_queue=_ogg_malloc(maxpackets*sizeof(*b->bitrate_queue));
+ if(eighths){
+ b->bitrate_queue_eighths=_ogg_malloc(maxpackets*eighths*sizeof(*b->bitrate_queue));
+ b->bitrate_avgbitacc=_ogg_malloc(eighths*sizeof(*b->bitrate_avgbitacc));
+ }
+ b->bitrate_floatinglimit=ci->bitrate_floatinglimit_initial;
+ }
+
return(0);
}
@@ -307,6 +328,9 @@
_ogg_free(b->transform[1]);
}
if(b->psy_g_look)_vp_global_free(b->psy_g_look);
+ if(b->bitrate_queue)_ogg_free(b->bitrate_queue);
+ if(b->bitrate_queue_eighths)_ogg_free(b->bitrate_queue_eighths);
+ if(b->bitrate_avgbitacc)_ogg_free(b->bitrate_avgbitacc);
}
1.9.4.1 +33 -1 vorbis/lib/codec_internal.h
Index: codec_internal.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/codec_internal.h,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -r1.9 -r1.9.4.1
--- codec_internal.h 2001/08/13 01:36:56 1.9
+++ codec_internal.h 2001/10/09 04:34:45 1.9.4.1
@@ -10,7 +10,7 @@
********************************************************************
function: libvorbis codec headers
- last mod: $Id: codec_internal.h,v 1.9 2001/08/13 01:36:56 xiphmont Exp $
+ last mod: $Id: codec_internal.h,v 1.9.4.1 2001/10/09 04:34:45 xiphmont Exp $
********************************************************************/
@@ -65,7 +65,24 @@
unsigned char *header;
unsigned char *header1;
unsigned char *header2;
+
+ /* encode side bitrate tracking */
+ ogg_uint32_t *bitrate_queue;
+ ogg_uint32_t *bitrate_queue_eighths;
+ int bitrate_queue_size;
+ int bitrate_queue_head;
+ int bitrate_eighths;
+
+ long bitrate_boundbitacc;
+ long bitrate_boundsampleacc;
+ long bitrate_boundtail;
+ long *bitrate_avgbitacc;
+ long bitrate_avgsampleacc;
+ long bitrate_avgtail;
+
+ double bitrate_floatinglimit;
+
} backend_lookup_state;
/* vorbis_info contains all the setup information specific to the
@@ -104,9 +121,24 @@
int residue_type[64];
vorbis_info_residue *residue_param[64];
static_codebook *book_param[256];
+
vorbis_info_psy *psy_param[64]; /* encode only */
vorbis_info_psy_global *psy_g_param;
+ /* detailed bitrate management setup */
+ double bitrate_floatinglimit_initial; /* set by mode */
+ double bitrate_bound_queuetime;
+ double bitrate_avg_queuetime;
+
+ double bitrate_absolute_max;
+ double bitrate_absolute_min;
+ double bitrate_queue_max;
+ double bitrate_queue_min;
+ double bitrate_queue_upperavg;
+ double bitrate_queue_loweravg;
+
+ int passlimit[32]; /* iteration limit per couple/quant pass */
+ int coupling_passes;
} codec_setup_info;
extern vorbis_look_psy_global *_vp_global_look(vorbis_info *vi);
1.37.2.1 +196 -19 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -r1.37 -r1.37.2.1
--- mapping0.c 2001/10/02 00:14:31 1.37
+++ mapping0.c 2001/10/09 04:34:45 1.37.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.37 2001/10/02 00:14:31 segher Exp $
+ last mod: $Id: mapping0.c,v 1.37.2.1 2001/10/09 04:34:45 xiphmont Exp $
********************************************************************/
@@ -281,6 +281,37 @@
#include "psy.h"
#include "scales.h"
+static double floater_interpolate(backend_lookup_state *b,vorbis_info *vi,
+ double desired_rate){
+ int eighth=b->bitrate_floatinglimit*8-1.;
+ double lobitrate;
+ double hibitrate;
+
+ lobitrate=(double)(eighth==0?0.:
+ b->bitrate_avgbitacc[eighth-1])/b->bitrate_avgsampleacc*vi->rate;
+ while(lobitrate>desired_rate && eighth>0){
+ eighth--;
+ lobitrate=(double)(eighth==0?0.:
+ b->bitrate_avgbitacc[eighth-1])/b->bitrate_avgsampleacc*vi->rate;
+ }
+
+ hibitrate=(eighth>=b->bitrate_eighths?b->bitrate_avgbitacc[b->bitrate_eighths-1]:
+ (double)b->bitrate_avgbitacc[eighth])/b->bitrate_avgsampleacc*vi->rate;
+ while(hibitrate<desired_rate && eighth<b->bitrate_eighths){
+ eighth++;
+ if(eighth<b->bitrate_eighths)
+ hibitrate=(double)b->bitrate_avgbitacc[eighth]/b->bitrate_avgsampleacc*vi->rate;
+ }
+
+ /* interpolate */
+ if(eighth==b->bitrate_eighths){
+ return eighth/8.;
+ }else{
+ double delta=(desired_rate-lobitrate)/(hibitrate-lobitrate);
+ return (eighth+delta)/8.;
+ }
+}
+
/* no time mapping implementation for now */
static long seq=0;
static int mapping0_forward(vorbis_block *vb,vorbis_look_mapping *l){
@@ -461,9 +492,11 @@
int *chbundle=alloca(sizeof(*chbundle)*info->submaps);
int chcounter=0;
+ long maxbits,minbits;
+
/* play a little loose with this abstraction */
- int quant_passes=look->psy_look[blocktype]->vi->coupling_passes;
- int stopflag=0;
+ int quant_passes=ci->coupling_passes;
+ int stopflag=0,stoppos=0;
for(i=0;i<vi->channels;i++){
quantized[i]=pcm[i]+n/2;
@@ -525,27 +558,87 @@
class(vb,look->residue_look[i],pcmbundle[i],zerobundle[i],chbundle[i]);
}
- /* actual encoding loop */
+ /* basic bitrate fitting algorithm:
+ determine a current-packet maximum size from the bound queue and
+ point maximums
+ determine a current-packet minimum size from the bound queue and
+ point minimums
+ determine a desired packet size:
+ if there's a requested average, get that from the floater
+ else, use the bits sunk by a single iteration (bounded by min/max)
+ */
+ {
+ long period_samples=b->bitrate_boundsampleacc+ci->blocksizes[vb->W]/2;
+ long maxbits_period=ci->bitrate_queue_max/vi->rate*period_samples;
+ long minbits_period=ci->bitrate_queue_min/vi->rate*period_samples;
+ long maxbits_absolute=ci->bitrate_absolute_max/vi->rate*
+ ci->blocksizes[vb->W]/2;
+ long minbits_absolute=ci->bitrate_absolute_min/vi->rate*
+ ci->blocksizes[vb->W]/2;
+
+ maxbits=min(maxbits_period-b->bitrate_boundbitacc,maxbits_absolute);
+ minbits=max(minbits_period-b->bitrate_boundbitacc,minbits_absolute);
+ if(maxbits<0)maxbits=0;
+ if(maxbits)minbits=min(minbits,maxbits);
+ }
+
+ /* actual encoding loop; if we have a desired stopping point, pack
+ slightly past it so that the end of the packet is not
+ uninitialized data that could pollute the decoded audio on the
+ decode side. We want to truncate at a clean byte boundary */
for(i=0;!stopflag;){
/* perform residue encoding of this pass's quantized residue
vector, according residue mapping */
- for(j=0;j<info->submaps;j++)
- look->residue_func[j]->
- forward(vb,look->residue_look[j],
- pcmbundle[j],sobundle[j],zerobundle[j],chbundle[j],
- i,classifications[j]);
- i++;
+ for(j=0;j<info->submaps;j++){
+ ogg_uint32_t *queueptr=b->bitrate_queue_eighths;
+ if(queueptr)queueptr+=b->bitrate_queue_head*b->bitrate_eighths;
+
+ if(stoppos){
+ look->residue_func[j]->
+ forward(vb,look->residue_look[j],
+ pcmbundle[j],sobundle[j],zerobundle[j],chbundle[j],
+ i,classifications[j],b->bitrate_floatinglimit,queueptr);
+
+ }else{
+ stoppos=look->residue_func[j]->
+ forward(vb,look->residue_look[j],
+ pcmbundle[j],sobundle[j],zerobundle[j],chbundle[j],
+ i,classifications[j],b->bitrate_floatinglimit,queueptr);
+ }
+ i++;
+ }
+
+ /* bitrate management.... deciding when it's time to stop. */
+ if(i<quant_passes){
+ if(b->bitrate_eighths==0){ /* average bitrate always runs
+ encode to the bitter end in
+ order to collect statistics */
+
+ long current_bytes=oggpack_bits(&vb->opb)/8;
+
+ if(maxbits && current_bytes>maxbits/8){
+ /* maxbits trumps all... */
+ stoppos=maxbits/8;
+ stopflag=1;
+ }else{
+ if(current_bytes>(minbits+7)/8){
+ if(ci->passlimit[i-1]>=b->bitrate_floatinglimit){
+ if(!stoppos)stoppos=current_bytes;
+ if(stoppos<current_bytes)
+ stopflag=1;
+ }
+ }
+ }
+ }
+ }else
+ stopflag=1;
- /* bitrate management decision hook; the following if() is where
- we tell progressive encoding to halt, right now it just
- avoids falling off the edge */
- if(i>=quant_passes /* || yadda yadda */)stopflag=1;
-
- if(!stopflag){
- /* down-couple/down-quantize from perfect-'so-far' ->
- new quantized vector */
+ /* down-couple/down-quantize from perfect-'so-far' ->
+ new quantized vector */
+ if(!stoppos){ /* only do this if we're doing a real iteration
+ and not padding */
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 */
@@ -566,11 +659,95 @@
i);
}
}
+
+ /* truncate the packet according to stoppos */
+ if(!stoppos)stoppos=oggpack_bytes(&vb->opb);
+ if(minbits && stoppos*8<minbits)stoppos=(minbits+7)/8;
+ if(maxbits && stoppos*8>maxbits)stoppos=maxbits/8;
+ if(stoppos>oggpack_bytes(&vb->opb))stoppos=oggpack_bytes(&vb->opb);
+ vb->opb.endbyte=stoppos;
+ vb->opb.endbit=0;
+
/* steady as she goes */
}
seq+=vi->channels;
+
+ fprintf(stderr,"Bitrate: cav %d, cmin %ld, cmax %ld, float %.1f,"
+ " this %ld\n",
+ (int)((double)b->bitrate_boundbitacc*vi->rate/b->bitrate_boundsampleacc),
+ minbits,maxbits,b->bitrate_floatinglimit,
+ oggpack_bytes(&vb->opb)*8);
+ fprintf(stderr,"\thead:%d, boundtail:%ld(%ld), avtail:%ld(%ld)\n",
+ b->bitrate_queue_head,b->bitrate_boundtail,b->bitrate_boundsampleacc,
+ b->bitrate_avgtail,b->bitrate_avgsampleacc);
+
+ /* track bitrate*/
+ /* update boundary accumulators */
+ while(b->bitrate_boundsampleacc>ci->bitrate_bound_queuetime*vi->rate){
+ int samples=ci->blocksizes[0]>>1;
+ if(b->bitrate_queue[b->bitrate_boundtail]&0x80000000UL)
+ samples=ci->blocksizes[1]>>1;
+ b->bitrate_boundsampleacc-=samples;
+ b->bitrate_boundbitacc-=
+ b->bitrate_queue[b->bitrate_boundtail]&0x7fffffffUL;
+ b->bitrate_boundtail++;
+ if(b->bitrate_boundtail>=b->bitrate_queue_size)b->bitrate_boundtail=0;
+ }
+
+ /* update moving average accumulators */
+ while(b->bitrate_avgsampleacc>ci->bitrate_avg_queuetime*vi->rate){
+ int samples=ci->blocksizes[0]>>1;
+ if(b->bitrate_queue[b->bitrate_avgtail]&0x80000000UL)
+ samples=ci->blocksizes[1]>>1;
+ b->bitrate_avgsampleacc-=samples;
+ for(i=0;i<b->bitrate_eighths;i++)
+ b->bitrate_avgbitacc[i]-=
+ b->bitrate_queue_eighths[b->bitrate_avgtail*b->bitrate_eighths+i];
+ b->bitrate_avgtail++;
+ if(b->bitrate_avgtail>=b->bitrate_queue_size)b->bitrate_avgtail=0;
+ }
+
+ /* update queue head */
+ {
+ int bits=oggpack_bytes(&vb->opb)*8;
+
+ if(bits>32){ /* (avoid pushing the floater too far in digital silence) */
+
+ /* boundaries */
+ b->bitrate_queue[b->bitrate_queue_head]=bits;
+ if(vb->W)b->bitrate_queue[b->bitrate_queue_head]|=0x80000000UL;
+ b->bitrate_boundbitacc+=bits;
+ b->bitrate_boundsampleacc+=ci->blocksizes[vb->W]>>1;
+
+ /* eighths */
+ if(b->bitrate_eighths){
+ for(i=0;i<b->bitrate_eighths;i++)
+ b->bitrate_avgbitacc[i]+=
+ b->bitrate_queue_eighths[b->bitrate_queue_head*b->bitrate_eighths+i];
+ b->bitrate_avgsampleacc+=ci->blocksizes[vb->W]>>1;
+ }
+
+ b->bitrate_queue_head++;
+ if(b->bitrate_queue_head>=b->bitrate_queue_size)b->bitrate_queue_head=0;
+
+ /* adjust the floater to offset bitrate above/below desired average */
+ /* look for the eighth settings in recent history that bracket
+ the desired bitrate, and interpolate twixt them for the
+ flaoter setting we want */
+
+ if(b->bitrate_eighths>0){
+ double upper=floater_interpolate(b,vi,ci->bitrate_queue_upperavg);
+ double lower=floater_interpolate(b,vi,ci->bitrate_queue_loweravg);
+ b->bitrate_floatinglimit=ci->bitrate_floatinglimit_initial;
+ if(upper>0 && upper<b->bitrate_floatinglimit)
+ b->bitrate_floatinglimit=upper;
+ if(lower>b->bitrate_floatinglimit)
+ b->bitrate_floatinglimit=lower;
+ }
+ }
+ }
}
-
+
look->lastframe=vb->sequence;
return(0);
}
1.24.2.1 +1 -2 vorbis/lib/psy.h
Index: psy.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.h,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- psy.h 2001/09/11 05:06:57 1.24
+++ psy.h 2001/10/09 04:34:45 1.24.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.24 2001/09/11 05:06:57 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.24.2.1 2001/10/09 04:34:45 xiphmont Exp $
********************************************************************/
@@ -84,7 +84,6 @@
float max_curve_dB;
- int coupling_passes;
vp_couple_pass *couple_pass;
} vorbis_info_psy;
1.37.2.1 +61 -12 vorbis/lib/res0.c
Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -r1.37 -r1.37.2.1
--- res0.c 2001/10/02 00:14:32 1.37
+++ res0.c 2001/10/09 04:34:45 1.37.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.37 2001/10/02 00:14:32 segher Exp $
+ last mod: $Id: res0.c,v 1.37.2.1 2001/10/09 04:34:45 xiphmont Exp $
********************************************************************/
@@ -49,6 +49,8 @@
long phrasebits;
long frames;
+ int qoffsets[8];
+
} vorbis_look_residue0;
vorbis_info_residue *res0_copy_info(vorbis_info_residue *vr){
@@ -191,7 +193,7 @@
return(NULL);
}
-vorbis_look_residue *res0_look (vorbis_dsp_state *vd,vorbis_info_mode *vm,
+vorbis_look_residue *res0_look(vorbis_dsp_state *vd,vorbis_info_mode *vm,
vorbis_info_residue *vr){
vorbis_info_residue0 *info=(vorbis_info_residue0 *)vr;
vorbis_look_residue0 *look=_ogg_calloc(1,sizeof(*look));
@@ -236,6 +238,15 @@
}
}
+ {
+ int samples_per_partition=info->grouping;
+ int n=info->end-info->begin,i;
+ int partvals=n/samples_per_partition;
+
+ for(i=0;i<8;i++)
+ look->qoffsets[i]=partvals*(i+1)/8;
+ }
+
return(look);
}
@@ -477,11 +488,17 @@
float **in,int ch,
int pass,long **partword,
int (*encode)(oggpack_buffer *,float *,int,
- codebook *,vorbis_look_residue0 *)){
+ codebook *,vorbis_look_residue0 *),
+ double passlimit,ogg_uint32_t *stats){
long i,j,k,s;
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
vorbis_info_residue0 *info=look->info;
+ vorbis_dsp_state *vd=vb->vd;
+ vorbis_info *vi=vd->vi;
+ codec_setup_info *ci=vi->codec_setup;
+
+
/* move all this setup out later */
int samples_per_partition=info->grouping;
int possible_partitions=info->partitions;
@@ -492,6 +509,18 @@
long resbits[128];
long resvals[128];
+ long wholepasses;
+ long partialpass;
+ int stoppos=0;
+
+ if((int)passlimit<ci->passlimit[pass]){
+ wholepasses=passlimit;
+ partialpass=rint((passlimit-wholepasses)*partvals);
+ }else{
+ wholepasses=ci->passlimit[pass];
+ partialpass=0;
+ }
+
#ifdef TRAIN_RES
FILE *of;
char buffer[80];
@@ -514,10 +543,19 @@
words for a partition per channel until we've written all the
residual words for that partition word. Then write the next
partition channel words... */
+
+ for(s=(pass==0?0:ci->passlimit[pass-1]);s<ci->passlimit[pass];s++){
+ int eighth=0;
+ ogg_uint32_t *qptr=NULL;
+ if(stats)qptr=stats+s*8;
- for(s=(pass==0?0:info->passlimit[pass-1]);s<info->passlimit[pass];s++){
for(i=0;i<partvals;){
-
+
+ if(!stoppos &&
+ s>=wholepasses &&
+ i>=partialpass)
+ stoppos=oggpack_bytes(&vb->opb);
+
/* first we encode a partition codeword for each channel */
if(s==0){
for(j=0;j<ch;j++){
@@ -543,6 +581,11 @@
/* now we encode interleaved residual values for the partitions */
for(k=0;k<partitions_per_word && i<partvals;k++,i++){
long offset=i*samples_per_partition+info->begin;
+
+ if(!stoppos &&
+ s>=wholepasses &&
+ i>=partialpass)
+ stoppos=oggpack_bytes(&vb->opb);
for(j=0;j<ch;j++){
if(s==0)resvals[partword[j][i]]+=samples_per_partition;
@@ -556,6 +599,12 @@
}
}
}
+
+ if(qptr)while(i>=look->qoffsets[eighth])
+ qptr[eighth++]=oggpack_bits(&vb->opb);
+
+
+
}
}
}
@@ -572,7 +621,7 @@
fprintf(stderr,":: %ld:%1.2g\n",total,(double)totalbits/total);
}*/
- return(0);
+ return(stoppos);
}
/* a truncated packet here just means 'stop working'; it's not an error */
@@ -650,7 +699,7 @@
int res0_forward(vorbis_block *vb,vorbis_look_residue *vl,
float **in,float **out,int *nonzero,int ch,
- int pass, long **partword){
+ int pass, long **partword,double passlimit,ogg_uint32_t *stats){
/* we encode only the nonzero parts of a bundle */
int i,j,used=0,n=vb->pcmend/2;
for(i=0;i<ch;i++)
@@ -661,7 +710,7 @@
}
if(used){
int ret=_01forward(vb,vl,in,used,pass,partword,
- _interleaved_encodepart);
+ _interleaved_encodepart,passlimit,stats);
used=0;
for(i=0;i<ch;i++)
if(nonzero[i]){
@@ -688,7 +737,7 @@
int res1_forward(vorbis_block *vb,vorbis_look_residue *vl,
float **in,float **out,int *nonzero,int ch,
- int pass, long **partword){
+ int pass, long **partword, double passlimit,ogg_uint32_t *stats){
int i,j,used=0,n=vb->pcmend/2;
for(i=0;i<ch;i++)
if(nonzero[i]){
@@ -698,7 +747,7 @@
}
if(used){
- int ret=_01forward(vb,vl,in,used,pass,partword,_encodepart);
+ int ret=_01forward(vb,vl,in,used,pass,partword,_encodepart,passlimit,stats);
used=0;
for(i=0;i<ch;i++)
if(nonzero[i]){
@@ -752,7 +801,7 @@
int res2_forward(vorbis_block *vb,vorbis_look_residue *vl,
float **in,float **out,int *nonzero,int ch,
- int pass,long **partword){
+ int pass,long **partword,double passlimit, ogg_uint32_t *stats){
long i,j,k,n=vb->pcmend/2,used=0;
/* don't duplicate the code; use a working vector hack for now and
@@ -767,7 +816,7 @@
}
if(used){
- int ret=_01forward(vb,vl,&work,1,pass,partword,_encodepart);
+ int ret=_01forward(vb,vl,&work,1,pass,partword,_encodepart,passlimit,stats);
/* update the sofar vector */
for(i=0;i<ch;i++){
float *pcm=in[i];
No revision
No revision
1.3.4.1 +1 -1 vorbis/lib/books/line_1024x31_0sub0.vqh
Index: line_1024x31_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_0sub0.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_0sub0.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_0sub0.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_0sub0[] = {
- 3, 4, 4, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5,
+ 4, 3, 4, 4, 4, 3, 4, 3, 5, 4, 5, 4, 6, 4, 6, 5,
};
static static_codebook _huff_book_line_1024x31_0sub0 = {
1.3.4.1 +3 -3 vorbis/lib/books/line_1024x31_0sub1.vqh
Index: line_1024x31_0sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_0sub1.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_0sub1.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_0sub1.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_1024x31_0sub1[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 3, 3, 3, 3, 4, 3, 5, 4, 5, 4, 6, 5, 6, 6, 7, 7,
- 8, 8, 9,11,11,10,10,11,11,11,10,11,11,11,11,11,
- 11,11,11,11,10,10,10,10,10,10,10,10,10,10,10,10,
+ 4, 3, 4, 3, 5, 3, 5, 3, 6, 4, 7, 4, 7, 4, 7, 5,
+ 7, 6, 8, 6,10, 9,10,10,11,12,10,12,12,12,12,12,
+ 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
};
static static_codebook _huff_book_line_1024x31_0sub1 = {
1.3.4.1 +1 -1 vorbis/lib/books/line_1024x31_1sub0.vqh
Index: line_1024x31_1sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_1sub0.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_1sub0.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_1sub0.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_1sub0[] = {
- 2, 4, 4, 4, 4, 4, 3, 5, 4, 5, 4, 6, 5, 5, 5, 6,
+ 2, 3, 4, 4, 3, 4, 4, 4, 4, 5, 5, 6, 6, 6, 7, 7,
};
static static_codebook _huff_book_line_1024x31_1sub0 = {
1.3.4.1 +3 -3 vorbis/lib/books/line_1024x31_1sub1.vqh
Index: line_1024x31_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_1sub1.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_1sub1.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_1sub1.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_1024x31_1sub1[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 2, 3, 3, 4, 3, 4, 4, 6, 4, 7, 5, 7, 6, 8, 7,10,
- 10,10,10,10,10,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,
+ 3, 3, 3, 4, 3, 3, 3, 4, 5, 5, 6, 6, 7,10,10,10,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,10,10,10,10,10,10,10,10,10,10,
};
static static_codebook _huff_book_line_1024x31_1sub1 = {
1.3.4.1 +1 -1 vorbis/lib/books/line_1024x31_2sub1.vqh
Index: line_1024x31_2sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_2sub1.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_2sub1.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_2sub1.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_2sub1[] = {
- 0, 3, 3, 2, 3, 3, 3, 4, 4,
+ 0, 2, 4, 2, 4, 3, 4, 3, 4,
};
static static_codebook _huff_book_line_1024x31_2sub1 = {
1.3.4.1 +2 -2 vorbis/lib/books/line_1024x31_2sub2.vqh
Index: line_1024x31_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_2sub2.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_2sub2.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_2sub2.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,8 +20,8 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_2sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 4, 3, 5, 3, 5,
- 3, 7, 3, 8, 4, 9, 5, 9, 6,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 4, 4, 6, 5, 7,
+ 4, 8, 3, 9, 3,10, 4,10, 4,
};
static static_codebook _huff_book_line_1024x31_2sub2 = {
1.3.4.1 +3 -3 vorbis/lib/books/line_1024x31_2sub3.vqh
Index: line_1024x31_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_2sub3.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_2sub3.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_2sub3.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_1024x31_2sub3[] = {
0, 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, 1, 7, 4, 7, 4, 7,
- 4, 7, 5, 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,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 2, 7, 3, 7, 2, 7,
+ 4, 7, 6, 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,
};
static static_codebook _huff_book_line_1024x31_2sub3 = {
1.3.4.1 +1 -1 vorbis/lib/books/line_1024x31_3sub1.vqh
Index: line_1024x31_3sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_3sub1.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_3sub1.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_3sub1.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_3sub1[] = {
- 0, 3, 3, 3, 3, 2, 4, 3, 4,
+ 0, 3, 3, 2, 3, 3, 4, 3, 4,
};
static static_codebook _huff_book_line_1024x31_3sub1 = {
1.3.4.1 +2 -2 vorbis/lib/books/line_1024x31_3sub2.vqh
Index: line_1024x31_3sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_3sub2.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_3sub2.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_3sub2.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,8 +20,8 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_3sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2, 4, 3, 6, 5,
- 6, 5, 7, 5, 9, 5, 8, 6, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2, 4, 3, 6, 4,
+ 7, 5, 9, 5, 9, 6, 9, 6, 9,
};
static static_codebook _huff_book_line_1024x31_3sub2 = {
1.3.4.1 +3 -3 vorbis/lib/books/line_1024x31_3sub3.vqh
Index: line_1024x31_3sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_3sub3.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_3sub3.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_3sub3.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_1024x31_3sub3[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 7, 4, 7, 4,
- 7, 4, 6, 7, 7, 7, 4, 7, 6, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 7, 3, 7, 4, 7, 6,
+ 5, 6, 7, 7, 7, 5, 5, 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 static_codebook _huff_book_line_1024x31_3sub3 = {
1.2.4.1 +1 -1 vorbis/lib/books/line_1024x31_class0.vqh
Index: line_1024x31_class0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class0.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- line_1024x31_class0.vqh 2001/08/13 01:37:03 1.2
+++ line_1024x31_class0.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class0[] = {
- 1, 3, 3, 4, 3, 5, 6, 6,
+ 1, 2, 4, 6, 3, 5, 7, 7,
};
static static_codebook _huff_book_line_1024x31_class0 = {
1.3.4.1 +1 -1 vorbis/lib/books/line_1024x31_class1.vqh
Index: line_1024x31_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class1.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_class1.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_class1.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class1[] = {
- 1, 2, 3, 6, 8, 9,11,11, 4, 5, 8,10,10, 9,11,11,
+ 1, 5, 2, 4, 7,11,10,12, 3, 8, 6,10,11,12,12,12,
};
static static_codebook _huff_book_line_1024x31_class1 = {
1.3.4.1 +4 -4 vorbis/lib/books/line_1024x31_class2.vqh
Index: line_1024x31_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class2.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_class2.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_class2.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class2[] = {
- 1, 3, 4, 9, 7, 5, 6, 9, 9, 6, 6,13,14,14,12,14,
- 6, 3, 5,10, 8, 6, 7,10,12, 8, 9,14,14,14,14,14,
- 10, 8, 9,14,11, 9,10,14,14,14,11,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,13,13,13,13,13,
+ 1, 3, 4,10, 7, 5, 6,10, 9, 6,11,15,15,15,15,15,
+ 6, 3, 5,11, 7, 5, 7,11,11, 8,12,15,15,15,15,15,
+ 10, 8, 8,13,11, 9,10,14,15,15,15,15,15,15,15,15,
+ 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
};
static static_codebook _huff_book_line_1024x31_class2 = {
1.3.4.1 +4 -4 vorbis/lib/books/line_1024x31_class3.vqh
Index: line_1024x31_class3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_1024x31_class3.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_1024x31_class3.vqh 2001/08/13 11:30:01 1.3
+++ line_1024x31_class3.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_1024x31_class3[] = {
- 1, 3, 5,10, 6, 4, 5,11, 9, 7, 8,14,14,13,13,13,
- 6, 4, 6, 9, 7, 4, 6,10,10, 7, 9,13,13,13,13,13,
- 11, 9, 9,11,10, 8, 7,11,13, 9,10,13,13,13,13,13,
- 13,13,13,10,13,13,13,12,13,13,13,12,13,13,13,13,
+ 1, 3, 5,11, 7, 3, 5,11, 9, 7, 9,15,15,15,15,14,
+ 7, 4, 6,11, 7, 5, 6,12,10, 8, 9,14,14,14,14,14,
+ 11, 8, 9,12,11, 8, 8,11,13,10,11,14,14,14,14,14,
+ 14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
};
static static_codebook _huff_book_line_1024x31_class3 = {
1.3.4.1 +4 -4 vorbis/lib/books/line_128x7_0sub0.vqh
Index: line_128x7_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x7_0sub0.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_128x7_0sub0.vqh 2001/08/13 11:30:01 1.3
+++ line_128x7_0sub0.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x7_0sub0[] = {
- 4, 4, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 4, 6, 4, 6,
- 4, 7, 4, 7, 5, 8, 5, 9, 5,10, 6,10, 6,11, 7,12,
- 7,12, 8,12, 8,12, 9,12, 9,12, 9,12,11,11,10,12,
- 12,12,12,12,11,12,12,12,12,12,12,11,11,11,11,11,
+ 5, 5, 5, 6, 4, 6, 4, 7, 4, 7, 4, 8, 4, 9, 4,11,
+ 4,12, 4,13, 5,13, 5,13, 5,13, 5,13, 5,13, 5,13,
+ 5,13, 6,13, 6,13, 6,13, 5,13, 6,13, 6,12, 7,12,
+ 7,12, 9,11, 9,11,11,12,12,13,13,13,13,13,13,13,
};
static static_codebook _huff_book_line_128x7_0sub0 = {
1.2.4.1 +1 -1 vorbis/lib/books/line_128x7_1sub1.vqh
Index: line_128x7_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x7_1sub1.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- line_128x7_1sub1.vqh 2001/08/13 01:37:03 1.2
+++ line_128x7_1sub1.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x7_1sub1[] = {
- 0, 3, 3, 3, 3, 3, 3, 3, 3,
+ 0, 4, 2, 5, 2, 5, 3, 3, 3,
};
static static_codebook _huff_book_line_128x7_1sub1 = {
1.3.4.1 +2 -2 vorbis/lib/books/line_128x7_1sub2.vqh
Index: line_128x7_1sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x7_1sub2.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_128x7_1sub2.vqh 2001/08/13 11:30:01 1.3
+++ line_128x7_1sub2.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,8 +20,8 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x7_1sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 4, 4, 4,
- 4, 4, 4, 5, 5, 7, 5, 7, 6,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 1, 6, 2, 9, 3,11,
+ 5,12, 7,12, 9,12, 9,12,11,
};
static static_codebook _huff_book_line_128x7_1sub2 = {
1.3.4.1 +3 -3 vorbis/lib/books/line_128x7_1sub3.vqh
Index: line_128x7_1sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x7_1sub3.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_128x7_1sub3.vqh 2001/08/13 11:30:01 1.3
+++ line_128x7_1sub3.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_128x7_1sub3[] = {
0, 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, 3, 7, 3, 7, 4, 6,
- 4, 6, 5, 6, 4, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 6, 5, 6, 6, 6,
+ 4, 6, 6, 6, 5, 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,
};
static static_codebook _huff_book_line_128x7_1sub3 = {
1.3.4.1 +1 -1 vorbis/lib/books/line_128x7_2sub1.vqh
Index: line_128x7_2sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x7_2sub1.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_128x7_2sub1.vqh 2001/08/13 11:30:01 1.3
+++ line_128x7_2sub1.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,7 +20,7 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x7_2sub1[] = {
- 0, 3, 3, 3, 3, 2, 4, 3, 4,
+ 0, 3, 3, 2, 4, 2, 5, 3, 5,
};
static static_codebook _huff_book_line_128x7_2sub1 = {
1.3.4.1 +2 -2 vorbis/lib/books/line_128x7_2sub2.vqh
Index: line_128x7_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x7_2sub2.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_128x7_2sub2.vqh 2001/08/13 11:30:01 1.3
+++ line_128x7_2sub2.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,8 +20,8 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x7_2sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 6, 3,
- 6, 4, 6, 4, 7, 5, 8, 4, 8,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 5, 2, 6, 3, 7, 3,
+ 8, 4, 9, 4,11, 5,10, 5,11,
};
static static_codebook _huff_book_line_128x7_2sub2 = {
1.3.4.1 +3 -3 vorbis/lib/books/line_128x7_2sub3.vqh
Index: line_128x7_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x7_2sub3.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_128x7_2sub3.vqh 2001/08/13 11:30:01 1.3
+++ line_128x7_2sub3.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -21,9 +21,9 @@
static long _huff_lengthlist_line_128x7_2sub3[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 6, 2, 7, 3, 7, 4,
- 7, 4, 8, 4, 8, 5, 8, 7, 7, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 9, 2, 9, 3, 9, 5,
+ 9, 6, 8, 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, 8, 8,
};
static static_codebook _huff_book_line_128x7_2sub3 = {
1.3.4.1 +4 -4 vorbis/lib/books/line_128x7_class1.vqh
Index: line_128x7_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x7_class1.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_128x7_class1.vqh 2001/08/13 11:30:01 1.3
+++ line_128x7_class1.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x7_class1[] = {
- 2, 4, 3,10,10, 5, 6,12,12,12,11,12,12,12,12,12,
- 6, 3, 3, 9, 9, 7, 7,12,12,12,12,12,12,12,12,12,
- 7, 4, 4, 8,10, 6, 4,12,12,12,12,12,12,12,12,12,
- 12,11,10,12,12,11,10,12,12,12,12,12,12,12,12,12,
+ 1, 3,10,13,13, 5, 6,13,12, 6, 6,13,13,13,13,13,
+ 6, 4,10,13,12, 7,12,13,13,12,13,13,13,13,13,13,
+ 4, 3,12,13, 9, 7,10,13,12, 8,11,13,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
};
static static_codebook _huff_book_line_128x7_class1 = {
1.3.4.1 +4 -4 vorbis/lib/books/line_128x7_class2.vqh
Index: line_128x7_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/line_128x7_class2.vqh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- line_128x7_class2.vqh 2001/08/13 11:30:01 1.3
+++ line_128x7_class2.vqh 2001/10/09 04:34:47 1.3.4.1
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x7_class2[] = {
- 7, 6, 6, 8, 7, 4, 4, 7, 9, 5, 6, 9,12,12,12,12,
- 7, 5, 5, 7, 6, 3, 3, 6, 8, 5, 5, 8,12,10,11,12,
- 10, 7, 5, 9, 8, 4, 3, 6, 9, 5, 5, 8,12,11, 9,12,
- 12,10,11,12,11, 9,10,12,12, 9, 9,11,11,11,10,11,
+ 5, 4, 4,10, 7, 4, 5,13,13, 8, 8,13,13,13,13,13,
+ 6, 3, 3, 7, 7, 4, 4, 9,11, 8, 8,13,13,13,13,13,
+ 9, 5, 3, 5, 8, 5, 4, 7,10, 7, 7,11,13,13,13,13,
+ 13,13,12,13,13,12,13,13,13,13,12,12,12,12,12,12,
};
static static_codebook _huff_book_line_128x7_class2 = {
1.3.2.1 +7 -7 vorbis/lib/books/res_44c_A_128aux.vqh
Index: res_44c_A_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_44c_A_128aux.vqh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- res_44c_A_128aux.vqh 2001/09/11 05:45:00 1.3
+++ res_44c_A_128aux.vqh 2001/10/09 04:34:47 1.3.2.1
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_A_128aux[] = {
- 6, 9, 5,17,10,10,11,15,17,16, 9, 3,16, 7, 4,16,
- 6, 9,16,16, 5,16, 2,16,16, 7, 9,12,16,16,16, 6,
- 16, 5,16,16, 5, 8,15,16, 9, 4,16,16, 4,16, 6,11,
- 16,16, 9,16, 6,16,16,10,12,14,16,16, 8, 5, 8, 5,
- 6,12, 5, 8,15,16,11, 9,11, 9,10,14, 9,10,15,16,
- 16,16,16,10,16,16, 6, 5,12,16,16,16,16,13,16,16,
- 9, 6, 9,16,
+ 8,16, 9,16,16,11,12,15,16,16,13, 5,16,16, 5,16,
+ 7,13,16,16, 6,15, 2,15,15, 6, 6,11,15,15,15, 6,
+ 15,15, 4,15, 6,11,15,15,14, 4,15,15, 3,15, 6,10,
+ 15,15,10,15, 6,15,15, 8,11,13,15,15,11, 5, 8,14,
+ 4,10, 5,10,15,15,13, 9,10,10, 7,13, 8,11,15,15,
+ 15,11,15, 5,15,15, 4, 6,15,15,15,14,15, 7,15,15,
+ 5, 7,13,15,
};
static static_codebook _huff_book_res_44c_A_128aux = {
1.1.4.1 +7 -7 vorbis/lib/books/res_44c_Z_1024aux.vqh
Index: res_44c_Z_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_44c_Z_1024aux.vqh,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- res_44c_Z_1024aux.vqh 2001/08/13 06:05:19 1.1
+++ res_44c_Z_1024aux.vqh 2001/10/09 04:34:47 1.1.4.1
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_Z_1024aux[] = {
- 3, 8, 9,11, 4, 7, 8,11,16,16, 8, 4, 5, 7,16,16,
- 16,16,14,16, 8, 4, 5, 6,16,16,16,16,12,16, 9, 5,
- 5, 5,16,16,16,16,10,16, 4,16,16,16, 3, 4, 7,11,
- 16,16, 6,16,16,16, 4, 4, 8,13,16,16, 9,16,16,16,
- 7, 8,10,13,16,16,11,16,16,16,11,13,12,14,16,16,
- 14,11, 9, 6,16,16,16,16, 5,10,16,14,13, 8,16,16,
- 16,16, 8,15,
+ 3,10, 9,10, 4, 7, 8,12,17,17, 9, 4, 4, 6,17,17,
+ 17,17,13,17, 9, 4, 4, 5,17,17,17,17,12,17, 9, 5,
+ 5, 5,16,16,16,16, 8,11, 4,16,16,16, 3, 5, 8,10,
+ 16,16, 6,16,16,16, 5, 4, 8,12,16,16, 9,16,16,16,
+ 7, 8, 9,12,16,16,11,16,16,16,10,12,11,12,16,16,
+ 13,10,10, 6,15,16,16,16, 7,10,16,14,14, 8,16,16,
+ 16,16, 7,10,
};
static static_codebook _huff_book_res_44c_Z_1024aux = {
1.1.4.1 +45 -45 vorbis/lib/books/res_44c_Z_128aux.vqh
Index: res_44c_Z_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_44c_Z_128aux.vqh,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- res_44c_Z_128aux.vqh 2001/08/13 06:05:19 1.1
+++ res_44c_Z_128aux.vqh 2001/10/09 04:34:47 1.1.4.1
@@ -20,65 +20,65 @@
#include "codebook.h"
static long _huff_lengthlist_res_44c_Z_128aux[] = {
- 4,15,15,15, 6, 8,11,11,15,14,14,14,14,14,14,14,
+ 4,14,14,14, 6, 8, 9,10,14,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14, 6,14,14,14, 6, 7,10,12,
- 14,14, 9,14,14,14, 7, 7,10,13,14,14,13,14,14,14,
- 11,11,12,13,14,14,13,14,14,14,13,14,13,13,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,13,13,14,14,10,10,11,13,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14, 9,14,14,14,
- 7, 6, 8, 9,14,14, 9,14,14,14, 6, 5, 7, 8,14,14,
- 10,14,14,14, 7, 7, 8,10,14,14,12,14,14,14,10,10,
- 11,12,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,11,14,14,14, 9,10,12,13,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 9,14,14,14, 7, 7, 9,12,14,14,10,14,14,14, 7, 6,
- 8,11,14,14,11,14,14,14, 9, 8,10,12,14,14,13,14,
- 14,14,13,11,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,12,14,14,14,
- 10,11,12,13,14,14,14,12,13,13,14,14,14,14,14,14,
- 14,12,12,14,14,14,14,14,14,14,14,13,13,14,14,14,
- 14,14,14,14,10,14,14,14, 9, 9,11,12,14,14,13,14,
- 14,14,10,10,11,14,14,14,13,14,14,14,12,11,14,13,
+ 14,14,14,14,14,14,14,14, 8,14,14,14, 6, 7, 8,11,
+ 14,14, 9,14,14,14, 7, 7,10,13,14,14,11,14,14,14,
+ 10,11,12,12,14,14,13,14,14,14,14,12,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14, 8,14,14,14, 6, 7, 9,11,14,14,14,13,
+ 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14, 7,14,14,14,
+ 5, 5, 8,12,14,14, 8,14,14,14, 6, 5, 8,12,14,14,
+ 9,14,14,14, 9, 9,10,12,14,14,13,14,14,14,13,14,
+ 13,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14, 9,14,14,14, 8, 9,13,12,
+ 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 8,14,14,14, 7, 8,11,14,14,14,10,14,14,14, 8, 7,
+ 11,14,14,14,11,14,14,14,11,11,12,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14,10,14,14,14,
+ 10,12,13,14,14,14,14,12,13,14,14,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,11,14,14,14,10,11,13,14,14,14,14,14,
+ 14,14,11,12,14,14,14,14,13,14,14,14,12,14,14,14,
14,14,13,14,14,14,14,14,14,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 5,14,14,14, 5, 8,11,12,14,14,14,14,14,14,14,14,
+ 7,14,14,14, 7, 8,10,13,14,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14, 5,14,14,14, 4, 6, 9,12,
+ 14,14,14,14,14,14,14,14, 7,14,14,14, 4, 5, 8,12,
14,14, 7,14,14,14, 5, 6, 9,12,14,14,10,14,14,14,
- 9, 9,12,14,14,14,14,14,14,14,14,13,14,14,14,14,
+ 8, 9,11,13,14,14,13,14,14,14,13,14,12,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14, 9,14,14,14, 7, 8,11,13,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14, 7,14,14,14, 7, 8,11,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14, 7,14,14,14,
+ 5, 6, 9,13,14,14, 7,14,14,14, 5, 5, 9,14,14,14,
+ 12,14,14,14, 9, 9,11,14,14,14,13,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14, 6,14,14,14,
- 5, 6, 9,13,14,14, 7,14,14,14, 5, 5, 9,13,14,14,
- 11,14,14,14, 9, 9,12,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,11,14,14,14,10,11,13,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,11,14,14,14,10,12,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 9,14,14,14, 7, 8,10,14,14,14, 9,14,14,14, 8, 8,
+ 10,14,14,14,10,14,14,14,12, 9,12,14,14,14,14,14,
+ 14,14,13,13,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14,11,14,14,14,
+ 13,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 9,14,14,14, 8, 9,11,14,14,14,10,14,14,14, 8, 8,
- 10,14,14,14,12,14,14,14,11,10,13,14,14,14,14,14,
- 14,14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,13,14,14,14,
- 12,13,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,12,14,14,14,11,12,14,14,14,14,14,14,
+ 14,14,13,14,13,14,14,14,14,14,14,14,13,12,14,14,
+ 14,14,14,14,14,14,13,14,14,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,13,14,14,14,12,13,14,14,14,14,13,14,
- 14,14,13,12,13,14,14,14,14,14,14,14,13,12,13,14,
- 14,14,14,14,14,14,13,13,14,14,14,14,14,14,14,14,
+ 14,11,10,12,14,14,14,14,14,14, 9, 5, 6,10,14,14,
+ 14,14,14,14,10, 7, 8,11,14,14,14,14,14,14,14,12,
+ 12,14,14,14,14,14,14,14,14,14,14,14,14,14,13,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 12,14,13,13,12,13,14,14,13,14,14, 6, 5, 6,14,14,
- 14,14,11,14,13, 5, 5, 6,14,14,14,14,10,14,13, 7,
- 7, 6,14,14,14,14,10,14,13,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,13,14,13,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,11,
- 10,10,14,14,14,14,14,14,14,10, 9, 9,14,14,14,14,
- 13,14,14,11,11, 8,14,14,14,14,11,14,14,14,14,14,
+ 14,14,14,14,14,11, 9, 9,14,14,14,14,13,14, 8, 4,
+ 5, 7,14,14,14,14,11,14, 9, 6, 6, 7,14,14,14,14,
+ 11,14,13, 9, 8, 8,14,14,14,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
1.2.4.1 +3 -3 vorbis/lib/books/res_Zc_1.vqh
Index: res_Zc_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Zc_1.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- res_Zc_1.vqh 2001/08/13 01:37:06 1.2
+++ res_Zc_1.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -25,9 +25,9 @@
};
static long _vq_lengthlist_res_Zc_1[] = {
- 1, 6, 6, 0, 5, 5, 0, 5, 5, 5, 8, 8, 0, 9, 8, 0,
- 8, 8, 5, 8, 9, 0, 8, 9, 0, 8, 9, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 5, 9, 8, 0, 8, 7, 0, 7, 8, 5, 8, 9,
+ 1, 6, 6, 0, 5, 5, 0, 5, 5, 6, 8, 7, 0, 9, 8, 0,
+ 8, 8, 5, 7, 8, 0, 8, 9, 0, 8, 8, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 5, 8, 8, 0, 8, 7, 0, 7, 8, 5, 8, 8,
0, 7, 8, 0, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
9, 8, 0, 8, 7, 0, 8, 7, 5, 8, 9, 0, 7, 8, 0, 7,
8,
1.2.4.1 +169 -169 vorbis/lib/books/res_Zc_2.vqh
Index: res_Zc_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Zc_2.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- res_Zc_2.vqh 2001/08/13 01:37:06 1.2
+++ res_Zc_2.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -27,46 +27,46 @@
};
static long _vq_lengthlist_res_Zc_2[] = {
- 2, 6, 5, 8, 8, 0, 5, 5, 9, 8, 0, 5, 5, 8, 9, 0,
- 7, 7, 9, 9, 0, 0, 0, 9,10, 6, 8, 8,10,10, 0, 8,
- 8,11,10, 0, 8, 8,10,10, 0,10, 9,12,11, 0, 0, 0,
- 11,11, 6, 8, 8,10,10, 0, 8, 9,10,11, 0, 8, 8,10,
- 10, 0, 9,10,11,11, 0, 0, 0,12,12, 8,10,10,12,12,
- 0,11,11,13,12, 0,11,11,12,12, 0,14,14,15,14, 0,
- 0, 0,16,14, 8,10,10,12,12, 0,11,12,12,13, 0,11,
- 11,12,12, 0,12,13,13,14, 0, 0, 0,15,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, 5, 8, 8,11,11, 0, 8, 7,10,10,
- 0, 7, 7,10,10, 0, 9, 8,11,11, 0, 0, 0,11,11, 5,
- 8, 8,11,11, 0, 7, 8,10,11, 0, 8, 7,11,10, 0, 8,
- 9,11,11, 0, 0, 0,11,11, 8,10,10,12,12, 0,11,10,
- 12,12, 0,10,10,12,12, 0,13,12,13,13, 0, 0, 0,13,
- 13, 8,10,10,13,14, 0,10,11,12,13, 0,10,10,12,12,
- 0,12,13,14,13, 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, 5, 8, 8,11,11, 0, 8, 7,11,10, 0, 7, 7,
- 11,10, 0, 9, 9,11,11, 0, 0, 0,11,11, 5, 8, 8,11,
- 12, 0, 7, 8,10,11, 0, 7, 7,10,11, 0, 9, 9,11,11,
- 0, 0, 0,11,12, 8,11,10,13,12, 0,10,10,13,12, 0,
- 11,10,13,12, 0,13,12,13,13, 0, 0, 0,14,13, 8,10,
- 11,12,13, 0,10,11,12,13, 0,10,10,13,12, 0,12,13,
+ 2, 6, 6, 8, 9, 0, 5, 5, 9, 9, 0, 5, 5, 9, 9, 0,
+ 7, 7, 9, 9, 0, 0, 0,10,10, 5, 8, 8,10,10, 0, 8,
+ 8,11,10, 0, 8, 8,11,10, 0,10, 9,12,11, 0, 0, 0,
+ 11,11, 6, 8, 8,10,11, 0, 8, 8,10,11, 0, 8, 8,10,
+ 10, 0, 9,10,11,11, 0, 0, 0,11,12, 9,10,10,12,12,
+ 0,12,11,14,13, 0,11,11,14,13, 0,14,13,17,13, 0,
+ 0, 0,14,14, 9,10,10,12,12, 0,11,12,13,14, 0,11,
+ 11,12,13, 0,13,15,14,15, 0, 0, 0,14,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, 5, 8, 8,11,11, 0, 7, 7,11,11,
+ 0, 7, 7,10,11, 0, 9, 8,11,11, 0, 0, 0,11,12, 5,
+ 8, 8,12,11, 0, 7, 7,10,11, 0, 7, 7,11,10, 0, 8,
+ 9,11,12, 0, 0, 0,11,11, 8,10,10,13,12, 0,11,10,
+ 13,12, 0,10,11,13,12, 0,13,12,14,13, 0, 0, 0,13,
+ 13, 9,10,11,13,13, 0,10,11,12,13, 0,10,10,13,12,
+ 0,12,12,15,16, 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, 5, 8, 8,12,11, 0, 7, 7,11,10, 0, 7, 7,
+ 11,10, 0, 9, 9,11,11, 0, 0, 0,12,11, 5, 8, 8,11,
+ 12, 0, 7, 7,10,11, 0, 7, 7,10,11, 0, 8, 9,11,11,
+ 0, 0, 0,11,12, 9,11,10,13,13, 0,11,10,13,12, 0,
+ 11,10,13,13, 0,13,12,14,13, 0, 0, 0,14,14, 9,10,
+ 11,13,13, 0,10,11,12,13, 0,10,11,13,13, 0,12,12,
13,13, 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,
- 7, 9,10,12,13, 0, 9, 8,12,13, 0, 8, 9,12,12, 0,
- 11,10,13,13, 0, 0, 0,13,13, 7,10, 9,13,13, 0, 9,
- 9,13,12, 0, 9, 8,14,12, 0,10,11,13,13, 0, 0, 0,
- 13,12, 9,11,11,15,16, 0,12,10,14,14, 0,10,12,12,
- 13, 0,13,12,14,14, 0, 0, 0,13,13, 9,12,11,14,14,
- 0,11,11,13,14, 0,11,10,13,12, 0,13,13,14,14, 0,
- 0, 0,14,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 7, 9,10,13,13, 0, 9, 8,12,13, 0, 8, 9,13,13, 0,
+ 11, 9,12,12, 0, 0, 0,12,13, 7,10, 9,13,13, 0, 9,
+ 9,13,12, 0, 9, 8,14,12, 0,10,11,12,12, 0, 0, 0,
+ 13,12, 9,11,11,14,14, 0,12,10,14,14, 0,11,11,13,
+ 13, 0,13,12,14,13, 0, 0, 0,13,14, 9,12,12,16,16,
+ 0,11,12,13,14, 0,12,11,13,13, 0,12,13,15,14, 0,
+ 0, 0,15,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,10,
- 11,11, 0,13, 0,11,11,13,13, 0,11,11,14,13, 0,13,
- 13,14,14, 0, 0, 0,15,14,10,11,12,13,14, 0,11,11,
- 12,14, 0,11,11,13,14, 0,13,13,13,14, 0, 0, 0,14,
- 15,
+ 12,11,14,13, 0,11,11,14,13, 0,11,11,15,14, 0,13,
+ 13,14,13, 0, 0, 0,14,13, 9,11,12,15,15, 0,11,11,
+ 12,14, 0,10,12,13,14, 0,12,12,13,14, 0, 0, 0,13,
+ 17,
};
static float _vq_quantthresh_res_Zc_2[] = {
@@ -129,157 +129,157 @@
244, 354, 359, 362, 367, 479, 484, 487,
492, 364, 369, 489, 494, 123, 248, 363,
488, 124, 249, 374, 499, 373, 498, 368,
- 493, 343, 575, 576, 577, 581, 582, 583,
- 586, 591, 579, 584, 587, 592, 589, 594,
- 588, 599, 598, 600, 601, 602, 603, 606,
- 607, 608, 611, 616, 604, 609, 612, 617,
- 614, 619, 613, 624, 623, 618, 593, 0,
- 1, 3, 6, 8, 11, 13, 16, 18,
- 25, 26, 28, 31, 33, 36, 38, 41,
- 43, 50, 51, 53, 56, 58, 61, 63,
- 66, 68, 75, 76, 78, 81, 83, 86,
- 88, 91, 93, 150, 151, 153, 156, 158,
- 161, 163, 166, 168, 175, 176, 178, 181,
- 183, 186, 188, 191, 193, 200, 201, 203,
- 206, 208, 211, 213, 216, 218, 275, 276,
- 278, 281, 283, 286, 288, 291, 293, 300,
- 301, 303, 306, 308, 311, 313, 316, 318,
- 325, 326, 328, 331, 333, 336, 338, 341,
- 343, 400, 401, 403, 406, 408, 411, 413,
- 416, 418, 425, 426, 428, 431, 433, 436,
- 438, 441, 443, 450, 451, 453, 456, 458,
- 461, 463, 466, 468, 23, 48, 73, 98,
- 173, 198, 223, 298, 323, 348, 423, 448,
- 473, 100, 101, 103, 106, 108, 111, 113,
- 116, 118, 225, 226, 228, 231, 233, 236,
- 238, 241, 243, 350, 351, 353, 356, 358,
- 361, 363, 366, 368, 475, 476, 478, 481,
- 483, 486, 488, 491, 493, 123, 248, 373,
- 498, 575, 576, 581, 583, 586, 588, 591,
- 593, 598, 600, 601, 603, 606, 608, 611,
- 613, 616, 618, 623, 0, 1, 2, 3,
- 6, 7, 8, 16, 17, 18, 25, 26,
- 27, 28, 31, 32, 33, 41, 42, 43,
- 50, 51, 52, 53, 56, 57, 58, 66,
- 67, 68, 75, 76, 77, 78, 81, 82,
+ 493, 343, 575, 576, 577, 578, 581, 582,
+ 583, 586, 591, 579, 584, 587, 592, 589,
+ 594, 588, 599, 598, 600, 601, 602, 603,
+ 606, 607, 608, 611, 616, 604, 609, 612,
+ 617, 614, 619, 613, 624, 623, 618, 593,
+ 0, 1, 3, 6, 8, 11, 13, 16,
+ 18, 25, 26, 28, 31, 33, 36, 38,
+ 41, 43, 50, 51, 53, 56, 58, 61,
+ 63, 66, 68, 75, 76, 78, 81, 83,
+ 86, 88, 91, 93, 150, 151, 153, 156,
+ 158, 161, 163, 166, 168, 175, 176, 178,
+ 181, 183, 186, 188, 191, 193, 200, 201,
+ 203, 206, 208, 211, 213, 216, 218, 275,
+ 276, 278, 281, 283, 286, 288, 291, 293,
+ 300, 301, 303, 306, 308, 311, 313, 316,
+ 318, 325, 326, 328, 331, 333, 336, 338,
+ 341, 343, 400, 401, 403, 406, 408, 411,
+ 413, 416, 418, 425, 426, 428, 431, 433,
+ 436, 438, 441, 443, 450, 451, 453, 456,
+ 458, 461, 463, 466, 468, 23, 48, 73,
+ 98, 173, 198, 223, 298, 323, 348, 423,
+ 448, 473, 100, 101, 103, 106, 108, 111,
+ 113, 116, 118, 225, 226, 228, 231, 233,
+ 236, 238, 241, 243, 350, 351, 353, 356,
+ 358, 361, 363, 366, 368, 475, 476, 478,
+ 481, 483, 486, 488, 491, 493, 123, 248,
+ 373, 498, 575, 576, 578, 581, 583, 586,
+ 588, 591, 593, 598, 600, 601, 603, 606,
+ 608, 611, 613, 616, 618, 623, 0, 1,
+ 2, 3, 6, 7, 8, 16, 17, 18,
+ 25, 26, 27, 28, 31, 32, 33, 41,
+ 42, 43, 50, 51, 52, 53, 56, 57,
+ 58, 66, 67, 68, 75, 76, 77, 78,
+ 81, 82, 83, 91, 92, 93, 150, 151,
+ 152, 153, 156, 157, 158, 166, 167, 168,
+ 175, 176, 177, 178, 181, 182, 183, 191,
+ 192, 193, 200, 201, 202, 203, 206, 207,
+ 208, 216, 217, 218, 275, 276, 277, 278,
+ 281, 282, 283, 291, 292, 293, 300, 301,
+ 306, 307, 308, 316, 317, 318, 325, 326,
+ 331, 332, 333, 341, 342, 343, 400, 401,
+ 402, 403, 406, 407, 408, 416, 417, 418,
+ 425, 426, 431, 432, 433, 441, 442, 443,
+ 450, 451, 456, 457, 458, 466, 467, 468,
+ 4, 9, 19, 29, 34, 44, 54, 59,
+ 69, 79, 84, 94, 154, 159, 169, 179,
+ 184, 194, 204, 209, 219, 279, 284, 294,
+ 302, 309, 319, 327, 334, 344, 404, 409,
+ 419, 427, 434, 444, 452, 459, 469, 304,
+ 329, 429, 454, 100, 101, 102, 103, 106,
+ 107, 108, 116, 117, 118, 225, 226, 227,
+ 228, 231, 232, 233, 241, 242, 243, 303,
+ 350, 351, 356, 357, 358, 366, 367, 368,
+ 428, 475, 476, 481, 482, 483, 491, 492,
+ 493, 104, 109, 119, 229, 234, 244, 352,
+ 359, 369, 477, 484, 494, 354, 479, 353,
+ 478, 328, 575, 576, 581, 582, 583, 591,
+ 592, 593, 577, 584, 594, 579, 600, 601,
+ 606, 607, 608, 616, 617, 618, 602, 609,
+ 619, 604, 603, 578, 0, 1, 2, 3,
+ 6, 7, 8, 11, 12, 13, 16, 17,
+ 18, 25, 26, 27, 28, 31, 32, 33,
+ 36, 37, 38, 41, 42, 43, 75, 76,
+ 77, 78, 81, 82, 83, 86, 87, 88,
+ 91, 92, 93, 150, 151, 152, 153, 156,
+ 157, 158, 161, 162, 163, 166, 167, 168,
+ 200, 201, 202, 203, 206, 207, 208, 211,
+ 212, 213, 216, 217, 218, 275, 276, 277,
+ 278, 281, 282, 283, 286, 287, 288, 291,
+ 292, 293, 325, 326, 327, 328, 331, 332,
+ 333, 336, 337, 338, 341, 342, 343, 400,
+ 401, 402, 403, 406, 407, 408, 411, 412,
+ 413, 416, 417, 418, 450, 451, 452, 453,
+ 456, 457, 458, 461, 462, 463, 466, 467,
+ 468, 4, 9, 14, 19, 29, 34, 39,
+ 44, 79, 84, 89, 94, 154, 159, 164,
+ 169, 204, 209, 214, 219, 279, 284, 289,
+ 294, 329, 334, 339, 344, 404, 409, 414,
+ 419, 454, 459, 464, 469, 23, 48, 98,
+ 173, 223, 298, 348, 423, 473, 24, 49,
+ 99, 174, 224, 299, 349, 424, 474, 575,
+ 576, 577, 578, 581, 582, 583, 586, 587,
+ 588, 591, 592, 593, 579, 584, 589, 594,
+ 598, 599, 0, 1, 2, 3, 6, 7,
+ 8, 11, 12, 13, 16, 17, 18, 25,
+ 26, 27, 28, 31, 32, 33, 36, 37,
+ 38, 41, 42, 43, 50, 51, 52, 53,
+ 56, 57, 58, 61, 66, 75, 76, 77,
+ 78, 81, 82, 83, 86, 91, 150, 151,
+ 152, 153, 156, 157, 158, 161, 162, 163,
+ 166, 167, 168, 175, 176, 177, 178, 181,
+ 182, 183, 186, 187, 188, 191, 192, 193,
+ 200, 201, 202, 203, 206, 207, 208, 211,
+ 212, 213, 216, 217, 218, 400, 401, 402,
+ 403, 406, 407, 408, 411, 412, 413, 416,
+ 417, 418, 425, 426, 427, 428, 431, 432,
+ 433, 436, 437, 438, 441, 442, 443, 450,
+ 451, 452, 453, 456, 457, 458, 461, 462,
+ 463, 466, 467, 468, 4, 9, 14, 19,
+ 29, 34, 39, 44, 54, 59, 62, 67,
+ 79, 84, 87, 92, 154, 159, 164, 169,
+ 179, 184, 189, 194, 204, 209, 214, 219,
+ 404, 409, 414, 419, 429, 434, 439, 444,
+ 454, 459, 464, 469, 64, 69, 89, 94,
+ 23, 48, 63, 88, 173, 198, 223, 423,
+ 448, 473, 24, 49, 174, 199, 224, 424,
+ 449, 474, 74, 99, 73, 98, 68, 100,
+ 101, 102, 103, 106, 107, 108, 111, 116,
+ 225, 226, 227, 228, 231, 232, 233, 236,
+ 237, 238, 241, 242, 243, 475, 476, 477,
+ 478, 481, 482, 483, 486, 487, 488, 491,
+ 492, 493, 104, 109, 112, 117, 229, 234,
+ 239, 244, 479, 484, 489, 494, 114, 119,
+ 113, 248, 498, 249, 499, 124, 123, 118,
+ 0, 1, 2, 3, 6, 7, 8, 16,
+ 17, 18, 25, 26, 27, 28, 31, 32,
+ 33, 41, 42, 43, 50, 51, 56, 57,
+ 58, 66, 67, 68, 75, 76, 81, 82,
83, 91, 92, 93, 150, 151, 152, 153,
156, 157, 158, 166, 167, 168, 175, 176,
177, 178, 181, 182, 183, 191, 192, 193,
200, 201, 202, 203, 206, 207, 208, 216,
- 217, 218, 275, 276, 277, 278, 281, 282,
- 283, 291, 292, 293, 300, 301, 306, 307,
- 308, 316, 317, 318, 325, 326, 331, 332,
- 333, 341, 342, 343, 400, 401, 402, 403,
- 406, 407, 408, 416, 417, 418, 425, 426,
+ 217, 218, 400, 401, 402, 403, 406, 407,
+ 408, 416, 417, 418, 425, 426, 427, 428,
431, 432, 433, 441, 442, 443, 450, 451,
- 456, 457, 458, 466, 467, 468, 4, 9,
- 19, 29, 34, 44, 54, 59, 69, 79,
- 84, 94, 154, 159, 169, 179, 184, 194,
- 204, 209, 219, 279, 284, 294, 302, 309,
- 319, 327, 334, 344, 404, 409, 419, 427,
- 434, 444, 452, 459, 469, 304, 329, 429,
- 454, 100, 101, 102, 103, 106, 107, 108,
- 116, 117, 118, 225, 226, 227, 228, 231,
- 232, 233, 241, 242, 243, 303, 350, 351,
- 356, 357, 358, 366, 367, 368, 428, 475,
- 476, 481, 482, 483, 491, 492, 493, 104,
- 109, 119, 229, 234, 244, 352, 359, 369,
- 477, 484, 494, 354, 479, 353, 478, 328,
- 575, 576, 581, 582, 583, 591, 592, 593,
- 577, 584, 594, 579, 600, 601, 606, 607,
- 608, 616, 617, 618, 602, 609, 619, 604,
- 603, 0, 1, 2, 3, 6, 7, 8,
- 11, 12, 13, 16, 17, 18, 25, 26,
- 27, 28, 31, 32, 33, 36, 37, 38,
- 41, 42, 43, 75, 76, 77, 78, 81,
- 82, 83, 86, 87, 88, 91, 92, 93,
- 150, 151, 152, 153, 156, 157, 158, 161,
- 162, 163, 166, 167, 168, 200, 201, 202,
- 203, 206, 207, 208, 211, 212, 213, 216,
- 217, 218, 275, 276, 277, 278, 281, 282,
- 283, 286, 287, 288, 291, 292, 293, 325,
- 326, 327, 328, 331, 332, 333, 336, 337,
- 338, 341, 342, 343, 400, 401, 402, 403,
- 406, 407, 408, 411, 412, 413, 416, 417,
- 418, 450, 451, 452, 453, 456, 457, 458,
- 461, 462, 463, 466, 467, 468, 4, 9,
- 14, 19, 29, 34, 39, 44, 79, 84,
- 89, 94, 154, 159, 164, 169, 204, 209,
- 214, 219, 279, 284, 289, 294, 329, 334,
- 339, 344, 404, 409, 414, 419, 454, 459,
- 464, 469, 23, 48, 98, 173, 223, 298,
- 348, 423, 473, 24, 49, 99, 174, 224,
- 299, 349, 424, 474, 575, 576, 577, 581,
- 582, 583, 586, 587, 588, 591, 592, 593,
- 579, 584, 589, 594, 598, 599, 0, 1,
- 2, 3, 6, 7, 8, 11, 12, 13,
- 16, 17, 18, 25, 26, 27, 28, 31,
- 32, 33, 36, 37, 38, 41, 42, 43,
- 50, 51, 52, 53, 56, 57, 58, 61,
- 66, 75, 76, 77, 78, 81, 82, 83,
- 86, 91, 150, 151, 152, 153, 156, 157,
- 158, 161, 162, 163, 166, 167, 168, 175,
- 176, 177, 178, 181, 182, 183, 186, 187,
- 188, 191, 192, 193, 200, 201, 202, 203,
- 206, 207, 208, 211, 212, 213, 216, 217,
- 218, 400, 401, 402, 403, 406, 407, 408,
- 411, 412, 413, 416, 417, 418, 425, 426,
- 427, 428, 431, 432, 433, 436, 437, 438,
- 441, 442, 443, 450, 451, 452, 453, 456,
- 457, 458, 461, 462, 463, 466, 467, 468,
- 4, 9, 14, 19, 29, 34, 39, 44,
- 54, 59, 62, 67, 79, 84, 87, 92,
- 154, 159, 164, 169, 179, 184, 189, 194,
- 204, 209, 214, 219, 404, 409, 414, 419,
- 429, 434, 439, 444, 454, 459, 464, 469,
- 64, 69, 89, 94, 23, 48, 63, 88,
- 173, 198, 223, 423, 448, 473, 24, 49,
- 174, 199, 224, 424, 449, 474, 74, 99,
- 73, 98, 68, 100, 101, 102, 103, 106,
- 107, 108, 111, 116, 225, 226, 227, 228,
- 231, 232, 233, 236, 237, 238, 241, 242,
- 243, 475, 476, 477, 478, 481, 482, 483,
- 486, 487, 488, 491, 492, 493, 104, 109,
- 112, 117, 229, 234, 239, 244, 479, 484,
- 489, 494, 114, 119, 113, 248, 498, 249,
- 499, 124, 123, 118, 0, 1, 2, 3,
- 6, 7, 8, 16, 17, 18, 25, 26,
- 27, 28, 31, 32, 33, 41, 42, 43,
- 50, 51, 56, 57, 58, 66, 67, 68,
- 75, 76, 81, 82, 83, 91, 92, 93,
- 150, 151, 152, 153, 156, 157, 158, 166,
- 167, 168, 175, 176, 177, 178, 181, 182,
- 183, 191, 192, 193, 200, 201, 202, 203,
- 206, 207, 208, 216, 217, 218, 400, 401,
- 402, 403, 406, 407, 408, 416, 417, 418,
- 425, 426, 427, 428, 431, 432, 433, 441,
- 442, 443, 450, 451, 452, 453, 456, 457,
- 458, 466, 467, 468, 4, 9, 19, 29,
- 34, 44, 52, 59, 69, 77, 84, 94,
- 154, 159, 169, 179, 184, 194, 204, 209,
- 219, 404, 409, 419, 429, 434, 444, 454,
- 459, 469, 54, 79, 53, 100, 101, 106,
- 107, 108, 116, 117, 118, 225, 226, 227,
- 228, 231, 232, 233, 241, 242, 243, 475,
- 476, 477, 478, 481, 482, 483, 491, 492,
- 493, 102, 109, 119, 229, 234, 244, 479,
- 484, 494, 104, 103,
+ 452, 453, 456, 457, 458, 466, 467, 468,
+ 4, 9, 19, 29, 34, 44, 52, 59,
+ 69, 77, 84, 94, 154, 159, 169, 179,
+ 184, 194, 204, 209, 219, 404, 409, 419,
+ 429, 434, 444, 454, 459, 469, 54, 79,
+ 53, 100, 101, 106, 107, 108, 116, 117,
+ 118, 225, 226, 227, 228, 231, 232, 233,
+ 241, 242, 243, 475, 476, 477, 478, 481,
+ 482, 483, 491, 492, 493, 102, 109, 119,
+ 229, 234, 244, 479, 484, 494, 104, 103,
};
static long _vq_fitmap_res_Zc_2[] = {
- 0, 359, 548, 359, 793, 359, 793, 359,
- 982, 359, 1228, 359, 793, 359, 793, 359,
+ 0, 360, 550, 360, 796, 360, 796, 360,
+ 986, 360, 1232, 360, 796, 360, 796, 360,
};
static long _vq_fitlength_res_Zc_2[] = {
- 359, 189, 245, 189, 189, 189, 189, 189,
- 246, 189, 168, 189, 189, 189, 189, 189,
+ 360, 190, 246, 190, 190, 190, 190, 190,
+ 246, 190, 168, 190, 190, 190, 190, 190,
};
static encode_aux_pigeonhole _vq_auxp_res_Zc_2 = {
-2, 1, 4, 2,
_vq_pigeonmap_res_Zc_2,
- 1396,
+ 1400,
_vq_fitlist_res_Zc_2,
_vq_fitmap_res_Zc_2,
_vq_fitlength_res_Zc_2
1.2.4.1 +14 -14 vorbis/lib/books/res_Zc_3.vqh
Index: res_Zc_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Zc_3.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- res_Zc_3.vqh 2001/08/13 01:37:06 1.2
+++ res_Zc_3.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -37,21 +37,21 @@
};
static long _vq_lengthlist_res_Zc_3[] = {
- 1, 5, 5, 7, 7, 8, 8, 9, 9,11,10,12,11,12,13, 0,
- 4, 4, 7, 7, 8, 8, 9, 9,11,11,11,11,12,12, 0, 4,
- 4, 7, 7, 8, 8, 9,10,11,11,12,12,12,13, 0, 7, 7,
- 8, 8, 8, 8,10,10,11,11,12,12,13,13, 0, 0, 0, 8,
- 8, 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 8, 8,
- 9, 9,10,10,12,11,12,12,13,13, 0, 0, 0, 8, 8, 9,
- 9,11,10,12,11,13,13,13,14, 0, 0, 0, 9, 9,10,10,
- 11,11,12,12,12,13,13,14, 0, 0, 0, 0, 0,10,10,12,
+ 1, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11,12,12, 0,
+ 4, 5, 7, 7, 8, 8, 9, 9,10,10,11,11,12,12, 0, 4,
+ 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12,12, 0, 6, 6,
+ 7, 8, 8, 8,10,10,11,11,12,12,12,13, 0, 0, 0, 7,
+ 8, 9, 8,10,10,11,11,12,12,13,13, 0, 0, 0, 8, 8,
+ 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 8, 8, 9,
+ 9,11,10,12,12,12,12,13,13, 0, 0, 0, 9, 9,10,10,
+ 11,11,12,12,12,12,13,14, 0, 0, 0, 0, 0,10,10,11,
11,12,12,13,13,14,14, 0, 0, 0, 0, 0,11,11,11,11,
- 12,12,13,13,14,14, 0, 0, 0, 0, 0,11,11,12,12,14,
- 13,15,13,15,15, 0, 0, 0, 0, 0,12,12,12,12,12,13,
- 13,13,15,14, 0, 0, 0, 0, 0, 0, 0,12,12,14,13,14,
- 15,15,16, 0, 0, 0, 0, 0, 0, 0,13,12,13,13,14,14,
- 15,15, 0, 0, 0, 0, 0, 0, 0,13,13,15,14,14,15,16,
- 15,
+ 12,12,13,13,14,14, 0, 0, 0, 0, 0,11,11,12,12,13,
+ 13,14,13,14,14, 0, 0, 0, 0, 0,11,12,12,12,12,13,
+ 13,13,15,14, 0, 0, 0, 0, 0, 0, 0,12,12,13,13,14,
+ 14,17,16, 0, 0, 0, 0, 0, 0, 0,12,13,14,13,13,14,
+ 14,15, 0, 0, 0, 0, 0, 0, 0,13,13,13,13,14,14,15,
+ 17,
};
static float _vq_quantthresh_res_Zc_3[] = {
1.2.4.1 +2 -2 vorbis/lib/books/res_Zc_5.vqh
Index: res_Zc_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Zc_5.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- res_Zc_5.vqh 2001/08/13 01:37:06 1.2
+++ res_Zc_5.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -25,8 +25,8 @@
};
static long _vq_lengthlist_res_Zc_5[] = {
- 1, 4, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0,
- 0, 0, 3, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0,
+ 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 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.2.4.1 +2 -2 vorbis/lib/books/res_Zc_6.vqh
Index: res_Zc_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Zc_6.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- res_Zc_6.vqh 2001/08/13 01:37:06 1.2
+++ res_Zc_6.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -31,9 +31,9 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 5, 7, 6, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 4, 5, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6,10, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 9, 9,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 6, 6, 7, 8,10, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 6, 6, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 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.2.4.1 +7 -7 vorbis/lib/books/res_Zc_7.vqh
Index: res_Zc_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Zc_7.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- res_Zc_7.vqh 2001/08/13 01:37:06 1.2
+++ res_Zc_7.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -37,7 +37,7 @@
};
static long _vq_lengthlist_res_Zc_7[] = {
- 1, 3, 3, 5, 4, 4, 4, 7, 6, 8, 0, 0, 8, 0, 0, 0,
+ 1, 3, 3, 4, 5, 4, 4, 7, 6, 9, 8,11,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,
@@ -78,7 +78,7 @@
static long _vq_fitlist_res_Zc_7[] = {
0, 1, 2, 3, 4, 6, 5, 7,
- 8, 9, 12,
+ 8, 9, 10, 11, 12, 13,
};
static long _vq_fitmap_res_Zc_7[] = {
@@ -89,16 +89,16 @@
};
static long _vq_fitlength_res_Zc_7[] = {
- 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11,
- 11,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14,
};
static encode_aux_pigeonhole _vq_auxp_res_Zc_7 = {
-7, 1, 14, 5,
_vq_pigeonmap_res_Zc_7,
- 11,
+ 14,
_vq_fitlist_res_Zc_7,
_vq_fitmap_res_Zc_7,
_vq_fitlength_res_Zc_7
1.2.4.1 +844 -1035 vorbis/lib/books/res_Zc_8.vqh
Index: res_Zc_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Zc_8.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- res_Zc_8.vqh 2001/08/13 01:37:06 1.2
+++ res_Zc_8.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -67,133 +67,133 @@
};
static long _vq_lengthlist_res_Zc_8[] = {
- 3, 5, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 8, 9, 9, 9,
- 9, 9, 9,10, 9,10,10,10,10,11,10,12,11,12,11,13,
- 11,13,12,15,14,15,13,15, 0,15,17, 0,16, 0, 5, 5,
- 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,
- 10,10,10,10,11,11,11,11,12,11,12,12,12,12,13,15,
- 15,14,14,15,15, 0,17, 0, 0,16, 0, 5, 5, 6, 6, 7,
- 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
- 10,10,10,11,10,11,11,11,11,13,12,13,13,13,13,13,
- 13,14,14,16,16,16, 0, 0, 7, 7, 7, 7, 8, 8, 8, 8,
- 9, 9, 9,10,10,10,10,10,10,10,10,10,11,10,11,11,
- 11,11,11,11,12,12,12,12,14,14,13,14,14,14,15,16,
- 16, 0,16,16, 0, 0, 0, 7, 7, 8, 8, 8, 8, 9, 9, 9,
- 9,10,10,10,10,10,10,11,10,10,11,11,11,11,11,12,
- 12,13,12,12,12,13,12,13,13,14,14,14,15,16, 0,16,
- 16, 0, 0, 0, 8, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,
- 11,10,11,11,11,11,11,11,12,12,11,12,12,12,13,13,
- 12,13,13,14,14,14,15,15,15,15,15, 0,16, 0, 0, 0,
- 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,
- 10,10,11,11,11,11,12,12,12,12,12,12,13,14,12,13,
- 13,14,13,14,15,16,16,16, 0,16,15, 0, 0, 0, 8, 9,
- 9, 9, 9, 9,10,10,10,10,10,11,10,10,11,11,12,11,
- 12,12,12,12,12,13,12,14,12,13,13,14,14,14,15,15,
- 14, 0,15,15,16,16, 0,16, 0, 0, 0, 0, 0, 9, 8, 9,
- 9, 9,10,10,10,10,10,10,11,11,11,11,11,11,12,12,
- 12,12,12,13,12,13,13,14,14,13,14,14,13,14,14,15,
- 15,16, 0, 0,16, 0, 0, 0, 0, 0, 9, 9, 9, 9,10,10,
- 11,10,11,10,11,11,11,11,11,11,12,12,13,12,13,13,
- 13,14,14,13,14,14,14,13,16,15,16,15, 0,15, 0,15,
- 16, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9,10,10,10,10,11,
- 11,11,11,11,11,11,11,12,12,12,12,13,13,14,13,14,
- 14,13,14,14,14,15,14,15,16,16,16, 0,16,16, 0, 0,
- 0, 0, 0, 0, 9,10,10,10,10,10,10,10,11,11,11,11,
- 11,11,12,11,12,12,13,12,13,13,14,14,13,14,15,14,
- 15,14,15,14,15, 0, 0, 0,15,16,16,16, 0, 0, 0, 0,
- 0, 0, 0,10,10,11,10,10,10,11,11,11,11,11,11,12,
- 12,12,12,12,13,13,14,13,14,14,14,14,14,13,15,14,
- 15,16, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 10,10,10,11,11,11,11,11,12,11,12,12,11,12,12,12,
- 13,13,13,14,14,14,14,15,15,14,14,15,15,15, 0, 0,
- 16,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,10,
- 10,11,11,11,11,11,11,11,11,13,12,12,12,12,13,13,
- 13,13,14,15,15,14,16,14,15, 0,14,16, 0,16, 0,15,
- 0,15, 0, 0, 0, 0, 0, 0, 0, 0,11,10,11,10,11,11,
- 11,11,11,11,11,12,12,12,12,12,13,13,13,12,13,15,
- 16,13,14,15,16, 0,15,15, 0,16,15, 0, 0,16, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,10,11,11,11,
- 11,12,11,12,12,12,12,13,12,14,14,15,14,14,14,15,
- 0,16,15, 0,15,16,15,15,16,16, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,11,11,11,11,11,11,11,11,12,12,
- 12,12,13,12,13,13,14,13,13,13,15,13,16, 0, 0,15,
- 15, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0,11,11,11,11,11,11,12,11,12,12,12,12,13,
- 13,13,13,13,13,14,16,15,14,16,16, 0, 0, 0,16, 0,
- 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 12,11,12,12,12,12,12,12,12,12,12,13,13,13,13,13,
- 14,13,14,13,15,15,15,15,15,16,15,16,16,15, 0,16,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,
- 12,12,12,12,12,12,12,13,12,12,12,13,13,13,14,14,
- 14,15,15,16,15, 0,16, 0,16,16,16, 0, 0, 0,16, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,
- 12,12,12,12,12,12,13,13,13,13,14,12,14,14,15,14,
- 15,15, 0,16,15,15,15,16, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,
- 13,12,12,13,13,13,13,13,14,15,14,15,15,16,15,16,
- 16, 0,16, 0, 0,16, 0,16, 0,16, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,12,12,13,12,13,12,13,13,13,13,
- 13,13,13,12,13,14,14,14,14,15,15, 0, 0, 0,16, 0,
- 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,13,13,13,12,13,13,12,13,13,12,14,
- 13,14,14,14,15,16,15,15,15,16,16, 0, 0,16, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,13,13,13,13,13,13,14,13,12,13,13,15,14,14,
- 14,14,14,15,15,15, 0,15, 0, 0, 0,16, 0, 0, 0, 0,
+ 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9,10,10,10,
+ 9,10,10,11,10,12,11,12,12,13,12,13,13,12,13,14,
+ 13,14,13,14,14,15,13,14,14,16,15,14,14, 0, 5, 5,
+ 6, 7, 8, 7, 8, 8, 9, 9,10,10,10,10,10,10,10,11,
+ 11,11,11,12,13,12,12,12,13,13,13,13,14,14,16,13,
+ 14,13,13,15,14,14,14,13,15,15, 0, 5, 5, 7, 6, 7,
+ 7, 8, 8, 9, 9, 9, 9,10,10,10, 9,10,10,11,11,11,
+ 12,12,12,12,12,12,11,13,12,13,13,12,14,13,13,14,
+ 13,14,14,14,14,16,14, 0, 6, 6, 7, 7, 8, 8, 9, 9,
+ 10,10,10,10,11,11,10,10,11,11,12,12,11,12,12,13,
+ 12,12,13,12,13,13,12,13,13,13,14,13,15,12,13,13,
+ 14,16,14,14, 0, 0, 0, 7, 7, 8, 8, 9, 8,10, 9,10,
+ 10,11,11,11,10,11,11,12,12,12,12,12,12,13,13,13,
+ 0,13,14,15,14,13,13,14,16,13,14,15,16,14,15,14,
+ 14, 0, 0, 0, 8, 8, 8, 8, 9, 9,10,10,11,10,11,11,
+ 11,10,11,11,12,11,12,13,13,13,14,13,13,14,16, 0,
+ 13,16,13,15,14,13,13,13,13,16,15,16,14,16, 0, 0,
+ 0, 7, 8, 8, 8, 9, 9,10,10,10,10,11,11,11,11,11,
+ 11,11,13,12,13,13,13,13,13,13,13,14,13,14,14,14,
+ 15,16,16,14,14,15, 0,16,15, 0,14, 0, 0, 0, 8, 9,
+ 9, 9, 9, 9,10,10,10,11,11,11,11,11,11,12,12,13,
+ 13,12,14,14,13,13,15,14,13, 0,14,14,14,14,14,16,
+ 0,14,14,16,14,16, 0,14, 0, 0, 0, 0, 0, 9, 9, 9,
+ 9,10,10,11,11,11,11,11,12,12,11,12,13,12,13,14,
+ 13,13,13,14,14,13,14,13,13, 0,14,14,16,14,14,16,
+ 14,15,16,15, 0, 0, 0, 0, 0, 0, 9,10,10,10,10,10,
+ 11,11,12,11,12,11,12,11,12,12,13,14,14,13,13,13,
+ 15,16,14,14,13,15,16,14,16, 0,16,15,16, 0,15,14,
+ 16, 0, 0, 0, 0, 0, 0, 9, 9,10,10,10,10,11,11,12,
+ 12,11,12,12,11,12,12,14,13,12,15,15,14,14, 0,14,
+ 16,15,14,16,14,16, 0, 0,16,14,14,16, 0, 0, 0, 0,
+ 0, 0, 0, 0, 9,10,10,10,11,10,11,11,12,12,12,11,
+ 12,12,16,12,13,13,13,13,14,13,15,14,15,16, 0,15,
+ 16, 0,16,16, 0,14, 0,16,16, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,10,10,11,11,11,12,12,11,11,12,12,12,12,
+ 13,13,14,13,13,14,16, 0,14, 0,16,15, 0,15,16,16,
+ 15,16,14,15,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 10,11,11,11,11,11,12,12,11,12,12,12,13,14,13,13,
+ 14,15,15,13,13,13,14,14,16, 0, 0, 0,16,16,16,14,
+ 15, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 0,11,10,12,
+ 11,12,11,12,12,12,12,12,14,14,13,13,14,14,15,15,
+ 13,14,16,16,15,16, 0,16, 0,16, 0, 0, 0,16, 0,16,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,11,11,10,11,11,
+ 11,11,12,12,13,13,13,12,13,13,14,14,14,15,14,16,
+ 16, 0,14,16, 0, 0, 0,16,16, 0, 0,15, 0, 0,16,16,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,11,10,11,11,12,11,13,
+ 12,12,13,14,13,14,14,15,14,14,15,15,15,16,14, 0,
+ 16,16, 0,16,16,16,16, 0, 0, 0,15, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,11,11,12,11,12,12,12,13,13,13,
+ 12,13,13,13,15,15,14,16,15,16,15,15,16, 0,16,16,
+ 0, 0, 0,16, 0,16,16, 0, 0,16, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,11,11,12,11,12,12,12,12,12,13,14,13, 0,
+ 14,14,14,15,16, 0,16,15,16, 0,15, 0,16, 0,16, 0,
+ 0,16,16, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 11,12,11,11,13,12,12,13,13,13,13,15,14,15,14,16,
+ 15,14, 0,16, 0,15,16, 0,15, 0, 0,15,16, 0,16, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,
+ 12,12,12,12,12,13,14,16,13,14, 0,15,15, 0,16,14,
+ 14, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,16, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,13,13,
+ 14,12,14,14,14,14,14, 0,16,14,15,15,16,14,16,15,
+ 16,14,15,15,16,16, 0, 0,16, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,12,13,12,12,13,13,13,
+ 14,15,13,16,13,15, 0,16,16,16,15,16, 0,16, 0,16,
+ 16, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,13,13,14,13,14,14,13,14,15,16,
+ 14,15,16,15,15, 0, 0,16, 0, 0,15, 0, 0, 0, 0,16,
+ 0, 0, 0,16, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,13,14,14,13, 0,14, 0,14,14,14,16,
+ 16,16, 0, 0,15, 0, 0,16,16,15, 0, 0, 0, 0, 0, 0,
+ 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,14,13,15,13,15, 0,13,14,16,14,15, 0, 0,16,
+ 0, 0, 0,15,15,16,16,16,16, 0, 0, 0, 0, 0, 0, 0,
16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,
- 13,13,12,13,14,13,13,13,12,14,13,13,13,14,13,15,
- 15, 0,16, 0, 0,16, 0,16,15, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,12,14,
- 13,16,14,13,13,13,14,14,14,13,14,15,16,15,15, 0,
- 15,16,15,16,16, 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,13,13,
- 13,14,14,14,14,14,14,14,14,16,15,15,15,16,15,15,
- 0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,13,14,13,13,13,13,14,13,
- 15,13,13,14,14,14,15,16,15,14, 0,16, 0,15, 0, 0,
- 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,13,13,13,14,13,15,15,14,14,14,14,
- 14,15,15,15,15, 0,15, 0, 0,16, 0,16,16, 0, 0, 0,
- 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,14,13,13,14,14,14,13,14,14,14,14,14,14,16,
- 16,16,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 14,14,13, 0,13,16,14,15, 0,15, 0, 0, 0,16, 0, 0,
+ 16,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14,16,14,13,
+ 13, 0,16, 0,15,16,16, 0,16,16,16,15,16,16, 0, 0,
+ 15,16, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,14,14,16,
+ 0,16,16,16,16,16, 0, 0, 0,16,15,16, 0, 0,16, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,13,14,13,13,13,13,14,14,14,15,14,15,14,14,16,
- 15, 0,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, 0, 0,13,13,
- 14,14,14,14,14,15,15,15,16,15,14,16,15,16,16, 0,
- 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,16,14,13,13,13,
- 14,15,16,14,15,15, 0, 0,16,15, 0,15,14,16,16,16,
- 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,16,14,14,13,14,14,16,13,
- 15,14,14,16,15,15,16,16, 0,15, 0, 0, 0, 0, 0, 0,
- 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0,15,14,15,14,16,13,15,15,14,
- 16,15, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,14,14,15,16, 0, 0,15, 0,
+ 14,16,14,16, 0,15, 0, 0, 0,15, 0, 0, 0, 0,16, 0,
+ 16,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,15,14,14, 0,15,14,16,16, 0, 0,16,
+ 14, 0, 0,15, 0, 0, 0, 0,16, 0,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,13,14,15,14,15,15,14,15,15, 0, 0,16,
- 0, 0,15,15, 0,15, 0, 0,16, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,15,16,16,15,16,14, 0,16,15,16,15,15, 0, 0,
+ 16, 0, 0, 0, 0,16, 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,14,13,15,14,14,15,15,15,16,16,16,16,16, 0,16,
- 16,16, 0, 0,16, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14,13,
- 14,15,15,14,16,15,15,15,15,15,15, 0, 0,16, 0, 0,
+ 0, 0,14,14,15,15, 0,15,16, 0, 0, 0, 0, 0, 0,16,
+ 0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15, 0,
+ 0, 0,15, 0, 0,16,16, 0,16, 0,16, 0, 0, 0, 0, 0,
+ 0,16, 0, 0, 0,16, 0, 0, 0,16, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,16,16, 0,16, 0,
+ 14, 0,15,14,16, 0, 0, 0, 0, 0,16, 0, 0,16,16, 0,
+ 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,14,13, 0,16,14,15, 0,13,
+ 16, 0,16,16, 0, 0, 0, 0,16, 0, 0,16, 0, 0, 0, 0,
+ 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,15, 0,15, 0,16,16,16, 0, 0,
+ 16, 0,16, 0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0,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, 0, 0, 0, 0, 0,14,13,16,
- 15,14,15,16,16, 0,15,16,15, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,13,15, 0, 0,16, 0,16, 0, 0,16, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,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, 0, 0, 0, 0, 0, 0, 0, 0,14,14,15,15,15,15,
- 16,15,15, 0, 0,16,16,15,16, 0, 0,16, 0, 0, 0, 0,
+ 0, 0,14,16, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12, 0,
+ 12,16,16, 0, 0,16, 0, 0, 0,15, 0, 0, 0, 0, 0,16,
+ 16,16, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15,14,16,
+ 0,16, 0,16, 0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0,
+ 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,16,14,16, 0, 0,
+ 0, 0, 0, 0,16, 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,12, 0, 0, 0, 0,16, 0,16,
+ 0, 0, 0, 0, 0, 0,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,
- 0, 0, 0, 0, 0, 0, 0,14,14,15,16,15, 0,16,14,16,
- 15, 0, 0,15,16, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,12, 0,12,16,14, 0, 0, 0, 0,16,15, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,12,14,13,16,14,14, 0,15, 0,16, 0,16,
- 16, 0, 0, 0,16, 0, 0, 0,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, 0,14,14,16,16,16,16, 0,16,15, 0,15,16, 0,
- 0, 0,16, 0, 0,16, 0, 0,16,
+ 0, 0, 0, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
};
static float _vq_quantthresh_res_Zc_8[] = {
@@ -261,493 +261,476 @@
201, 203, 107, 199, 110, 116, 202, 204,
205, 291, 293, 197, 289, 200, 206, 292,
294, 27, 72, 160, 28, 73, 161, 30,
- 75, 118, 163, 117, 120, 208, 207, 295,
- 296, 210, 298, 25, 27, 29, 31, 70,
- 72, 74, 76, 117, 119, 162, 164, 23,
- 68, 115, 160, 26, 28, 30, 32, 71,
- 73, 75, 77, 118, 120, 163, 165, 121,
- 207, 209, 113, 205, 116, 122, 208, 210,
- 211, 297, 299, 203, 295, 206, 212, 298,
- 300, 33, 78, 166, 34, 79, 167, 36,
- 81, 124, 169, 123, 126, 214, 213, 301,
- 302, 216, 304, 31, 33, 35, 37, 76,
- 78, 80, 82, 123, 125, 168, 170, 29,
- 74, 121, 166, 32, 34, 36, 38, 77,
- 79, 81, 83, 124, 126, 169, 171, 127,
- 213, 215, 119, 211, 122, 128, 214, 216,
- 217, 303, 305, 209, 301, 212, 218, 304,
- 306, 39, 84, 172, 173, 42, 130, 175,
- 129, 132, 220, 219, 307, 308, 310, 37,
- 39, 41, 82, 84, 86, 129, 131, 174,
- 176, 35, 80, 127, 172, 38, 42, 44,
- 83, 89, 130, 132, 175, 133, 219, 221,
- 125, 217, 128, 220, 223, 309, 311, 215,
- 307, 218, 224, 310, 178, 179, 313, 314,
- 262, 264, 266, 268, 354, 356, 170, 260,
- 352, 173, 263, 265, 355, 357, 399, 401,
- 305, 397, 308, 400, 359, 404, 46, 136,
- 137, 138, 228, 47, 139, 229, 49, 141,
- 231, 319, 0, 1, 48, 2, 4, 51,
- 91, 92, 93, 183, 184, 185, 273, 274,
- 275, 94, 186, 276, 50, 140, 142, 230,
- 232, 318, 320, 143, 233, 321, 3, 5,
- 52, 6, 53, 95, 187, 277, 365, 96,
- 188, 278, 366, 322, 410, 323, 411, 367,
- 455, 368, 456, 457, 458, 50, 52, 138,
- 140, 142, 144, 228, 230, 232, 234, 320,
- 322, 51, 53, 139, 141, 143, 145, 229,
- 231, 233, 235, 321, 323, 55, 147, 237,
- 325, 5, 7, 48, 54, 6, 8, 49,
- 10, 57, 95, 97, 183, 185, 187, 189,
- 273, 275, 277, 279, 365, 367, 96, 98,
- 184, 186, 188, 190, 274, 276, 278, 280,
- 366, 368, 100, 192, 282, 370, 54, 56,
- 142, 144, 146, 148, 232, 234, 236, 238,
- 324, 326, 52, 140, 230, 322, 55, 57,
- 143, 145, 147, 149, 233, 235, 237, 239,
- 325, 327, 9, 11, 58, 7, 50, 10,
- 12, 53, 59, 99, 101, 187, 189, 191,
- 193, 277, 279, 281, 283, 369, 371, 97,
- 185, 275, 367, 100, 102, 188, 190, 192,
- 194, 278, 280, 282, 284, 370, 372, 56,
- 58, 144, 146, 148, 150, 234, 236, 238,
- 240, 326, 328, 57, 59, 145, 147, 149,
- 151, 235, 237, 239, 241, 327, 329, 61,
- 153, 243, 331, 11, 13, 54, 60, 12,
- 14, 55, 16, 63, 101, 103, 189, 191,
- 193, 195, 279, 281, 283, 285, 371, 373,
- 102, 104, 190, 192, 194, 196, 280, 282,
- 284, 286, 372, 374, 106, 198, 288, 376,
- 60, 62, 148, 150, 152, 154, 238, 240,
- 242, 244, 330, 332, 58, 146, 236, 328,
- 61, 63, 149, 151, 153, 155, 239, 241,
- 243, 245, 331, 333, 15, 17, 64, 13,
- 56, 16, 18, 59, 65, 105, 107, 193,
- 195, 197, 199, 283, 285, 287, 289, 375,
- 377, 103, 191, 281, 373, 106, 108, 194,
- 196, 198, 200, 284, 286, 288, 290, 376,
- 378, 62, 64, 150, 152, 154, 156, 240,
- 242, 244, 246, 332, 334, 63, 65, 151,
- 153, 155, 157, 241, 243, 245, 247, 333,
- 335, 67, 159, 249, 337, 17, 19, 60,
- 66, 18, 20, 61, 22, 69, 107, 109,
- 195, 197, 199, 201, 285, 287, 289, 291,
- 377, 379, 108, 110, 196, 198, 200, 202,
- 286, 288, 290, 292, 378, 380, 112, 204,
- 294, 382, 66, 68, 154, 156, 158, 160,
- 244, 246, 248, 250, 336, 338, 64, 152,
- 242, 334, 67, 69, 155, 157, 159, 161,
- 245, 247, 249, 251, 337, 339, 21, 23,
- 70, 19, 62, 22, 24, 65, 71, 111,
- 113, 199, 201, 203, 205, 289, 291, 293,
- 295, 381, 383, 109, 197, 287, 379, 112,
- 114, 200, 202, 204, 206, 290, 292, 294,
- 296, 382, 384, 68, 70, 156, 158, 160,
- 162, 246, 248, 250, 252, 338, 340, 69,
- 71, 157, 159, 161, 163, 247, 249, 251,
- 253, 339, 341, 73, 165, 255, 343, 23,
- 25, 66, 72, 24, 26, 67, 28, 75,
- 113, 115, 201, 203, 205, 207, 291, 293,
- 295, 297, 383, 385, 114, 116, 202, 204,
- 206, 208, 292, 294, 296, 298, 384, 386,
- 118, 210, 300, 388, 72, 74, 160, 162,
- 164, 166, 250, 252, 254, 256, 342, 344,
- 70, 158, 248, 340, 73, 75, 161, 163,
- 165, 167, 251, 253, 255, 257, 343, 345,
- 27, 29, 76, 25, 68, 28, 30, 71,
- 77, 117, 119, 205, 207, 209, 211, 295,
- 297, 299, 301, 387, 389, 115, 203, 293,
- 385, 118, 120, 206, 208, 210, 212, 296,
- 298, 300, 302, 388, 390, 74, 76, 162,
- 164, 166, 168, 252, 254, 256, 258, 344,
- 346, 75, 77, 163, 165, 167, 169, 253,
- 255, 257, 259, 345, 347, 79, 171, 261,
- 349, 29, 31, 72, 78, 30, 32, 73,
- 34, 81, 119, 121, 207, 209, 211, 213,
- 297, 299, 301, 303, 389, 391, 120, 122,
- 208, 210, 212, 214, 298, 300, 302, 304,
- 390, 392, 124, 216, 306, 394, 78, 80,
- 166, 168, 170, 172, 256, 258, 260, 262,
- 348, 350, 76, 164, 254, 346, 79, 81,
- 167, 169, 171, 173, 257, 259, 261, 263,
- 349, 351, 33, 35, 82, 31, 74, 34,
- 36, 77, 83, 123, 125, 211, 213, 215,
- 217, 301, 303, 305, 307, 393, 395, 121,
- 209, 299, 391, 124, 126, 212, 214, 216,
- 218, 302, 304, 306, 308, 394, 396, 80,
- 82, 168, 170, 172, 174, 258, 260, 262,
- 264, 350, 352, 81, 83, 169, 171, 173,
- 175, 259, 261, 263, 265, 351, 355, 35,
- 37, 78, 84, 36, 38, 79, 125, 127,
- 213, 215, 217, 219, 303, 305, 307, 309,
- 395, 397, 126, 128, 214, 216, 218, 220,
- 304, 306, 308, 310, 396, 398, 130, 400,
- 46, 136, 137, 138, 228, 229, 230, 318,
- 319, 320, 47, 139, 231, 321, 91, 183,
- 273, 274, 275, 365, 92, 184, 276, 366,
- 455, 456, 368, 458, 410, 500, 411, 501,
- 413, 503, 457, 547, 548, 412, 502, 322,
- 323, 140, 142, 228, 230, 232, 234, 318,
- 320, 322, 324, 410, 412, 141, 143, 229,
- 231, 233, 235, 319, 321, 323, 325, 411,
- 413, 145, 237, 327, 415, 185, 187, 273,
- 275, 277, 279, 365, 367, 369, 455, 457,
- 186, 188, 274, 276, 278, 280, 366, 368,
- 370, 456, 458, 190, 282, 372, 460, 459,
- 547, 548, 462, 550, 144, 146, 232, 234,
- 236, 238, 322, 324, 326, 328, 414, 416,
- 142, 230, 320, 412, 145, 147, 233, 235,
- 237, 239, 323, 325, 327, 329, 415, 417,
- 189, 191, 277, 279, 281, 283, 367, 369,
- 371, 373, 459, 461, 187, 275, 365, 457,
- 190, 192, 278, 280, 282, 284, 368, 370,
- 372, 374, 460, 462, 463, 549, 551, 455,
- 547, 458, 464, 550, 552, 146, 148, 234,
- 236, 238, 240, 324, 326, 328, 330, 416,
- 418, 147, 149, 235, 237, 239, 241, 325,
- 327, 329, 331, 417, 419, 151, 243, 333,
- 421, 191, 193, 279, 281, 283, 285, 369,
- 371, 373, 375, 461, 463, 192, 194, 280,
- 282, 284, 286, 370, 372, 374, 376, 462,
- 464, 196, 288, 378, 466, 459, 465, 551,
- 553, 460, 552, 554, 468, 556, 150, 152,
- 238, 240, 242, 244, 328, 330, 332, 334,
- 420, 422, 148, 236, 326, 418, 151, 153,
- 239, 241, 243, 245, 329, 331, 333, 335,
- 421, 423, 195, 197, 283, 285, 287, 289,
- 373, 375, 377, 379, 465, 467, 193, 281,
- 371, 463, 196, 198, 284, 286, 288, 290,
- 374, 376, 378, 380, 466, 468, 469, 555,
- 557, 461, 553, 464, 470, 556, 558, 152,
- 154, 240, 242, 244, 246, 330, 332, 334,
- 336, 422, 424, 153, 155, 241, 243, 245,
- 247, 331, 333, 335, 337, 423, 425, 157,
- 249, 339, 427, 197, 199, 285, 287, 289,
- 291, 375, 377, 379, 381, 467, 469, 198,
- 200, 286, 288, 290, 292, 376, 378, 380,
- 382, 468, 470, 202, 294, 384, 472, 465,
- 471, 557, 559, 466, 558, 560, 474, 562,
- 156, 158, 244, 246, 248, 250, 334, 336,
- 338, 340, 426, 428, 154, 242, 332, 424,
- 157, 159, 245, 247, 249, 251, 335, 337,
- 339, 341, 427, 429, 201, 203, 289, 291,
- 293, 295, 379, 381, 383, 385, 471, 473,
- 199, 287, 377, 469, 202, 204, 290, 292,
- 294, 296, 380, 382, 384, 386, 472, 474,
- 475, 561, 563, 467, 559, 470, 476, 562,
- 564, 158, 160, 246, 248, 250, 252, 336,
- 338, 340, 342, 428, 430, 159, 161, 247,
- 249, 251, 253, 337, 339, 341, 343, 429,
- 431, 163, 255, 345, 433, 203, 205, 291,
- 293, 295, 297, 381, 383, 385, 387, 473,
- 475, 204, 206, 292, 294, 296, 298, 382,
- 384, 386, 388, 474, 476, 208, 300, 390,
- 478, 471, 477, 563, 565, 472, 564, 566,
- 480, 568, 162, 164, 250, 252, 254, 256,
- 340, 342, 344, 346, 432, 434, 160, 248,
- 338, 430, 163, 165, 251, 253, 255, 257,
- 341, 343, 345, 347, 433, 435, 207, 209,
- 295, 297, 299, 301, 385, 387, 389, 391,
- 477, 479, 205, 293, 383, 475, 208, 210,
- 296, 298, 300, 302, 386, 388, 390, 392,
- 478, 480, 481, 567, 569, 473, 565, 476,
- 482, 568, 570, 164, 166, 252, 254, 256,
- 258, 342, 344, 346, 348, 434, 436, 165,
- 167, 253, 255, 257, 259, 343, 345, 347,
- 349, 435, 437, 169, 261, 351, 439, 209,
- 211, 297, 299, 301, 303, 387, 389, 391,
- 393, 479, 481, 210, 212, 298, 300, 302,
- 304, 388, 390, 392, 394, 480, 482, 214,
- 306, 396, 484, 477, 483, 569, 571, 478,
- 570, 572, 486, 574, 168, 170, 256, 258,
- 260, 262, 346, 348, 350, 352, 438, 440,
- 166, 254, 344, 436, 169, 171, 257, 259,
- 261, 263, 347, 349, 351, 439, 441, 213,
- 215, 301, 303, 305, 307, 391, 393, 395,
- 397, 483, 485, 211, 299, 389, 481, 214,
- 216, 302, 304, 306, 308, 392, 394, 396,
- 398, 484, 486, 487, 573, 575, 479, 571,
- 482, 488, 574, 576, 170, 172, 258, 260,
- 262, 264, 348, 350, 352, 354, 440, 442,
- 171, 173, 259, 261, 263, 265, 349, 351,
- 355, 441, 443, 175, 357, 445, 215, 217,
- 303, 305, 307, 309, 393, 395, 397, 399,
- 485, 487, 216, 218, 304, 306, 308, 310,
- 394, 396, 398, 400, 486, 488, 220, 490,
- 483, 489, 575, 577, 484, 576, 492, 174,
- 176, 262, 264, 266, 268, 352, 354, 356,
- 172, 260, 350, 442, 175, 263, 265, 355,
- 357, 359, 445, 447, 219, 221, 307, 309,
- 311, 313, 397, 399, 401, 489, 217, 305,
- 395, 487, 220, 308, 310, 314, 398, 400,
- 404, 490, 492, 493, 581, 485, 577, 488,
- 582, 178, 448, 179, 223, 224, 320, 322,
- 410, 412, 414, 500, 502, 504, 592, 321,
- 323, 411, 413, 415, 501, 503, 505, 593,
- 325, 417, 507, 595, 230, 232, 318, 324,
- 231, 233, 319, 235, 327, 365, 367, 455,
- 457, 459, 547, 549, 637, 366, 368, 456,
- 458, 460, 548, 550, 638, 370, 462, 552,
- 640, 594, 682, 683, 597, 685, 639, 642,
- 730, 729, 732, 820, 324, 326, 412, 414,
- 416, 418, 502, 504, 506, 508, 594, 596,
- 322, 410, 500, 592, 325, 327, 413, 415,
- 417, 419, 503, 505, 507, 509, 595, 597,
- 234, 236, 328, 232, 320, 235, 237, 323,
- 329, 369, 371, 457, 459, 461, 463, 547,
- 549, 551, 553, 639, 641, 367, 455, 637,
- 370, 372, 458, 460, 462, 464, 548, 550,
- 552, 554, 640, 642, 326, 328, 414, 416,
- 418, 420, 504, 506, 508, 510, 596, 598,
- 327, 329, 415, 417, 419, 421, 505, 507,
- 509, 511, 597, 599, 331, 423, 513, 601,
- 236, 238, 324, 330, 237, 239, 325, 241,
- 333, 371, 373, 459, 461, 463, 465, 549,
- 551, 553, 555, 641, 643, 372, 374, 460,
- 462, 464, 466, 550, 552, 554, 556, 642,
- 644, 376, 468, 558, 646, 330, 332, 418,
- 420, 422, 424, 508, 510, 512, 514, 600,
- 602, 328, 416, 506, 598, 331, 333, 419,
- 421, 423, 425, 509, 511, 513, 515, 601,
- 603, 240, 242, 334, 238, 326, 241, 243,
- 329, 335, 375, 377, 463, 465, 467, 469,
- 553, 555, 557, 559, 645, 647, 373, 461,
- 551, 643, 376, 378, 464, 466, 468, 470,
- 554, 556, 558, 560, 646, 648, 332, 334,
- 420, 422, 424, 426, 510, 512, 514, 516,
- 602, 604, 333, 335, 421, 423, 425, 427,
- 511, 513, 515, 517, 603, 605, 337, 429,
- 519, 607, 242, 244, 330, 336, 243, 245,
- 331, 247, 339, 377, 379, 465, 467, 469,
- 471, 555, 557, 559, 561, 647, 649, 378,
- 380, 466, 468, 470, 472, 556, 558, 560,
- 562, 648, 650, 382, 474, 564, 652, 336,
- 338, 424, 426, 428, 430, 514, 516, 518,
- 520, 606, 608, 334, 422, 512, 604, 337,
- 339, 425, 427, 429, 431, 515, 517, 519,
- 521, 607, 609, 246, 248, 340, 244, 332,
- 247, 249, 335, 341, 381, 383, 469, 471,
- 473, 475, 559, 561, 563, 565, 651, 653,
- 379, 467, 557, 649, 382, 384, 470, 472,
- 474, 476, 560, 562, 564, 566, 652, 654,
- 338, 340, 426, 428, 430, 432, 516, 518,
- 520, 522, 608, 610, 339, 341, 427, 429,
- 431, 433, 517, 519, 521, 523, 609, 611,
- 343, 435, 525, 613, 248, 250, 336, 342,
- 249, 251, 337, 253, 345, 383, 385, 471,
- 473, 475, 477, 561, 563, 565, 567, 653,
- 655, 384, 386, 472, 474, 476, 478, 562,
- 564, 566, 568, 654, 656, 388, 480, 570,
- 658, 342, 344, 430, 432, 434, 436, 520,
- 522, 524, 526, 612, 614, 340, 428, 518,
- 610, 343, 345, 431, 433, 435, 437, 521,
+ 75, 118, 163, 117, 120, 207, 295, 296,
+ 210, 298, 25, 27, 29, 31, 70, 72,
+ 74, 76, 117, 119, 162, 164, 23, 68,
+ 115, 160, 26, 28, 30, 32, 71, 73,
+ 75, 77, 118, 120, 163, 165, 121, 207,
+ 209, 113, 205, 116, 122, 210, 211, 297,
+ 299, 203, 295, 206, 212, 298, 300, 33,
+ 78, 166, 34, 79, 167, 36, 81, 124,
+ 169, 123, 126, 214, 213, 301, 302, 216,
+ 304, 31, 33, 35, 37, 76, 78, 80,
+ 82, 123, 125, 168, 170, 29, 74, 121,
+ 166, 32, 34, 36, 38, 77, 79, 81,
+ 83, 124, 126, 169, 171, 127, 213, 215,
+ 119, 211, 122, 128, 214, 216, 217, 303,
+ 305, 209, 301, 212, 218, 304, 306, 39,
+ 84, 172, 40, 85, 173, 42, 87, 130,
+ 175, 129, 132, 220, 219, 307, 308, 222,
+ 37, 39, 41, 43, 82, 84, 86, 88,
+ 129, 131, 174, 176, 35, 80, 127, 172,
+ 38, 40, 42, 44, 83, 85, 87, 89,
+ 130, 132, 175, 177, 133, 219, 221, 125,
+ 217, 128, 134, 220, 222, 223, 309, 311,
+ 215, 307, 218, 224, 312, 178, 179, 314,
+ 264, 266, 268, 356, 265, 267, 269, 357,
+ 359, 401, 403, 402, 46, 136, 137, 138,
+ 228, 47, 139, 229, 49, 141, 231, 319,
+ 0, 1, 48, 2, 4, 51, 91, 92,
+ 93, 183, 184, 185, 273, 274, 275, 94,
+ 186, 276, 50, 140, 142, 230, 232, 318,
+ 320, 143, 233, 321, 3, 5, 52, 6,
+ 53, 95, 187, 277, 365, 96, 188, 278,
+ 366, 322, 410, 323, 411, 367, 455, 368,
+ 456, 457, 458, 50, 52, 138, 140, 142,
+ 144, 228, 230, 232, 234, 320, 322, 51,
+ 53, 139, 141, 143, 145, 229, 231, 233,
+ 235, 321, 323, 55, 147, 237, 325, 5,
+ 7, 48, 54, 6, 8, 49, 10, 57,
+ 95, 97, 183, 185, 187, 189, 273, 275,
+ 277, 279, 365, 367, 96, 98, 184, 186,
+ 188, 190, 274, 276, 278, 280, 366, 368,
+ 100, 192, 282, 370, 54, 56, 142, 144,
+ 146, 148, 232, 234, 236, 238, 324, 326,
+ 52, 140, 230, 322, 55, 57, 143, 145,
+ 147, 149, 233, 235, 237, 239, 325, 327,
+ 9, 11, 58, 7, 50, 10, 12, 53,
+ 59, 99, 101, 187, 189, 191, 193, 277,
+ 279, 281, 283, 369, 371, 97, 185, 275,
+ 367, 100, 102, 188, 190, 192, 194, 278,
+ 280, 282, 284, 370, 372, 56, 58, 144,
+ 146, 148, 150, 234, 236, 238, 240, 326,
+ 328, 57, 59, 145, 147, 149, 151, 235,
+ 237, 239, 241, 327, 329, 61, 153, 243,
+ 331, 11, 13, 54, 60, 12, 14, 55,
+ 16, 63, 101, 103, 189, 191, 193, 195,
+ 279, 281, 283, 285, 371, 373, 102, 104,
+ 190, 192, 194, 196, 280, 282, 284, 286,
+ 372, 374, 106, 198, 288, 376, 60, 62,
+ 148, 150, 152, 154, 238, 240, 242, 244,
+ 330, 332, 58, 146, 236, 328, 61, 63,
+ 149, 151, 153, 155, 239, 241, 243, 245,
+ 331, 333, 15, 17, 64, 13, 56, 16,
+ 18, 59, 65, 105, 107, 193, 195, 197,
+ 199, 283, 285, 287, 289, 375, 377, 103,
+ 191, 281, 373, 106, 108, 194, 196, 198,
+ 200, 284, 286, 288, 290, 376, 378, 62,
+ 64, 150, 152, 154, 156, 240, 242, 244,
+ 246, 332, 334, 63, 65, 151, 153, 155,
+ 157, 241, 243, 245, 247, 333, 335, 67,
+ 159, 249, 337, 17, 19, 60, 66, 18,
+ 20, 61, 22, 69, 107, 109, 195, 197,
+ 199, 201, 285, 287, 289, 291, 377, 379,
+ 108, 110, 196, 198, 200, 202, 286, 288,
+ 290, 292, 378, 380, 112, 204, 294, 382,
+ 66, 68, 154, 156, 158, 160, 244, 246,
+ 248, 250, 336, 338, 64, 152, 242, 334,
+ 67, 69, 155, 157, 159, 161, 245, 247,
+ 249, 251, 337, 339, 21, 23, 70, 19,
+ 62, 22, 24, 65, 71, 111, 113, 199,
+ 201, 203, 205, 289, 291, 293, 295, 381,
+ 383, 109, 197, 287, 379, 112, 114, 200,
+ 202, 204, 206, 290, 292, 294, 296, 382,
+ 384, 68, 70, 156, 158, 160, 162, 246,
+ 248, 250, 252, 338, 340, 69, 71, 157,
+ 159, 161, 163, 247, 249, 251, 253, 339,
+ 341, 73, 165, 343, 23, 25, 66, 72,
+ 24, 26, 67, 28, 75, 113, 115, 201,
+ 203, 205, 207, 291, 293, 295, 297, 383,
+ 385, 114, 116, 202, 204, 206, 292, 294,
+ 296, 298, 384, 386, 118, 210, 300, 388,
+ 72, 74, 160, 162, 164, 166, 250, 252,
+ 254, 256, 342, 344, 70, 158, 248, 340,
+ 73, 75, 161, 163, 165, 167, 251, 253,
+ 257, 343, 27, 29, 76, 25, 68, 28,
+ 30, 71, 77, 117, 119, 205, 207, 209,
+ 211, 295, 297, 299, 301, 387, 389, 115,
+ 203, 293, 385, 118, 120, 206, 210, 212,
+ 296, 298, 300, 302, 388, 390, 74, 76,
+ 162, 164, 166, 168, 252, 254, 256, 258,
+ 344, 346, 75, 77, 163, 165, 167, 169,
+ 253, 257, 259, 347, 79, 171, 261, 349,
+ 29, 31, 72, 78, 30, 32, 73, 34,
+ 81, 119, 121, 207, 209, 211, 213, 297,
+ 299, 301, 303, 389, 391, 120, 122, 210,
+ 212, 214, 298, 300, 302, 304, 390, 392,
+ 124, 216, 306, 394, 78, 80, 166, 168,
+ 170, 172, 256, 258, 260, 262, 348, 350,
+ 76, 164, 254, 346, 79, 81, 167, 169,
+ 171, 173, 257, 259, 261, 263, 349, 351,
+ 33, 35, 82, 31, 74, 34, 36, 77,
+ 83, 123, 125, 211, 213, 215, 217, 301,
+ 303, 305, 307, 395, 121, 209, 299, 391,
+ 124, 126, 212, 214, 216, 218, 302, 304,
+ 306, 308, 394, 396, 80, 82, 168, 170,
+ 172, 174, 258, 260, 262, 264, 350, 81,
+ 83, 169, 171, 173, 175, 259, 261, 263,
+ 265, 351, 353, 85, 177, 267, 355, 35,
+ 37, 78, 84, 36, 38, 79, 40, 87,
+ 125, 127, 213, 215, 217, 219, 303, 305,
+ 307, 309, 395, 397, 126, 128, 214, 216,
+ 218, 220, 304, 306, 308, 396, 398, 130,
+ 222, 312, 400, 84, 86, 172, 174, 176,
+ 178, 262, 264, 266, 268, 354, 356, 82,
+ 170, 260, 85, 87, 173, 175, 177, 179,
+ 263, 265, 267, 269, 355, 357, 39, 41,
+ 88, 37, 80, 40, 42, 83, 89, 129,
+ 131, 217, 219, 221, 223, 307, 309, 311,
+ 399, 401, 127, 215, 305, 397, 130, 132,
+ 218, 220, 222, 224, 308, 312, 314, 400,
+ 402, 46, 136, 137, 138, 228, 229, 230,
+ 318, 319, 320, 47, 139, 231, 321, 91,
+ 183, 273, 274, 275, 365, 92, 184, 276,
+ 366, 455, 456, 368, 458, 410, 500, 411,
+ 501, 413, 503, 457, 547, 548, 412, 502,
+ 322, 323, 140, 142, 228, 230, 232, 234,
+ 318, 320, 322, 324, 410, 412, 141, 143,
+ 229, 231, 233, 235, 319, 321, 323, 325,
+ 411, 413, 145, 237, 327, 415, 185, 187,
+ 273, 275, 277, 279, 365, 367, 369, 455,
+ 457, 186, 188, 274, 276, 278, 280, 366,
+ 368, 370, 456, 458, 190, 282, 372, 460,
+ 459, 547, 548, 462, 550, 144, 146, 232,
+ 234, 236, 238, 322, 324, 326, 328, 414,
+ 416, 142, 230, 320, 412, 145, 147, 233,
+ 235, 237, 239, 323, 325, 327, 329, 415,
+ 417, 189, 191, 277, 279, 281, 283, 367,
+ 369, 371, 373, 459, 461, 187, 275, 365,
+ 457, 190, 192, 278, 280, 282, 284, 368,
+ 370, 372, 374, 460, 462, 463, 549, 551,
+ 455, 547, 458, 464, 550, 552, 146, 148,
+ 234, 236, 238, 240, 324, 326, 328, 330,
+ 416, 418, 147, 149, 235, 237, 239, 241,
+ 325, 327, 329, 331, 417, 419, 151, 243,
+ 333, 421, 191, 193, 279, 281, 283, 285,
+ 369, 371, 373, 375, 461, 463, 192, 194,
+ 280, 282, 284, 286, 370, 372, 374, 376,
+ 462, 464, 196, 288, 378, 466, 459, 465,
+ 551, 553, 460, 552, 554, 468, 556, 150,
+ 152, 238, 240, 242, 244, 328, 330, 332,
+ 334, 420, 422, 148, 236, 326, 418, 151,
+ 153, 239, 241, 243, 245, 329, 331, 333,
+ 335, 421, 423, 195, 197, 283, 285, 287,
+ 289, 373, 375, 377, 379, 465, 467, 193,
+ 281, 371, 463, 196, 198, 284, 286, 288,
+ 290, 374, 376, 378, 380, 466, 468, 469,
+ 555, 557, 461, 553, 464, 470, 556, 558,
+ 152, 154, 240, 242, 244, 246, 330, 332,
+ 334, 336, 422, 424, 153, 155, 241, 243,
+ 245, 247, 331, 333, 335, 337, 423, 425,
+ 157, 249, 339, 427, 197, 199, 285, 287,
+ 289, 291, 375, 377, 379, 381, 467, 469,
+ 198, 200, 286, 288, 290, 292, 376, 378,
+ 380, 382, 468, 470, 202, 294, 384, 472,
+ 465, 471, 557, 559, 466, 558, 560, 474,
+ 562, 156, 158, 244, 246, 248, 250, 334,
+ 336, 338, 340, 426, 428, 154, 242, 332,
+ 424, 157, 159, 245, 247, 249, 251, 335,
+ 337, 339, 341, 427, 429, 201, 203, 289,
+ 291, 293, 295, 379, 381, 383, 385, 471,
+ 473, 199, 287, 377, 469, 202, 204, 290,
+ 292, 294, 296, 380, 382, 384, 386, 472,
+ 474, 475, 561, 563, 467, 559, 470, 476,
+ 562, 564, 158, 160, 246, 248, 250, 252,
+ 336, 338, 340, 342, 428, 430, 159, 161,
+ 247, 249, 251, 253, 337, 339, 341, 343,
+ 429, 431, 163, 433, 203, 205, 291, 293,
+ 295, 297, 381, 383, 385, 387, 473, 475,
+ 204, 206, 292, 294, 296, 298, 382, 384,
+ 386, 388, 474, 476, 300, 390, 471, 477,
+ 563, 565, 472, 564, 566, 480, 568, 162,
+ 164, 250, 252, 254, 256, 340, 342, 344,
+ 346, 432, 434, 160, 248, 338, 430, 163,
+ 165, 251, 253, 257, 341, 343, 347, 433,
+ 435, 207, 209, 295, 297, 299, 301, 385,
+ 387, 389, 391, 477, 479, 205, 293, 383,
+ 475, 210, 296, 298, 300, 302, 386, 388,
+ 390, 392, 480, 481, 473, 565, 476, 482,
+ 568, 570, 164, 166, 252, 254, 256, 258,
+ 342, 344, 346, 348, 434, 436, 165, 167,
+ 253, 257, 259, 343, 347, 349, 435, 437,
+ 169, 261, 351, 439, 209, 211, 297, 299,
+ 301, 303, 387, 389, 391, 479, 481, 210,
+ 212, 298, 300, 302, 304, 388, 390, 392,
+ 394, 480, 482, 214, 306, 396, 484, 477,
+ 483, 571, 570, 574, 168, 170, 256, 258,
+ 260, 262, 346, 348, 350, 438, 440, 166,
+ 254, 344, 436, 169, 171, 257, 259, 261,
+ 263, 347, 349, 351, 353, 439, 213, 215,
+ 301, 303, 305, 307, 391, 395, 397, 483,
+ 485, 211, 299, 389, 481, 214, 216, 302,
+ 304, 306, 308, 392, 394, 396, 398, 484,
+ 573, 575, 479, 571, 482, 488, 574, 576,
+ 170, 172, 258, 260, 262, 264, 348, 350,
+ 354, 440, 442, 171, 173, 259, 261, 263,
+ 265, 349, 351, 353, 355, 443, 175, 267,
+ 357, 215, 217, 303, 305, 307, 309, 395,
+ 397, 399, 485, 216, 218, 304, 306, 308,
+ 394, 396, 398, 400, 488, 220, 312, 402,
+ 490, 483, 489, 575, 577, 484, 576, 578,
+ 580, 174, 176, 262, 264, 266, 268, 354,
+ 356, 444, 446, 172, 260, 350, 442, 175,
+ 177, 263, 265, 267, 269, 353, 355, 357,
+ 359, 447, 219, 221, 307, 309, 311, 397,
+ 399, 401, 403, 489, 491, 217, 305, 395,
+ 220, 222, 308, 312, 314, 398, 400, 402,
+ 490, 579, 485, 577, 488, 580, 178, 448,
+ 179, 223, 224, 320, 322, 410, 412, 414,
+ 500, 502, 504, 592, 321, 323, 411, 413,
+ 415, 501, 503, 505, 593, 325, 417, 507,
+ 595, 230, 232, 318, 324, 231, 233, 319,
+ 235, 327, 365, 367, 455, 457, 459, 547,
+ 549, 637, 366, 368, 456, 458, 460, 548,
+ 550, 638, 370, 462, 552, 640, 594, 682,
+ 683, 597, 685, 639, 642, 730, 729, 732,
+ 820, 324, 326, 412, 414, 416, 418, 502,
+ 504, 506, 508, 594, 596, 322, 410, 500,
+ 592, 325, 327, 413, 415, 417, 419, 503,
+ 505, 507, 509, 595, 597, 234, 236, 328,
+ 232, 320, 235, 237, 323, 329, 369, 371,
+ 457, 459, 461, 463, 547, 549, 551, 553,
+ 639, 641, 367, 455, 637, 370, 372, 458,
+ 460, 462, 464, 548, 550, 552, 554, 640,
+ 642, 326, 328, 414, 416, 418, 420, 504,
+ 506, 508, 510, 596, 598, 327, 329, 415,
+ 417, 419, 421, 505, 507, 509, 511, 597,
+ 599, 331, 423, 513, 601, 236, 238, 324,
+ 330, 237, 239, 325, 241, 333, 371, 373,
+ 459, 461, 463, 465, 549, 551, 553, 555,
+ 641, 643, 372, 374, 460, 462, 464, 466,
+ 550, 552, 554, 556, 642, 644, 376, 468,
+ 558, 646, 330, 332, 418, 420, 422, 424,
+ 508, 510, 512, 514, 600, 602, 328, 416,
+ 506, 598, 331, 333, 419, 421, 423, 425,
+ 509, 511, 513, 515, 601, 603, 240, 242,
+ 334, 238, 326, 241, 243, 329, 335, 375,
+ 377, 463, 465, 467, 469, 553, 555, 557,
+ 559, 645, 647, 373, 461, 551, 643, 376,
+ 378, 464, 466, 468, 470, 554, 556, 558,
+ 560, 646, 648, 332, 334, 420, 422, 424,
+ 426, 510, 512, 514, 516, 602, 604, 333,
+ 335, 421, 423, 425, 427, 511, 513, 515,
+ 517, 603, 605, 337, 429, 519, 607, 242,
+ 244, 330, 336, 243, 245, 331, 247, 339,
+ 377, 379, 465, 467, 469, 471, 555, 557,
+ 559, 561, 647, 649, 378, 380, 466, 468,
+ 470, 472, 556, 558, 560, 562, 648, 650,
+ 382, 474, 564, 652, 336, 338, 424, 426,
+ 428, 430, 514, 516, 518, 520, 606, 608,
+ 334, 422, 512, 604, 337, 339, 425, 427,
+ 429, 431, 515, 517, 519, 521, 607, 609,
+ 246, 248, 340, 244, 332, 247, 249, 335,
+ 341, 381, 383, 469, 471, 473, 475, 559,
+ 561, 563, 565, 651, 653, 379, 467, 557,
+ 649, 382, 384, 470, 472, 474, 476, 560,
+ 562, 564, 566, 652, 654, 338, 340, 426,
+ 428, 430, 432, 516, 518, 520, 522, 608,
+ 610, 339, 341, 427, 429, 431, 433, 517,
+ 519, 521, 523, 609, 611, 343, 435, 525,
+ 613, 248, 250, 336, 342, 249, 251, 337,
+ 253, 383, 385, 471, 473, 475, 477, 561,
+ 563, 565, 653, 655, 384, 386, 472, 474,
+ 476, 562, 564, 566, 568, 654, 656, 388,
+ 480, 570, 658, 342, 344, 430, 432, 434,
+ 436, 520, 522, 524, 612, 614, 340, 428,
+ 518, 610, 343, 431, 433, 435, 437, 521,
523, 525, 527, 613, 615, 252, 254, 346,
- 250, 338, 253, 255, 341, 347, 387, 389,
- 475, 477, 479, 481, 565, 567, 569, 571,
- 657, 659, 385, 473, 563, 655, 388, 390,
- 476, 478, 480, 482, 566, 568, 570, 572,
- 658, 660, 344, 346, 432, 434, 436, 438,
- 522, 524, 526, 528, 614, 616, 345, 347,
- 433, 435, 437, 439, 523, 525, 527, 529,
- 615, 617, 349, 441, 531, 619, 254, 256,
- 342, 348, 255, 257, 343, 259, 351, 389,
- 391, 477, 479, 481, 483, 567, 569, 571,
- 573, 659, 661, 390, 392, 478, 480, 482,
- 484, 568, 570, 572, 574, 660, 662, 394,
- 486, 576, 664, 348, 350, 436, 438, 440,
- 442, 526, 528, 530, 532, 618, 620, 346,
- 434, 524, 616, 349, 351, 437, 439, 441,
- 443, 527, 529, 531, 619, 621, 258, 260,
- 352, 256, 344, 259, 261, 347, 393, 395,
- 481, 483, 485, 487, 571, 573, 575, 577,
- 663, 391, 479, 569, 661, 394, 396, 482,
- 484, 486, 488, 572, 574, 576, 664, 666,
- 350, 352, 438, 440, 442, 528, 530, 532,
- 620, 351, 439, 441, 443, 445, 529, 531,
- 621, 355, 447, 537, 625, 260, 262, 348,
- 354, 261, 263, 349, 265, 357, 395, 397,
- 483, 485, 487, 489, 573, 575, 577, 667,
- 396, 398, 484, 486, 488, 490, 574, 576,
- 666, 400, 492, 582, 354, 356, 442, 448,
- 532, 536, 538, 624, 352, 440, 530, 355,
- 357, 443, 445, 447, 537, 539, 625, 264,
- 266, 262, 350, 265, 359, 399, 401, 487,
- 489, 493, 577, 581, 669, 671, 397, 485,
- 575, 667, 400, 488, 490, 492, 582, 714,
- 620, 717, 673, 759, 761, 757, 760, 851,
- 758, 356, 448, 536, 538, 357, 359, 445,
- 447, 537, 539, 266, 268, 354, 355, 401,
- 489, 493, 581, 671, 673, 404, 490, 492,
- 582, 318, 319, 320, 410, 500, 501, 502,
- 592, 321, 411, 503, 593, 273, 365, 455,
- 456, 457, 547, 637, 274, 366, 458, 548,
- 638, 639, 729, 640, 730, 549, 550, 682,
- 683, 684, 774, 685, 775, 819, 820, 594,
- 595, 687, 777, 865, 505, 597, 731, 821,
- 732, 822, 864, 912, 911, 1001, 1002, 414,
- 416, 502, 504, 506, 508, 592, 594, 596,
- 598, 684, 686, 412, 500, 682, 415, 417,
- 503, 505, 507, 509, 593, 595, 597, 599,
- 685, 687, 459, 461, 547, 549, 551, 553,
- 637, 639, 641, 643, 729, 731, 457, 460,
- 462, 548, 550, 552, 554, 638, 640, 642,
- 644, 730, 732, 733, 819, 821, 734, 820,
- 822, 416, 418, 504, 506, 508, 510, 594,
- 596, 598, 600, 686, 688, 417, 419, 505,
- 507, 509, 511, 595, 597, 599, 601, 687,
- 689, 421, 513, 603, 691, 461, 463, 549,
- 551, 553, 555, 639, 641, 643, 645, 731,
- 733, 462, 464, 550, 552, 554, 556, 640,
- 642, 644, 646, 732, 734, 466, 558, 648,
- 736, 729, 735, 821, 823, 730, 822, 824,
- 738, 826, 420, 422, 508, 510, 512, 514,
- 598, 600, 602, 604, 690, 692, 418, 506,
- 596, 688, 421, 423, 509, 511, 513, 515,
- 599, 601, 603, 605, 691, 693, 465, 467,
- 553, 555, 557, 559, 643, 645, 647, 649,
- 735, 737, 463, 551, 641, 733, 466, 468,
- 554, 556, 558, 560, 644, 646, 648, 650,
- 736, 738, 739, 825, 827, 731, 823, 734,
- 740, 826, 828, 422, 424, 510, 512, 514,
- 516, 600, 602, 604, 606, 692, 694, 423,
- 425, 511, 513, 515, 517, 601, 603, 605,
- 607, 693, 695, 427, 519, 609, 697, 467,
- 469, 555, 557, 559, 561, 645, 647, 649,
- 651, 737, 739, 468, 470, 556, 558, 560,
- 562, 646, 648, 650, 652, 738, 740, 472,
- 564, 654, 742, 735, 741, 827, 829, 736,
- 828, 830, 744, 832, 426, 428, 514, 516,
- 518, 520, 604, 606, 608, 610, 696, 698,
- 424, 512, 602, 694, 427, 429, 515, 517,
- 519, 521, 605, 607, 609, 611, 697, 699,
- 471, 473, 559, 561, 563, 565, 649, 651,
- 653, 655, 741, 743, 469, 557, 647, 739,
- 472, 474, 560, 562, 564, 566, 650, 652,
- 654, 656, 742, 744, 745, 831, 833, 737,
+ 250, 338, 253, 341, 347, 387, 389, 475,
+ 477, 479, 481, 565, 571, 657, 659, 385,
+ 473, 563, 655, 388, 390, 476, 480, 482,
+ 566, 568, 570, 658, 660, 344, 346, 432,
+ 434, 436, 438, 522, 524, 528, 614, 616,
+ 347, 433, 435, 437, 439, 523, 525, 527,
+ 615, 349, 531, 254, 256, 342, 348, 257,
+ 343, 259, 351, 389, 391, 477, 479, 481,
+ 483, 571, 573, 659, 661, 390, 392, 480,
+ 482, 484, 568, 570, 574, 660, 394, 576,
+ 348, 350, 436, 438, 440, 442, 528, 530,
+ 620, 346, 434, 524, 616, 349, 351, 437,
+ 439, 443, 527, 531, 533, 621, 258, 260,
+ 256, 344, 259, 261, 347, 353, 395, 481,
+ 483, 485, 571, 573, 575, 577, 663, 665,
+ 391, 479, 661, 394, 396, 482, 484, 488,
+ 574, 576, 578, 622, 614, 706, 623, 711,
+ 753, 755, 659, 756, 757, 749, 752, 758,
+ 844, 846, 350, 438, 440, 442, 444, 528,
+ 530, 620, 622, 351, 353, 439, 443, 531,
+ 533, 535, 621, 623, 355, 447, 260, 262,
+ 348, 354, 261, 263, 349, 265, 357, 395,
+ 397, 483, 485, 489, 573, 575, 577, 579,
+ 665, 396, 398, 484, 488, 490, 574, 576,
+ 578, 580, 400, 356, 446, 448, 536, 624,
+ 264, 266, 267, 359, 399, 401, 491, 669,
+ 671, 402, 356, 444, 446, 448, 536, 628,
+ 357, 359, 447, 535, 629, 266, 268, 354,
+ 267, 269, 355, 401, 403, 489, 491, 579,
+ 671, 312, 314, 400, 402, 488, 490, 578,
+ 580, 762, 318, 319, 320, 410, 500, 501,
+ 502, 592, 321, 411, 503, 593, 273, 365,
+ 455, 456, 457, 547, 637, 274, 366, 458,
+ 548, 638, 639, 729, 640, 730, 549, 550,
+ 682, 683, 684, 774, 685, 775, 819, 820,
+ 594, 595, 687, 777, 865, 505, 597, 731,
+ 821, 732, 822, 864, 912, 911, 1001, 1002,
+ 414, 416, 502, 504, 506, 508, 592, 594,
+ 596, 598, 684, 686, 412, 500, 682, 415,
+ 417, 503, 505, 507, 509, 593, 595, 597,
+ 599, 685, 687, 459, 461, 547, 549, 551,
+ 553, 637, 639, 641, 643, 729, 731, 457,
+ 460, 462, 548, 550, 552, 554, 638, 640,
+ 642, 644, 730, 732, 733, 819, 821, 734,
+ 820, 822, 416, 418, 504, 506, 508, 510,
+ 594, 596, 598, 600, 686, 688, 417, 419,
+ 505, 507, 509, 511, 595, 597, 599, 601,
+ 687, 689, 421, 513, 603, 691, 461, 463,
+ 549, 551, 553, 555, 639, 641, 643, 645,
+ 731, 733, 462, 464, 550, 552, 554, 556,
+ 640, 642, 644, 646, 732, 734, 466, 558,
+ 648, 736, 729, 735, 821, 823, 730, 822,
+ 824, 738, 826, 420, 422, 508, 510, 512,
+ 514, 598, 600, 602, 604, 690, 692, 418,
+ 506, 596, 688, 421, 423, 509, 511, 513,
+ 515, 599, 601, 603, 605, 691, 693, 465,
+ 467, 553, 555, 557, 559, 643, 645, 647,
+ 649, 735, 737, 463, 551, 641, 733, 466,
+ 468, 554, 556, 558, 560, 644, 646, 648,
+ 650, 736, 738, 739, 825, 827, 731, 823,
+ 734, 740, 826, 828, 422, 424, 510, 512,
+ 514, 516, 600, 602, 604, 606, 692, 694,
+ 423, 425, 511, 513, 515, 517, 601, 603,
+ 605, 607, 693, 695, 427, 519, 609, 697,
+ 467, 469, 555, 557, 559, 561, 645, 647,
+ 649, 651, 737, 739, 468, 470, 556, 558,
+ 560, 562, 646, 648, 650, 652, 738, 740,
+ 472, 564, 654, 742, 735, 741, 827, 829,
+ 736, 828, 830, 744, 832, 426, 428, 514,
+ 516, 518, 520, 604, 606, 608, 610, 696,
+ 698, 424, 512, 602, 694, 427, 429, 515,
+ 517, 519, 521, 605, 607, 609, 611, 697,
+ 699, 471, 473, 559, 561, 563, 565, 649,
+ 651, 653, 655, 741, 743, 469, 557, 647,
+ 739, 472, 474, 560, 562, 564, 566, 650,
+ 652, 654, 656, 742, 744, 745, 833, 737,
829, 740, 746, 832, 834, 428, 430, 516,
518, 520, 522, 606, 608, 610, 612, 698,
700, 429, 431, 517, 519, 521, 523, 607,
609, 611, 613, 699, 701, 433, 525, 615,
- 703, 473, 475, 561, 563, 565, 567, 651,
- 653, 655, 657, 743, 745, 474, 476, 562,
- 564, 566, 568, 652, 654, 656, 658, 744,
- 746, 478, 570, 660, 748, 741, 747, 833,
- 835, 742, 834, 836, 750, 838, 432, 434,
- 520, 522, 524, 526, 610, 612, 614, 616,
- 702, 704, 430, 518, 608, 700, 433, 435,
- 521, 523, 525, 527, 611, 613, 615, 617,
- 703, 705, 477, 479, 565, 567, 569, 571,
- 655, 657, 659, 661, 747, 749, 475, 563,
- 653, 745, 478, 480, 566, 568, 570, 572,
- 656, 658, 660, 662, 748, 750, 751, 837,
- 839, 743, 835, 746, 838, 840, 434, 436,
- 522, 524, 526, 528, 612, 614, 616, 618,
- 704, 706, 435, 437, 523, 525, 527, 529,
- 613, 615, 617, 619, 705, 707, 439, 531,
- 621, 479, 481, 567, 569, 571, 573, 657,
- 659, 661, 663, 749, 751, 480, 482, 568,
- 570, 572, 574, 658, 660, 662, 664, 750,
- 484, 576, 666, 754, 747, 753, 839, 841,
- 748, 840, 842, 756, 438, 440, 526, 528,
- 530, 532, 616, 618, 620, 708, 710, 436,
- 524, 614, 706, 439, 441, 527, 529, 531,
- 617, 619, 621, 711, 483, 485, 571, 573,
- 575, 577, 661, 663, 667, 753, 481, 569,
- 659, 751, 484, 486, 572, 574, 576, 662,
- 664, 666, 754, 756, 757, 749, 841, 758,
- 846, 440, 442, 528, 530, 532, 618, 620,
- 624, 710, 441, 443, 529, 531, 619, 621,
- 625, 711, 713, 445, 537, 485, 487, 573,
- 575, 577, 663, 667, 669, 757, 486, 488,
- 574, 576, 664, 666, 756, 758, 398, 400,
- 490, 492, 582, 760, 753, 759, 754, 846,
- 448, 536, 538, 624, 447, 537, 539, 625,
- 717, 493, 581, 669, 671, 673, 761, 492,
- 582, 759, 851, 758, 760, 942, 714, 804,
- 710, 800, 892, 713, 895, 532, 620, 757,
- 667, 937, 594, 596, 682, 684, 686, 688,
- 774, 776, 778, 864, 866, 592, 595, 597,
- 683, 685, 687, 689, 775, 777, 779, 865,
- 867, 504, 506, 598, 502, 505, 507, 593,
- 599, 639, 641, 729, 731, 733, 819, 821,
- 823, 911, 637, 640, 642, 730, 732, 734,
- 820, 822, 824, 912, 868, 956, 869, 957,
- 913, 1001, 914, 1002, 1003, 1004, 596, 598,
- 684, 686, 688, 690, 774, 776, 778, 780,
- 866, 868, 597, 599, 685, 687, 689, 691,
- 775, 777, 779, 781, 867, 869, 601, 693,
- 783, 871, 506, 508, 594, 600, 507, 509,
- 595, 511, 603, 641, 643, 729, 731, 733,
- 735, 819, 821, 823, 825, 911, 913, 642,
- 644, 730, 732, 734, 736, 820, 822, 824,
- 826, 912, 914, 646, 738, 828, 916, 600,
- 602, 688, 690, 692, 694, 778, 780, 782,
- 784, 870, 872, 598, 686, 776, 868, 601,
- 603, 689, 691, 693, 695, 779, 781, 783,
- 785, 871, 873, 510, 512, 604, 508, 596,
- 511, 513, 599, 605, 645, 647, 733, 735,
- 737, 739, 823, 825, 827, 829, 915, 917,
- 643, 731, 821, 913, 646, 648, 734, 736,
- 738, 740, 824, 826, 828, 830, 916, 918,
- 602, 604, 690, 692, 694, 696, 780, 782,
- 784, 786, 872, 874, 603, 605, 691, 693,
- 695, 697, 781, 783, 785, 787, 873, 875,
- 607, 699, 789, 877, 512, 514, 600, 606,
- 513, 515, 601, 517, 609, 647, 649, 735,
- 737, 739, 741, 825, 827, 829, 831, 917,
- 919, 648, 650, 736, 738, 740, 742, 826,
- 828, 830, 832, 918, 920, 652, 744, 834,
- 922, 606, 608, 694, 696, 698, 700, 784,
- 786, 788, 790, 876, 878, 604, 692, 782,
- 874, 607, 609, 695, 697, 699, 701, 785,
- 787, 789, 791, 877, 879, 516, 518, 610,
- 514, 602, 517, 519, 605, 611, 651, 653,
- 739, 741, 743, 745, 829, 831, 833, 835,
- 921, 923, 649, 737, 827, 919, 652, 654,
- 740, 742, 744, 746, 830, 832, 834, 836,
- 922, 924, 608, 610, 696, 698, 700, 702,
- 786, 788, 790, 792, 878, 880, 609, 611,
- 697, 699, 701, 703, 787, 789, 791, 793,
- 879, 881, 613, 705, 795, 883, 518, 520,
+ 703, 473, 475, 561, 563, 565, 651, 653,
+ 655, 657, 743, 745, 474, 476, 562, 564,
+ 566, 568, 652, 654, 656, 658, 744, 746,
+ 570, 660, 748, 741, 747, 833, 835, 742,
+ 834, 836, 750, 838, 432, 434, 520, 522,
+ 524, 610, 612, 614, 616, 702, 704, 430,
+ 518, 608, 700, 433, 435, 521, 523, 525,
+ 527, 611, 613, 615, 703, 477, 479, 565,
+ 571, 655, 657, 659, 661, 747, 749, 475,
+ 563, 653, 745, 480, 566, 568, 570, 656,
+ 658, 660, 748, 750, 839, 743, 835, 746,
+ 752, 838, 840, 434, 436, 522, 524, 528,
+ 612, 614, 616, 704, 706, 435, 437, 523,
+ 525, 527, 613, 615, 707, 439, 531, 621,
+ 479, 481, 571, 573, 657, 659, 661, 663,
+ 749, 480, 482, 568, 570, 574, 658, 660,
+ 750, 752, 484, 576, 747, 753, 839, 748,
+ 840, 842, 756, 844, 702, 792, 794, 796,
+ 798, 886, 703, 793, 795, 799, 885, 711,
+ 838, 932, 846, 440, 442, 528, 530, 620,
+ 622, 624, 712, 443, 531, 533, 535, 621,
+ 623, 711, 715, 485, 573, 575, 577, 579,
+ 663, 665, 669, 755, 757, 488, 574, 576,
+ 578, 580, 756, 758, 490, 753, 846, 762,
+ 850, 444, 446, 536, 628, 447, 629, 489,
+ 491, 671, 849, 446, 448, 536, 624, 628,
+ 718, 447, 535, 629, 719, 491, 579, 669,
+ 671, 402, 490, 578, 580, 762, 853, 594,
+ 596, 682, 684, 686, 688, 774, 776, 778,
+ 864, 866, 592, 595, 597, 683, 685, 687,
+ 689, 775, 777, 779, 865, 867, 504, 506,
+ 598, 502, 505, 507, 593, 599, 639, 641,
+ 729, 731, 733, 819, 821, 823, 911, 637,
+ 640, 642, 730, 732, 734, 820, 822, 824,
+ 912, 868, 956, 869, 957, 913, 1001, 914,
+ 1002, 1003, 1004, 596, 598, 684, 686, 688,
+ 690, 774, 776, 778, 780, 866, 868, 597,
+ 599, 685, 687, 689, 691, 775, 777, 779,
+ 781, 867, 869, 601, 693, 783, 871, 506,
+ 508, 594, 600, 507, 509, 595, 511, 603,
+ 641, 643, 729, 731, 733, 735, 819, 821,
+ 823, 825, 911, 913, 642, 644, 730, 732,
+ 734, 736, 820, 822, 824, 826, 912, 914,
+ 646, 738, 828, 916, 600, 602, 688, 690,
+ 692, 694, 778, 780, 782, 784, 870, 872,
+ 598, 686, 776, 868, 601, 603, 689, 691,
+ 693, 695, 779, 781, 783, 785, 871, 873,
+ 510, 512, 604, 508, 596, 511, 513, 599,
+ 605, 645, 647, 733, 735, 737, 739, 823,
+ 825, 827, 829, 915, 917, 643, 731, 821,
+ 913, 646, 648, 734, 736, 738, 740, 824,
+ 826, 828, 830, 916, 918, 602, 604, 690,
+ 692, 694, 696, 780, 782, 784, 786, 872,
+ 874, 603, 605, 691, 693, 695, 697, 781,
+ 783, 785, 787, 873, 875, 607, 699, 789,
+ 877, 512, 514, 600, 606, 513, 515, 601,
+ 517, 609, 647, 649, 735, 737, 739, 741,
+ 825, 827, 829, 917, 919, 648, 650, 736,
+ 738, 740, 742, 826, 828, 830, 832, 918,
+ 920, 652, 744, 834, 606, 608, 694, 696,
+ 698, 700, 784, 786, 788, 790, 876, 878,
+ 604, 692, 782, 874, 607, 609, 695, 697,
+ 699, 701, 785, 787, 789, 791, 877, 879,
+ 516, 518, 610, 514, 602, 517, 519, 605,
+ 611, 651, 653, 739, 741, 743, 745, 829,
+ 833, 835, 921, 923, 649, 737, 827, 919,
+ 652, 654, 740, 742, 744, 746, 830, 832,
+ 834, 836, 924, 608, 610, 696, 698, 700,
+ 702, 786, 788, 790, 792, 878, 880, 609,
+ 611, 697, 699, 701, 703, 787, 789, 791,
+ 793, 879, 881, 613, 795, 883, 518, 520,
606, 612, 519, 521, 607, 523, 615, 653,
- 655, 741, 743, 745, 747, 831, 833, 835,
- 837, 923, 925, 654, 656, 742, 744, 746,
- 748, 832, 834, 836, 838, 924, 926, 658,
- 750, 840, 928, 612, 614, 700, 702, 704,
- 706, 790, 792, 794, 796, 882, 884, 610,
- 698, 788, 880, 613, 615, 701, 703, 705,
- 707, 791, 793, 795, 883, 885, 522, 524,
- 616, 520, 608, 523, 525, 611, 617, 657,
- 659, 745, 747, 749, 751, 835, 837, 839,
- 841, 927, 929, 655, 743, 833, 925, 658,
- 660, 746, 748, 750, 836, 838, 840, 842,
- 928, 930, 614, 616, 702, 704, 706, 708,
- 792, 794, 796, 884, 886, 615, 617, 703,
- 705, 707, 793, 795, 799, 885, 887, 619,
- 711, 889, 524, 526, 612, 618, 525, 527,
- 613, 529, 621, 659, 661, 747, 749, 751,
- 753, 837, 839, 841, 929, 931, 660, 662,
- 748, 750, 754, 838, 840, 842, 930, 932,
- 664, 756, 846, 934, 618, 620, 706, 708,
- 710, 796, 800, 888, 890, 616, 704, 794,
- 886, 619, 621, 707, 711, 713, 799, 889,
- 891, 528, 530, 526, 614, 529, 531, 617,
- 663, 751, 753, 757, 841, 661, 749, 839,
- 931, 664, 666, 754, 756, 758, 842, 846,
- 934, 936, 620, 708, 710, 714, 800, 804,
- 890, 892, 621, 711, 713, 799, 891, 893,
- 625, 717, 895, 530, 532, 618, 624, 531,
- 619, 667, 753, 757, 759, 937, 666, 754,
- 756, 758, 760, 846, 936, 938, 888, 980,
- 982, 889, 981, 983, 934, 1026, 942, 1023,
- 1029, 1117, 1024, 592, 682, 684, 774, 776,
- 864, 866, 593, 683, 685, 775, 777, 865,
- 867, 637, 729, 819, 821, 911, 638, 730,
- 820, 822, 912, 1001, 1002, 914, 1004, 956,
- 1046, 957, 1047, 500, 501, 639, 640, 1003,
- 1093, 1094, 959, 1049, 958, 1048, 868, 869,
- 1183, 1184, 1138, 1139, 1228, 1229, 1185, 1275,
- 1365, 1186, 1276, 1366, 686, 688, 774, 776,
+ 655, 741, 743, 745, 747, 833, 835, 923,
+ 654, 656, 742, 744, 746, 748, 832, 834,
+ 836, 838, 924, 926, 658, 750, 840, 928,
+ 612, 614, 700, 702, 704, 706, 790, 792,
+ 794, 796, 610, 698, 788, 880, 613, 615,
+ 701, 703, 707, 791, 793, 795, 883, 885,
+ 522, 524, 616, 520, 608, 523, 525, 611,
+ 657, 659, 745, 747, 749, 835, 839, 927,
+ 655, 743, 833, 658, 660, 746, 748, 750,
+ 752, 836, 838, 840, 842, 928, 620, 706,
+ 712, 796, 798, 888, 616, 704, 794, 886,
+ 621, 707, 711, 799, 803, 891, 528, 530,
+ 622, 614, 531, 623, 663, 665, 753, 755,
+ 757, 661, 749, 839, 752, 756, 758, 842,
+ 844, 846, 892, 715, 805, 624, 533, 535,
+ 849, 850, 762, 978, 980, 976, 979, 981,
+ 1021, 1023, 1113, 927, 1019, 1111, 932, 1024,
+ 624, 712, 718, 806, 894, 622, 892, 715,
+ 719, 803, 805, 809, 536, 628, 620, 535,
+ 623, 629, 669, 671, 757, 849, 853, 755,
+ 758, 762, 850, 942, 984, 1031, 1121, 1023,
+ 1078, 980, 1075, 891, 981, 1211, 1113, 1168,
+ 798, 888, 711, 799, 665, 753, 756, 844,
+ 846, 1021, 932, 1024, 978, 1160, 979, 1071,
+ 1111, 1112, 592, 682, 684, 774, 776, 864,
+ 866, 593, 683, 685, 775, 777, 865, 867,
+ 637, 729, 819, 821, 911, 638, 730, 820,
+ 822, 912, 1001, 1002, 914, 1004, 956, 1046,
+ 957, 1047, 500, 501, 639, 640, 1003, 1093,
+ 1094, 959, 1049, 958, 1048, 868, 869, 1183,
+ 1184, 1138, 1139, 1228, 1229, 1185, 1275, 1365,
+ 1186, 1276, 1366, 1230, 1320, 1410, 1231, 1321,
+ 1411, 1547, 1458, 1548, 686, 688, 774, 776,
778, 780, 864, 866, 868, 870, 956, 958,
687, 689, 775, 777, 779, 781, 865, 867,
869, 871, 957, 959, 691, 783, 873, 961,
@@ -762,458 +745,284 @@
829, 913, 915, 917, 919, 1005, 1007, 733,
821, 911, 1003, 736, 738, 824, 826, 828,
830, 914, 916, 918, 920, 1006, 1008, 1009,
- 1095, 1097, 1001, 1093, 1004, 1010, 1096, 1098,
- 692, 694, 780, 782, 784, 786, 870, 872,
- 874, 876, 962, 964, 693, 695, 781, 783,
- 785, 787, 871, 873, 875, 877, 963, 965,
- 697, 789, 879, 967, 737, 739, 825, 827,
- 829, 831, 915, 917, 919, 921, 1007, 1009,
- 738, 740, 826, 828, 830, 832, 916, 918,
- 920, 922, 1008, 1010, 742, 834, 924, 1012,
- 1005, 1011, 1097, 1099, 1006, 1098, 1100, 1014,
- 1102, 696, 698, 784, 786, 788, 790, 874,
- 876, 878, 880, 966, 968, 694, 782, 872,
- 964, 697, 699, 785, 787, 789, 791, 875,
- 877, 879, 881, 967, 969, 741, 743, 829,
- 831, 833, 835, 919, 921, 923, 925, 1011,
- 1013, 739, 827, 917, 1009, 742, 744, 830,
- 832, 834, 836, 920, 922, 924, 926, 1012,
- 1014, 1015, 1101, 1103, 1007, 1099, 1010, 1016,
- 1102, 1104, 698, 700, 786, 788, 790, 792,
- 876, 878, 880, 882, 968, 970, 699, 701,
- 787, 789, 791, 793, 877, 879, 881, 883,
- 969, 971, 703, 795, 885, 973, 743, 745,
- 831, 833, 835, 837, 921, 923, 925, 927,
- 1013, 1015, 744, 746, 832, 834, 836, 838,
- 922, 924, 926, 928, 1014, 1016, 748, 840,
- 930, 1018, 1011, 1017, 1103, 1105, 1012, 1104,
- 1106, 1020, 1108, 702, 704, 790, 792, 794,
- 796, 880, 882, 884, 886, 972, 974, 700,
- 788, 878, 970, 703, 705, 791, 793, 795,
- 881, 883, 885, 887, 973, 975, 747, 749,
- 835, 837, 839, 841, 925, 927, 929, 931,
- 1017, 1019, 745, 833, 923, 1015, 748, 750,
- 836, 838, 840, 842, 926, 928, 930, 932,
- 1018, 1020, 1021, 1107, 1109, 1013, 1105, 1016,
- 1022, 1108, 1110, 704, 706, 792, 794, 796,
- 882, 884, 886, 888, 974, 976, 705, 707,
- 793, 795, 799, 883, 885, 887, 889, 975,
- 977, 891, 979, 749, 751, 837, 839, 841,
- 927, 929, 931, 1019, 1021, 750, 838, 840,
- 842, 928, 930, 932, 934, 1020, 1022, 754,
- 846, 936, 1024, 1017, 1023, 1109, 1111, 1018,
- 1110, 1112, 1026, 1114, 708, 710, 796, 800,
- 886, 888, 890, 892, 980, 706, 794, 884,
- 976, 711, 799, 887, 889, 891, 893, 979,
- 981, 663, 751, 753, 757, 839, 841, 929,
- 931, 937, 1021, 1023, 1113, 754, 756, 842,
- 846, 932, 934, 936, 938, 1024, 1026, 1019,
- 1111, 1022, 1114, 982, 1066, 1070, 974, 1064,
- 1156, 977, 983, 1073, 1159, 1117, 1205, 1109,
- 1112, 714, 804, 892, 800, 890, 982, 717,
- 893, 895, 759, 761, 851, 937, 1029, 1031,
- 757, 760, 938, 942, 1033, 1117, 980, 1070,
- 1168, 981, 983, 1073, 1163, 1207, 1026, 1208,
- 1252, 1250, 1347, 1205, 1304, 1392, 1295, 1387,
- 1388, 891, 979, 888, 889, 1023, 1113, 936,
- 1024, 1114, 866, 868, 956, 958, 960, 1046,
- 1048, 1050, 1138, 867, 869, 957, 959, 961,
- 1047, 1049, 1051, 1139, 871, 963, 1053, 1141,
- 776, 778, 864, 870, 777, 779, 865, 781,
- 873, 911, 913, 1001, 1003, 1005, 1093, 1095,
- 1183, 912, 914, 1002, 1004, 1006, 1094, 1096,
- 1184, 916, 1008, 1098, 1186, 1140, 1228, 1229,
- 1143, 1231, 1185, 1188, 1276, 1275, 1278, 1366,
+ 1095, 1001, 1093, 1004, 1010, 1096, 1098, 692,
+ 694, 780, 782, 784, 786, 870, 872, 874,
+ 876, 962, 964, 693, 695, 781, 783, 785,
+ 787, 871, 873, 875, 877, 963, 965, 697,
+ 789, 879, 737, 739, 825, 827, 829, 915,
+ 917, 919, 921, 1007, 1009, 738, 740, 826,
+ 828, 830, 832, 916, 918, 920, 1008, 1010,
+ 742, 834, 924, 1012, 1005, 1011, 1006, 1098,
+ 1100, 1102, 696, 698, 784, 786, 788, 790,
+ 874, 876, 878, 880, 966, 968, 694, 782,
+ 872, 964, 697, 699, 785, 787, 789, 791,
+ 875, 877, 879, 881, 969, 741, 743, 829,
+ 833, 835, 919, 921, 923, 1011, 1013, 739,
+ 827, 917, 1009, 742, 744, 830, 832, 834,
+ 836, 920, 924, 926, 1012, 1015, 1101, 1103,
+ 1007, 1010, 1016, 1102, 1104, 698, 700, 786,
+ 788, 790, 792, 876, 878, 880, 968, 970,
+ 699, 701, 787, 789, 791, 793, 877, 879,
+ 881, 883, 969, 971, 703, 795, 885, 973,
+ 743, 745, 833, 835, 921, 923, 927, 1013,
+ 1015, 744, 746, 832, 834, 836, 838, 924,
+ 926, 928, 1016, 748, 840, 1018, 1011, 1017,
+ 1103, 1105, 1012, 1104, 1108, 702, 704, 790,
+ 792, 794, 796, 880, 886, 972, 974, 700,
+ 788, 878, 970, 703, 791, 793, 795, 881,
+ 883, 885, 973, 975, 747, 749, 835, 839,
+ 927, 1017, 1019, 745, 833, 923, 1015, 748,
+ 750, 836, 838, 840, 842, 926, 928, 932,
+ 1018, 1021, 1013, 1105, 1016, 1108, 976, 1060,
+ 1066, 968, 1058, 971, 977, 1063, 1155, 1111,
+ 1197, 1103, 1112, 1200, 704, 706, 792, 794,
+ 796, 798, 886, 888, 974, 976, 707, 793,
+ 795, 799, 883, 885, 975, 977, 891, 979,
+ 749, 839, 927, 1019, 1021, 750, 752, 838,
+ 840, 842, 844, 928, 932, 846, 1024, 1017,
+ 1023, 1111, 1018, 1112, 972, 978, 1066, 1156,
+ 973, 1063, 1155, 1157, 981, 1071, 1159, 1113,
+ 1201, 1108, 1200, 866, 868, 956, 958, 960,
+ 1046, 1048, 1050, 1138, 867, 869, 957, 959,
+ 961, 1047, 1049, 1051, 1139, 871, 963, 1053,
+ 1141, 776, 778, 864, 870, 777, 779, 865,
+ 781, 873, 911, 913, 1001, 1003, 1005, 1093,
+ 1095, 1183, 912, 914, 1002, 1004, 1006, 1094,
+ 1096, 1184, 916, 1008, 1098, 1186, 1140, 1228,
+ 1229, 1231, 1185, 1188, 1276, 1275, 1278, 1366,
870, 872, 958, 960, 962, 964, 1048, 1050,
1052, 1054, 1140, 1142, 868, 956, 1046, 1138,
871, 873, 959, 961, 963, 965, 1049, 1051,
- 1053, 1055, 1141, 1143, 780, 782, 874, 778,
- 866, 781, 783, 869, 875, 915, 917, 1003,
- 1005, 1007, 1009, 1093, 1095, 1097, 1099, 1185,
- 1187, 913, 1001, 1183, 916, 918, 1004, 1006,
- 1008, 1010, 1094, 1096, 1098, 1100, 1186, 1188,
- 872, 874, 960, 962, 964, 966, 1050, 1052,
- 1054, 1056, 1142, 1144, 873, 875, 961, 963,
- 965, 967, 1051, 1053, 1055, 1057, 1143, 1145,
- 877, 969, 1059, 1147, 782, 784, 870, 876,
- 783, 785, 871, 787, 879, 917, 919, 1005,
- 1007, 1009, 1011, 1095, 1097, 1099, 1101, 1187,
- 1189, 918, 920, 1006, 1008, 1010, 1012, 1096,
- 1098, 1100, 1102, 1188, 1190, 922, 1014, 1104,
- 1192, 876, 878, 964, 966, 968, 970, 1054,
- 1056, 1058, 1060, 1146, 1148, 874, 962, 1052,
- 1144, 877, 879, 965, 967, 969, 971, 1055,
- 1057, 1059, 1061, 1147, 1149, 786, 788, 880,
- 784, 872, 787, 789, 875, 881, 921, 923,
- 1009, 1011, 1013, 1015, 1099, 1101, 1103, 1105,
- 1191, 1193, 919, 1007, 1097, 1189, 922, 924,
- 1010, 1012, 1014, 1016, 1100, 1102, 1104, 1106,
- 1192, 1194, 878, 880, 966, 968, 970, 972,
- 1056, 1058, 1060, 1062, 1148, 1150, 879, 881,
- 967, 969, 971, 973, 1057, 1059, 1061, 1063,
- 1149, 1151, 883, 975, 1065, 1153, 788, 790,
- 876, 882, 789, 791, 877, 793, 885, 923,
- 925, 1011, 1013, 1015, 1017, 1101, 1103, 1105,
- 1107, 1193, 1195, 924, 926, 1012, 1014, 1016,
- 1018, 1102, 1104, 1106, 1108, 1194, 1196, 928,
- 1020, 1110, 1198, 882, 884, 970, 972, 974,
- 976, 1060, 1062, 1064, 1066, 1152, 1154, 880,
- 968, 1058, 1150, 883, 885, 971, 973, 975,
- 977, 1061, 1063, 1065, 1153, 1155, 792, 794,
- 886, 790, 878, 793, 795, 881, 887, 927,
- 929, 1015, 1017, 1019, 1021, 1105, 1107, 1109,
- 1111, 1197, 1199, 925, 1013, 1103, 1195, 928,
- 930, 1016, 1018, 1020, 1022, 1106, 1108, 1110,
- 1112, 1198, 1200, 884, 886, 972, 974, 976,
- 1062, 1064, 1066, 1154, 1156, 885, 887, 973,
- 975, 977, 979, 1063, 1065, 1155, 1157, 889,
- 981, 1159, 794, 796, 882, 888, 795, 883,
- 799, 891, 929, 931, 1017, 1019, 1021, 1023,
- 1107, 1109, 1111, 1113, 1199, 930, 932, 1018,
- 1020, 1022, 1024, 1108, 1110, 1112, 1114, 1200,
- 1202, 934, 1026, 864, 866, 956, 1046, 1048,
- 1138, 865, 867, 957, 1047, 1049, 1139, 819,
- 911, 1001, 1003, 1093, 1183, 820, 912, 1002,
- 1004, 1094, 1184, 1185, 1275, 1186, 1276, 1095,
- 1096, 1228, 1230, 1320, 1229, 1231, 1321, 1365,
- 1366, 1140, 1141, 1233, 1323, 1411, 1051, 1143,
- 1277, 1367, 1278, 1368, 1410, 1457, 1547, 1458,
- 1548, 1502, 1592, 1503, 1593, 1413, 1412, 1640,
- 1730, 1549, 1639, 1729, 1550, 960, 962, 1048,
- 1050, 1052, 1054, 1138, 1140, 1142, 1144, 1230,
- 1232, 958, 1046, 1228, 961, 963, 1049, 1051,
- 1053, 1055, 1139, 1141, 1143, 1145, 1231, 1233,
- 1005, 1007, 1093, 1095, 1097, 1099, 1183, 1185,
- 1187, 1189, 1275, 1277, 1003, 1006, 1008, 1094,
- 1096, 1098, 1100, 1184, 1186, 1188, 1190, 1276,
- 1278, 1279, 1365, 1367, 1280, 1366, 1368, 962,
- 964, 1050, 1052, 1054, 1056, 1140, 1142, 1144,
- 1146, 1232, 1234, 963, 965, 1051, 1053, 1055,
- 1057, 1141, 1143, 1145, 1147, 1233, 1235, 967,
- 1059, 1149, 1237, 1007, 1009, 1095, 1097, 1099,
- 1101, 1185, 1187, 1189, 1191, 1277, 1279, 1008,
- 1010, 1096, 1098, 1100, 1102, 1186, 1188, 1190,
- 1192, 1278, 1280, 1012, 1104, 1194, 1282, 1275,
- 1281, 1367, 1369, 1276, 1368, 1370, 1284, 1372,
- 966, 968, 1054, 1056, 1058, 1060, 1144, 1146,
- 1148, 1150, 1236, 1238, 964, 1052, 1142, 1234,
- 967, 969, 1055, 1057, 1059, 1061, 1145, 1147,
- 1149, 1151, 1237, 1239, 1011, 1013, 1099, 1101,
- 1103, 1105, 1189, 1191, 1193, 1195, 1281, 1283,
- 1009, 1097, 1187, 1279, 1012, 1014, 1100, 1102,
- 1104, 1106, 1190, 1192, 1194, 1196, 1282, 1284,
- 1285, 1371, 1373, 1277, 1369, 1280, 1286, 1372,
- 1374, 968, 970, 1056, 1058, 1060, 1062, 1146,
- 1148, 1150, 1152, 1238, 1240, 969, 971, 1057,
- 1059, 1061, 1063, 1147, 1149, 1151, 1153, 1239,
- 1241, 973, 1065, 1155, 1243, 1013, 1015, 1101,
- 1103, 1105, 1107, 1191, 1193, 1195, 1197, 1283,
- 1285, 1014, 1016, 1102, 1104, 1106, 1108, 1192,
- 1194, 1196, 1198, 1284, 1286, 1018, 1110, 1200,
- 1288, 1281, 1287, 1373, 1375, 1282, 1374, 1376,
- 1290, 1378, 972, 974, 1060, 1062, 1064, 1066,
- 1150, 1152, 1154, 1156, 1242, 1244, 970, 1058,
- 1148, 1240, 973, 975, 1061, 1063, 1065, 1151,
- 1153, 1155, 1157, 1243, 1245, 1017, 1019, 1105,
- 1107, 1109, 1111, 1195, 1197, 1199, 1287, 1289,
- 1015, 1103, 1193, 1285, 1018, 1020, 1106, 1108,
- 1110, 1112, 1196, 1198, 1200, 1202, 1288, 1290,
- 1291, 1377, 1379, 1283, 1375, 1286, 1292, 1378,
- 1380, 974, 976, 1062, 1064, 1066, 1152, 1154,
- 1156, 1244, 1246, 975, 977, 1063, 1065, 1153,
- 1155, 1157, 1159, 1245, 979, 1249, 1019, 1021,
- 1107, 1109, 1111, 1113, 1197, 1199, 1289, 1291,
- 1020, 1022, 1108, 1110, 1112, 1114, 1198, 1200,
- 1202, 1290, 1292, 1024, 1294, 1287, 1293, 1379,
- 1288, 1380, 1382, 980, 1066, 1070, 1156, 1248,
- 1250, 976, 1064, 1154, 1246, 979, 981, 1073,
- 1157, 1159, 1163, 1249, 1251, 1023, 1111, 1113,
- 1117, 1205, 1207, 1293, 1295, 1021, 1109, 1199,
- 1291, 1024, 1026, 1112, 1114, 1202, 1208, 1294,
- 1385, 1289, 1292, 982, 1252, 983, 1387, 1388,
- 1339, 1341, 1347, 1523, 1392, 1140, 1142, 1228,
- 1230, 1232, 1234, 1320, 1322, 1324, 1410, 1412,
- 1138, 1141, 1143, 1229, 1231, 1233, 1235, 1321,
- 1323, 1325, 1411, 1413, 1050, 1052, 1144, 1048,
- 1051, 1053, 1139, 1145, 1185, 1187, 1275, 1277,
- 1279, 1365, 1367, 1369, 1457, 1183, 1186, 1188,
- 1276, 1278, 1280, 1366, 1368, 1370, 1458, 1414,
- 1502, 1415, 1503, 1459, 1547, 1460, 1548, 1549,
- 1550, 1142, 1144, 1230, 1232, 1234, 1236, 1320,
- 1322, 1324, 1326, 1412, 1414, 1143, 1145, 1231,
- 1233, 1235, 1237, 1321, 1323, 1325, 1327, 1413,
- 1415, 1147, 1239, 1329, 1417, 1052, 1054, 1140,
- 1146, 1053, 1055, 1141, 1057, 1149, 1187, 1189,
+ 1053, 1055, 1141, 780, 782, 874, 778, 866,
+ 781, 783, 869, 875, 915, 917, 1003, 1005,
+ 1007, 1009, 1093, 1095, 1185, 913, 1001, 1183,
+ 916, 918, 1004, 1006, 1008, 1010, 1094, 1096,
+ 1098, 1100, 1186, 1188, 872, 874, 960, 962,
+ 964, 966, 1050, 1052, 1054, 1056, 1142, 1144,
+ 873, 875, 961, 963, 965, 1051, 1053, 1055,
+ 1057, 1145, 877, 969, 1059, 1147, 782, 784,
+ 870, 876, 783, 785, 871, 787, 879, 917,
+ 919, 1005, 1007, 1009, 1011, 1095, 1101, 1189,
+ 918, 920, 1006, 1008, 1010, 1012, 1096, 1098,
+ 1100, 1102, 1188, 1190, 1104, 876, 878, 964,
+ 966, 968, 970, 1054, 1056, 1058, 1060, 1146,
+ 1148, 874, 962, 1052, 1144, 877, 879, 965,
+ 969, 971, 1055, 1057, 1059, 1147, 786, 788,
+ 880, 784, 872, 787, 789, 875, 881, 921,
+ 923, 1009, 1011, 1013, 1015, 1101, 1103, 1105,
+ 1191, 1193, 919, 1007, 1189, 924, 1010, 1012,
+ 1016, 1100, 1102, 1104, 878, 880, 966, 968,
+ 970, 972, 1056, 1058, 1060, 1148, 879, 881,
+ 969, 971, 973, 1057, 1059, 1063, 1151, 883,
+ 975, 788, 790, 876, 789, 791, 877, 793,
+ 885, 923, 1011, 1013, 1015, 1017, 1101, 1103,
+ 1105, 1193, 924, 926, 1012, 1016, 1018, 1102,
+ 1104, 1108, 928, 1146, 1238, 1240, 1147, 1241,
+ 1155, 1243, 1191, 1197, 1283, 1285, 1284, 1200,
+ 1281, 1375, 1282, 1376, 1290, 888, 976, 978,
+ 980, 1066, 1158, 1160, 886, 974, 1156, 891,
+ 977, 979, 981, 1071, 1159, 798, 892, 796,
+ 799, 1021, 1023, 1111, 1113, 1019, 1201, 1024,
+ 1112, 1248, 1157, 1249, 1291, 1200, 1294, 1384,
+ 1386, 1289, 864, 866, 956, 1046, 1048, 1138,
+ 865, 867, 957, 1047, 1049, 1139, 819, 911,
+ 1001, 1003, 1093, 1183, 820, 912, 1002, 1004,
+ 1094, 1184, 1185, 1275, 1186, 1276, 1095, 1096,
+ 1228, 1230, 1320, 1229, 1231, 1321, 1365, 1366,
+ 1140, 1141, 1323, 1411, 1051, 1277, 1367, 1278,
+ 1142, 1232, 1234, 1322, 1410, 1412, 1413, 1050,
+ 1052, 1144, 1053, 1145, 1279, 1369, 1188, 1370,
+ 1458, 1547, 1548, 960, 962, 1048, 1050, 1052,
+ 1054, 1138, 1140, 1142, 1144, 1230, 1232, 958,
+ 1046, 1228, 961, 963, 1049, 1051, 1053, 1055,
+ 1139, 1141, 1145, 1231, 1005, 1007, 1093, 1095,
+ 1183, 1185, 1189, 1275, 1277, 1003, 1006, 1008,
+ 1094, 1096, 1098, 1100, 1184, 1186, 1188, 1190,
+ 1276, 1278, 1279, 1365, 1367, 1366, 962, 964,
+ 1050, 1052, 1054, 1056, 1140, 1142, 1144, 1146,
+ 1232, 1234, 963, 965, 1051, 1053, 1055, 1057,
+ 1141, 1145, 1147, 1059, 1237, 1007, 1009, 1095,
+ 1101, 1185, 1189, 1191, 1277, 1279, 1008, 1010,
+ 1096, 1098, 1100, 1102, 1186, 1188, 1190, 1278,
+ 1012, 1104, 1282, 1275, 1281, 1367, 1369, 1276,
+ 1370, 1284, 1372, 966, 968, 1054, 1056, 1058,
+ 1060, 1144, 1146, 1148, 1236, 1238, 964, 1052,
+ 1142, 1234, 969, 1055, 1057, 1059, 1145, 1147,
+ 1151, 1237, 1011, 1013, 1101, 1103, 1105, 1189,
+ 1191, 1193, 1281, 1283, 1009, 1279, 1012, 1100,
+ 1102, 1104, 1190, 1282, 1284, 1285, 1371, 1277,
+ 1369, 1372, 970, 972, 974, 976, 1058, 1060,
+ 1066, 1148, 1156, 1158, 1240, 1242, 1244, 973,
+ 975, 1063, 1151, 1155, 1157, 1243, 1245, 1017,
+ 1019, 1105, 1111, 1197, 1201, 1289, 1015, 1103,
+ 1193, 1285, 1018, 1108, 1112, 1200, 1290, 1291,
+ 1379, 1283, 1375, 977, 1159, 979, 1071, 1249,
+ 1021, 1113, 1024, 1294, 1384, 980, 1158, 1160,
+ 1252, 981, 1071, 1075, 1159, 1023, 1111, 1113,
+ 1121, 1201, 1211, 1024, 1112, 1294, 1384, 1386,
+ 846, 850, 942, 1480, 1291, 894, 984, 1078,
+ 1168, 1344, 892, 1342, 1031, 1248, 1432, 1249,
+ 1337, 1345, 1429, 1433, 1521, 1157, 1289, 1379,
+ 1471, 1565, 1569, 1156, 1242, 1244, 1424, 1155,
+ 1243, 1245, 1333, 1066, 1200, 1290, 1608, 1514,
+ 1566, 1562, 1142, 1144, 1230, 1232, 1234, 1236,
+ 1320, 1322, 1326, 1412, 1414, 1145, 1231, 1237,
+ 1321, 1323, 1413, 1415, 1147, 1329, 1417, 1052,
+ 1054, 1140, 1146, 1053, 1055, 1141, 1057, 1189,
1275, 1277, 1279, 1281, 1365, 1367, 1369, 1371,
- 1457, 1459, 1188, 1190, 1276, 1278, 1280, 1282,
- 1366, 1368, 1370, 1372, 1458, 1460, 1192, 1284,
- 1374, 1462, 1146, 1148, 1234, 1236, 1238, 1240,
- 1324, 1326, 1328, 1330, 1416, 1418, 1144, 1232,
- 1322, 1414, 1147, 1149, 1235, 1237, 1239, 1241,
- 1325, 1327, 1329, 1331, 1417, 1419, 1056, 1058,
- 1150, 1054, 1142, 1057, 1059, 1145, 1151, 1191,
- 1193, 1279, 1281, 1283, 1285, 1369, 1371, 1373,
- 1375, 1461, 1463, 1189, 1277, 1367, 1459, 1192,
- 1194, 1280, 1282, 1284, 1286, 1370, 1372, 1374,
- 1376, 1462, 1464, 1148, 1150, 1236, 1238, 1240,
- 1242, 1326, 1328, 1330, 1332, 1418, 1420, 1149,
- 1151, 1237, 1239, 1241, 1243, 1327, 1329, 1331,
- 1333, 1419, 1421, 1153, 1245, 1335, 1423, 1058,
- 1060, 1146, 1152, 1059, 1061, 1147, 1063, 1155,
- 1193, 1195, 1281, 1283, 1285, 1287, 1371, 1373,
- 1375, 1377, 1463, 1465, 1194, 1196, 1282, 1284,
- 1286, 1288, 1372, 1374, 1376, 1378, 1464, 1466,
- 1198, 1290, 1380, 1468, 1152, 1154, 1240, 1242,
- 1244, 1246, 1330, 1332, 1334, 1336, 1422, 1424,
- 1150, 1238, 1328, 1420, 1153, 1155, 1241, 1243,
- 1245, 1331, 1333, 1335, 1337, 1423, 1425, 1062,
- 1064, 1156, 1060, 1148, 1063, 1065, 1151, 1157,
- 1197, 1199, 1285, 1287, 1289, 1291, 1375, 1377,
- 1379, 1467, 1469, 1195, 1283, 1373, 1465, 1198,
- 1200, 1286, 1288, 1290, 1292, 1376, 1378, 1380,
- 1382, 1468, 1470, 1154, 1156, 1242, 1244, 1246,
- 1248, 1332, 1334, 1336, 1424, 1426, 1155, 1157,
- 1243, 1245, 1249, 1333, 1335, 1337, 1339, 1425,
- 1427, 1159, 1251, 1341, 1064, 1066, 1152, 1065,
- 1153, 1199, 1287, 1289, 1291, 1293, 1377, 1379,
- 1469, 1471, 1200, 1202, 1288, 1290, 1292, 1294,
- 1378, 1380, 1382, 1470, 1472, 1474, 1246, 1248,
- 1250, 1252, 1336, 1156, 1244, 1334, 1426, 1159,
- 1249, 1251, 1337, 1339, 1341, 1070, 1066, 1154,
- 1157, 1163, 1205, 1291, 1293, 1295, 1385, 1387,
- 1289, 1379, 1471, 1292, 1294, 1382, 1388, 1474,
- 1424, 1516, 1518, 1427, 1563, 1565, 1469, 1561,
- 1472, 1564, 1566, 1567, 1168, 1250, 1252, 1347,
- 1073, 1163, 1251, 1207, 1295, 1385, 1387, 1304,
- 1388, 1392, 1528, 1031, 1033, 1117, 1567, 1565,
- 1566, 1574, 1750, 1138, 1228, 1230, 1320, 1322,
- 1410, 1412, 1139, 1229, 1231, 1321, 1323, 1411,
- 1413, 1183, 1275, 1365, 1367, 1457, 1184, 1276,
- 1366, 1368, 1458, 1547, 1548, 1460, 1550, 1502,
- 1592, 1503, 1593, 1549, 1639, 1640, 1505, 1595,
- 1504, 1594, 1414, 1415, 1684, 1685, 1729, 1730,
- 1731, 1821, 1732, 1822, 1774, 1775, 1046, 1047,
- 1911, 1912, 1866, 1956, 1867, 1957, 1776, 1777,
- 1232, 1234, 1320, 1322, 1324, 1326, 1410, 1412,
- 1414, 1416, 1502, 1504, 1233, 1235, 1321, 1323,
- 1325, 1327, 1411, 1413, 1415, 1417, 1503, 1505,
- 1237, 1329, 1419, 1507, 1277, 1279, 1365, 1367,
- 1369, 1371, 1457, 1459, 1461, 1547, 1549, 1278,
- 1280, 1366, 1368, 1370, 1372, 1458, 1460, 1462,
- 1548, 1550, 1282, 1374, 1464, 1552, 1551, 1639,
- 1640, 1554, 1642, 1236, 1238, 1324, 1326, 1328,
- 1330, 1414, 1416, 1418, 1420, 1506, 1508, 1234,
- 1322, 1412, 1504, 1237, 1239, 1325, 1327, 1329,
- 1331, 1415, 1417, 1419, 1421, 1507, 1509, 1281,
- 1283, 1369, 1371, 1373, 1375, 1459, 1461, 1463,
- 1465, 1551, 1553, 1279, 1367, 1457, 1549, 1282,
- 1284, 1370, 1372, 1374, 1376, 1460, 1462, 1464,
- 1466, 1552, 1554, 1555, 1641, 1643, 1547, 1639,
- 1550, 1556, 1642, 1644, 1238, 1240, 1326, 1328,
- 1330, 1332, 1416, 1418, 1420, 1422, 1508, 1510,
- 1239, 1241, 1327, 1329, 1331, 1333, 1417, 1419,
- 1421, 1423, 1509, 1511, 1243, 1335, 1425, 1513,
- 1283, 1285, 1371, 1373, 1375, 1377, 1461, 1463,
- 1465, 1467, 1553, 1555, 1284, 1286, 1372, 1374,
- 1376, 1378, 1462, 1464, 1466, 1468, 1554, 1556,
- 1288, 1380, 1470, 1551, 1557, 1643, 1645, 1552,
- 1644, 1646, 1560, 1648, 1242, 1244, 1330, 1332,
- 1334, 1336, 1420, 1422, 1424, 1426, 1512, 1514,
- 1240, 1328, 1418, 1510, 1243, 1245, 1331, 1333,
- 1335, 1337, 1421, 1423, 1425, 1427, 1513, 1515,
- 1287, 1289, 1375, 1377, 1379, 1465, 1467, 1469,
- 1471, 1557, 1285, 1373, 1463, 1555, 1288, 1290,
- 1376, 1378, 1380, 1382, 1466, 1468, 1470, 1472,
- 1560, 1561, 1647, 1649, 1553, 1645, 1556, 1648,
- 1244, 1246, 1332, 1334, 1336, 1422, 1424, 1426,
- 1514, 1516, 1245, 1333, 1335, 1337, 1339, 1423,
- 1425, 1427, 1515, 1517, 1249, 1341, 1289, 1291,
- 1377, 1379, 1467, 1469, 1471, 1561, 1290, 1292,
- 1378, 1380, 1382, 1468, 1470, 1472, 1474, 1560,
- 1294, 1564, 1557, 1563, 1649, 1652, 1566, 1512,
- 1518, 1602, 1604, 1606, 1513, 1603, 1605, 1607,
- 1609, 1695, 1699, 1647, 1739, 1741, 1648, 1740,
- 1744, 1248, 1250, 1252, 1336, 1426, 1518, 1251,
- 1339, 1341, 1523, 1163, 1347, 1295, 1385, 1387,
- 1565, 1567, 1388, 1474, 1566, 1392, 1563, 1564,
- 1574, 1748, 1750, 1516, 1606, 1698, 1704, 1609,
- 1701, 1617, 1745, 1528, 1412, 1414, 1502, 1504,
- 1506, 1592, 1594, 1596, 1684, 1413, 1415, 1503,
- 1505, 1507, 1593, 1595, 1597, 1685, 1417, 1509,
- 1599, 1687, 1322, 1324, 1410, 1416, 1323, 1325,
- 1411, 1327, 1419, 1457, 1459, 1547, 1549, 1551,
- 1639, 1641, 1729, 1458, 1460, 1548, 1550, 1552,
- 1640, 1642, 1730, 1462, 1554, 1644, 1732, 1686,
- 1774, 1775, 1689, 1777, 1731, 1734, 1822, 1821,
- 1824, 1912, 1416, 1418, 1504, 1506, 1508, 1510,
- 1594, 1596, 1598, 1600, 1686, 1688, 1414, 1502,
- 1592, 1684, 1417, 1419, 1505, 1507, 1509, 1511,
- 1595, 1597, 1599, 1601, 1687, 1689, 1326, 1328,
- 1420, 1324, 1412, 1327, 1329, 1415, 1421, 1461,
- 1463, 1549, 1551, 1553, 1555, 1639, 1641, 1643,
- 1645, 1731, 1733, 1459, 1547, 1729, 1462, 1464,
- 1550, 1552, 1554, 1556, 1640, 1642, 1644, 1646,
- 1732, 1734, 1418, 1420, 1506, 1508, 1510, 1512,
- 1596, 1598, 1600, 1602, 1688, 1690, 1419, 1421,
- 1507, 1509, 1511, 1513, 1597, 1599, 1601, 1603,
- 1689, 1691, 1423, 1515, 1605, 1328, 1330, 1416,
- 1422, 1329, 1331, 1417, 1333, 1425, 1463, 1465,
- 1551, 1553, 1555, 1557, 1641, 1643, 1645, 1647,
- 1733, 1735, 1464, 1466, 1552, 1554, 1556, 1642,
- 1644, 1646, 1648, 1734, 1736, 1468, 1560, 1738,
- 1422, 1424, 1510, 1512, 1514, 1516, 1600, 1602,
- 1604, 1606, 1692, 1420, 1508, 1598, 1690, 1423,
- 1425, 1511, 1513, 1515, 1517, 1601, 1603, 1605,
- 1607, 1695, 1332, 1334, 1426, 1330, 1418, 1333,
- 1335, 1421, 1427, 1467, 1469, 1555, 1557, 1561,
- 1645, 1647, 1649, 1737, 1739, 1465, 1553, 1643,
- 1735, 1468, 1470, 1556, 1560, 1646, 1648, 1652,
- 1738, 1740, 1516, 1518, 1606, 1698, 1426, 1514,
- 1604, 1517, 1523, 1607, 1609, 1699, 1701, 1336,
- 1424, 1249, 1251, 1337, 1339, 1341, 1425, 1427,
- 1515, 1561, 1563, 1565, 1567, 1743, 1745, 1471,
- 1649, 1741, 1474, 1564, 1566, 1652, 1744, 1786,
- 1789, 1739, 1831, 1748, 1923, 1832, 1924, 1502,
- 1592, 1594, 1684, 1410, 1503, 1593, 1595, 1685,
- 1457, 1547, 1549, 1639, 1641, 1729, 1731, 1458,
- 1548, 1550, 1640, 1642, 1730, 1732, 1821, 1822,
- 1774, 1776, 1866, 1775, 1777, 1867, 1411, 1911,
- 1912, 1686, 1687, 1779, 1869, 1957, 1597, 1689,
- 1823, 1913, 1824, 1914, 1956, 2004, 2003, 1868,
- 1958, 1959, 1506, 1508, 1594, 1596, 1598, 1600,
- 1684, 1686, 1688, 1690, 1776, 1778, 1504, 1592,
- 1774, 1507, 1509, 1595, 1597, 1599, 1601, 1685,
- 1687, 1689, 1691, 1777, 1779, 1551, 1553, 1639,
- 1641, 1643, 1645, 1729, 1731, 1733, 1735, 1821,
- 1823, 1549, 1552, 1554, 1640, 1642, 1644, 1646,
- 1730, 1732, 1734, 1736, 1822, 1824, 1825, 1911,
- 1913, 1826, 1912, 1914, 1508, 1510, 1596, 1598,
- 1600, 1602, 1686, 1688, 1690, 1692, 1778, 1780,
- 1509, 1511, 1597, 1599, 1601, 1603, 1687, 1689,
- 1691, 1779, 1781, 1513, 1605, 1695, 1783, 1553,
- 1555, 1641, 1643, 1645, 1647, 1731, 1733, 1735,
- 1737, 1823, 1825, 1554, 1556, 1642, 1644, 1646,
- 1648, 1732, 1734, 1736, 1738, 1824, 1826, 1740,
- 1828, 1821, 1827, 1913, 1915, 1822, 1914, 1830,
- 1918, 1512, 1514, 1600, 1602, 1604, 1606, 1690,
- 1692, 1782, 1784, 1510, 1598, 1688, 1780, 1513,
- 1515, 1601, 1603, 1605, 1607, 1691, 1695, 1783,
- 1785, 1557, 1645, 1647, 1649, 1735, 1737, 1739,
- 1741, 1827, 1555, 1643, 1733, 1825, 1560, 1646,
- 1648, 1652, 1736, 1738, 1740, 1828, 1830, 1831,
- 1917, 1919, 1823, 1915, 1826, 1832, 1918, 1920,
- 1514, 1516, 1602, 1604, 1606, 1692, 1698, 1784,
- 1786, 1515, 1517, 1603, 1605, 1607, 1609, 1695,
- 1699, 1785, 1701, 1789, 1561, 1647, 1649, 1737,
- 1739, 1741, 1743, 1831, 1560, 1648, 1652, 1738,
- 1740, 1744, 1830, 1832, 1564, 1827, 1919, 1828,
- 1920, 1924, 1782, 1872, 1874, 1878, 1783, 1873,
- 1877, 1879, 1965, 1967, 1917, 1923, 2011, 1918,
- 2010, 2014, 1880, 1968, 1883, 1745, 2013, 1963,
- 2007, 2008, 1518, 1606, 1698, 1704, 1880, 1523,
- 1609, 1699, 1701, 1617, 1883, 1565, 1567, 1743,
- 1745, 1566, 1744, 1748, 1750, 1930, 1878, 1972,
- 1789, 1879, 1786, 1831, 1923, 2013, 1832, 1924,
- 2014, 2018, 1976, 2021, 1968, 2011, 1704, 1617,
- 1565, 1567, 1745, 1743, 1748, 1750, 2021, 1930,
- 1528, 1574, 2024, 1976, 1883, 1686, 1688, 1774,
- 1776, 1778, 1780, 1866, 1868, 1870, 1956, 1958,
- 1684, 1687, 1689, 1775, 1777, 1779, 1781, 1867,
- 1869, 1871, 1957, 1959, 1596, 1598, 1690, 1594,
- 1597, 1599, 1685, 1691, 1731, 1733, 1821, 1823,
- 1825, 1911, 1913, 1915, 2003, 1729, 1732, 1734,
- 1822, 1824, 1826, 1912, 1914, 2004, 1960, 1961,
- 2005, 2006, 1872, 1873, 1963, 1783, 1965, 1917,
- 2007, 1918, 2008, 1828, 1920, 2010, 1688, 1690,
- 1776, 1778, 1780, 1782, 1866, 1868, 1870, 1872,
- 1958, 1960, 1689, 1691, 1777, 1779, 1781, 1783,
- 1867, 1869, 1871, 1873, 1959, 1961, 1785, 1963,
- 1598, 1600, 1686, 1692, 1599, 1601, 1687, 1603,
- 1695, 1733, 1735, 1821, 1823, 1825, 1827, 1911,
- 1913, 1915, 1917, 2003, 2005, 1734, 1736, 1822,
- 1824, 1826, 1828, 1912, 1914, 1918, 2004, 2006,
- 1738, 1830, 1920, 2008, 1692, 1780, 1782, 1784,
- 1786, 1870, 1872, 1874, 1690, 1778, 1868, 1960,
- 1695, 1781, 1783, 1785, 1871, 1873, 1877, 1963,
- 1965, 1602, 1604, 1600, 1688, 1603, 1605, 1691,
- 1737, 1739, 1825, 1827, 1831, 1915, 1917, 1919,
- 2007, 1735, 1823, 1913, 2005, 1738, 1740, 1826,
- 1828, 1830, 1832, 1918, 1920, 2008, 2010, 1958,
- 1961, 1967, 2011, 2003, 2006, 1878, 1880, 1968,
- 1972, 1786, 1874, 1789, 1877, 1879, 1883, 1967,
- 1923, 2011, 2013, 1831, 1919, 1924, 2014, 2018,
- 1972, 1976, 1880, 1883, 2021, 1923, 2013, 1930,
- 2018, 2024,
+ 1459, 1188, 1190, 1276, 1278, 1282, 1366, 1370,
+ 1372, 1458, 1460, 1284, 1410, 1502, 1411, 1419,
+ 1461, 1547, 1548, 1550, 1464, 1552, 1639, 1554,
+ 1146, 1148, 1234, 1236, 1238, 1240, 1326, 1328,
+ 1330, 1418, 1144, 1232, 1322, 1414, 1147, 1237,
+ 1241, 1329, 1331, 1417, 1419, 1056, 1058, 1054,
+ 1142, 1057, 1059, 1145, 1151, 1191, 1193, 1279,
+ 1281, 1283, 1285, 1369, 1371, 1375, 1461, 1463,
+ 1189, 1277, 1367, 1459, 1282, 1284, 1370, 1372,
+ 1376, 1464, 1242, 1420, 1243, 1333, 1421, 1245,
+ 1060, 1063, 1155, 1290, 1240, 1242, 1244, 1330,
+ 1424, 1238, 1328, 1420, 1155, 1241, 1243, 1245,
+ 1331, 1333, 1337, 1156, 1060, 1148, 1063, 1151,
+ 1157, 1197, 1285, 1289, 1291, 1375, 1379, 1283,
+ 1200, 1290, 1376, 1512, 1514, 1418, 1510, 1421,
+ 1471, 1463, 1555, 1384, 1464, 1556, 1562, 1648,
+ 1650, 1645, 1554, 1078, 1168, 1252, 1342, 1344,
+ 1345, 1529, 1075, 1121, 1211, 1480, 1138, 1228,
+ 1230, 1320, 1322, 1410, 1412, 1139, 1229, 1231,
+ 1321, 1323, 1411, 1413, 1183, 1275, 1365, 1367,
+ 1184, 1276, 1366, 1458, 1547, 1548, 1460, 1550,
+ 1232, 1414, 1502, 1415, 1277, 1369, 1459, 1278,
+ 1370, 956, 1046, 1047, 1048, 1592, 957, 1049,
+ 1593, 864, 865, 1001, 1002, 1003, 1093, 1185,
+ 1004, 1094, 1186, 1730, 1639, 1684, 1774, 1595,
+ 1685, 1821, 1822, 1912, 1236, 1238, 1326, 1328,
+ 1330, 1414, 1418, 1420, 1506, 1234, 1322, 1412,
+ 1237, 1329, 1331, 1415, 1417, 1419, 1421, 1509,
+ 1281, 1283, 1369, 1371, 1375, 1459, 1461, 1463,
+ 1279, 1367, 1282, 1284, 1370, 1372, 1376, 1460,
+ 1464, 1552, 1554, 1555, 1641, 1643, 1547, 1639,
+ 1550, 1556, 1644, 1240, 1510, 1241, 1333, 1243,
+ 1285, 1645, 1648, 1596, 1600, 1688, 1502, 1592,
+ 1684, 1595, 1597, 1599, 1731, 1734, 1244, 1424,
+ 1514, 1245, 1333, 1337, 1429, 1249, 1289, 1291,
+ 1379, 1471, 1200, 1290, 1294, 1376, 1384, 1386,
+ 1562, 1650, 1566, 1252, 1342, 1344, 1432, 1345,
+ 1429, 1433, 1521, 1525, 1471, 1565, 1569, 1384,
+ 1386, 1480, 1566, 1211, 1659, 1662, 1168, 1616,
+ 1529, 1751, 1608, 1704, 1792, 1611, 1746, 1791,
+ 1793, 1885, 1836, 1926, 1827, 1919, 1917, 1876,
+ 1966, 1843, 1886, 1228, 1320, 1410, 1412, 1502,
+ 1592, 1230, 1229, 1321, 1411, 1413, 1593, 1138,
+ 1231, 1275, 1365, 1367, 1547, 1639, 1183, 1276,
+ 1366, 1458, 1548, 1550, 1595, 1322, 1414, 1323,
+ 1415, 1506, 1596, 1684, 1597, 1685, 1417, 1509,
+ 1599, 1419, 1459, 1641, 1460, 1552, 1730, 1554,
+ 1644, 1774, 1731, 1821, 1184, 1822, 1912, 1866,
+ 1956, 1867, 1777, 1734, 1823, 1600, 1688, 1690,
+ 1776, 1778, 1643, 1645, 1825, 1418, 1420, 1506,
+ 1510, 1512, 1596, 1600, 1602, 1688, 1690, 1419,
+ 1421, 1509, 1597, 1599, 1603, 1693, 1328, 1330,
+ 1329, 1331, 1417, 1333, 1463, 1555, 1641, 1643,
+ 1645, 1464, 1552, 1554, 1556, 1644, 1648, 1734,
+ 1650, 1424, 1514, 1243, 1245, 1337, 1429, 1379,
+ 1471, 1827, 1562, 1424, 1512, 1514, 1602, 1608,
+ 1337, 1429, 1521, 1603, 1611, 1693, 1785, 1245,
+ 1333, 1421, 1379, 1471, 1555, 1565, 1645, 1562,
+ 1648, 1650, 1566, 1600, 1690, 1876, 1791, 1825,
+ 1827, 1917, 1919, 1746, 1836, 1926, 1966, 1965,
+ 1793, 1608, 1514, 1429, 1521, 1611, 1248, 1342,
+ 1424, 1432, 1512, 1433, 1565, 1471, 1562, 1566,
+ 1746, 1616, 1525, 1529, 1344, 1432, 1569, 1659,
+ 1751, 1843, 1662, 1704, 1799, 1792, 1611, 1793,
+ 1885, 1746, 1836, 1886, 1791, 1926, 1510, 1596,
+ 1600, 1602, 1688, 1690, 1778, 1509, 1597, 1599,
+ 1603, 1693, 1781, 1555, 1641, 1643, 1645, 1731,
+ 1823, 1825, 1554, 1556, 1644, 1648, 1734, 1650,
+ 1821, 1827, 1822, 1512, 1514, 1785, 1917, 1919,
+ 1776, 1866, 1868, 1958, 1960, 1777, 1867, 1869,
+ 1959, 2005, 1912, 1876, 1966, 1965, 1836, 1926,
+ 1502, 1592, 1684, 1774, 1776, 1866, 1411, 1593,
+ 1595, 1685, 1777, 1867, 1410, 1547, 1639, 1641,
+ 1731, 1821, 1548, 1550, 1730, 1822, 1912, 1823,
+ 1869, 1597, 1688, 1778, 1868, 1956, 1958, 1781,
+ 1959, 1596, 1690, 1599, 1825, 1734, 1776, 1778,
+ 1866, 1868, 1956, 1958, 1960, 1774, 1777, 1867,
+ 1869, 1959, 1731, 1821, 1823, 1825, 1917, 2005,
+ 1822, 1912, 1781, 1693, 1785, 1965, 1734, 1648,
+ 1868, 1876, 1958, 1960, 1966, 1785, 1965, 1827,
+ 1917, 1919, 2005, 1825, 1644, 1648, 1650, 1734,
+ 1746, 1822, 1836, 1912, 1926, 1792, 1876, 1966,
+ 1791, 1793, 1885, 1965, 1917, 1919, 1836, 1926,
};
static long _vq_fitmap_res_Zc_8[] = {
0, 0, 0, 59, 59, 123, 123, 187,
- 187, 251, 251, 315, 315, 375, 375, 438,
- 438, 501, 566, 631, 696, 761, 826, 891,
- 956, 1021, 1086, 1151, 375, 375, 1208, 438,
- 1249, 1308, 1373, 1438, 1503, 1568, 1633, 1698,
- 1763, 1828, 1892, 1951, 1951, 1208, 1208, 2006,
- 2068, 2132, 2197, 2262, 2327, 2392, 2457, 2522,
- 2587, 2648, 2700, 2753, 2777, 2777, 2006, 2831,
- 2889, 2954, 3019, 3084, 3149, 3214, 3278, 3340,
- 3393, 2700, 3440, 2777, 2777, 2777, 3474, 3534,
- 3599, 3664, 3729, 3794, 3859, 3922, 3980, 4026,
- 3440, 3440, 2777, 2777, 4075, 3474, 4132, 4191,
- 4256, 4321, 4386, 4451, 4515, 4572, 4026, 4633,
- 4633, 4075, 4075, 4075, 4075, 4682, 4744, 4808,
- 4873, 4938, 5003, 5067, 4572, 4633, 4633, 4633,
- 4075, 4075, 5123, 5123, 4682, 5189, 5247, 5312,
- 5377, 5442, 5505, 5555, 5555, 4633, 4633, 4075,
- 4075, 5123, 5123, 5123, 5605, 5665, 5730, 5795,
- 5860, 5923, 5974, 5555, 6020, 6020, 5123, 5123,
- 5123, 5123, 6043, 5605, 6104, 6163, 6228, 6292,
- 6352, 5974, 6417, 6020, 6020, 5123, 5123, 5123,
- 6043, 6043, 6043, 6452, 6514, 6578, 6640, 6352,
- 6698, 6417, 6417, 6417, 5123, 5123, 5123, 6043,
- 6043, 6743, 6452, 6794, 6852, 6913, 6968, 6698,
- 7034, 7070, 7070, 6043, 6043, 6043, 6043, 6743,
- 6743, 6743, 7085, 7150, 7212, 6968, 6968, 7034,
- 7034, 7070, 6043, 6043, 6043, 6043, 6743, 6743,
- 6743, 7085, 7085, 7212, 6968, 7269, 7034, 7288,
- 7070,
+ 187, 250, 250, 313, 313, 376, 376, 436,
+ 436, 499, 564, 629, 694, 759, 824, 889,
+ 952, 1014, 1076, 1140, 1203, 376, 1265, 436,
+ 1306, 1365, 1430, 1495, 1560, 1625, 1690, 1751,
+ 1810, 1868, 1928, 1985, 1985, 1265, 1265, 2043,
+ 2105, 2169, 2234, 2299, 2364, 2429, 2491, 2549,
+ 2600, 2666, 2666, 2730, 2762, 2762, 2043, 2816,
+ 2874, 2939, 3004, 3069, 3133, 3196, 3251, 2600,
+ 3315, 3315, 3363, 2762, 2762, 2762, 3383, 3443,
+ 3508, 3573, 3636, 3699, 3760, 3251, 3814, 3814,
+ 3872, 3872, 2762, 2762, 3930, 3383, 3996, 4055,
+ 4119, 4178, 4237, 4293, 4356, 3814, 3872, 3872,
+ 3872, 3930, 3930, 3930, 3930, 4411, 4472, 4532,
+ 4589, 4644, 4293, 4356, 4709, 3872, 3872, 3872,
+ 3930, 3930, 4746, 4746, 4411, 4811, 4862, 4915,
+ 4644, 4962, 4962, 4709, 5013, 5013, 5013, 3930,
+ 3930, 4746, 4746, 4746, 4746, 5074, 5136, 5136,
+ 5196, 5013, 5013, 5013, 5013, 5243, 3930, 4746,
+ 4746, 4746, 5254, 5254, 5074, 5316, 5316, 5196,
+ 5382, 5013, 5403, 5403, 5403, 5254, 5254, 5254,
+ 5443, 5443, 5443, 5443, 5316, 5509, 5509, 5555,
+ 5593, 5403, 5403, 5609, 5254, 5254, 5254, 5443,
+ 5443, 5443, 5443, 5443, 5630, 5630, 5555, 5403,
+ 5403, 5609, 5609, 5254, 5254, 5443, 5443, 5680,
+ 5680, 5680, 5680, 5630, 5630, 5555, 5403, 5403,
+ 5609, 5609, 5443, 5443, 5443, 5443, 5680, 5680,
+ 5680, 5718, 5718, 5744, 5555, 5765, 5403, 5609,
+ 5609,
};
static long _vq_fitlength_res_Zc_8[] = {
- 59, 59, 59, 64, 64, 64, 64, 64,
- 64, 64, 64, 60, 60, 63, 63, 63,
- 63, 65, 65, 65, 65, 65, 65, 65,
- 65, 65, 65, 57, 63, 63, 41, 63,
- 59, 65, 65, 65, 65, 65, 65, 65,
- 65, 64, 59, 55, 55, 41, 41, 62,
- 64, 65, 65, 65, 65, 65, 65, 65,
- 61, 52, 53, 24, 54, 54, 62, 58,
- 65, 65, 65, 65, 65, 64, 62, 53,
- 47, 53, 34, 54, 54, 54, 60, 65,
- 65, 65, 65, 65, 63, 58, 46, 49,
- 34, 34, 54, 54, 57, 60, 59, 65,
- 65, 65, 65, 64, 57, 61, 49, 49,
- 49, 57, 57, 57, 57, 62, 64, 65,
- 65, 65, 64, 56, 61, 49, 49, 49,
- 57, 57, 66, 66, 62, 58, 65, 65,
- 65, 63, 50, 50, 50, 49, 49, 57,
- 57, 66, 66, 66, 60, 65, 65, 65,
- 63, 51, 46, 50, 23, 23, 66, 66,
- 66, 66, 61, 60, 59, 65, 64, 60,
- 65, 46, 35, 23, 23, 66, 66, 66,
- 61, 61, 61, 62, 64, 62, 58, 65,
- 45, 35, 35, 35, 66, 66, 66, 61,
- 61, 51, 62, 58, 61, 55, 66, 45,
- 36, 15, 15, 61, 61, 61, 61, 51,
- 51, 51, 65, 62, 57, 66, 66, 36,
- 36, 15, 61, 61, 61, 61, 51, 51,
- 51, 65, 65, 57, 66, 19, 36, 10,
- 15,
+ 59, 59, 59, 64, 64, 64, 64, 63,
+ 63, 63, 63, 63, 63, 60, 60, 63,
+ 63, 65, 65, 65, 65, 65, 65, 63,
+ 62, 62, 64, 63, 62, 60, 41, 63,
+ 59, 65, 65, 65, 65, 65, 61, 59,
+ 58, 60, 57, 58, 58, 41, 41, 62,
+ 64, 65, 65, 65, 65, 62, 58, 51,
+ 66, 64, 64, 32, 54, 54, 62, 58,
+ 65, 65, 65, 64, 63, 55, 64, 66,
+ 48, 48, 20, 54, 54, 54, 60, 65,
+ 65, 63, 63, 61, 54, 64, 58, 58,
+ 58, 58, 54, 54, 66, 60, 59, 64,
+ 59, 59, 56, 63, 55, 58, 58, 58,
+ 58, 66, 66, 66, 66, 61, 60, 57,
+ 55, 65, 63, 55, 37, 58, 58, 58,
+ 66, 66, 65, 65, 61, 51, 53, 47,
+ 65, 51, 51, 37, 61, 61, 61, 66,
+ 66, 65, 65, 65, 65, 62, 60, 60,
+ 47, 61, 61, 61, 61, 11, 66, 65,
+ 65, 65, 62, 62, 62, 66, 66, 47,
+ 21, 61, 40, 40, 40, 62, 62, 62,
+ 66, 66, 66, 66, 66, 46, 46, 38,
+ 16, 40, 40, 21, 62, 62, 62, 66,
+ 66, 66, 66, 66, 50, 50, 38, 40,
+ 40, 21, 21, 62, 62, 66, 66, 38,
+ 38, 38, 38, 50, 50, 38, 40, 40,
+ 21, 21, 66, 66, 66, 66, 38, 38,
+ 38, 26, 26, 21, 38, 11, 40, 21,
+ 21,
};
static encode_aux_pigeonhole _vq_auxp_res_Zc_8 = {
-22, 1, 44, 15,
_vq_pigeonmap_res_Zc_8,
- 7298,
+ 5776,
_vq_fitlist_res_Zc_8,
_vq_fitmap_res_Zc_8,
_vq_fitlength_res_Zc_8
1.2.4.1 +25 -25 vorbis/lib/books/res_Zc_9.vqh
Index: res_Zc_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Zc_9.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- res_Zc_9.vqh 2001/08/13 01:37:06 1.2
+++ res_Zc_9.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -27,46 +27,46 @@
};
static long _vq_lengthlist_res_Zc_9[] = {
- 1,11,10,11,11, 7,11,11,11,11, 7,11,11,11,11,11,
+ 1, 6, 5,12,12, 7, 4, 9,11,11, 7,10, 5,11,11,11,
+ 9,11,11,11,11,11,11,11,11, 6,11,10,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11, 6,10,11,11,11,11,11,11,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11, 8,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,10,11,11,11,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11, 8,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,10,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
11,11,11,11,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,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
- 10,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,
};
static float _vq_quantthresh_res_Zc_9[] = {
1.2.4.1 +34 -34 vorbis/lib/books/res_Zc_9a.vqh
Index: res_Zc_9a.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Zc_9a.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- res_Zc_9a.vqh 2001/08/13 01:37:06 1.2
+++ res_Zc_9a.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -45,40 +45,40 @@
};
static long _vq_lengthlist_res_Zc_9a[] = {
- 2, 4, 4, 8, 8, 9,10,10,11,11,14,14,14,13,14,12,
- 12,14,12,14,14,14,14, 5, 5, 5, 7, 8,10,10,11,12,
- 12,12,13,12,14,14,11,12,14,14,14,14,14,14,14, 5,
- 4, 7, 7, 9, 9,10,10,13,13,13,13,12,13,12,12,12,
- 13,13,13,13,13,13, 5, 5, 8, 8, 9, 9,10,11,11,11,
- 12,13,13,13,12,13,13,13,13,13,13,13,13, 5, 5, 7,
- 6, 9, 9,10,10,11,12,13,12,13,13,11,12,13,12,13,
- 13,13,13,13, 8, 9, 6, 7, 9,10,10,11,12,11,13,13,
- 13,13,13,12,13,13,13,13,13,13,13,13,13, 8, 6, 9,
- 8,10,10,11,11,13,12,13,13,13,11,12,12,13,12,13,
- 13,13,13,13, 9, 9, 9, 9, 9,10,11,13,13,13,13,13,
- 13,12,13,13,12,13,13,13,13,13,13, 9, 9, 9, 9,10,
- 11,13,11,13,13,13,13,13,12,13,13,13,13,13,13,13,
- 13,13,12,12, 9, 9,10,10,11,12,13,13,13,13,12,13,
- 13,13,13,13,13,12,13,13,13,13,13,10, 9,11,10,12,
- 12,13,13,13,13,13,13,13,13,13,12,13,13,13,13,13,
- 13,13,11,12,11,10,13,12,13,13,13,13,13,11,12,13,
- 13,13,13,13,13,13,13,13,13,12,12,10,12,12,13,13,
- 12,13,13,12,12,13,13,13,13,13,13,13,13,13,13,13,
- 11,12,11,11,12,12,13,13,13,13,13,12,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,11,11,12,12,12,13,13,
- 13,13,12,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 7, 9, 9,11,12,12,13,13,13,12,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,10, 7,10, 8,11,11,12,13,13,
- 12,13,13,13,13,13,13,13,13,13,13,13,13,13, 8,12,
- 7,11,11,11,12,12,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,10, 7,12,12,12,12,12,13,13,
- 13,12,13,13,13,13,13,13,13,13,13,13,13,13, 9,12,
- 9,12,11,12,12,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13, 9,10,10,11,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,11,13,10,11,
- 12,11,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,10,11,11,12,13,13,13,13,13,13,13,
- 13,
+ 2, 4, 4, 6, 5, 7, 6, 7, 7, 8, 8, 9, 9, 9,10, 9,
+ 9, 9,10,10,10,10,11, 7, 5, 6, 7, 7, 8, 8, 8, 8,
+ 9, 9,10, 9,10,10, 9, 9,10,10,10,10,11,11,15, 6,
+ 4, 7, 7, 7, 8, 8, 9, 9, 9,10, 9, 9,10, 9, 9,10,
+ 9,10,10,11,12,15, 7, 7, 8, 8, 8, 9, 9, 9,10,10,
+ 10,10,11,11,10,11,10,11,11,11,12,11,14, 7, 6, 7,
+ 7, 9, 9, 9, 9,10,10,10,10,11,11,11,10,10,10,11,
+ 10,11,12,15, 9, 9, 7, 8, 9, 9,10,10,10,10,11,11,
+ 11,12,12,12,10,12,11,12,13,12,15,14,14, 7, 6, 9,
+ 9, 9,10,10,10,11,11,11,11,10,11,10,12,11,13,12,
+ 12,14,14,14, 8, 9,10,10,11,10,10,10,11,10,12,12,
+ 12,12,12,12,12,13,13,12,14,14,14, 8, 8, 9, 9,11,
+ 10,11,11,12,11,12,12,11,12,12,12,13,14,13,12,14,
+ 14,14,14,13,11,10,12,10,11,13,13,11,11,11,12,11,
+ 12,11,14,12,14,13,14,14,14,14,14, 9, 9,11,10,10,
+ 11,12,11,13,12,12,12,12,13,14,12,14,14,14,14,14,
+ 14,14,12, 9,11,10,13,11,12,12,13,11,13,11,13,13,
+ 14,12,14,13,14,14,14,14,14, 9,11,10,10,11,11,11,
+ 11,11,13,12,12,13,13,12,13,13,13,14,14,14,14,14,
+ 12,12,10,10,11,12,13,12,12,11,12,12,12,13,14,12,
+ 13,13,14,14,14,14,14,14,14,12, 9,10,12,12,13,11,
+ 13,12,12,13,13,13,13,13,14,14,14,14,14,14,14,14,
+ 9,12, 8,11,13,11,13,12,11,12,13,12,13,13,13,12,
+ 14,14,14,14,14,14,14,13,10,10,13,11,12,12,14,13,
+ 13,13,13,12,14,13,13,14,14,14,14,14,14,13,13,11,
+ 9,11, 9,11,12,13,12,13,13,13,13,13,13,13,13,14,
+ 14,14,14,14,14,14,13,12,13,11,11,13,13,12,13,12,
+ 13,13,13,13,14,14,14,14,14,13,14,13,14,13,13,13,
+ 10,14,11,12,13,12,13,13,13,14,13,13,14,14,14,14,
+ 13,14,14,14,14,12,13,13,11,12,14,13,13,13,13,13,
+ 14,14,13,14,14,14,14,14,14,13,14,13,13,13,11,12,
+ 12,14,13,14,13,13,12,14,13,13,14,14,13,14,14,14,
+ 14,14,14,14,14,12,13,14,12,13,13,13,13,13,14,13,
+ 14,
};
static float _vq_quantthresh_res_Zc_9a[] = {
1.2.4.1 +6 -6 vorbis/lib/books/res_Zc_9b.vqh
Index: res_Zc_9b.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res_Zc_9b.vqh,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- res_Zc_9b.vqh 2001/08/13 01:37:06 1.2
+++ res_Zc_9b.vqh 2001/10/09 04:34:47 1.2.4.1
@@ -25,12 +25,12 @@
};
static long _vq_lengthlist_res_Zc_9b[] = {
- 5, 6, 6, 7, 6, 6, 7, 6, 7, 6, 6, 6, 7, 6, 6, 7,
- 6, 7, 6, 6, 6, 7, 7, 7, 7, 6, 6, 7, 7, 7, 7, 7,
- 7, 7, 7, 8, 6, 6, 6, 7, 7, 6, 7, 6, 6, 6, 6, 6,
- 7, 6, 6, 7, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6,
- 6, 6, 7, 6, 6, 8, 5, 6, 6, 6, 6, 6, 7, 6, 7, 6,
- 6,
+ 3, 6, 6, 7, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 6, 7,
+ 6, 7, 6, 6, 6, 7, 6, 7, 7, 6, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 6, 6, 6, 7, 6, 7, 7, 7, 7, 6, 6, 7,
+ 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 6,
+ 7, 7, 7, 7, 7, 7, 7, 6, 6, 7, 6, 6, 7, 7, 7, 6,
+ 7,
};
static float _vq_quantthresh_res_Zc_9b[] = {
No revision
No revision
1.4.2.1 +54 -25 vorbis/lib/modes/mode_44c_A.h
Index: mode_44c_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_44c_A.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- mode_44c_A.h 2001/09/11 05:45:03 1.4
+++ mode_44c_A.h 2001/10/09 04:34:55 1.4.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_A.h,v 1.4 2001/09/11 05:45:03 xiphmont Exp $
+ last mod: $Id: mode_44c_A.h,v 1.4.2.1 2001/10/09 04:34:55 xiphmont Exp $
********************************************************************/
@@ -85,6 +85,9 @@
{64, 0, 0, 0},
{9999, 0, 0, 2.5f}}
},
+ {1.f,1.f,
+ {{9999, 0, 0, 0}}
+ },
};
static vp_couple_pass _psy_pass_44c_A[]={
@@ -92,7 +95,10 @@
{{288, 0, 0, 0},
{512, 0, 0, 0},
{9999, 0, 0, 2.5f}}
- }
+ },
+ {1.f,1.f,
+ {{9999, 0, 0, 0}}
+ },
};
static float _psy_compand_44c_A[NOISE_COMPAND_LEVELS]={
@@ -101,15 +107,9 @@
1.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, /* 23dB */
0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, /* 31dB */
1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, /* 39dB */
-};
-static float _psy_compand_44c_0[NOISE_COMPAND_LEVELS]={
- 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
- 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
- 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
- 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
- 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
};
+
static vorbis_info_psy _psy_set_44c_A0={
ATH_Bark_dB_lineaggressive,
-100.,-140.,
@@ -126,12 +126,12 @@
2, 2, 15,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-30,-30,-30,-30,-24,-20,-18,-14,-10,-2, -3, -3, 0, 0, 0, 0, 2},
+ {-30,-30,-30,-30,-26,-22,-20,-14,-10,-2, -3, -3, 0, 0, 0, 0, 2},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- 1,
+
_psy_pass_44c_A0
};
@@ -151,12 +151,13 @@
4,4,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-30,-30,-30,-30,-20,-20,-10,-10, 0, -2, -5, -5, 0, 0, 0, 0, 2},
+ {-30,-30,-30,-30,-26,-20,-20,-10, -6, -2, -5, -5, 0, 0, 0, 0, 2},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- 1,_psy_pass_44c_A
+
+ _psy_pass_44c_A
};
static vorbis_info_psy _psy_set_44c_A={
@@ -175,12 +176,13 @@
4,4,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-20,-20,-20,-20,-20,-20,-10, -3, 0, -2, -5, -5, 0, 0, 0, 0, 2},
+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -5, -5, 0, 0, 0, 0, 2},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- 1,_psy_pass_44c_A
+
+ _psy_pass_44c_A
};
static vorbis_info_time0 _time_set_44c_A={0};
@@ -240,9 +242,13 @@
896};
static vorbis_info_residue0 _residue_set_44c_A0={
- 0,192, 8, 10,23,
- {0,1,1,1,1,1,1,3,3,7},
- {25, 26, 27, 28, 29, 30, 31,32, 33,34, 35,36,37},
+ 0,192, 16, 10,23,
+ {0,4,40,
+ 1,2,20,
+ 4,6,6,7},
+ {25, 26,26,
+ 27, 28, 29,29,
+ 30, 31,32, 33,34, 35,36,37},
{9999,9999,9999,9999,9999,9999,
9999,9999,9999,9999},
{.5f,
@@ -250,13 +256,16 @@
2.5f,2.5f,2.5f,
4.5f,17.5f,84.5f},
{0},
- {99,16,99,6,16,99,99,99,99,99},
- {3}};
+ {99,8,99,3,8,99,99,99,99,99}};
static vorbis_info_residue0 _residue_set_44c_A={
0,1792, 32,10,24,
- {0,1,1,1,1,1,1,3,3,7},
- {25, 26, 27, 28, 29, 30, 31,32, 33,34, 35,36,37},
+ {0,4,40,
+ 1,2,20,
+ 4,6,6,7},
+ {25, 26,26,
+ 27, 28, 29,29,
+ 30, 31,32, 33,34, 35,36,37},
{9999,9999,9999,9999,9999,9999,
9999,9999,9999,9999},
{.5f,
@@ -264,8 +273,7 @@
2.5f,2.5f,2.5f,
4.5f,17.5f,84.5f},
{0},
- {99,32,99,18,32,99,99,99,99,99},
- {3}};
+ {99,32,99,18,32,99,99,99,99,99}};
static vorbis_info_mapping0 _mapping_set_44c_A0={
1, {0,0}, {0}, {0}, {0}, {0,0}, 1,{0},{1}};
@@ -342,7 +350,28 @@
},
/* psy */
{&_psy_set_44c_A0,&_psy_set_44c_AT,&_psy_set_44c_A},
- &_psy_set_44c_AG
+ &_psy_set_44c_AG,
+
+ /* progressive coding and bitrate controls */
+ 3.0,
+ 1.,4.,
+
+ 0,
+ 0,
+
+ 0,
+ 0,
+
+ 0,0,
+
+ {4,6},
+ 2,
};
#endif
+
+
+
+
+
+
1.6.4.1 +46 -22 vorbis/lib/modes/mode_44c_Z.h
Index: mode_44c_Z.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_44c_Z.h,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- mode_44c_Z.h 2001/08/13 07:43:15 1.6
+++ mode_44c_Z.h 2001/10/09 04:34:55 1.6.4.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_Z.h,v 1.6 2001/08/13 07:43:15 xiphmont Exp $
+ last mod: $Id: mode_44c_Z.h,v 1.6.4.1 2001/10/09 04:34:55 xiphmont Exp $
********************************************************************/
@@ -79,35 +79,53 @@
static struct vp_couple_pass _psy_pass_44c_Z0[]={
{1.f,1.f,
- {{24, 0,0, 0,0, 0,0},
- {9999, 0,0, 7.5f,12, 7.5f,0}}
+ {{24, 0, 0, 0},
+ {9999, 0, 0, 7.5f}}
},
};
static vp_couple_pass _psy_pass_44c_Z[]={
{1.f,1.f,
- {{288, 0,0, 0,0, 0,0},
- {9999, 0,0, 7.5f,12, 7.5f,0}}
+ {{288, 0, 0, 0},
+ {9999, 0, 0, 7.5f}}
}
};
+static float _psy_compand_44c_Z[NOISE_COMPAND_LEVELS]={
+ 0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, /* 7dB */
+ 8.f, 9.f, 9.f,10.f,10.f,10.f,11.f, 11.f, /* 15dB */
+ 12.f,12.f,11.f,11.f,10.f,10.f, 9.f, 9.f, /* 23dB */
+ 8.f, 8.f, 8.f, 9.f, 9.f,10.f,11.f, 12.f, /* 31dB */
+ 13.f,14.f,15.f,16.f,17.f,18.f,19.f, 20.f, /* 39dB */
+};
+
+static float _psy_compand_44c_Z0[NOISE_COMPAND_LEVELS]={
+ 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,13.f,14.f, 15.f, /* 15dB */
+ 16.f,17.f,18.f,19.f,20.f,21.f,22.f, 23.f, /* 23dB */
+ 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 */
+};
+
static vorbis_info_psy _psy_set_44c_Z0={
ATH_Bark_dB_lineaggressive,
-100.,-110.,
/* tonemaskp */
- 3.f, -24.f,&_vp_tonemask_consbass_Z,
+ 3.f, -24.f,-10.f,
+ &_vp_tonemask_consbass_Z,
/* peakattp, curvelimitp */
1, 0, &_vp_peakatt_Z,
-
+
/*noisemaskp */
- 1,-24.f, /* suppress any noise curve over maxspec+n */
- 1.f, 1.f, /* low/high window */
- 2, 2, -1,
+ 1,-0.f, /* suppress any noise curve over maxspec+n */
+ 5.f, 5.f, /* low/high window */
+ 2, 2, 15,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-20,-20,-20,-20,-20,-20,-10, -5, 3, 3, 4, 4, 4, 4, 4, 4, 8},
- {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.7f,.8f,.88f,.89f,.9f,.9f},
+ {-26,-26,-26,-26,-26,-22,-20,-14, -10, -2, 2, 2, 2, 2, 3, 4, 10},
+ //{-20,-20,-20,-20,-20,-20,-20,-26, -22, -22,-20,-20,-22, -22, -22,-23,-20},
+ _psy_compand_44c_Z,
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
@@ -120,19 +138,22 @@
-100.f,-110.f,
/* tonemask */
- 3.f,-20.f,&_vp_tonemask_consbass_Z,
+ 3.f,-24.f,-10.f,
+ &_vp_tonemask_consbass_Z,
/* peakattp,curvelimitp */
1, 0, &_vp_peakatt_Z,
/*noisemaskp */
- 1, -24.f, /* suppress any noise curve over maxspec+n */
+ 1, -0.f, /* suppress any noise curve over maxspec+n */
.5f,.5f, /* low/high window */
10,10,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-20,-20,-20,-20,-20,-20,-20, -6, 3, 3, 4, 5, 5, 5, 5, 6, 10},
- {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.7f,.8f,.88f,.89f,.9f,.9f},
+ {-26,-26,-26,-26,-26,-20,-20,-10, -6, 0, 1, 2, 3, 3, 3, 3, 10},
+ //{-20,-20,-20,-20,-20,-20,-20,-26, -22, -22,-20,-20,-22, -22, -22,-23,-20},
+ _psy_compand_44c_Z,
+
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
1,_psy_pass_44c_Z
@@ -143,18 +164,21 @@
-100.f, -110.f,
/* tonemask */
- 3.f,-20.f,&_vp_tonemask_Z,
+ 3.f,-24.f,-10.f,
+ &_vp_tonemask_Z,
/* peakattp, curvelimitp */
1, 0, &_vp_peakatt_Z,
/*noisemaskp */
- 1, -24.f, /* suppress any noise curve over maxspec+n */
+ 1, -0.f, /* suppress any noise curve over maxspec+n */
.5f,.5f, /* low/high window */
10,10,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-20,-20,-20,-20,-20,-20,-10,-6, 3, 3, 4, 5, 5, 5, 5, 6, 10},
- {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.8f,.85f,.88f,.89f,.9f,.9f},
+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, 0, 1, 2, 3, 3, 3, 3, 10},
+ //{-20,-20,-20,-20,-20,-20,-20,-26, -22, -22,-20,-20,-22, -22, -22,-23,-20},
+ _psy_compand_44c_Z,
+
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
@@ -184,7 +208,7 @@
60,30,500,
999,999,0,18.,
8,70,
- 90};
+ 72};
static vorbis_info_floor1 _floor_set_44c_Z={
10,
@@ -217,7 +241,7 @@
704};
static vorbis_info_residue0 _residue_set_44c_Z0={
- 0,180, 12, 10,23,
+ 0,144, 12, 10,23,
{0,1,1,1,1,1,1,1,1,7},
{25, 26, 27, 28, 29, 30, 31, 32, 33,34,35},
{9999, 9999, 9999, 9999, 2,9999, 9999, 9999, 9999, 9999},
No revision
No revision
1.1.4.1 +5 -5 vorbis/vq/res_44c_A.vqs
Index: res_44c_A.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/res_44c_A.vqs,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- res_44c_A.vqs 2001/08/13 08:41:11 1.1
+++ res_44c_A.vqs 2001/10/09 04:34:55 1.1.4.1
@@ -9,20 +9,20 @@
huffbuild line_128x19_2sub2.vqd 9-25
huffbuild line_128x19_2sub3.vqd 25-64
-residuesplit residue_0#0.vqd 0,192,8 res_A ,.7, ,1.5,16 ,1.5 ,2.5,6 ,2.5,16 ,2.5 ,4.5 ,17.5 ,84.5
+residuesplit residue_0#0.vqd 0,192,16 res_A ,.7, ,1.5,8 ,1.5 ,2.5,3 ,2.5,8 ,2.5 ,4.5 ,17.5 ,84.5
mv res_Aaux.vqd res_44c_A_128aux.vqd
-residuesplit residue_1#0.vqd 0,1536,32 res_B ,.7, ,1.5,32 ,1.5 ,2.5,18 ,2.5,32 ,2.5 ,4.5 ,17.5 ,84.5
+residuesplit residue_1#0.vqd 0,1792,32 res_B ,.7, ,1.5,32 ,1.5 ,2.5,18 ,2.5,32 ,2.5 ,4.5 ,17.5 ,84.5
mv res_Baux.vqd res_44c_A_1024aux.vqd
GO
>res_Ac_128 noninterleaved
-haux res_44c_A_128aux.vqd 0,24,2
+haux res_44c_A_128aux.vqd 0,12,2
>res_Ac noninterleaved
-haux res_44c_A_1024aux.vqd 0,48,2
+haux res_44c_A_1024aux.vqd 0,56,2
:_1 res_B_1.vqd, 4, nonseq cull, 0 +- 1
:_2 res_B_2.vqd, 4, nonseq cull, 0 +- 1
@@ -36,7 +36,7 @@
:_8 res_B_8.vqd, 2, nonseq cull, 0 +- 13 26 39 52 65 78
+_8a, 2, nonseq cull, 0 +- 1 2 3 4 5 6
-:_9 res_B_9.vqd, 2, nonseq, 0 +- 169 338
+:_9 res_B_9.vqd, 2, nonseq, 0 +- 169 338 507
+_9a, 2, nonseq, 0 +- 13 26 39 52 65 78
+_9b, 2, nonseq, 0 +- 1 2 3 4 5 6
1.1.4.1 +2 -2 vorbis/vq/res_44c_Z.vqs
Index: res_44c_Z.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/res_44c_Z.vqs,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- res_44c_Z.vqs 2001/08/13 08:41:11 1.1
+++ res_44c_Z.vqs 2001/10/09 04:34:55 1.1.4.1
@@ -27,7 +27,7 @@
huffbuild line_1024x31_3sub2.vqd 9-25
huffbuild line_1024x31_3sub3.vqd 25-64
-residuesplit residue_0#0.vqd 0,180,12 res_A ,.5 ,1.5,4 ,2.5,4 ,7.5,4 2,1.5 ,1.5 ,2.5 ,7.5 ,22.5
+residuesplit residue_0#0.vqd 0,144,12 res_A ,.5 ,1.5,4 ,2.5,4 ,7.5,4 2,1.5 ,1.5 ,2.5 ,7.5 ,22.5
mv res_Aaux.vqd res_44c_Z_128aux.vqd
residuesplit residue_1#0.vqd 0,1408,32 res_B ,.5 ,1.5,18 ,2.5,18 ,7.5,18 3,1.5 ,1.5 ,2.5 ,7.5 ,22.5
@@ -36,7 +36,7 @@
GO
>res_Zc_128 noninterleaved
-haux res_44c_Z_128aux.vqd 0,15,3
+haux res_44c_Z_128aux.vqd 0,12,3
>res_Zc noninterleaved
haux res_44c_Z_1024aux.vqd 0,44,2
--- >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