[xiph-cvs] cvs commit: vorbis/vq 44c0.vqs 44c1.vqs 44c3.vqs 44c4.vqs 44c5.vqs 44u0.vqs 44u4.vqs 44u7.vqs 44c0_s4.vqs 44c1_s3.vqs 44c2_s2.vqs 44c3_s2.vqs 44c4_s1.vqs 44c5_s0.vqs 44c6_s0.vqs 44c7_s0.vqs 44c8_s0.vqs 44c9_s0.vqs
Monty
xiphmont at xiph.org
Tue Dec 18 15:49:27 PST 2001
xiphmont 01/12/18 15:49:26
Modified: examples Tag: branch_monty_20011217 encoder_example.c
lib Tag: branch_monty_20011217 Makefile bitrate.c
block.c mapping0.c psy.c psy.h res0.c vorbisenc.c
lib/books/coupled Tag: branch_monty_20011217
_44c0_s1_pS_r0.vqh _44c4_s1_p2_s0.vqh
_44c4_s1_p4_s0.vqh _44c4_s1_p6_s0.vqh
_44c4_s1_p7_s0.vqh _44c4_s1_p8_s0.vqh
_44c4_s1_p9_s0.vqh _44c4_s1_pS_r0.vqh
_44c4_s1_pS_r1.vqh _44c4_s2_p6_s0.vqh
_44c4_s2_p7_s0.vqh _44c4_s2_p8_s0.vqh
_44c4_s2_p9_s0.vqh _44c4_s3_p9_s0.vqh
lib/modes Tag: branch_monty_20011217 psych_44.h residue_44.h
vq Tag: branch_monty_20011217 44c0.vqs 44c1.vqs
44c3.vqs 44c4.vqs 44c5.vqs 44u0.vqs 44u4.vqs
44u7.vqs
Removed: vq Tag: branch_monty_20011217 44c0_s4.vqs 44c1_s3.vqs
44c2_s2.vqs 44c3_s2.vqs 44c4_s1.vqs 44c5_s0.vqs
44c6_s0.vqs 44c7_s0.vqs 44c8_s0.vqs 44c9_s0.vqs
Log:
Fixed numerous typos; all rc3 books build
Revision Changes Path
No revision
No revision
1.28.2.1 +2 -2 vorbis/examples/encoder_example.c
Index: encoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/encoder_example.c,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -r1.28 -r1.28.2.1
--- encoder_example.c 2001/12/12 09:45:22 1.28
+++ encoder_example.c 2001/12/18 23:49:15 1.28.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.28 2001/12/12 09:45:22 xiphmont Exp $
+ last mod: $Id: encoder_example.c,v 1.28.2.1 2001/12/18 23:49:15 xiphmont Exp $
********************************************************************/
@@ -100,7 +100,7 @@
/* add a comment */
vorbis_comment_init(&vc);
- vorbis_comment_add(&vc,"Track encoded by encoder_example.c");
+ vorbis_comment_add(&vc,"ENCODER=encoder_example.c");
/* set up the analysis state and auxiliary encoding storage */
vorbis_analysis_init(&vd,&vi);
No revision
No revision
1.2.2.2 +1 -1 vorbis/lib/Attic/Makefile
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/Attic/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Makefile 2001/12/17 05:39:23 1.2.2.1
+++ Makefile 2001/12/18 23:49:15 1.2.2.2
@@ -123,7 +123,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
-DEFS = -DPACKAGE=\"libvorbis\" -DVERSION=\"1.0rc3\" -DHAVE_DLFCN_H=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DHAVE_SQRTF=1 -DHAVE_LOGF=1 -DHAVE_EXPF=1 -DHAVE_ACOSF=1 -DHAVE_ATANF=1 -DHAVE_FREXPF=1 -DHAVE_RINTF=1 -I. -I$(srcdir)
+DEFS = -DPACKAGE=\"libvorbis\" -DVERSION=\"1.0rc3\" -DHAVE_DLFCN_H=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DHAVE_SQRTF=1 -DHAVE_LOGF=1 -DHAVE_EXPF=1 -DHAVE_ACOSF=1 -DHAVE_ATANF=1 -DHAVE_FREXPF=1 -DHAVE_RINTF=1 -I. -I$(srcdir) -DTRAIN_RES -DTRAIN_FLOOR1
CPPFLAGS =
LDFLAGS =
libvorbis_la_LIBADD =
1.3.2.2 +7 -6 vorbis/lib/bitrate.c
Index: bitrate.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/bitrate.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- bitrate.c 2001/12/17 05:39:23 1.3.2.1
+++ bitrate.c 2001/12/18 23:49:16 1.3.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: bitrate tracking and management
- last mod: $Id: bitrate.c,v 1.3.2.1 2001/12/17 05:39:23 xiphmont Exp $
+ last mod: $Id: bitrate.c,v 1.3.2.2 2001/12/18 23:49:16 xiphmont Exp $
********************************************************************/
@@ -264,7 +264,7 @@
in use) are taken into account by the min/max limiter (if min/max
is in use) */
if(bm->avg_binacc){
- long desired_center=bm->avg_centerdesired;
+ unsigned long desired_center=bm->avg_centerdesired;
if(eofflag)desired_center=0;
/* update the avg head */
@@ -335,13 +335,13 @@
if(bm->noisetrigger_postpone<=0){
if(bm->noisetrigger_request<0.){
bm->avgnoise-=1.f;
- if(bm->noisetrigger_request<bm->avg_sampleacc/2)
+ if(bm->noisetrigger_request<(signed long)(bm->avg_sampleacc)/2)
bm->avgnoise-=1.f;
bm->noisetrigger_postpone=bm->avg_sampleacc/2;
}
if(bm->noisetrigger_request>0.){
bm->avgnoise+=1.f;
- if(bm->noisetrigger_request>bm->avg_sampleacc/2)
+ if(bm->noisetrigger_request>(signed long)(bm->avg_sampleacc)/2)
bm->avgnoise+=1.f;
bm->noisetrigger_postpone=bm->avg_sampleacc/2;
}
@@ -373,10 +373,11 @@
/* update the min/max queues and enforce limits */
if(bm->minmax_binstack){
- long sampledesired=eofflag?0:bm->minmax_sampledesired;
+ unsigned long sampledesired=eofflag?0:bm->minmax_sampledesired;
/* add to stack recent */
while(minmax_head!=new_minmax_head){
+ unsigned int i;
int samples=ci->blocksizes[bm->queue_actual[minmax_head]&
0x80000000UL?1:0]>>1;
@@ -400,7 +401,7 @@
-bin+1 minmax[0] <-> floater limited to 1
limited to zero (val= -bin) is implicit
*/
- for(i=0;i<bins;i++){
+ for(i=0;i<(unsigned int)bins;i++){
bm->minmax_binstack[bm->minmax_stackptr*bins*2+bins+i]+=
LACING_ADJUST(
BINBITS(minmax_head,
1.51.2.1 +1 -14 vorbis/lib/block.c
Index: block.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/block.c,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -r1.51 -r1.51.2.1
--- block.c 2001/12/12 09:45:24 1.51
+++ block.c 2001/12/18 23:49:16 1.51.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.51 2001/12/12 09:45:24 xiphmont Exp $
+ last mod: $Id: block.c,v 1.51.2.1 2001/12/18 23:49:16 xiphmont Exp $
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -379,7 +379,6 @@
return(v->pcmret);
}
-static int seq=0;
static void _preextrapolate_helper(vorbis_dsp_state *v){
int i;
int order=32;
@@ -394,12 +393,8 @@
for(j=0;j<v->pcm_current;j++)
work[j]=v->pcm[i][v->pcm_current-j-1];
- _analysis_output("preextrap",seq,v->pcm[i],v->pcm_current,0,0);
- _analysis_output("workextrap",seq,work,v->pcm_current,0,0);
-
/* prime as above */
vorbis_lpc_from_data(work,lpc,v->pcm_current-v->centerW,order);
- _analysis_output("lpc",seq,lpc,order,0,0);
/* run the predictor filter */
vorbis_lpc_predict(lpc,work+v->pcm_current-v->centerW-order,
@@ -407,13 +402,9 @@
work+v->pcm_current-v->centerW,
v->centerW);
- _analysis_output("extrap",seq,work,v->pcm_current,0,0);
-
-
for(j=0;j<v->pcm_current;j++)
v->pcm[i][v->pcm_current-j-1]=work[j];
- _analysis_output("postextrap",seq++,v->pcm[i],v->pcm_current,0,0);
}
}
}
@@ -735,7 +726,6 @@
}
for(j=0;j<vi->channels;j++){
- static int seq=0;
float *pcm=v->pcm[j]+beginW;
float *p=vb->pcm[j];
@@ -746,9 +736,6 @@
for(;i<sizeW;i++)
pcm[i]=p[i];
- //_analysis_output("lapped",seq,pcm,sizeW,0,0);
- //_analysis_output("buffered",seq++,v->pcm[j],sizeW+beginW,0,0);
-
}
/* deal with initial packet state; we do this using the explicit
1.39.2.2 +5 -12 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -r1.39.2.1 -r1.39.2.2
--- mapping0.c 2001/12/17 05:39:24 1.39.2.1
+++ mapping0.c 2001/12/18 23:49:16 1.39.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.39.2.1 2001/12/17 05:39:24 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.39.2.2 2001/12/18 23:49:16 xiphmont Exp $
********************************************************************/
@@ -378,14 +378,11 @@
/* perform psychoacoustics; do masking */
_vp_compute_mask(look->psy_look[blocktype],
- b->psy_g_look,
- i,
logfft, /* -> logmax */
logmdct,
logmask,
global_ampmax,
local_ampmax[i],
- ci->blocksizes[vb->lW]/2,
bm->avgnoise);
_analysis_output("mask",seq+i,logmask,n/2,1,0);
@@ -401,12 +398,9 @@
_vp_remove_floor(look->psy_look[blocktype],
- b->psy_g_look,
- logmdct,
mdct,
codedflr,
- res,
- local_ampmax[i]);
+ res);
/*for(j=0;j<n/2;j++)
if(fabs(res[j])>1200){
@@ -414,7 +408,6 @@
fprintf(stderr,"%ld ",seq+i);
}*/
- //_analysis_output("res",seq+i,res,n/2,1,0);
_analysis_output("codedflr",seq+i,codedflr,n/2,1,1);
}
@@ -493,8 +486,8 @@
0);
}
- //for(i=0;i<vi->channels;i++)
- //_analysis_output("quant",seq+i,quantized[i],n/2,1,0);
+ for(i=0;i<vi->channels;i++)
+ _analysis_output("quant",seq+i,quantized[i],n/2,1,0);
/* classify, by submap */
@@ -555,6 +548,7 @@
lqua[j]=lpcm[j]-lsof[j];
}
}else{
+
_vp_quantize_couple(look->psy_look[blocktype],
info,
pcm,
@@ -562,7 +556,6 @@
quantized,
nonzero,
i);
-
}
}
}
1.57.2.1 +7 -15 vorbis/lib/psy.c
Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.57
retrieving revision 1.57.2.1
diff -u -r1.57 -r1.57.2.1
--- psy.c 2001/12/12 09:45:25 1.57
+++ psy.c 2001/12/18 23:49:16 1.57.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.57 2001/12/12 09:45:25 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.57.2.1 2001/12/18 23:49:16 xiphmont Exp $
********************************************************************/
@@ -650,8 +650,6 @@
/* bleaugh, this is more complicated than it needs to be */
static void max_seeds(vorbis_look_psy *p,
- vorbis_look_psy_global *g,
- int channel,
float *seed,
float *flr){
long n=p->total_octave_lines;
@@ -789,12 +787,9 @@
void _vp_remove_floor(vorbis_look_psy *p,
- vorbis_look_psy_global *g,
- float *logmdct,
float *mdct,
float *codedflr,
- float *residue,
- float local_specmax){
+ float *residue){
int i,n=p->n;
for(i=0;i<n;i++)
@@ -806,14 +801,11 @@
void _vp_compute_mask(vorbis_look_psy *p,
- vorbis_look_psy_global *g,
- int channel,
float *logfft,
float *logmdct,
float *logmask,
float global_specmax,
float local_specmax,
- int lastsize,
float bitrate_noise_offset){
int i,n=p->n;
static int seq=0;
@@ -869,7 +861,7 @@
/* tone masking */
seed_loop(p,(const float ***)p->tonecurves,logfft,logmask,seed,global_specmax);
- max_seeds(p,g,channel,seed,logmask);
+ max_seeds(p,seed,logmask);
/* doing this here is clean, but we need to find a faster way to do
it than to just tack it on */
@@ -1014,13 +1006,13 @@
we opt not to fill in additional resolution (in order to
simplify the iterative codebook design and
efficiency). */
+
+ qM[j]=mag-sofarM[j];
+ qA[j]=ang-sofarA[j];
- if(ang<-rqlimit || ang>rqlimit){
+ if(qA[j]<-rqlimit || qA[j]>rqlimit){
qM[j]=0.f;
qA[j]=0.f;
- }else{
- qM[j]=mag-sofarM[j];
- qA[j]=ang-sofarA[j];
}
}
}
1.25.2.2 +2 -8 vorbis/lib/psy.h
Index: psy.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.h,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -r1.25.2.1 -r1.25.2.2
--- psy.h 2001/12/17 05:39:24 1.25.2.1
+++ psy.h 2001/12/18 23:49:17 1.25.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.25.2.1 2001/12/17 05:39:24 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.25.2.2 2001/12/18 23:49:17 xiphmont Exp $
********************************************************************/
@@ -134,22 +134,16 @@
extern vorbis_info_psy *_vi_psy_copy(vorbis_info_psy *i);
extern void _vp_remove_floor(vorbis_look_psy *p,
- vorbis_look_psy_global *g,
- float *logmdct,
float *mdct,
float *codedflr,
- float *residue,
- float local_specmax);
+ float *residue);
extern void _vp_compute_mask(vorbis_look_psy *p,
- vorbis_look_psy_global *g,
- int channel,
float *fft,
float *mdct,
float *mask,
float global_specmax,
float local_specmax,
- int lastsize,
float bitrate_noise_offset);
extern void _vp_quantize_couple(vorbis_look_psy *p,
1.39.2.1 +23 -10 vorbis/lib/res0.c
Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -r1.39 -r1.39.2.1
--- res0.c 2001/12/16 04:15:47 1.39
+++ res0.c 2001/12/18 23:49:17 1.39.2.1
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.39 2001/12/16 04:15:47 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.39.2.1 2001/12/18 23:49:17 xiphmont Exp $
********************************************************************/
@@ -56,9 +56,11 @@
#ifdef TRAIN_RES
long *training_data[8][64];
+ float training_max[8][64];
+ float training_min[8][64];
int longp;
- double tmin;
- double tmax;
+ float tmin;
+ float tmax;
#endif
} vorbis_look_residue0;
@@ -88,6 +90,7 @@
{
int j,k,l;
for(j=0;j<look->parts;j++){
+ fprintf(stderr,"partition %d: ",j);
for(k=0;k<8;k++)
if(look->training_data[k][j]){
char buffer[80];
@@ -103,8 +106,11 @@
fclose(of);
+ fprintf(stderr,"%d(%.2f|%.2f) ",k,look->training_min[k][j],look->training_max[k][j]);
+
_ogg_free(look->training_data[k][j]);
}
+ fprintf(stderr,"\n");
}
}
fprintf(stderr,"min/max residue: %g::%g\n",look->tmin,look->tmax);
@@ -368,8 +374,7 @@
}
static int _interleaved_encodepart(oggpack_buffer *opb,float *vec, int n,
- codebook *book,vorbis_look_residue0 *look,
- long *acc){
+ codebook *book,long *acc){
int i,bits=0;
int dim=book->dim;
int step=n/dim;
@@ -388,8 +393,7 @@
}
static int _encodepart(oggpack_buffer *opb,float *vec, int n,
- codebook *book,vorbis_look_residue0 *look,
- long *acc){
+ codebook *book,long *acc){
int i,bits=0;
int dim=book->dim;
int step=n/dim;
@@ -523,7 +527,7 @@
float **in,int ch,
int pass,long **partword,
int (*encode)(oggpack_buffer *,float *,int,
- codebook *,vorbis_look_residue0 *,long *),
+ codebook *,long *),
ogg_uint32_t *stats){
long i,j,k,s;
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
@@ -602,16 +606,25 @@
if(info->secondstages[partword[j][i]]&(1<<s)){
codebook *statebook=look->partbooks[partword[j][i]][s];
if(statebook){
- int fn=-1;
int ret;
long *accumulator=NULL;
#ifdef TRAIN_RES
accumulator=look->training_data[s][partword[j][i]];
+ {
+ int l;
+ float *samples=in[j]+offset;
+ for(l=0;l<samples_per_partition;l++){
+ if(samples[l]<look->training_min[s][partword[j][i]])
+ look->training_min[s][partword[j][i]]=samples[l];
+ if(samples[l]>look->training_max[s][partword[j][i]])
+ look->training_max[s][partword[j][i]]=samples[l];
+ }
+ }
#endif
ret=encode(&vb->opb,in[j]+offset,samples_per_partition,
- statebook,look,accumulator);
+ statebook,accumulator);
look->postbits+=ret;
resbits[partword[j][i]]+=ret;
1.23.2.2 +18 -6 vorbis/lib/vorbisenc.c
Index: vorbisenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisenc.c,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -r1.23.2.1 -r1.23.2.2
--- vorbisenc.c 2001/12/17 05:39:24 1.23.2.1
+++ vorbisenc.c 2001/12/18 23:49:17 1.23.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.23.2.1 2001/12/17 05:39:24 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.23.2.2 2001/12/18 23:49:17 xiphmont Exp $
********************************************************************/
@@ -471,12 +471,12 @@
if(stereo_backfill_p && amplitude_select){
memcpy(psy->couple_pass+iterations,psy->couple_pass+iterations-1,
sizeof(*psy->couple_pass));
- amplitude_select=amplitude_select-1;
psy->couple_pass[1].couple_pass[1].amppost_point=stereo_threshholds[amplitude_select-1];
ci->passlimit[1]=4;
for(i=0;i<r->partitions;i++)
- if(in[iq].books_stereo_backfill[amplitude_select-1][i])
+ if(in[iq].books_stereo_backfill[amplitude_select][i])
r->secondstages[i]|=8;
+ amplitude_select=amplitude_select-1;
iterations++;
}
@@ -485,6 +485,8 @@
sizeof(*psy->couple_pass));
psy->couple_pass[iterations].granulem=.333333333;
psy->couple_pass[iterations].igranulem=3.;
+ psy->couple_pass[iterations].couple_pass[0].outofphase_requant_limit=1.;
+ psy->couple_pass[iterations].couple_pass[1].outofphase_requant_limit=1.;
for(i=0;i<r->partitions;i++)
if(in[iq].books_residue_backfill[amplitude_select][i][0])
r->secondstages[i]|=(1<<(iterations+2));
@@ -495,6 +497,8 @@
sizeof(*psy->couple_pass));
psy->couple_pass[iterations].granulem=.1111111111;
psy->couple_pass[iterations].igranulem=9.;
+ psy->couple_pass[iterations].couple_pass[0].outofphase_requant_limit=.3;
+ psy->couple_pass[iterations].couple_pass[1].outofphase_requant_limit=.3;
for(i=0;i<r->partitions;i++)
if(in[iq].books_residue_backfill[amplitude_select][i][1])
r->secondstages[i]|=(1<<(iterations+2));
@@ -521,7 +525,7 @@
memcpy(&ci->psy_param[block*2+1]->couple_pass,
&ci->psy_param[block*2]->couple_pass,
- sizeof(psy->couple_pass[0]));
+ sizeof(psy->couple_pass));
/* fill in all the books */
{
@@ -588,10 +592,10 @@
here to next boundary, or the vorbis spec will round it *down* to
previous boundary in encode/decode */
if(ci->residue_type[block]==2)
- r->end=((freq/nyq*blocksize*2)/r->grouping+.9)* /* round up only if we're well past */
+ r->end=(int)((freq/nyq*blocksize*2)/r->grouping+.9)* /* round up only if we're well past */
r->grouping;
else
- r->end=((freq/nyq*blocksize)/r->grouping+.9)* /* round up only if we're well past */
+ r->end=(int)((freq/nyq*blocksize)/r->grouping+.9)* /* round up only if we're well past */
r->grouping;
return(0);
}
@@ -814,8 +818,16 @@
float base_quality /* 0. to 1. */
){
int ret=0;
+
+ ret=vorbis_encode_setup_vbr(vi,channels,rate,1.);
+
+ {
+ codec_setup_info *ci=vi->codec_setup;
+ highlevel_encode_setup *hi=&ci->hi;
+ hi->stereo_couple_p=0;
+ hi->residue_backfill_p=1;
+ }
- ret=vorbis_encode_setup_vbr(vi,channels,rate,base_quality);
if(ret){
vorbis_info_clear(vi);
return ret;
No revision
No revision
1.1.2.2 +58 -0 vorbis/lib/books/coupled/Attic/_44c0_s1_pS_r0.vqh
Index: _44c0_s1_pS_r0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c0_s1_pS_r0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c0_s1_pS_r0.vqh 2001/12/18 22:14:40 1.1.2.1
+++ _44c0_s1_pS_r0.vqh 2001/12/18 23:49:19 1.1.2.2
@@ -0,0 +1,58 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V__44c0_s1_pS_r0_VQH_
+#define _V__44c0_s1_pS_r0_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist__44c0_s1_pS_r0[] = {
+ 1,
+ 0,
+ 2,
+};
+
+static long _vq_lengthlist__44c0_s1_pS_r0[] = {
+ 1, 2, 3, 6, 6, 6, 6, 5, 5,
+};
+
+static float _vq_quantthresh__44c0_s1_pS_r0[] = {
+ -0.16667, 0.16667,
+};
+
+static long _vq_quantmap__44c0_s1_pS_r0[] = {
+ 1, 0, 2,
+};
+
+static encode_aux_threshmatch _vq_auxt__44c0_s1_pS_r0 = {
+ _vq_quantthresh__44c0_s1_pS_r0,
+ _vq_quantmap__44c0_s1_pS_r0,
+ 3,
+ 3
+};
+
+static static_codebook _44c0_s1_pS_r0 = {
+ 2, 9,
+ _vq_lengthlist__44c0_s1_pS_r0,
+ 1, -539667115, 1607816533, 2, 0,
+ _vq_quantlist__44c0_s1_pS_r0,
+ NULL,
+ &_vq_auxt__44c0_s1_pS_r0,
+ NULL,
+ 0
+};
+
+
+#endif
1.1.2.2 +2 -2 vorbis/lib/books/coupled/Attic/_44c4_s1_p2_s0.vqh
Index: _44c4_s1_p2_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s1_p2_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s1_p2_s0.vqh 2001/12/18 22:14:45 1.1.2.1
+++ _44c4_s1_p2_s0.vqh 2001/12/18 23:49:19 1.1.2.2
@@ -27,8 +27,8 @@
};
static long _vq_lengthlist__44c4_s1_p2_s0[] = {
- 2, 3, 3,10,10, 5, 4, 4,10,10, 5, 4, 4,10,10,10,
- 4, 4,10, 9, 9, 6, 5, 9, 9,
+ 1,12,12,12,12, 3, 5, 4,12,12, 3, 4, 4,12,12, 6,
+ 12,12, 7, 8,12,12,12,12,11,
};
static float _vq_quantthresh__44c4_s1_p2_s0[] = {
1.1.2.2 +6 -6 vorbis/lib/books/coupled/Attic/_44c4_s1_p4_s0.vqh
Index: _44c4_s1_p4_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s1_p4_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s1_p4_s0.vqh 2001/12/18 22:14:45 1.1.2.1
+++ _44c4_s1_p4_s0.vqh 2001/12/18 23:49:19 1.1.2.2
@@ -31,12 +31,12 @@
};
static long _vq_lengthlist__44c4_s1_p4_s0[] = {
- 3, 3, 3,12,12, 4, 4, 4,12,12, 4, 4, 4,12,12,12,
- 4, 4,11,12,11, 5, 4,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,
+ 1,19,19,19,19,19,19,19,19, 3, 5, 5,19,19,19,19,
+ 19,19, 3, 5, 5,19,19,19,19,19,19, 5, 7, 7, 6, 6,
+ 19,19,19,19, 8, 7, 7,13,12,19,19,19,19, 8, 8, 8,
+ 19,19,19,19,19,19, 8, 8, 8,19,19,19,19,19,19, 9,
+ 19,19,19,19,19,19,10,11,18,18,18,18,18,18,18,18,
+ 18,
};
static float _vq_quantthresh__44c4_s1_p4_s0[] = {
1.1.2.2 +6 -6 vorbis/lib/books/coupled/Attic/_44c4_s1_p6_s0.vqh
Index: _44c4_s1_p6_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s1_p6_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s1_p6_s0.vqh 2001/12/18 22:14:45 1.1.2.1
+++ _44c4_s1_p6_s0.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -31,12 +31,12 @@
};
static long _vq_lengthlist__44c4_s1_p6_s0[] = {
- 3, 3, 3,12,12, 4, 4, 4,12,12, 4, 4, 4,12,12,12,
- 4, 4,12,11,11, 5, 4,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,
+ 1,18,18,18,18,18,18,18,18, 3, 5, 5,18,18,18,18,
+ 18,18, 3, 5, 5,18,18,18,18,18,18, 5, 7, 7, 7, 6,
+ 18,18,18,18, 8, 7, 7,11,12,18,18,18,18, 7, 8, 8,
+ 18,18,18,18,18,18, 8, 8, 8,18,18,18,18,18,18, 8,
+ 18,18,18,18,18,18, 9,10,17,17,17,17,17,17,17,17,
+ 17,
};
static float _vq_quantthresh__44c4_s1_p6_s0[] = {
1.1.2.2 +6 -6 vorbis/lib/books/coupled/Attic/_44c4_s1_p7_s0.vqh
Index: _44c4_s1_p7_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s1_p7_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s1_p7_s0.vqh 2001/12/18 22:14:45 1.1.2.1
+++ _44c4_s1_p7_s0.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -31,12 +31,12 @@
};
static long _vq_lengthlist__44c4_s1_p7_s0[] = {
- 3, 3, 3,12,12, 4, 4, 4,12,12, 4, 4, 4,12,12,12,
- 4, 4,12,11,11, 5, 4,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,
+ 1,18,18,18,18,18,18,18,18, 3, 5, 5,18,18,18,18,
+ 18,18, 3, 5, 5,18,18,18,18,18,18, 5, 7, 7, 7, 7,
+ 18,18,18,18, 7, 7, 7,11,12,18,18,18,18, 7, 8, 8,
+ 18,18,18,18,18,18, 7, 8, 8,18,18,18,18,18,18, 8,
+ 18,18,18,18,18,18,10, 9,17,17,17,17,17,17,17,17,
+ 17,
};
static float _vq_quantthresh__44c4_s1_p7_s0[] = {
1.1.2.2 +6 -6 vorbis/lib/books/coupled/Attic/_44c4_s1_p8_s0.vqh
Index: _44c4_s1_p8_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s1_p8_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s1_p8_s0.vqh 2001/12/18 22:14:45 1.1.2.1
+++ _44c4_s1_p8_s0.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -31,12 +31,12 @@
};
static long _vq_lengthlist__44c4_s1_p8_s0[] = {
- 3, 3, 3,12,12, 4, 4, 4,12,12, 4, 4, 4,12,12,12,
- 4, 4,12,11,11, 5, 4,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,
+ 1,14,14,14,14,14,14,14,14, 3, 5, 5,14,14,14,14,
+ 14,14, 3, 5, 5,14,14,14,14,14,14, 5, 7, 7, 7, 7,
+ 14,14,14,14, 8, 7, 7,12,14,14,14,14,14, 7, 8, 8,
+ 14,14,14,14,14,14, 7, 8, 8,14,14,14,14,14,14, 8,
+ 14,14,14,14,14,14, 9, 9,14,14,14,14,14,13,13,13,
+ 13,
};
static float _vq_quantthresh__44c4_s1_p8_s0[] = {
1.1.2.2 +6 -6 vorbis/lib/books/coupled/Attic/_44c4_s1_p9_s0.vqh
Index: _44c4_s1_p9_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s1_p9_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s1_p9_s0.vqh 2001/12/18 22:14:45 1.1.2.1
+++ _44c4_s1_p9_s0.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -31,12 +31,12 @@
};
static long _vq_lengthlist__44c4_s1_p9_s0[] = {
- 3, 3, 3,12,12, 4, 4, 4,12,12, 4, 4, 4,12,11,12,
- 4, 4,12,12,11, 5, 4,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,
+ 1, 9, 9, 9, 9, 9, 9, 9, 9, 4, 5, 5, 9, 9, 9, 9,
+ 9, 9, 4, 5, 6, 9, 9, 9, 9, 9, 9, 6, 8, 6, 7, 6,
+ 9, 9, 9, 9, 7, 6, 6, 9, 9, 9, 9, 9, 9, 9, 8, 9,
+ 9, 9, 9, 9, 9, 9, 7, 9, 9, 9, 9, 9, 9, 9, 9, 8,
+ 9, 9, 9, 9, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8,
};
static float _vq_quantthresh__44c4_s1_p9_s0[] = {
1.1.2.2 +58 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_pS_r0.vqh
Index: _44c4_s1_pS_r0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s1_pS_r0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s1_pS_r0.vqh 2001/12/18 22:14:45 1.1.2.1
+++ _44c4_s1_pS_r0.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -0,0 +1,58 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V__44c4_s1_pS_r0_VQH_
+#define _V__44c4_s1_pS_r0_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist__44c4_s1_pS_r0[] = {
+ 1,
+ 0,
+ 2,
+};
+
+static long _vq_lengthlist__44c4_s1_pS_r0[] = {
+ 3, 2, 1, 6, 6, 6, 6, 5, 5,
+};
+
+static float _vq_quantthresh__44c4_s1_pS_r0[] = {
+ -0.16667, 0.16667,
+};
+
+static long _vq_quantmap__44c4_s1_pS_r0[] = {
+ 1, 0, 2,
+};
+
+static encode_aux_threshmatch _vq_auxt__44c4_s1_pS_r0 = {
+ _vq_quantthresh__44c4_s1_pS_r0,
+ _vq_quantmap__44c4_s1_pS_r0,
+ 3,
+ 3
+};
+
+static static_codebook _44c4_s1_pS_r0 = {
+ 2, 9,
+ _vq_lengthlist__44c4_s1_pS_r0,
+ 1, -539667115, 1607816533, 2, 0,
+ _vq_quantlist__44c4_s1_pS_r0,
+ NULL,
+ &_vq_auxt__44c4_s1_pS_r0,
+ NULL,
+ 0
+};
+
+
+#endif
1.1.2.2 +1 -1 vorbis/lib/books/coupled/Attic/_44c4_s1_pS_r1.vqh
Index: _44c4_s1_pS_r1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s1_pS_r1.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s1_pS_r1.vqh 2001/12/18 22:14:45 1.1.2.1
+++ _44c4_s1_pS_r1.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -25,7 +25,7 @@
};
static long _vq_lengthlist__44c4_s1_pS_r1[] = {
- 4, 4, 3, 3, 3, 3, 3, 3, 3,
+ 1, 3, 2, 6, 6, 6, 6, 5, 5,
};
static float _vq_quantthresh__44c4_s1_pS_r1[] = {
1.1.2.2 +19 -19 vorbis/lib/books/coupled/Attic/_44c4_s2_p6_s0.vqh
Index: _44c4_s2_p6_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s2_p6_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s2_p6_s0.vqh 2001/12/18 22:14:45 1.1.2.1
+++ _44c4_s2_p6_s0.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -39,25 +39,25 @@
};
static long _vq_lengthlist__44c4_s2_p6_s0[] = {
- 2, 2, 2,16,16, 5, 6, 6,16,16, 5, 6, 7,16,16,16,
- 5, 5,16,16,16, 5, 5,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,
+ 1,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+ 19, 5, 6, 6,19,19,19,19,19,19,19,19,19,19,19,19,
+ 19,19, 5, 6, 5,19,19,19,19,19,19,19,19,19,19,19,
+ 19,19,19, 7, 5, 5,10,10,19,19,19,19,19,19,19,19,
+ 19,19,19,19, 7, 5, 5, 9, 9,19,19,19,19,19,19,19,
+ 19,19,19,19,19, 8, 6, 6, 9, 9,13,14,19,19,19,19,
+ 19,19,19,19,19,19, 8, 6, 6, 8, 8,12,12,19,19,19,
+ 19,19,19,19,19,19,19, 8, 7, 7,10,10,14,13,17,18,
+ 19,19,19,19,19,19,19,19, 8, 6, 6, 9, 9,13,13,16,
+ 17,19,19,19,19,19,19,19,19, 7, 7, 7,11,11,15,15,
+ 19,19,19,19,19,19,19,19,19,19, 7, 7, 7,11,11,14,
+ 14,19,19,19,19,19,19,19,19,19,19, 8,10,10,13,13,
+ 19,19,19,19,19,19, 9, 9,19,19,19,19,11,10,10,13,
+ 13,19,19,19,19,19,19,19,19,19,19,19,19,10,10,10,
+ 19,19,19,19,19,19,19,19,19,19,19,19,19,19,10,10,
+ 11,19,19,19,19,19,19,19,19,19,19,19,19,19,19,10,
+ 19,19,19,19,19,19,19,19,19,19,19,19,19,19,12,11,
+ 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
+ 18,
};
static float _vq_quantthresh__44c4_s2_p6_s0[] = {
1.1.2.2 +19 -19 vorbis/lib/books/coupled/Attic/_44c4_s2_p7_s0.vqh
Index: _44c4_s2_p7_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s2_p7_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s2_p7_s0.vqh 2001/12/18 22:14:45 1.1.2.1
+++ _44c4_s2_p7_s0.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -39,25 +39,25 @@
};
static long _vq_lengthlist__44c4_s2_p7_s0[] = {
- 2, 3, 3,15,15, 4, 4, 4,15,15, 4, 4, 4,15,15,15,
- 5, 5,15,15,15, 6, 5,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,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,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,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,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,14,14,14,
- 14,
+ 1,18,18,18,18,18,18,18,18,18,18,17,17,17,17,17,
+ 17, 5, 6, 6,17,17,17,17,17,17,17,17,17,17,17,17,
+ 17,17, 5, 6, 6,17,17,17,17,17,17,17,17,17,17,17,
+ 17,17,17, 7, 6, 6, 9,10,17,17,17,17,17,17,17,17,
+ 17,17,17,17, 7, 5, 6, 9,10,17,17,17,17,17,17,17,
+ 17,17,17,17,17, 7, 6, 6, 8, 9,12,13,17,17,17,17,
+ 17,17,17,17,17,17, 8, 6, 6, 8, 8,12,12,17,17,17,
+ 17,17,17,17,17,17,17, 7, 6, 6, 9, 9,12,13,17,17,
+ 17,17,17,17,17,17,17,17, 8, 6, 6, 9, 9,12,12,16,
+ 15,17,17,17,17,17,17,17,17, 7, 7, 7,10,10,14,14,
+ 17,17,17,17,17,17,17,17,17,17, 7, 7, 7,10,10,13,
+ 13,17,17,17,17,17,17,17,17,17,17, 7, 8, 8,12,12,
+ 17,17,17,17,17,17, 8, 8,17,17,17,17,10, 8, 8,12,
+ 11,17,17,17,17,17,17,17,17,17,17,17,17, 9, 9, 9,
+ 17,17,17,17,17,17,17,17,17,17,17,17,17,17, 8, 9,
+ 9,17,17,17,17,17,17,17,17,17,17,17,17,17,17, 9,
+ 17,17,17,17,17,17,17,17,17,17,17,17,17,17,10,10,
+ 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+ 17,
};
static float _vq_quantthresh__44c4_s2_p7_s0[] = {
1.1.2.2 +19 -19 vorbis/lib/books/coupled/Attic/_44c4_s2_p8_s0.vqh
Index: _44c4_s2_p8_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s2_p8_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s2_p8_s0.vqh 2001/12/18 22:14:46 1.1.2.1
+++ _44c4_s2_p8_s0.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -39,25 +39,25 @@
};
static long _vq_lengthlist__44c4_s2_p8_s0[] = {
- 3, 3, 3,14,14, 4, 4, 4,14,14, 4, 4, 4,14,14,14,
- 4, 4,14,14,14, 5, 4,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,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,
+ 1,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+ 12, 5, 6, 6,12,12,12,12,12,12,12,12,12,12,12,12,
+ 12,12, 5, 6, 5,12,12,12,12,12,12,12,12,12,12,12,
+ 12,12,12, 7, 6, 6,10,11,12,12,12,12,12,12,12,12,
+ 12,12,12,12, 8, 6, 6,10,10,12,12,12,12,12,12,12,
+ 12,12,12,12,12, 8, 6, 6, 9, 9,12,12,12,12,12,12,
+ 12,12,12,12,12,12, 8, 6, 6, 9, 9,12,12,12,12,12,
+ 12,12,12,12,12,12,12, 9, 7, 7, 9, 9,12,12,12,12,
+ 12,12,12,12,12,12,12,12, 9, 6, 6, 8, 9,11,11,12,
+ 12,12,12,12,12,12,12,12,12, 7, 7, 7,10,12,11,11,
+ 12,12,12,12,12,12,12,12,12,12, 7, 7, 7,12,10,12,
+ 11,12,12,12,12,12,12,12,12,12,12, 8, 8, 8,12,12,
+ 12,12,12,12,12,12,10, 9,12,12,12,12,10, 9, 8,11,
+ 11,12,12,12,12,12,12,12,12,12,12,12,12, 8, 9,10,
+ 12,12,12,12,12,12,12,12,12,12,12,12,12,12, 9, 9,
+ 10,12,12,12,12,12,12,12,12,12,12,12,12,12,12, 9,
+ 12,12,12,12,12,12,12,12,12,12,12,12,12,12,10,10,
+ 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+ 12,
};
static float _vq_quantthresh__44c4_s2_p8_s0[] = {
1.1.2.2 +19 -19 vorbis/lib/books/coupled/Attic/_44c4_s2_p9_s0.vqh
Index: _44c4_s2_p9_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s2_p9_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s2_p9_s0.vqh 2001/12/18 22:14:46 1.1.2.1
+++ _44c4_s2_p9_s0.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -39,25 +39,25 @@
};
static long _vq_lengthlist__44c4_s2_p9_s0[] = {
- 3, 3, 3,14,14, 4, 4, 4,14,14, 4, 4, 4,14,13,14,
- 4, 4,14,14,14, 5, 4,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,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,
+ 1,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10, 7, 7,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10, 7, 8, 7,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10, 9, 8, 8,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10, 8,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10, 7,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10, 9, 8,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10, 8,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10, 8,10, 8, 8, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7, 9, 8, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 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, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9,
};
static float _vq_quantthresh__44c4_s2_p9_s0[] = {
1.1.2.2 +64 -64 vorbis/lib/books/coupled/Attic/_44c4_s3_p9_s0.vqh
Index: _44c4_s3_p9_s0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/coupled/Attic/_44c4_s3_p9_s0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- _44c4_s3_p9_s0.vqh 2001/12/18 22:14:46 1.1.2.1
+++ _44c4_s3_p9_s0.vqh 2001/12/18 23:49:20 1.1.2.2
@@ -55,75 +55,75 @@
};
static long _vq_lengthlist__44c4_s3_p9_s0[] = {
- 3, 3, 3,16,16, 4, 4, 4,16,16, 4, 4, 4,16,15,16,
- 4, 4,16,16,16, 5, 4,16,16,16,16,16,16,16,16,16,
+ 1,17,17,16,16,16,16,16,16,16,16,16,16,16,16,16,
16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16, 6, 6, 6,16,16,16,16,16,16,16,16,16,16,16,16,
16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16, 6, 6, 6,16,16,16,16,16,16,16,16,16,16,16,
16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16, 8, 6, 6, 9,10,16,16,16,16,16,16,16,16,
16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16, 8, 6, 6, 9, 9,16,16,16,16,16,16,16,
16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,
+ 16,16,16,16,16, 9, 7, 7, 7, 7,12,11,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16, 9, 7, 7, 7, 7,11,11,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16, 9, 8, 8, 7, 7, 9,10,13,13,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,10, 8, 8, 7, 7,10, 9,12,
+ 12,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16, 9, 8, 8, 8, 8, 9,10,
+ 11,12,15,15,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,10, 8, 8, 8, 7, 9,
+ 9,11,11,15,13,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,10, 8, 8, 8, 8,
+ 10,10,12,12,13,14,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,10, 8, 8, 8,
+ 8, 9,10,11,11,13,14,15,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,10, 8, 8,
+ 9, 9,10,10,12,11,14,14,15,15,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,10, 8,
+ 8, 9, 9,10,10,12,12,13,13,15,15,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,10,
+ 8, 8, 9, 9,11,11,13,13,14,15,15,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 10, 8, 8, 9, 9,11,10,13,13,15,15,14,15,16,15,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16, 9, 9, 9,10,10,12,11,13,15,16,14,15,15,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16, 9, 9, 9,10,10,11,12,14,13,14,14,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16, 9,10,10,11,11,12,12,14,14,16,16,16,15,
+ 16,16,16,16,16,16,10,10,16,16,16,16,16,16,16,16,
+ 16,16,16,16,12,10,10,11,11,12,13,14,15,16,15,15,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,10,10,10,11,12,14,13,15,14,16,15,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,10,10,10,11,12,13,13,15,14,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,11,11,11,13,12,14,14,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,12,12,
+ 16,16,16,16,16,16,16,16,13,11,11,12,12,14,14,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,11,12,12,14,14,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,12,11,11,13,13,16,
+ 15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,12,13,12,15,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,13,14,16,16,16,16,14,13,13,15,
+ 15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,13,15,14,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,13,13,
+ 14,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,13,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,14,14,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 16,
};
static float _vq_quantthresh__44c4_s3_p9_s0[] = {
No revision
No revision
1.3.2.2 +4 -4 vorbis/lib/modes/psych_44.h
Index: psych_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/psych_44.h,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- psych_44.h 2001/12/17 05:39:26 1.3.2.1
+++ psych_44.h 2001/12/18 23:49:22 1.3.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: psych_44.h,v 1.3.2.1 2001/12/17 05:39:26 xiphmont Exp $
+ last mod: $Id: psych_44.h,v 1.3.2.2 2001/12/18 23:49:22 xiphmont Exp $
********************************************************************/
@@ -571,11 +571,11 @@
};
static double _psy_tone_masterguard[11]={
- -18.,-24.,-24.,-24.,-26.,-40.,-40.,-40.,-40.,-45.,-45.,-45.,
+ -18.,-24.,-24.,-24.,-26.,-40.,-40.,-40.,-45.,-45.,-45.,
};
static double _psy_tone_suppress[11]={
- -10.,-20.,-20.,-20.,-30.,-30.,-40.,-40.,-40.,-45.,-45.,-45.,
+ -10.,-20.,-20.,-20.,-30.,-30.,-40.,-40.,-45.,-45.,-45.,
};
static double _psy_tone_0dB[11]={
@@ -583,7 +583,7 @@
};
static double _psy_noise_suppress[11]={
- -0.,-24.,-24.,-24.,-24.,-30.,-40.,-40.,-40.,-45.,-45.,-45.,
+ -0.,-24.,-24.,-24.,-24.,-30.,-40.,-40.,-45.,-45.,-45.,
};
static int _psy_ehmer_bandlimit[11]={
@@ -629,7 +629,7 @@
};
/* stereo ****************/
-static int _psy_stereo_point_dB_44[11]={4, 3, 2, 2, 1, 0, 0, 0, 0, 0, 0};
+static int _psy_stereo_point_dB_44[11]={3, 3, 2, 2, 1, 0, 0, 0, 0, 0, 0};
static double _psy_stereo_point_kHz_44[2][11]={
{4., 6., 6., 6., 10., 6., 6., 4., 4., 4., 4.},
{6., 6., 6., 10., 10., 6., 6., 4., 4., 4., 4.}
1.4.2.1 +605 -137 vorbis/lib/modes/residue_44.h
Index: residue_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/residue_44.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- residue_44.h 2001/12/16 04:15:56 1.4
+++ residue_44.h 2001/12/18 23:49:23 1.4.2.1
@@ -8,10 +8,10 @@
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
* by the XIPHOPHORUS Company http://www.xiph.org/ *
* *
- ********************************************************************
+v ********************************************************************
function: toplevel residue templates for 32/44.1/48kHz
- last mod: $Id: residue_44.h,v 1.4 2001/12/16 04:15:56 xiphmont Exp $
+ last mod: $Id: residue_44.h,v 1.4.2.1 2001/12/18 23:49:23 xiphmont Exp $
********************************************************************/
@@ -127,11 +127,37 @@
#include "books/coupled/_44c0_s0_p3_0.vqh"
#include "books/coupled/_44c0_s0_p4_0.vqh"
#include "books/coupled/_44c0_s0_p4_1.vqh"
+#include "books/coupled/_44c0_s0_p5_0.vqh"
#include "books/coupled/_44c0_s1_p5_0.vqh"
+#include "books/coupled/_44c0_s0_p6_0.vqh"
+#include "books/coupled/_44c0_s1_p6_0.vqh"
#include "books/coupled/_44c0_s2_p6_0.vqh"
-#include "books/coupled/_44c0_s4_p7_0.vqh"
-#include "books/coupled/_44c0_s4_p7_1.vqh"
-#include "books/coupled/_44c0_s4_p7_2.vqh"
+#include "books/coupled/_44c0_s0_p7_0.vqh"
+#include "books/coupled/_44c0_s0_p7_1.vqh"
+#include "books/coupled/_44c0_s0_p7_2.vqh"
+#include "books/coupled/_44c0_s1_p7_0.vqh"
+#include "books/coupled/_44c0_s1_p7_1.vqh"
+#include "books/coupled/_44c0_s1_p7_2.vqh"
+#include "books/coupled/_44c0_s2_p7_0.vqh"
+#include "books/coupled/_44c0_s2_p7_1.vqh"
+#include "books/coupled/_44c0_s2_p7_2.vqh"
+#include "books/coupled/_44c0_s3_p7_0.vqh"
+#include "books/coupled/_44c0_s3_p7_1.vqh"
+#include "books/coupled/_44c0_s3_p7_2.vqh"
+
+#include "books/coupled/_44c0_s1_p5_s0.vqh"
+#include "books/coupled/_44c0_s1_p6_s0.vqh"
+#include "books/coupled/_44c0_s1_p7_s0.vqh"
+#include "books/coupled/_44c0_s2_p6_s0.vqh"
+#include "books/coupled/_44c0_s2_p7_s0.vqh"
+#include "books/coupled/_44c0_s3_p7_s0.vqh"
+
+#include "books/coupled/_44c0_s0_p0_r0.vqh"
+#include "books/coupled/_44c0_s0_pN_r0.vqh"
+#include "books/coupled/_44c0_s1_pS_r0.vqh"
+#include "books/coupled/_44c0_s0_p0_r1.vqh"
+#include "books/coupled/_44c0_s0_pN_r1.vqh"
+#include "books/coupled/_44c0_s1_pS_r1.vqh"
#include "books/coupled/_44c1_short.vqh"
#include "books/coupled/_44c1_long.vqh"
@@ -141,8 +167,20 @@
#include "books/coupled/_44c1_s0_p3_0.vqh"
#include "books/coupled/_44c1_s0_p4_0.vqh"
#include "books/coupled/_44c1_s0_p4_1.vqh"
+#include "books/coupled/_44c1_s0_p5_0.vqh"
#include "books/coupled/_44c1_s1_p5_0.vqh"
+#include "books/coupled/_44c1_s0_p6_0.vqh"
+#include "books/coupled/_44c1_s1_p6_0.vqh"
#include "books/coupled/_44c1_s2_p6_0.vqh"
+#include "books/coupled/_44c1_s0_p7_0.vqh"
+#include "books/coupled/_44c1_s0_p7_1.vqh"
+#include "books/coupled/_44c1_s0_p7_2.vqh"
+#include "books/coupled/_44c1_s1_p7_0.vqh"
+#include "books/coupled/_44c1_s1_p7_1.vqh"
+#include "books/coupled/_44c1_s1_p7_2.vqh"
+#include "books/coupled/_44c1_s2_p7_0.vqh"
+#include "books/coupled/_44c1_s2_p7_1.vqh"
+#include "books/coupled/_44c1_s2_p7_2.vqh"
#include "books/coupled/_44c1_s3_p7_0.vqh"
#include "books/coupled/_44c1_s3_p7_1.vqh"
#include "books/coupled/_44c1_s3_p7_2.vqh"
@@ -155,12 +193,25 @@
#include "books/coupled/_44c2_s0_p3_0.vqh"
#include "books/coupled/_44c2_s0_p4_0.vqh"
#include "books/coupled/_44c2_s0_p4_1.vqh"
+#include "books/coupled/_44c2_s0_p5_0.vqh"
#include "books/coupled/_44c2_s1_p5_0.vqh"
+#include "books/coupled/_44c2_s0_p6_0.vqh"
+#include "books/coupled/_44c2_s1_p6_0.vqh"
#include "books/coupled/_44c2_s2_p6_0.vqh"
+#include "books/coupled/_44c2_s0_p7_0.vqh"
+#include "books/coupled/_44c2_s0_p7_1.vqh"
+#include "books/coupled/_44c2_s0_p7_2.vqh"
+#include "books/coupled/_44c2_s1_p7_0.vqh"
+#include "books/coupled/_44c2_s1_p7_1.vqh"
+#include "books/coupled/_44c2_s1_p7_2.vqh"
#include "books/coupled/_44c2_s2_p7_0.vqh"
#include "books/coupled/_44c2_s2_p7_1.vqh"
#include "books/coupled/_44c2_s2_p7_2.vqh"
+#include "books/coupled/_44c2_s3_p7_0.vqh"
+#include "books/coupled/_44c2_s3_p7_1.vqh"
+#include "books/coupled/_44c2_s3_p7_2.vqh"
+
#include "books/coupled/_44c3_short.vqh"
#include "books/coupled/_44c3_long.vqh"
@@ -169,62 +220,170 @@
#include "books/coupled/_44c3_s0_p3_0.vqh"
#include "books/coupled/_44c3_s0_p4_0.vqh"
#include "books/coupled/_44c3_s0_p4_1.vqh"
+#include "books/coupled/_44c3_s0_p5_0.vqh"
#include "books/coupled/_44c3_s1_p5_0.vqh"
+#include "books/coupled/_44c3_s0_p6_0.vqh"
+#include "books/coupled/_44c3_s1_p6_0.vqh"
#include "books/coupled/_44c3_s2_p6_0.vqh"
+#include "books/coupled/_44c3_s0_p7_0.vqh"
+#include "books/coupled/_44c3_s0_p7_1.vqh"
+#include "books/coupled/_44c3_s0_p7_2.vqh"
+#include "books/coupled/_44c3_s1_p7_0.vqh"
+#include "books/coupled/_44c3_s1_p7_1.vqh"
+#include "books/coupled/_44c3_s1_p7_2.vqh"
#include "books/coupled/_44c3_s2_p7_0.vqh"
#include "books/coupled/_44c3_s2_p7_1.vqh"
#include "books/coupled/_44c3_s2_p7_2.vqh"
+#include "books/coupled/_44c3_s3_p7_0.vqh"
+#include "books/coupled/_44c3_s3_p7_1.vqh"
+#include "books/coupled/_44c3_s3_p7_2.vqh"
#include "books/coupled/_44c4_short.vqh"
#include "books/coupled/_44c4_long.vqh"
#include "books/coupled/_44c4_s0_p1_0.vqh"
+#include "books/coupled/_44c4_s0_p2_0.vqh"
#include "books/coupled/_44c4_s1_p2_0.vqh"
#include "books/coupled/_44c4_s0_p3_0.vqh"
+#include "books/coupled/_44c4_s0_p4_0.vqh"
#include "books/coupled/_44c4_s1_p4_0.vqh"
#include "books/coupled/_44c4_s0_p5_0.vqh"
+#include "books/coupled/_44c4_s0_p6_0.vqh"
#include "books/coupled/_44c4_s1_p6_0.vqh"
+#include "books/coupled/_44c4_s2_p6_0.vqh"
+#include "books/coupled/_44c4_s0_p7_0.vqh"
+#include "books/coupled/_44c4_s0_p7_1.vqh"
#include "books/coupled/_44c4_s1_p7_0.vqh"
#include "books/coupled/_44c4_s1_p7_1.vqh"
+#include "books/coupled/_44c4_s2_p7_0.vqh"
+#include "books/coupled/_44c4_s2_p7_1.vqh"
+#include "books/coupled/_44c4_s3_p7_0.vqh"
+#include "books/coupled/_44c4_s3_p7_1.vqh"
+#include "books/coupled/_44c4_s0_p8_0.vqh"
+#include "books/coupled/_44c4_s0_p8_1.vqh"
#include "books/coupled/_44c4_s1_p8_0.vqh"
#include "books/coupled/_44c4_s1_p8_1.vqh"
+#include "books/coupled/_44c4_s2_p8_0.vqh"
+#include "books/coupled/_44c4_s2_p8_1.vqh"
+#include "books/coupled/_44c4_s3_p8_0.vqh"
+#include "books/coupled/_44c4_s3_p8_1.vqh"
+#include "books/coupled/_44c4_s0_p9_0.vqh"
+#include "books/coupled/_44c4_s0_p9_1.vqh"
+#include "books/coupled/_44c4_s0_p9_2.vqh"
#include "books/coupled/_44c4_s1_p9_0.vqh"
#include "books/coupled/_44c4_s1_p9_1.vqh"
#include "books/coupled/_44c4_s1_p9_2.vqh"
+#include "books/coupled/_44c4_s2_p9_0.vqh"
+#include "books/coupled/_44c4_s2_p9_1.vqh"
+#include "books/coupled/_44c4_s2_p9_2.vqh"
+#include "books/coupled/_44c4_s3_p9_0.vqh"
+#include "books/coupled/_44c4_s3_p9_1.vqh"
+#include "books/coupled/_44c4_s3_p9_2.vqh"
+
+#include "books/coupled/_44c4_s1_p2_s0.vqh"
+#include "books/coupled/_44c4_s1_p4_s0.vqh"
+#include "books/coupled/_44c4_s1_p6_s0.vqh"
+#include "books/coupled/_44c4_s1_p7_s0.vqh"
+#include "books/coupled/_44c4_s1_p8_s0.vqh"
+#include "books/coupled/_44c4_s1_p9_s0.vqh"
+
+#include "books/coupled/_44c4_s2_p6_s0.vqh"
+#include "books/coupled/_44c4_s2_p7_s0.vqh"
+#include "books/coupled/_44c4_s2_p8_s0.vqh"
+#include "books/coupled/_44c4_s2_p9_s0.vqh"
+
+#include "books/coupled/_44c4_s3_p9_s0.vqh"
+
+#include "books/coupled/_44c4_s0_p0_r0.vqh"
+#include "books/coupled/_44c4_s0_p0_r1.vqh"
+#include "books/coupled/_44c4_s0_pN_r0.vqh"
+#include "books/coupled/_44c4_s0_pN_r1.vqh"
+#include "books/coupled/_44c4_s1_pS_r0.vqh"
+#include "books/coupled/_44c4_s1_pS_r1.vqh"
#include "books/coupled/_44c5_short.vqh"
#include "books/coupled/_44c5_long.vqh"
#include "books/coupled/_44c5_s0_p1_0.vqh"
#include "books/coupled/_44c5_s0_p2_0.vqh"
+#include "books/coupled/_44c5_s1_p2_0.vqh"
#include "books/coupled/_44c5_s0_p3_0.vqh"
#include "books/coupled/_44c5_s0_p4_0.vqh"
+#include "books/coupled/_44c5_s1_p4_0.vqh"
#include "books/coupled/_44c5_s0_p5_0.vqh"
#include "books/coupled/_44c5_s0_p6_0.vqh"
+#include "books/coupled/_44c5_s1_p6_0.vqh"
+#include "books/coupled/_44c5_s2_p6_0.vqh"
#include "books/coupled/_44c5_s0_p7_0.vqh"
#include "books/coupled/_44c5_s0_p7_1.vqh"
+#include "books/coupled/_44c5_s1_p7_0.vqh"
+#include "books/coupled/_44c5_s1_p7_1.vqh"
+#include "books/coupled/_44c5_s2_p7_0.vqh"
+#include "books/coupled/_44c5_s2_p7_1.vqh"
+#include "books/coupled/_44c5_s3_p7_0.vqh"
+#include "books/coupled/_44c5_s3_p7_1.vqh"
#include "books/coupled/_44c5_s0_p8_0.vqh"
#include "books/coupled/_44c5_s0_p8_1.vqh"
+#include "books/coupled/_44c5_s1_p8_0.vqh"
+#include "books/coupled/_44c5_s1_p8_1.vqh"
+#include "books/coupled/_44c5_s2_p8_0.vqh"
+#include "books/coupled/_44c5_s2_p8_1.vqh"
+#include "books/coupled/_44c5_s3_p8_0.vqh"
+#include "books/coupled/_44c5_s3_p8_1.vqh"
#include "books/coupled/_44c5_s0_p9_0.vqh"
#include "books/coupled/_44c5_s0_p9_1.vqh"
#include "books/coupled/_44c5_s0_p9_2.vqh"
+#include "books/coupled/_44c5_s1_p9_0.vqh"
+#include "books/coupled/_44c5_s1_p9_1.vqh"
+#include "books/coupled/_44c5_s1_p9_2.vqh"
+#include "books/coupled/_44c5_s2_p9_0.vqh"
+#include "books/coupled/_44c5_s2_p9_1.vqh"
+#include "books/coupled/_44c5_s2_p9_2.vqh"
+#include "books/coupled/_44c5_s3_p9_0.vqh"
+#include "books/coupled/_44c5_s3_p9_1.vqh"
+#include "books/coupled/_44c5_s3_p9_2.vqh"
#include "books/coupled/_44c6_short.vqh"
#include "books/coupled/_44c6_long.vqh"
#include "books/coupled/_44c6_s0_p1_0.vqh"
#include "books/coupled/_44c6_s0_p2_0.vqh"
+#include "books/coupled/_44c6_s1_p2_0.vqh"
#include "books/coupled/_44c6_s0_p3_0.vqh"
#include "books/coupled/_44c6_s0_p4_0.vqh"
+#include "books/coupled/_44c6_s1_p4_0.vqh"
#include "books/coupled/_44c6_s0_p5_0.vqh"
#include "books/coupled/_44c6_s0_p6_0.vqh"
+#include "books/coupled/_44c6_s1_p6_0.vqh"
+#include "books/coupled/_44c6_s2_p6_0.vqh"
#include "books/coupled/_44c6_s0_p7_0.vqh"
#include "books/coupled/_44c6_s0_p7_1.vqh"
+#include "books/coupled/_44c6_s1_p7_0.vqh"
+#include "books/coupled/_44c6_s1_p7_1.vqh"
+#include "books/coupled/_44c6_s2_p7_0.vqh"
+#include "books/coupled/_44c6_s2_p7_1.vqh"
+#include "books/coupled/_44c6_s3_p7_0.vqh"
+#include "books/coupled/_44c6_s3_p7_1.vqh"
#include "books/coupled/_44c6_s0_p8_0.vqh"
#include "books/coupled/_44c6_s0_p8_1.vqh"
+#include "books/coupled/_44c6_s1_p8_0.vqh"
+#include "books/coupled/_44c6_s1_p8_1.vqh"
+#include "books/coupled/_44c6_s2_p8_0.vqh"
+#include "books/coupled/_44c6_s2_p8_1.vqh"
+#include "books/coupled/_44c6_s3_p8_0.vqh"
+#include "books/coupled/_44c6_s3_p8_1.vqh"
#include "books/coupled/_44c6_s0_p9_0.vqh"
#include "books/coupled/_44c6_s0_p9_1.vqh"
#include "books/coupled/_44c6_s0_p9_2.vqh"
+#include "books/coupled/_44c6_s1_p9_0.vqh"
+#include "books/coupled/_44c6_s1_p9_1.vqh"
+#include "books/coupled/_44c6_s1_p9_2.vqh"
+#include "books/coupled/_44c6_s2_p9_0.vqh"
+#include "books/coupled/_44c6_s2_p9_1.vqh"
+#include "books/coupled/_44c6_s2_p9_2.vqh"
+#include "books/coupled/_44c6_s3_p9_0.vqh"
+#include "books/coupled/_44c6_s3_p9_1.vqh"
+#include "books/coupled/_44c6_s3_p9_2.vqh"
#include "books/coupled/_44c7_short.vqh"
#include "books/coupled/_44c7_long.vqh"
@@ -246,6 +405,11 @@
#include "books/coupled/_44c7_s0_p9_1.vqh"
#include "books/coupled/_44c7_s0_p9_2.vqh"
+#include "books/coupled/_44c7_s0_p0_r0.vqh"
+#include "books/coupled/_44c7_s0_p0_r1.vqh"
+#include "books/coupled/_44c7_s0_pN_r0.vqh"
+#include "books/coupled/_44c7_s0_pN_r1.vqh"
+
#include "books/coupled/_44c8_short.vqh"
#include "books/coupled/_44c8_long.vqh"
@@ -293,123 +457,240 @@
/* mode 0; 64-ish */
{{&_residue_44_low, &_residue_44_low},
{&_huff_book__44c0_short,&_huff_book__44c0_long},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
+ /* mostly temporary entries pending training */
+ { {{0},{0,0,&_44c0_s0_p1_0},{0,0,&_44c0_s0_p2_0},{0,0,&_44c0_s0_p3_0},
+ {&_44c0_s0_p4_0,&_44c0_s0_p4_1},{0,0,&_44c0_s0_p5_0},{0,0,&_44c0_s0_p6_0},
+ {&_44c0_s0_p7_0,&_44c0_s0_p7_1,&_44c0_s0_p7_2}}, /* lossless stereo */
{{0},{0,0,&_44c0_s0_p1_0},{0,0,&_44c0_s0_p2_0},{0,0,&_44c0_s0_p3_0},
+ {&_44c0_s0_p4_0,&_44c0_s0_p4_1},{0,0,&_44c0_s1_p5_0},{0,0,&_44c0_s1_p6_0},
+ {&_44c0_s1_p7_0,&_44c0_s1_p7_1,&_44c0_s1_p7_2}}, /* 6dB (2.5) stereo */
+ {{0},{0,0,&_44c0_s0_p1_0},{0,0,&_44c0_s0_p2_0},{0,0,&_44c0_s0_p3_0},
+ {&_44c0_s0_p4_0,&_44c0_s0_p4_1},{0,0,&_44c0_s1_p5_0},{0,0,&_44c0_s2_p6_0},
+ {&_44c0_s2_p7_0,&_44c0_s2_p7_1,&_44c0_s2_p7_2}}, /* 12dB (4.5) stereo */
+ {{0},{0,0,&_44c0_s0_p1_0},{0,0,&_44c0_s0_p2_0},{0,0,&_44c0_s0_p3_0},
{&_44c0_s0_p4_0,&_44c0_s0_p4_1},{0,0,&_44c0_s1_p5_0},{0,0,&_44c0_s2_p6_0},
- {&_44c0_s4_p7_0,&_44c0_s4_p7_1,&_44c0_s4_p7_2}}, /* 24dB (16.5) stereo */
+ {&_44c0_s3_p7_0,&_44c0_s3_p7_1,&_44c0_s3_p7_2}}, /* 18dB (8.5) stereo */
+ {{0}}, /* 24dB (16.5) stereo */
},
{ {0}, /* lossless stereo */
- {0}, /* 6dB (2.5) stereo */
- {0}, /* 12dB (4.5) stereo */
- {0}, /* 18dB (8.5) stereo */
+ {0,0,0,0,0,&_44c0_s1_p5_s0,&_44c0_s1_p6_s0,&_44c0_s1_p7_s0}, /* 6dB (2.5) stereo */
+ {0,0,0,0,0,0,&_44c0_s2_p6_s0,&_44c0_s2_p7_s0}, /* 12dB (4.5) stereo */
+ {0,0,0,0,0,0,0,&_44c0_s3_p7_s0}, /* 18dB (8.5) stereo */
{0},
- //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
- //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
- // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
- // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
- // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
- // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
+ {
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* lossless stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 6dB (2.5) stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 12dB (4.5) stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 18dB (8.5) stereo */
{{0}}, /* 24dB (16.5) stereo */
},
},
-
/* mode 1; 80-ish */
{{&_residue_44_low, &_residue_44_low},
{&_huff_book__44c1_short,&_huff_book__44c1_long},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
+ /* mostly temporary entries pending training */
+ { {{0},{0,0,&_44c1_s0_p1_0},{0,0,&_44c1_s0_p2_0},{0,0,&_44c1_s0_p3_0},
+ {&_44c1_s0_p4_0,&_44c1_s0_p4_1},{0,0,&_44c1_s0_p5_0},{0,0,&_44c1_s0_p6_0},
+ {&_44c1_s0_p7_0,&_44c1_s0_p7_1,&_44c1_s0_p7_2}}, /* lossless stereo */
+ {{0},{0,0,&_44c1_s0_p1_0},{0,0,&_44c1_s0_p2_0},{0,0,&_44c1_s0_p3_0},
+ {&_44c1_s0_p4_0,&_44c1_s0_p4_1},{0,0,&_44c1_s1_p5_0},{0,0,&_44c1_s1_p6_0},
+ {&_44c1_s1_p7_0,&_44c1_s1_p7_1,&_44c1_s1_p7_2}}, /* 6dB (2.5) stereo */
{{0},{0,0,&_44c1_s0_p1_0},{0,0,&_44c1_s0_p2_0},{0,0,&_44c1_s0_p3_0},
{&_44c1_s0_p4_0,&_44c1_s0_p4_1},{0,0,&_44c1_s1_p5_0},{0,0,&_44c1_s2_p6_0},
- {&_44c1_s3_p7_0,&_44c1_s3_p7_1,&_44c1_s3_p7_2}}, /* 24dB (8.5) stereo */
+ {&_44c1_s2_p7_0,&_44c1_s2_p7_1,&_44c1_s2_p7_2}}, /* 12dB (4.5) stereo */
+ {{0},{0,0,&_44c1_s0_p1_0},{0,0,&_44c1_s0_p2_0},{0,0,&_44c1_s0_p3_0},
+ {&_44c1_s0_p4_0,&_44c1_s0_p4_1},{0,0,&_44c1_s1_p5_0},{0,0,&_44c1_s2_p6_0},
+ {&_44c1_s3_p7_0,&_44c1_s3_p7_1,&_44c1_s3_p7_2}}, /* 18dB (8.5) stereo */
{{0}}, /* 24dB (16.5) stereo */
},
{ {0}, /* lossless stereo */
- {0}, /* 6dB (2.5) stereo */
- {0}, /* 12dB (4.5) stereo */
- {0}, /* 18dB (8.5) stereo */
+ {0,0,0,0,0,&_44c0_s1_p5_s0,&_44c0_s1_p6_s0,&_44c0_s1_p7_s0}, /* 6dB (2.5) stereo */
+ {0,0,0,0,0,0,&_44c0_s2_p6_s0,&_44c0_s2_p7_s0}, /* 12dB (4.5) stereo */
+ {0,0,0,0,0,0,0,&_44c0_s3_p7_s0}, /* 18dB (8.5) stereo */
{0},
- //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
- //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
- // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
- // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
- // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
- // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
+ {
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* lossless stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 6dB (2.5) stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 12dB (4.5) stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 18dB (8.5) stereo */
{{0}}, /* 24dB (16.5) stereo */
},
},
-
/* mode 2; 96-ish */
{{&_residue_44_low, &_residue_44_low},
{&_huff_book__44c2_short,&_huff_book__44c2_long},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
+ /* mostly temporary entries pending training */
+ { {{0},{0,0,&_44c2_s0_p1_0},{0,0,&_44c2_s0_p2_0},{0,0,&_44c2_s0_p3_0},
+ {&_44c2_s0_p4_0,&_44c2_s0_p4_1},{0,0,&_44c2_s0_p5_0},{0,0,&_44c2_s0_p6_0},
+ {&_44c2_s0_p7_0,&_44c2_s0_p7_1,&_44c2_s0_p7_2}}, /* lossless stereo */
{{0},{0,0,&_44c2_s0_p1_0},{0,0,&_44c2_s0_p2_0},{0,0,&_44c2_s0_p3_0},
+ {&_44c2_s0_p4_0,&_44c2_s0_p4_1},{0,0,&_44c2_s1_p5_0},{0,0,&_44c2_s1_p6_0},
+ {&_44c2_s1_p7_0,&_44c2_s1_p7_1,&_44c2_s1_p7_2}}, /* 6dB (2.5) stereo */
+ {{0},{0,0,&_44c2_s0_p1_0},{0,0,&_44c2_s0_p2_0},{0,0,&_44c2_s0_p3_0},
{&_44c2_s0_p4_0,&_44c2_s0_p4_1},{0,0,&_44c2_s1_p5_0},{0,0,&_44c2_s2_p6_0},
{&_44c2_s2_p7_0,&_44c2_s2_p7_1,&_44c2_s2_p7_2}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
+ {{0},{0,0,&_44c2_s0_p1_0},{0,0,&_44c2_s0_p2_0},{0,0,&_44c2_s0_p3_0},
+ {&_44c2_s0_p4_0,&_44c2_s0_p4_1},{0,0,&_44c2_s1_p5_0},{0,0,&_44c2_s2_p6_0},
+ {&_44c2_s3_p7_0,&_44c2_s3_p7_1,&_44c2_s3_p7_2}}, /* 18dB (8.5) stereo */
{{0}}, /* 24dB (16.5) stereo */
},
{ {0}, /* lossless stereo */
- {0}, /* 6dB (2.5) stereo */
- {0}, /* 12dB (4.5) stereo */
- {0}, /* 18dB (8.5) stereo */
+ {0,0,0,0,0,&_44c0_s1_p5_s0,&_44c0_s1_p6_s0,&_44c0_s1_p7_s0}, /* 6dB (2.5) stereo */
+ {0,0,0,0,0,0,&_44c0_s2_p6_s0,&_44c0_s2_p7_s0}, /* 12dB (4.5) stereo */
+ {0,0,0,0,0,0,0,&_44c0_s3_p7_s0}, /* 18dB (8.5) stereo */
{0},
- //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
- //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
- // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
- // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
- // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
- // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
+ {
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* lossless stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 6dB (2.5) stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 12dB (4.5) stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 18dB (8.5) stereo */
{{0}}, /* 24dB (16.5) stereo */
},
},
-
/* mode 3; 112-ish */
{{&_residue_44_low, &_residue_44_low},
{&_huff_book__44c3_short,&_huff_book__44c3_long},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
+ /* mostly temporary entries pending training */
+ { {{0},{0,0,&_44c3_s0_p1_0},{0,0,&_44c3_s0_p2_0},{0,0,&_44c3_s0_p3_0},
+ {&_44c3_s0_p4_0,&_44c3_s0_p4_1},{0,0,&_44c3_s0_p5_0},{0,0,&_44c3_s0_p6_0},
+ {&_44c3_s0_p7_0,&_44c3_s0_p7_1,&_44c3_s0_p7_2}}, /* lossless stereo */
{{0},{0,0,&_44c3_s0_p1_0},{0,0,&_44c3_s0_p2_0},{0,0,&_44c3_s0_p3_0},
+ {&_44c3_s0_p4_0,&_44c3_s0_p4_1},{0,0,&_44c3_s1_p5_0},{0,0,&_44c3_s1_p6_0},
+ {&_44c3_s1_p7_0,&_44c3_s1_p7_1,&_44c3_s1_p7_2}}, /* 6dB (2.5) stereo */
+ {{0},{0,0,&_44c3_s0_p1_0},{0,0,&_44c3_s0_p2_0},{0,0,&_44c3_s0_p3_0},
{&_44c3_s0_p4_0,&_44c3_s0_p4_1},{0,0,&_44c3_s1_p5_0},{0,0,&_44c3_s2_p6_0},
{&_44c3_s2_p7_0,&_44c3_s2_p7_1,&_44c3_s2_p7_2}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
+ {{0},{0,0,&_44c3_s0_p1_0},{0,0,&_44c3_s0_p2_0},{0,0,&_44c3_s0_p3_0},
+ {&_44c3_s0_p4_0,&_44c3_s0_p4_1},{0,0,&_44c3_s1_p5_0},{0,0,&_44c3_s2_p6_0},
+ {&_44c3_s3_p7_0,&_44c3_s3_p7_1,&_44c3_s3_p7_2}}, /* 18dB (8.5) stereo */
{{0}}, /* 24dB (16.5) stereo */
},
{ {0}, /* lossless stereo */
- {0}, /* 6dB (2.5) stereo */
- {0}, /* 12dB (4.5) stereo */
- {0}, /* 18dB (8.5) stereo */
+ {0,0,0,0,0,&_44c0_s1_p5_s0,&_44c0_s1_p6_s0,&_44c0_s1_p7_s0}, /* 6dB (2.5) stereo */
+ {0,0,0,0,0,0,&_44c0_s2_p6_s0,&_44c0_s2_p7_s0}, /* 12dB (4.5) stereo */
+ {0,0,0,0,0,0,0,&_44c0_s3_p7_s0}, /* 18dB (8.5) stereo */
{0},
- //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
- //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
- // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
- // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
- // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
- // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
+ {
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* lossless stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 6dB (2.5) stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 12dB (4.5) stereo */
+ {{&_44c0_s0_p0_r0,&_44c0_s0_p0_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s1_pS_r0,&_44c0_s1_pS_r1},
+ {&_44c0_s0_pN_r0,&_44c0_s0_pN_r1}}, /* 18dB (8.5) stereo */
{{0}}, /* 24dB (16.5) stereo */
},
},
@@ -417,99 +698,256 @@
/* mode 4; 128-ish */
{{&_residue_44_mid, &_residue_44_mid},
{&_huff_book__44c4_short,&_huff_book__44c4_long},
- { {{0}}, /* lossless stereo */
+ {
+ {{0},{0,0,&_44c4_s0_p1_0},{0,0,&_44c4_s0_p2_0},{0,0,&_44c4_s0_p3_0},
+ {0,0,&_44c4_s0_p4_0},{0,0,&_44c4_s0_p5_0},{0,0,&_44c4_s0_p6_0},
+ {&_44c4_s0_p7_0,&_44c4_s0_p7_1},{&_44c4_s0_p8_0,&_44c4_s0_p8_1},
+ {&_44c4_s0_p9_0,&_44c4_s0_p9_1,&_44c4_s0_p9_2}},
{{0},{0,0,&_44c4_s0_p1_0},{0,0,&_44c4_s1_p2_0},{0,0,&_44c4_s0_p3_0},
{0,0,&_44c4_s1_p4_0},{0,0,&_44c4_s0_p5_0},{0,0,&_44c4_s1_p6_0},
{&_44c4_s1_p7_0,&_44c4_s1_p7_1},{&_44c4_s1_p8_0,&_44c4_s1_p8_1},
- {&_44c4_s1_p9_0,&_44c4_s1_p9_1,&_44c4_s1_p9_2}},
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
+ {&_44c4_s1_p9_0,&_44c4_s1_p9_1,&_44c4_s1_p9_2}},
+ {{0},{0,0,&_44c4_s0_p1_0},{0,0,&_44c4_s1_p2_0},{0,0,&_44c4_s0_p3_0},
+ {0,0,&_44c4_s1_p4_0},{0,0,&_44c4_s0_p5_0},{0,0,&_44c4_s2_p6_0},
+ {&_44c4_s2_p7_0,&_44c4_s2_p7_1},{&_44c4_s2_p8_0,&_44c4_s2_p8_1},
+ {&_44c4_s2_p9_0,&_44c4_s2_p9_1,&_44c4_s2_p9_2}},
+ {{0},{0,0,&_44c4_s0_p1_0},{0,0,&_44c4_s1_p2_0},{0,0,&_44c4_s0_p3_0},
+ {0,0,&_44c4_s1_p4_0},{0,0,&_44c4_s0_p5_0},{0,0,&_44c4_s2_p6_0},
+ {&_44c4_s3_p7_0,&_44c4_s3_p7_1},{&_44c4_s3_p8_0,&_44c4_s3_p8_1},
+ {&_44c4_s3_p9_0,&_44c4_s3_p9_1,&_44c4_s3_p9_2}},
{{0}}, /* 24dB (16.5) stereo */
},
+
{ {0}, /* lossless stereo */
- {0}, /* 6dB (2.5) stereo */
- {0}, /* 12dB (4.5) stereo */
- {0}, /* 18dB (8.5) stereo */
+ {0,0,&_44c4_s1_p2_s0,0,&_44c4_s1_p4_s0,0,&_44c4_s1_p6_s0,&_44c4_s1_p7_s0,
+ &_44c4_s1_p8_s0,&_44c4_s1_p9_s0}, /* (2.5) stereo */
+ {0,0,0,0,0,0,&_44c4_s2_p6_s0,&_44c4_s2_p7_s0,&_44c4_s2_p8_s0,
+ &_44c4_s2_p9_s0}, /* (4.5) stereo */
+ {0,0,0,0,0,0,0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0}, /* (8.5) stereo */
{0},
- //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
- //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
- // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
- // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
- // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
- // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
- {{0}}, /* 24dB (16.5) stereo */
+ {
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* lossless stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 6dB stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 12dB stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 18dB stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 24dB stereo */
},
},
-
/* mode 5; 160-ish */
{{&_residue_44_mid, &_residue_44_mid},
{&_huff_book__44c5_short,&_huff_book__44c5_long},
- { {{0},{0,0,&_44c5_s0_p1_0},{0,0,&_44c5_s0_p2_0},{0,0,&_44c5_s0_p3_0},
+ {
+ {{0},{0,0,&_44c5_s0_p1_0},{0,0,&_44c5_s0_p2_0},{0,0,&_44c5_s0_p3_0},
{0,0,&_44c5_s0_p4_0},{0,0,&_44c5_s0_p5_0},{0,0,&_44c5_s0_p6_0},
{&_44c5_s0_p7_0,&_44c5_s0_p7_1},{&_44c5_s0_p8_0,&_44c5_s0_p8_1},
- {&_44c5_s0_p9_0,&_44c5_s0_p9_1,&_44c5_s0_p9_2}},
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
+ {&_44c5_s0_p9_0,&_44c5_s0_p9_1,&_44c5_s0_p9_2}},
+ {{0},{0,0,&_44c5_s0_p1_0},{0,0,&_44c5_s1_p2_0},{0,0,&_44c5_s0_p3_0},
+ {0,0,&_44c5_s1_p4_0},{0,0,&_44c5_s0_p5_0},{0,0,&_44c5_s1_p6_0},
+ {&_44c5_s1_p7_0,&_44c5_s1_p7_1},{&_44c5_s1_p8_0,&_44c5_s1_p8_1},
+ {&_44c5_s1_p9_0,&_44c5_s1_p9_1,&_44c5_s1_p9_2}},
+ {{0},{0,0,&_44c5_s0_p1_0},{0,0,&_44c5_s1_p2_0},{0,0,&_44c5_s0_p3_0},
+ {0,0,&_44c5_s1_p4_0},{0,0,&_44c5_s0_p5_0},{0,0,&_44c5_s2_p6_0},
+ {&_44c5_s2_p7_0,&_44c5_s2_p7_1},{&_44c5_s2_p8_0,&_44c5_s2_p8_1},
+ {&_44c5_s2_p9_0,&_44c5_s2_p9_1,&_44c5_s2_p9_2}},
+ {{0},{0,0,&_44c5_s0_p1_0},{0,0,&_44c5_s1_p2_0},{0,0,&_44c5_s0_p3_0},
+ {0,0,&_44c5_s1_p4_0},{0,0,&_44c5_s0_p5_0},{0,0,&_44c5_s2_p6_0},
+ {&_44c5_s3_p7_0,&_44c5_s3_p7_1},{&_44c5_s3_p8_0,&_44c5_s3_p8_1},
+ {&_44c5_s3_p9_0,&_44c5_s3_p9_1,&_44c5_s3_p9_2}},
{{0}}, /* 24dB (16.5) stereo */
},
+
{ {0}, /* lossless stereo */
- {0}, /* 6dB (2.5) stereo */
- {0}, /* 12dB (4.5) stereo */
- {0}, /* 18dB (8.5) stereo */
+ {0,0,&_44c4_s1_p2_s0,0,&_44c4_s1_p4_s0,0,&_44c4_s1_p6_s0,&_44c4_s1_p7_s0,
+ &_44c4_s1_p8_s0,&_44c4_s1_p9_s0}, /* (2.5) stereo */
+ {0,0,0,0,0,0,&_44c4_s2_p6_s0,&_44c4_s2_p7_s0,&_44c4_s2_p8_s0,
+ &_44c4_s2_p9_s0}, /* (4.5) stereo */
+ {0,0,0,0,0,0,0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0}, /* (8.5) stereo */
{0},
- //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
- //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
- // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
- // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
- // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
- // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
- {{0}}, /* 24dB (16.5) stereo */
+ {
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* lossless stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 6dB stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 12dB stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 18dB stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 24dB stereo */
},
},
-
/* mode 6; 192-ish */
{{&_residue_44_mid, &_residue_44_mid},
{&_huff_book__44c6_short,&_huff_book__44c6_long},
- { {{0},{0,0,&_44c6_s0_p1_0},{0,0,&_44c6_s0_p2_0},{0,0,&_44c6_s0_p3_0},
+ {
+ {{0},{0,0,&_44c6_s0_p1_0},{0,0,&_44c6_s0_p2_0},{0,0,&_44c6_s0_p3_0},
{0,0,&_44c6_s0_p4_0},{0,0,&_44c6_s0_p5_0},{0,0,&_44c6_s0_p6_0},
{&_44c6_s0_p7_0,&_44c6_s0_p7_1},{&_44c6_s0_p8_0,&_44c6_s0_p8_1},
- {&_44c6_s0_p9_0,&_44c6_s0_p9_1,&_44c6_s0_p9_2}},
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
+ {&_44c6_s0_p9_0,&_44c6_s0_p9_1,&_44c6_s0_p9_2}},
+ {{0},{0,0,&_44c6_s0_p1_0},{0,0,&_44c6_s1_p2_0},{0,0,&_44c6_s0_p3_0},
+ {0,0,&_44c6_s1_p4_0},{0,0,&_44c6_s0_p5_0},{0,0,&_44c6_s1_p6_0},
+ {&_44c6_s1_p7_0,&_44c6_s1_p7_1},{&_44c6_s1_p8_0,&_44c6_s1_p8_1},
+ {&_44c6_s1_p9_0,&_44c6_s1_p9_1,&_44c6_s1_p9_2}},
+ {{0},{0,0,&_44c6_s0_p1_0},{0,0,&_44c6_s1_p2_0},{0,0,&_44c6_s0_p3_0},
+ {0,0,&_44c6_s1_p4_0},{0,0,&_44c6_s0_p5_0},{0,0,&_44c6_s2_p6_0},
+ {&_44c6_s2_p7_0,&_44c6_s2_p7_1},{&_44c6_s2_p8_0,&_44c6_s2_p8_1},
+ {&_44c6_s2_p9_0,&_44c6_s2_p9_1,&_44c6_s2_p9_2}},
+ {{0},{0,0,&_44c6_s0_p1_0},{0,0,&_44c6_s1_p2_0},{0,0,&_44c6_s0_p3_0},
+ {0,0,&_44c6_s1_p4_0},{0,0,&_44c6_s0_p5_0},{0,0,&_44c6_s2_p6_0},
+ {&_44c6_s3_p7_0,&_44c6_s3_p7_1},{&_44c6_s3_p8_0,&_44c6_s3_p8_1},
+ {&_44c6_s3_p9_0,&_44c6_s3_p9_1,&_44c6_s3_p9_2}},
{{0}}, /* 24dB (16.5) stereo */
},
+
{ {0}, /* lossless stereo */
- {0}, /* 6dB (2.5) stereo */
- {0}, /* 12dB (4.5) stereo */
- {0}, /* 18dB (8.5) stereo */
+ {0,0,&_44c4_s1_p2_s0,0,&_44c4_s1_p4_s0,0,&_44c4_s1_p6_s0,&_44c4_s1_p7_s0,
+ &_44c4_s1_p8_s0,&_44c4_s1_p9_s0}, /* (2.5) stereo */
+ {0,0,0,0,0,0,&_44c4_s2_p6_s0,&_44c4_s2_p7_s0,&_44c4_s2_p8_s0,
+ &_44c4_s2_p9_s0}, /* (4.5) stereo */
+ {0,0,0,0,0,0,0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0,&_44c4_s3_p9_s0}, /* (8.5) stereo */
{0},
- //{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
},
- { {{0}}, /* lossless stereo */
- {{0}}, /* 6dB (2.5) stereo */
- {{0}}, /* 12dB (4.5) stereo */
- {{0}}, /* 18dB (8.5) stereo */
- //{{&44c0_s0_r0_0,&44c0_s0_r0_1},{&44c0_s0_r1_0,&44c0_s0_r1_1},
- // {&44c0_s0_r2_0,&44c0_s0_r2_1},{&44c0_s0_r3_0,&44c0_s0_r3_1},
- // {&44c0_s0_r4_0,&44c0_s0_r4_1},{&44c0_s1_r5_0,&44c0_s1_r5_1},
- // {&44c0_s1_r6_0,&44c0_s1_r6_1},{&44c0_s2_r7_0,&44c0_s2_r7_1},
- // {&44c0_s4_r8_0,&44c0_s3_r8_1},{&44c0_s4_r9_0,&44c0_s3_r9_1}}, /* 18dB (8.5) stereo */
- {{0}}, /* 24dB (16.5) stereo */
+ {
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* lossless stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 6dB stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 12dB stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 18dB stereo */
+ {{&_44c4_s0_p0_r0,&_44c4_s0_p0_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s1_pS_r0,&_44c4_s1_pS_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1},
+ {&_44c4_s0_pN_r0,&_44c4_s0_pN_r1}}, /* 24dB stereo */
},
},
-
+
/* mode 7; 224-ish */
{{&_residue_44_high, &_residue_44_high},
{&_huff_book__44c7_short,&_huff_book__44c7_long},
@@ -532,7 +970,17 @@
{0},
//{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
},
- { {{0}}, /* lossless stereo */
+ {
+ {{&_44c7_s0_p0_r0,&_44c7_s0_p0_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1}}, /* lossless stereo */
{{0}}, /* 6dB (2.5) stereo */
{{0}}, /* 12dB (4.5) stereo */
{{0}}, /* 18dB (8.5) stereo */
@@ -567,7 +1015,17 @@
{0},
//{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
},
- { {{0}}, /* lossless stereo */
+ {
+ {{&_44c7_s0_p0_r0,&_44c7_s0_p0_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1}}, /* lossless stereo */
{{0}}, /* 6dB (2.5) stereo */
{{0}}, /* 12dB (4.5) stereo */
{{0}}, /* 18dB (8.5) stereo */
@@ -601,7 +1059,17 @@
{0},
//{0,0,0,0,0,0,0,0,&44c0_s4_s8,&44c0_s4_s9},/* 24dB (16.5) stereo */
},
- { {{0}}, /* lossless stereo */
+ {
+ {{&_44c7_s0_p0_r0,&_44c7_s0_p0_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1},
+ {&_44c7_s0_pN_r0,&_44c7_s0_pN_r1}}, /* lossless stereo */
{{0}}, /* 6dB (2.5) stereo */
{{0}}, /* 12dB (4.5) stereo */
{{0}}, /* 18dB (8.5) stereo */
No revision
No revision
1.1.2.2 +3 -32 vorbis/vq/Attic/44c0.vqs
Index: 44c0.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/Attic/44c0.vqs,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- 44c0.vqs 2001/12/18 12:43:25 1.1.2.1
+++ 44c0.vqs 2001/12/18 23:49:24 1.1.2.2
@@ -1,32 +1,3 @@
-huffbuild 44l/line_128x7_class1.vqd 0-64
-huffbuild 44l/line_128x7_class2.vqd 0-64
-
-huffbuild 44l/line_128x7_0sub0.vqd 0-64
-huffbuild 44l/line_128x7_1sub1.vqd 1-9
-huffbuild 44l/line_128x7_1sub2.vqd 9-25
-huffbuild 44l/line_128x7_1sub3.vqd 25-64
-huffbuild 44l/line_128x7_2sub1.vqd 1-9
-huffbuild 44l/line_128x7_2sub2.vqd 9-25
-huffbuild 44l/line_128x7_2sub3.vqd 25-64
-
-huffbuild 44l/line_1024x31_class0.vqd 0-8
-huffbuild 44l/line_1024x31_class1.vqd 0-16
-huffbuild 44l/line_1024x31_class2.vqd 0-64
-huffbuild 44l/line_1024x31_class3.vqd 0-64
-
-huffbuild 44l/line_1024x31_0sub0.vqd 0-32
-huffbuild 44l/line_1024x31_0sub1.vqd 32-128
-
-huffbuild 44l/line_1024x31_1sub0.vqd 0-32
-huffbuild 44l/line_1024x31_1sub1.vqd 32-128
-
-huffbuild 44l/line_1024x31_2sub1.vqd 1-18
-huffbuild 44l/line_1024x31_2sub2.vqd 18-50
-huffbuild 44l/line_1024x31_2sub3.vqd 50-128
-huffbuild 44l/line_1024x31_3sub1.vqd 1-18
-huffbuild 44l/line_1024x31_3sub2.vqd 18-50
-huffbuild 44l/line_1024x31_3sub3.vqd 50-128
-
cp 44c0_s0/resaux_short.vqd _44c0_short.vqd
cp 44c0_s0/resaux_long.vqd _44c0_long.vqd
@@ -97,7 +68,7 @@
#iter 3 (residue backfill)
-:_s0_p0_r0 44cL_s0/res_part0_r1.vqd, 2, nonseq, 0 +- .111111111 .222222222
-:_s0_pN_r0 44cL_s0/res_partN_r1.vqd, 2, nonseq, 0 +- .111111111 .222222222
-:_s1_pS_r0 44cL_s1/res_partS_r1.vqd, 2, nonseq, 0 +- .111111111
+:_s0_p0_r1 44cL_s0/res_part0_r1.vqd, 2, nonseq, 0 +- .111111111 .222222222
+:_s0_pN_r1 44cL_s0/res_partN_r1.vqd, 2, nonseq, 0 +- .111111111 .222222222
+:_s1_pS_r1 44cL_s1/res_partS_r1.vqd, 2, nonseq, 0 +- .111111111
1.1.2.2 +0 -11 vorbis/vq/Attic/44c1.vqs
Index: 44c1.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/Attic/44c1.vqs,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- 44c1.vqs 2001/12/18 12:43:25 1.1.2.1
+++ 44c1.vqs 2001/12/18 23:49:24 1.1.2.2
@@ -1,14 +1,3 @@
-huffbuild 44l/line_128x9_class1.vqd 0-256
-huffbuild 44l/line_128x9_class2.vqd 0-256
-
-huffbuild 44l/line_128x9_0sub0.vqd 0-64
-huffbuild 44l/line_128x9_1sub1.vqd 1-9
-huffbuild 44l/line_128x9_1sub2.vqd 9-25
-huffbuild 44l/line_128x9_1sub3.vqd 25-64
-huffbuild 44l/line_128x9_2sub1.vqd 1-9
-huffbuild 44l/line_128x9_2sub2.vqd 9-25
-huffbuild 44l/line_128x9_2sub3.vqd 25-64
-
cp 44c1_s0/resaux_short.vqd _44c1_short.vqd
cp 44c1_s0/resaux_long.vqd _44c1_long.vqd
1.1.2.2 +0 -11 vorbis/vq/Attic/44c3.vqs
Index: 44c3.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/Attic/44c3.vqs,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- 44c3.vqs 2001/12/18 12:43:25 1.1.2.1
+++ 44c3.vqs 2001/12/18 23:49:24 1.1.2.2
@@ -1,14 +1,3 @@
-huffbuild 44l/line_128x19_class1.vqd 0-64
-huffbuild 44l/line_128x19_class2.vqd 0-64
-
-huffbuild 44l/line_128x19_0sub0.vqd 0-128
-huffbuild 44l/line_128x19_1sub1.vqd 1-25
-huffbuild 44l/line_128x19_1sub2.vqd 18-50
-huffbuild 44l/line_128x19_1sub3.vqd 50-128
-huffbuild 44l/line_128x19_2sub1.vqd 1-18
-huffbuild 44l/line_128x19_2sub2.vqd 18-50
-huffbuild 44l/line_128x19_2sub3.vqd 50-128
-
cp 44c3_s0/resaux_short.vqd _44c3_short.vqd
cp 44c3_s0/resaux_long.vqd _44c3_long.vqd
1.1.2.2 +11 -11 vorbis/vq/Attic/44c4.vqs
Index: 44c4.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/Attic/44c4.vqs,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- 44c4.vqs 2001/12/18 12:43:25 1.1.2.1
+++ 44c4.vqs 2001/12/18 23:49:24 1.1.2.2
@@ -76,19 +76,19 @@
# 2 . . .
# 4 . . . . . . .
-:_s1_p2_s0 44c4_s1/res_part2_pass4.vqd, 2, nonseq, 0 +- 1 2
-:_s1_p4_s0 44c4_s1/res_part4_pass4.vqd, 2, nonseq, 0 +- 1 2 3 4
-:_s1_p6_s0 44c4_s1/res_part6_pass4.vqd, 2, nonseq, 0 +- 1 2 3 4
-:_s1_p7_s0 44c4_s1/res_part7_pass4.vqd, 2, nonseq, 0 +- 1 2 3 4
-:_s1_p8_s0 44c4_s1/res_part8_pass4.vqd, 2, nonseq, 0 +- 1 2 3 4
-:_s1_p9_s0 44c4_s1/res_part9_pass4.vqd, 2, nonseq, 0 +- 1 2 3 4
+:_s1_p2_s0 44cM_s1/res_part2_pass3.vqd, 2, nonseq, 0 +- 1 2
+:_s1_p4_s0 44cM_s1/res_part4_pass3.vqd, 2, nonseq, 0 +- 1 2 3 4
+:_s1_p6_s0 44cM_s1/res_part6_pass3.vqd, 2, nonseq, 0 +- 1 2 3 4
+:_s1_p7_s0 44cM_s1/res_part7_pass3.vqd, 2, nonseq, 0 +- 1 2 3 4
+:_s1_p8_s0 44cM_s1/res_part8_pass3.vqd, 2, nonseq, 0 +- 1 2 3 4
+:_s1_p9_s0 44cM_s1/res_part9_pass3.vqd, 2, nonseq, 0 +- 1 2 3 4
-:_s2_p6_s0 44c4_s2/res_part6_pass4.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
-:_s2_p7_s0 44c4_s2/res_part7_pass4.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
-:_s2_p8_s0 44c4_s2/res_part8_pass4.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
-:_s2_p9_s0 44c4_s2/res_part9_pass4.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_s2_p6_s0 44cM_s2/res_part6_pass3.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_s2_p7_s0 44cM_s2/res_part7_pass3.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_s2_p8_s0 44cM_s2/res_part8_pass3.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_s2_p9_s0 44cM_s2/res_part9_pass3.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
-:_s3_p9_s0 44c4_s3/res_part789_pass4.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
+:_s3_p9_s0 44cM_s3/res_part789_pass3.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
#iter 2 (residue backfill) shared for all 'mid' modes
1.1.2.2 +4 -4 vorbis/vq/Attic/44c5.vqs
Index: 44c5.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/Attic/44c5.vqs,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- 44c5.vqs 2001/12/18 12:43:25 1.1.2.1
+++ 44c5.vqs 2001/12/18 23:49:24 1.1.2.2
@@ -53,15 +53,15 @@
:_s3_p8_0 44c5_s3/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 13 26 39 52 65 78
:_s3_p8_1 44c5_s3/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6
-:_s0_p9_0 44c5_s0/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1005 1226 1447
+:_s0_p9_0 44c5_s0/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326 1547
:_s0_p9_1 44c5_s0/res_part9_pass1.vqd, 2, nonseq, 0 +- 13 26 39 52 65 78 91 104
:_s0_p9_2 44c5_s0/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6
-:_s1_p9_0 44c5_s1/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1005 1226 1447
+:_s1_p9_0 44c5_s1/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326 1547
:_s1_p9_1 44c5_s1/res_part9_pass1.vqd, 2, nonseq, 0 +- 13 26 39 52 65 78 91 104
:_s1_p9_2 44c5_s1/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6
-:_s2_p9_0 44c5_s2/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1005 1226 1447
+:_s2_p9_0 44c5_s2/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326 1547
:_s2_p9_1 44c5_s2/res_part9_pass1.vqd, 2, nonseq, 0 +- 13 26 39 52 65 78 91 104
:_s2_p9_2 44c5_s2/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6
-:_s3_p9_0 44c5_s3/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1005 1226 1447
+:_s3_p9_0 44c5_s3/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326 1547
:_s3_p9_1 44c5_s3/res_part9_pass1.vqd, 2, nonseq, 0 +- 13 26 39 52 65 78 91 104
:_s3_p9_2 44c5_s3/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6
1.1.2.1 +15 -17 vorbis/vq/44u0.vqs
Index: 44u0.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/44u0.vqs,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- 44u0.vqs 2001/12/16 04:15:57 1.1
+++ 44u0.vqs 2001/12/18 23:49:24 1.1.2.1
@@ -1,5 +1,3 @@
-cat res_part1_pass3.vqd res_part2_pass3.vqd res_part3_pass3.vqd res_part4_pass3.vqd res_part5_pass3.vqd res_part6_pass3.vqd res_part7_pass3.vqd > temp_pass3.vqd
-cat res_part1_pass4.vqd res_part2_pass4.vqd res_part3_pass4.vqd res_part4_pass4.vqd res_part5_pass4.vqd res_part6_pass4.vqd res_part7_pass4.vqd > temp_pass4.vqd
GO
@@ -15,24 +13,24 @@
# 2 . .
# 4 . . . . . .
-:_p1_0 res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p2_0 res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p3_0 res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p4_0 res_part4_pass0.vqd, 2, nonseq , 0 +- 3 6 9 12 15 18 21 24 27
-:_p4_1 res_part4_pass1.vqd, 4, nonseq cull, 0 +- 1
-:_p5_0 res_part5_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p6_0 res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-
-:_p7_0 res_part7_pass0.vqd, 2, nonseq, 0 +- 67 134
-:_p7_1 res_part7_pass1.vqd, 2, nonseq, 0 +- 3 6 9 12 15 18 21 24 27 30 33
-:_p7_2 res_part7_pass2.vqd, 4, nonseq, 0 +- 1
+:_p1_0 44u0/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p2_0 44u0/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p3_0 44u0/res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p4_0 44u0/res_part4_pass0.vqd, 2, nonseq , 0 +- 3 6 9 12 15 18 21 24 27
+:_p4_1 44u0/res_part4_pass1.vqd, 4, nonseq cull, 0 +- 1
+:_p5_0 44u0/res_part5_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p6_0 44u0/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+
+:_p7_0 44u0/res_part7_pass0.vqd, 2, nonseq, 0 +- 67 134
+:_p7_1 44u0/res_part7_pass1.vqd, 2, nonseq, 0 +- 3 6 9 12 15 18 21 24 27 30 33
+:_p7_2 44u0/res_part7_pass2.vqd, 4, nonseq, 0 +- 1
#iter 1
-:_p0_r0 res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
-:_p1_r0 temp_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p0_r0 44u0/res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p1_r0 44u0/res_partN_pass3.vqd, 2, nonseq cull, 0 +- .33333333
#iter 2
-:_p0_r1 res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
-:_p1_r1 temp_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p0_r1 44u0/res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p1_r1 44u0/res_partN_pass4.vqd, 2, nonseq cull, 0 +- .11111111
1.1.2.1 +17 -20 vorbis/vq/44u4.vqs
Index: 44u4.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/44u4.vqs,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- 44u4.vqs 2001/12/16 04:15:57 1.1
+++ 44u4.vqs 2001/12/18 23:49:24 1.1.2.1
@@ -1,6 +1,3 @@
-cat res_part1_pass3.vqd res_part2_pass3.vqd res_part3_pass3.vqd res_part4_pass3.vqd res_part5_pass3.vqd res_part6_pass3.vqd res_part7_pass3.vqd res_part8_pass3.vqd res_part9_pass3.vqd > temp_pass3.vqd
-cat res_part1_pass4.vqd res_part2_pass4.vqd res_part3_pass4.vqd res_part4_pass4.vqd res_part5_pass4.vqd res_part6_pass4.vqd res_part7_pass4.vqd res_part8_pass4.vqd res_part9_pass4.vqd > temp_pass4.vqd
-
GO
>_44u4 noninterleaved
@@ -16,25 +13,25 @@
# 2 . . .
# 4 . . . . . . .
-:_p1_0 res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p2_0 res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p3_0 res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p4_0 res_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p5_0 res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p7_0 res_part7_pass0.vqd, 2, nonseq cull, 0 +- 3 6 9 12 15
-:_p7_1 res_part7_pass1.vqd, 4, nonseq cull, 0 +- 1
-:_p8_0 res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30 35 40
-:_p8_1 res_part8_pass1.vqd, 4, nonseq cull, 0 +- 1 2
-:_p9_0 res_part9_pass0.vqd, 2, nonseq, 0 +- 637 1274 1911
-:_p9_1 res_part9_pass1.vqd, 2, nonseq, 0 +- 49 98 147 196 245 294
-:_p9_2 res_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+:_p1_0 44u4/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p2_0 44u4/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p3_0 44u4/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p4_0 44u4/res_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p5_0 44u4/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p6_0 44u4/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p7_0 44u4/res_part7_pass0.vqd, 2, nonseq cull, 0 +- 3 6 9 12 15
+:_p7_1 44u4/res_part7_pass1.vqd, 4, nonseq cull, 0 +- 1
+:_p8_0 44u4/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30 35 40
+:_p8_1 44u4/res_part8_pass1.vqd, 4, nonseq cull, 0 +- 1 2
+:_p9_0 44u4/res_part9_pass0.vqd, 2, nonseq, 0 +- 637 1274 1911
+:_p9_1 44u4/res_part9_pass1.vqd, 2, nonseq, 0 +- 49 98 147 196 245 294
+:_p9_2 44u4/res_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
#iter 1
-:_p0_r0 res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
-:_p1_r0 temp_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p0_r0 44u4/res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p1_r0 44u4/res_partN_pass3.vqd, 2, nonseq cull, 0 +- .33333333
#iter 2
-:_p0_r1 res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
-:_p1_r1 temp_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p0_r1 44u4/res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p1_r1 44u4/res_partN_pass4.vqd, 2, nonseq cull, 0 +- .11111111
1.1.2.1 +22 -25 vorbis/vq/44u7.vqs
Index: 44u7.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/44u7.vqs,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- 44u7.vqs 2001/12/16 04:15:57 1.1
+++ 44u7.vqs 2001/12/18 23:49:24 1.1.2.1
@@ -1,6 +1,3 @@
-#cat res_part1_pass3.vqd res_part2_pass3.vqd res_part3_pass3.vqd res_part4_pass3.vqd res_part5_pass3.vqd res_part6_pass3.vqd res_part7_pass3.vqd res_part8_pass3.vqd res_part9_pass3.vqd > temp_pass3.vqd
-#cat res_part1_pass4.vqd res_part2_pass4.vqd res_part3_pass4.vqd res_part4_pass4.vqd res_part5_pass4.vqd res_part6_pass4.vqd res_part7_pass4.vqd res_part8_pass4.vqd res_part9_pass4.vqd > temp_pass4.vqd
-
GO
>_44u7 noninterleaved
@@ -13,31 +10,31 @@
# 2 . . . .
# 4 . . . . . .
-:_p1_0 res_part1_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
-:_p2_0 res_part2_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30 35 40
-:_p2_1 res_part2_pass1.vqd, 4, nonseq cull, 0 +- 1 2
-
-:_p3_0 res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p4_0 res_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p5_0 res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
-:_p7_0 res_part7_pass0.vqd, 2, nonseq cull, 0 +- 3 6 9 12 15
-:_p7_1 res_part7_pass1.vqd, 4, nonseq cull, 0 +- 1
-
-:_p8_0 res_part8_pass0.vqd, 2, nonseq cull, 0 +- 7 14 21 28 35 42 49 56
-:_p8_1 res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3
-
-
-:_p9_0 res_part9_pass0.vqd, 2, nonseq, 0 +- 1863 3726 5589 7452 9315 11178 13041
-:_p9_1 res_part9_pass1.vqd, 2, nonseq, 0 +- 81 162 243 324 405 486 567 648 729 810 891
-:_p9_2 res_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
+:_p1_0 44u7/res_part1_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p2_0 44u7/res_part2_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30 35 40
+:_p2_1 44u7/res_part2_pass1.vqd, 4, nonseq cull, 0 +- 1 2
+
+:_p3_0 44u7/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p4_0 44u7/res_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p5_0 44u7/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p6_0 44u7/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p7_0 44u7/res_part7_pass0.vqd, 2, nonseq cull, 0 +- 3 6 9 12 15
+:_p7_1 44u7/res_part7_pass1.vqd, 4, nonseq cull, 0 +- 1
+
+:_p8_0 44u7/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 7 14 21 28 35 42 49 56
+:_p8_1 44u7/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3
+
+
+:_p9_0 44u7/res_part9_pass0.vqd, 2, nonseq, 0 +- 1863 3726 5589 7452 9315 11178 13041
+:_p9_1 44u7/res_part9_pass1.vqd, 2, nonseq, 0 +- 81 162 243 324 405 486 567 648 729 810 891
+:_p9_2 44u7/res_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
#iter 1
-:_p0_r0 res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
-:_p1_r0 temp_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p0_r0 44u7/res_part0_pass3.vqd, 2, nonseq cull, 0 +- .33333333
+:_p1_r0 44u7/res_partN_pass3.vqd, 2, nonseq cull, 0 +- .33333333
#iter 2
-:_p0_r1 res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
-:_p1_r1 temp_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p0_r1 44u7/res_part0_pass4.vqd, 2, nonseq cull, 0 +- .11111111
+:_p1_r1 44u7/res_partN_pass4.vqd, 2, nonseq cull, 0 +- .11111111
--- >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