[xiph-cvs] cvs commit: vorbis/lib/modes floor_44.h psych_44.h residue_44.h
Monty
xiphmont at xiph.org
Wed Dec 12 01:13:58 PST 2001
xiphmont 01/12/12 01:13:57
Modified: lib Tag: branch_monty_20011009 block.c floor1.c
mapping0.c vorbisenc.c
lib/books/floor Tag: branch_monty_20011009
line_128x19_0sub0.vqh line_128x19_1sub1.vqh
line_128x19_1sub2.vqh line_128x19_1sub3.vqh
line_128x19_2sub1.vqh line_128x19_2sub2.vqh
line_128x19_2sub3.vqh line_128x19_class1.vqh
line_128x19_class2.vqh
lib/modes Tag: branch_monty_20011009 floor_44.h psych_44.h
residue_44.h
Added: lib/books/coupled Tag: branch_monty_20011009
_44c0_s2_p6_0.vqh _44c0_s4_p7_0.vqh
_44c0_s4_p7_1.vqh _44c0_s4_p7_2.vqh _44c1_long.vqh
_44c1_s0_p1_0.vqh _44c1_s0_p2_0.vqh
_44c1_s0_p3_0.vqh _44c1_s0_p4_0.vqh
_44c1_s0_p4_1.vqh _44c1_s1_p5_0.vqh
_44c1_s2_p6_0.vqh _44c1_s3_p7_0.vqh
_44c1_s3_p7_1.vqh _44c1_s3_p7_2.vqh _44c1_short.vqh
_44c2_long.vqh _44c2_s0_p1_0.vqh _44c2_s0_p2_0.vqh
_44c2_s0_p3_0.vqh _44c2_s0_p4_0.vqh
_44c2_s0_p4_1.vqh _44c2_s1_p5_0.vqh
_44c2_s2_p6_0.vqh _44c2_s2_p7_0.vqh
_44c2_s2_p7_1.vqh _44c2_s2_p7_2.vqh _44c2_short.vqh
_44c3_long.vqh _44c3_s0_p1_0.vqh _44c3_s0_p2_0.vqh
_44c3_s0_p3_0.vqh _44c3_s0_p4_0.vqh
_44c3_s0_p4_1.vqh _44c3_s1_p5_0.vqh
_44c3_s2_p6_0.vqh _44c3_s2_p7_0.vqh
_44c3_s2_p7_1.vqh _44c3_s2_p7_2.vqh _44c3_short.vqh
_44c4_long.vqh _44c4_s0_p1_0.vqh _44c4_s0_p3_0.vqh
_44c4_s0_p5_0.vqh _44c4_s1_p2_0.vqh
_44c4_s1_p4_0.vqh _44c4_s1_p6_0.vqh
_44c4_s1_p7_0.vqh _44c4_s1_p7_1.vqh
_44c4_s1_p8_0.vqh _44c4_s1_p8_1.vqh
_44c4_s1_p9_0.vqh _44c4_s1_p9_1.vqh
_44c4_s1_p9_2.vqh _44c4_short.vqh
lib/books/floor Tag: branch_monty_20011009
line_128x9_0sub0.vqh line_128x9_1sub1.vqh
line_128x9_1sub2.vqh line_128x9_1sub3.vqh
line_128x9_2sub1.vqh line_128x9_2sub2.vqh
line_128x9_2sub3.vqh line_128x9_class1.vqh
line_128x9_class2.vqh
Log:
Catch up commit for the merge
Revision Changes Path
No revision
No revision
1.50.2.9 +4 -3 vorbis/lib/block.c
Index: block.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/block.c,v
retrieving revision 1.50.2.8
retrieving revision 1.50.2.9
diff -u -r1.50.2.8 -r1.50.2.9
--- block.c 2001/12/11 08:19:39 1.50.2.8
+++ block.c 2001/12/12 09:13:39 1.50.2.9
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.50.2.8 2001/12/11 08:19:39 xiphmont Exp $
+ last mod: $Id: block.c,v 1.50.2.9 2001/12/12 09:13:39 xiphmont Exp $
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -511,6 +511,7 @@
if(bp==-1)return(0); /* not enough data currently to search for a
full long block */
v->nW=bp;
+ //v->nW=0;
}else
v->nW=0;
@@ -745,8 +746,8 @@
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);
+ //_analysis_output("lapped",seq,pcm,sizeW,0,0);
+ //_analysis_output("buffered",seq++,v->pcm[j],sizeW+beginW,0,0);
}
1.16.2.3 +2 -1 vorbis/lib/floor1.c
Index: floor1.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/floor1.c,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -r1.16.2.2 -r1.16.2.3
--- floor1.c 2001/11/30 07:19:53 1.16.2.2
+++ floor1.c 2001/12/12 09:13:39 1.16.2.3
@@ -11,7 +11,7 @@
********************************************************************
function: floor backend 1 implementation
- last mod: $Id: floor1.c,v 1.16.2.2 2001/11/30 07:19:53 xiphmont Exp $
+ last mod: $Id: floor1.c,v 1.16.2.3 2001/12/12 09:13:39 xiphmont Exp $
********************************************************************/
@@ -618,6 +618,7 @@
return B[pos];
if(B[pos]<0)
return A[pos];
+
return (A[pos]+B[pos])>>1;
}
1.37.2.14 +14 -12 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.37.2.13
retrieving revision 1.37.2.14
diff -u -r1.37.2.13 -r1.37.2.14
--- mapping0.c 2001/12/11 08:19:39 1.37.2.13
+++ mapping0.c 2001/12/12 09:13:39 1.37.2.14
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.37.2.13 2001/12/11 08:19:39 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.37.2.14 2001/12/12 09:13:39 xiphmont Exp $
********************************************************************/
@@ -348,7 +348,7 @@
for(j=0;j<n;j++)
fft[j]=pcm[j]*=window[j];
- _analysis_output("windowed",seq+i,pcm,n,0,0);
+ //_analysis_output("windowed",seq+i,pcm,n,0,0);
/* transform the PCM data */
/* only MDCT right now.... */
@@ -427,7 +427,7 @@
fprintf(stderr,"%ld ",seq+i);
}*/
- _analysis_output("res",seq+i,res,n/2,1,0);
+ //_analysis_output("res",seq+i,res,n/2,1,0);
_analysis_output("codedflr",seq+i,codedflr,n/2,1,1);
}
@@ -506,8 +506,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 */
@@ -578,9 +578,9 @@
nonzero,
i);
- sprintf(buf,"quant%d",i);
- for(j=0;j<vi->channels;j++)
- _analysis_output(buf,seq+j,quantized[j],n/2,1,0);
+ //sprintf(buf,"quant%d",i);
+ //for(j=0;j<vi->channels;j++)
+ //_analysis_output(buf,seq+j,quantized[j],n/2,1,0);
}
}
@@ -588,7 +588,6 @@
seq+=vi->channels;
}
-
look->lastframe=vb->sequence;
return(0);
}
@@ -694,8 +693,8 @@
/* only MDCT right now.... */
for(i=0;i<vi->channels;i++){
float *pcm=vb->pcm[i];
- _analysis_output("out",seq+i,pcm,n/2,1,1);
- _analysis_output("lout",seq+i,pcm,n/2,0,0);
+ //_analysis_output("out",seq+i,pcm,n/2,1,1);
+ //_analysis_output("lout",seq+i,pcm,n/2,0,0);
mdct_backward(b->transform[vb->W][0],pcm,pcm);
}
@@ -708,12 +707,15 @@
else
for(j=0;j<n;j++)
pcm[j]=0.f;
- _analysis_output("final",seq++,pcm,n,0,0);
+
+ //_analysis_output("final",seq,pcm,n,0,0);
}
/* now apply the decoded post-window time information */
/* NOT IMPLEMENTED */
+ fprintf(stderr,"seq %d\r",seq);
+
/* all done! */
return(0);
}
1.17.2.9 +15 -11 vorbis/lib/vorbisenc.c
Index: vorbisenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisenc.c,v
retrieving revision 1.17.2.8
retrieving revision 1.17.2.9
diff -u -r1.17.2.8 -r1.17.2.9
--- vorbisenc.c 2001/12/11 08:19:39 1.17.2.8
+++ vorbisenc.c 2001/12/12 09:13:39 1.17.2.9
@@ -11,7 +11,7 @@
********************************************************************
function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.17.2.8 2001/12/11 08:19:39 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.17.2.9 2001/12/12 09:13:39 xiphmont Exp $
********************************************************************/
@@ -591,12 +591,12 @@
){
int ret=0;
- base_quality=0.;
+ base_quality=.4;
if(rate>40000){
ret|=vorbis_encode_toplevel_init(vi,256,2048,channels,rate);
ret|=vorbis_encode_floor_init(vi,base_quality,0,_floor_44_128_books,_floor_44_128,
- 0,0,0,1,1,1,1,1,1,1,1);
+ 0,1,1,2,2,2,2,2,2,2,2);
ret|=vorbis_encode_floor_init(vi,base_quality,1,_floor_44_1024_books,_floor_44_1024,
0,0,0,0,0,0,0,0,0,0,0);
@@ -637,13 +637,13 @@
_psy_noiseguards_long);
ret|=vorbis_encode_ath_init(vi,base_quality,0,ATH_Bark_dB,
- 0., 0., 0., 0., 0., .5, 1., 1., 1.5, 2., 2.);
+ 0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
ret|=vorbis_encode_ath_init(vi,base_quality,1,ATH_Bark_dB,
- 0., 0., 0., 0., 0., .5, 1., 1., 1.5, 2., 2.);
+ 0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
ret|=vorbis_encode_ath_init(vi,base_quality,2,ATH_Bark_dB,
- 0., 0., 0., 0., 0., .5, 1., 1., 1.5, 2., 2.);
+ 0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
ret|=vorbis_encode_ath_init(vi,base_quality,3,ATH_Bark_dB,
- 0., 0., 0., 0., 0., .5, 1., 1., 1.5, 2., 2.);
+ 0., 0., 0., 0., .2, .5, 1., 1., 1.5, 2., 2.);
if(ret){
vorbis_info_clear(vi);
@@ -660,7 +660,7 @@
0, /* no mid stereo backfill */
0, /* no residue backfill */
_residue_template_44_stereo,
- 4, 3, 3, 2, 1, 0, 0, 0, 0, 0, 0,
+ 4, 3, 2, 2, 1, 0, 0, 0, 0, 0, 0,
4., 6., 6., 6., 10., 6., 6., 6., 6., 6., 6.);
ret|=vorbis_encode_residue_init(vi,base_quality,1,
@@ -668,14 +668,14 @@
0, /* no mid stereo backfill */
0, /* no residue backfill */
_residue_template_44_stereo,
- 4, 3, 3, 2, 1, 0, 0, 0, 0, 0, 0,
+ 4, 3, 2, 2, 1, 0, 0, 0, 0, 0, 0,
6., 6., 6., 10., 10., 6., 6., 6., 6., 6., 6.);
ret|=vorbis_encode_lowpass_init(vi,base_quality,0,
- 15.1,15.9,16.9,17.9,19.9,
+ 15.1,15.8,16.5,17.9,20.5,
999.,999.,999.,999.,999.,999.);
ret|=vorbis_encode_lowpass_init(vi,base_quality,1,
- 15.1,15.9,16.9,17.9,19.9,
+ 15.1,15.8,16.5,17.9,20.5,
999.,999.,999.,999.,999.,999.);
return(ret);
@@ -703,6 +703,10 @@
long max_bitrate,
long nominal_bitrate,
long min_bitrate){
+
+ /* it's temporary while I do the merge; relax */
+ return(vorbis_encode_init_vbr(vi,channels,rate, .4);
+
return(OV_EIMPL);
}
No revision
No revision
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c0_s2_p6_0.vqh
1.1.2.1 +65 -0 vorbis/lib/books/coupled/Attic/_44c0_s4_p7_0.vqh
1.1.2.1 +115 -0 vorbis/lib/books/coupled/Attic/_44c0_s4_p7_1.vqh
1.1.2.1 +63 -0 vorbis/lib/books/coupled/Attic/_44c0_s4_p7_2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/coupled/Attic/_44c1_long.vqh
1.1.2.1 +99 -0 vorbis/lib/books/coupled/Attic/_44c1_s0_p1_0.vqh
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c1_s0_p2_0.vqh
1.1.2.1 +93 -0 vorbis/lib/books/coupled/Attic/_44c1_s0_p3_0.vqh
1.1.2.1 +86 -0 vorbis/lib/books/coupled/Attic/_44c1_s0_p4_0.vqh
1.1.2.1 +65 -0 vorbis/lib/books/coupled/Attic/_44c1_s0_p4_1.vqh
1.1.2.1 +63 -0 vorbis/lib/books/coupled/Attic/_44c1_s1_p5_0.vqh
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c1_s2_p6_0.vqh
1.1.2.1 +65 -0 vorbis/lib/books/coupled/Attic/_44c1_s3_p7_0.vqh
1.1.2.1 +115 -0 vorbis/lib/books/coupled/Attic/_44c1_s3_p7_1.vqh
1.1.2.1 +63 -0 vorbis/lib/books/coupled/Attic/_44c1_s3_p7_2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/coupled/Attic/_44c1_short.vqh
1.1.2.1 +40 -0 vorbis/lib/books/coupled/Attic/_44c2_long.vqh
1.1.2.1 +99 -0 vorbis/lib/books/coupled/Attic/_44c2_s0_p1_0.vqh
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c2_s0_p2_0.vqh
1.1.2.1 +93 -0 vorbis/lib/books/coupled/Attic/_44c2_s0_p3_0.vqh
1.1.2.1 +86 -0 vorbis/lib/books/coupled/Attic/_44c2_s0_p4_0.vqh
1.1.2.1 +65 -0 vorbis/lib/books/coupled/Attic/_44c2_s0_p4_1.vqh
1.1.2.1 +63 -0 vorbis/lib/books/coupled/Attic/_44c2_s1_p5_0.vqh
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c2_s2_p6_0.vqh
1.1.2.1 +65 -0 vorbis/lib/books/coupled/Attic/_44c2_s2_p7_0.vqh
1.1.2.1 +115 -0 vorbis/lib/books/coupled/Attic/_44c2_s2_p7_1.vqh
1.1.2.1 +63 -0 vorbis/lib/books/coupled/Attic/_44c2_s2_p7_2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/coupled/Attic/_44c2_short.vqh
1.1.2.1 +40 -0 vorbis/lib/books/coupled/Attic/_44c3_long.vqh
1.1.2.1 +99 -0 vorbis/lib/books/coupled/Attic/_44c3_s0_p1_0.vqh
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c3_s0_p2_0.vqh
1.1.2.1 +93 -0 vorbis/lib/books/coupled/Attic/_44c3_s0_p3_0.vqh
1.1.2.1 +86 -0 vorbis/lib/books/coupled/Attic/_44c3_s0_p4_0.vqh
1.1.2.1 +65 -0 vorbis/lib/books/coupled/Attic/_44c3_s0_p4_1.vqh
1.1.2.1 +63 -0 vorbis/lib/books/coupled/Attic/_44c3_s1_p5_0.vqh
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c3_s2_p6_0.vqh
1.1.2.1 +65 -0 vorbis/lib/books/coupled/Attic/_44c3_s2_p7_0.vqh
1.1.2.1 +115 -0 vorbis/lib/books/coupled/Attic/_44c3_s2_p7_1.vqh
1.1.2.1 +63 -0 vorbis/lib/books/coupled/Attic/_44c3_s2_p7_2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/coupled/Attic/_44c3_short.vqh
1.1.2.1 +43 -0 vorbis/lib/books/coupled/Attic/_44c4_long.vqh
1.1.2.1 +99 -0 vorbis/lib/books/coupled/Attic/_44c4_s0_p1_0.vqh
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c4_s0_p3_0.vqh
1.1.2.1 +93 -0 vorbis/lib/books/coupled/Attic/_44c4_s0_p5_0.vqh
1.1.2.1 +63 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_p2_0.vqh
1.1.2.1 +99 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_p4_0.vqh
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_p6_0.vqh
1.1.2.1 +80 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_p7_0.vqh
1.1.2.1 +61 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_p7_1.vqh
1.1.2.1 +80 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_p8_0.vqh
1.1.2.1 +80 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_p8_1.vqh
1.1.2.1 +80 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_p9_0.vqh
1.1.2.1 +80 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_p9_1.vqh
1.1.2.1 +80 -0 vorbis/lib/books/coupled/Attic/_44c4_s1_p9_2.vqh
1.1.2.1 +43 -0 vorbis/lib/books/coupled/Attic/_44c4_short.vqh
No revision
No revision
1.1.2.2 +9 -5 vorbis/lib/books/floor/Attic/line_128x19_0sub0.vqh
Index: line_128x19_0sub0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/Attic/line_128x19_0sub0.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- line_128x19_0sub0.vqh 2001/12/07 08:52:40 1.1.2.1
+++ line_128x19_0sub0.vqh 2001/12/12 09:13:52 1.1.2.2
@@ -20,14 +20,18 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_0sub0[] = {
- 3, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 6, 5, 6, 5,
- 6, 5, 7, 6, 7, 6, 7, 7, 7, 7, 7, 8, 8, 9, 8, 9,
- 8,10, 8,11, 8,12, 8,12, 8,10, 8,10, 9,11, 9,10,
- 9,10, 9,11,11,14,14,13,14,16,16,15,15,15,15,15,
+ 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5,
+ 6, 5, 6, 5, 6, 5, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6,
+ 7, 6, 7, 6, 7, 6, 7, 7, 7, 7, 8, 7, 8, 7, 8, 8,
+ 8, 8, 8, 8, 8, 9, 8, 9, 8, 9, 8,10, 8,10, 8,10,
+ 8,11, 8,12, 9,12, 9,14, 9,14, 9,14, 9,15,10,15,
+ 11,15,11,15,12,15,15,15,14,15,14,15,15,15,15,15,
+ 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+ 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,14,
};
static static_codebook _huff_book_line_128x19_0sub0 = {
- 1, 64,
+ 1, 128,
_huff_lengthlist_line_128x19_0sub0,
0, 0, 0, 0, 0,
NULL,
1.1.2.2 +3 -2 vorbis/lib/books/floor/Attic/line_128x19_1sub1.vqh
Index: line_128x19_1sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/Attic/line_128x19_1sub1.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- line_128x19_1sub1.vqh 2001/12/07 08:52:40 1.1.2.1
+++ line_128x19_1sub1.vqh 2001/12/12 09:13:52 1.1.2.2
@@ -20,11 +20,12 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_1sub1[] = {
- 0, 3, 3, 3, 3, 3, 3, 3, 3,
+ 0, 3, 3, 3, 3, 3, 5, 2, 4, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9,
};
static static_codebook _huff_book_line_128x19_1sub1 = {
- 1, 9,
+ 1, 25,
_huff_lengthlist_line_128x19_1sub1,
0, 0, 0, 0, 0,
NULL,
1.1.2.2 +5 -3 vorbis/lib/books/floor/Attic/line_128x19_1sub2.vqh
Index: line_128x19_1sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/Attic/line_128x19_1sub2.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- line_128x19_1sub2.vqh 2001/12/07 08:52:40 1.1.2.1
+++ line_128x19_1sub2.vqh 2001/12/12 09:13:52 1.1.2.2
@@ -20,12 +20,14 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_1sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 4, 3, 4,
- 4, 5, 4, 6, 5, 7, 6, 7, 6,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 4, 3,
+ 5, 4, 5, 4, 5, 5, 6, 5, 7,12,12,12,12,12,12,12,
+ 12,12,12,12,12,12,12,12,12,12,12,11,11,11,11,11,
+ 11,11,
};
static static_codebook _huff_book_line_128x19_1sub2 = {
- 1, 25,
+ 1, 50,
_huff_lengthlist_line_128x19_1sub2,
0, 0, 0, 0, 0,
NULL,
1.1.2.2 +7 -3 vorbis/lib/books/floor/Attic/line_128x19_1sub3.vqh
Index: line_128x19_1sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/Attic/line_128x19_1sub3.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- line_128x19_1sub3.vqh 2001/12/07 08:52:40 1.1.2.1
+++ line_128x19_1sub3.vqh 2001/12/12 09:13:53 1.1.2.2
@@ -21,13 +21,17 @@
static long _huff_lengthlist_line_128x19_1sub3[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 2, 6, 2, 7, 3, 8,
- 3,10, 4,10, 5, 9, 5, 9, 6, 9, 9, 9, 9, 9, 9, 9,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 6, 4,
+ 9, 4, 9, 5, 8, 6, 0, 8, 0, 7, 0, 9, 0, 0, 0, 0,
+ 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
};
static static_codebook _huff_book_line_128x19_1sub3 = {
- 1, 64,
+ 1, 128,
_huff_lengthlist_line_128x19_1sub3,
0, 0, 0, 0, 0,
NULL,
1.1.2.2 +3 -2 vorbis/lib/books/floor/Attic/line_128x19_2sub1.vqh
Index: line_128x19_2sub1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/Attic/line_128x19_2sub1.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- line_128x19_2sub1.vqh 2001/12/07 08:52:40 1.1.2.1
+++ line_128x19_2sub1.vqh 2001/12/12 09:13:53 1.1.2.2
@@ -20,11 +20,12 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_2sub1[] = {
- 0, 3, 3, 2, 3, 3, 4, 3, 4,
+ 0, 2, 3, 3, 3, 3, 4, 3, 5, 9, 9, 8, 8, 8, 8, 8,
+ 8, 8,
};
static static_codebook _huff_book_line_128x19_2sub1 = {
- 1, 9,
+ 1, 18,
_huff_lengthlist_line_128x19_2sub1,
0, 0, 0, 0, 0,
NULL,
1.1.2.2 +5 -3 vorbis/lib/books/floor/Attic/line_128x19_2sub2.vqh
Index: line_128x19_2sub2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/Attic/line_128x19_2sub2.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- line_128x19_2sub2.vqh 2001/12/07 08:52:40 1.1.2.1
+++ line_128x19_2sub2.vqh 2001/12/12 09:13:53 1.1.2.2
@@ -20,12 +20,14 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_2sub2[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2, 5, 3, 6, 4,
- 7, 4, 8, 5,10, 6, 9, 6,10,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 5, 3,
+ 5, 4, 5, 4, 6, 4, 7, 4, 8,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,12,12,12,12,12,
+ 12,12,
};
static static_codebook _huff_book_line_128x19_2sub2 = {
- 1, 25,
+ 1, 50,
_huff_lengthlist_line_128x19_2sub2,
0, 0, 0, 0, 0,
NULL,
1.1.2.2 +8 -4 vorbis/lib/books/floor/Attic/line_128x19_2sub3.vqh
Index: line_128x19_2sub3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/Attic/line_128x19_2sub3.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- line_128x19_2sub3.vqh 2001/12/07 08:52:40 1.1.2.1
+++ line_128x19_2sub3.vqh 2001/12/12 09:13:53 1.1.2.2
@@ -21,13 +21,17 @@
static long _huff_lengthlist_line_128x19_2sub3[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 6, 2, 7, 3, 6, 4,
- 6, 6, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 6, 3, 6, 3, 6, 3,
+ 7, 4, 7, 4, 8, 5, 8, 5, 8, 6,10, 6, 9, 7,12, 7,
+ 10, 7,12, 7,10, 9,11, 9,12, 8,12,11,11, 9,11, 9,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
};
static static_codebook _huff_book_line_128x19_2sub3 = {
- 1, 64,
+ 1, 128,
_huff_lengthlist_line_128x19_2sub3,
0, 0, 0, 0, 0,
NULL,
1.1.2.2 +4 -4 vorbis/lib/books/floor/Attic/line_128x19_class1.vqh
Index: line_128x19_class1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/Attic/line_128x19_class1.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- line_128x19_class1.vqh 2001/12/07 08:52:40 1.1.2.1
+++ line_128x19_class1.vqh 2001/12/12 09:13:53 1.1.2.2
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_class1[] = {
- 3, 3, 4,11, 6, 4, 5,12, 7, 5, 6,12,14,13,13,15,
- 5, 3, 4,10, 7, 5, 6,12, 8, 5, 7,12,14,14,14,15,
- 7, 4, 5,11, 8, 5, 6,11, 9, 6, 6,11,14,12,13,15,
- 14,11,10,13,11, 8, 8,13,11, 8, 9,15,15,15,15,15,
+ 1, 3, 3, 7, 8, 5, 5, 9, 9, 5, 5, 8,13,12,11,13,
+ 8, 6, 6,12,13,11,11,13,12,10,10,14,14,13,14,14,
+ 8, 5, 6, 9,12, 9, 9,11,13, 9, 9,12,13,13,14,14,
+ 13,11,10,13,14,12,12,13,14,12,12,13,14,14,14,14,
};
static static_codebook _huff_book_line_128x19_class1 = {
1.1.2.2 +4 -4 vorbis/lib/books/floor/Attic/line_128x19_class2.vqh
Index: line_128x19_class2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/floor/Attic/line_128x19_class2.vqh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- line_128x19_class2.vqh 2001/12/07 08:52:40 1.1.2.1
+++ line_128x19_class2.vqh 2001/12/12 09:13:53 1.1.2.2
@@ -20,10 +20,10 @@
#include "codebook.h"
static long _huff_lengthlist_line_128x19_class2[] = {
- 1, 3, 4,14, 6, 4, 5,15, 9, 6, 8,14,15,15,15,15,
- 7, 4, 6,13, 7, 5, 6,14,10, 7, 9,15,15,15,15,15,
- 11, 7, 7,10,11, 8, 8,11,14,11,10,13,15,15,15,15,
- 15,15,10,12,15,14,12,14,15,15,13,15,15,15,15,15,
+ 2, 4, 3, 4, 8, 5, 5, 6, 8, 5, 4, 6,11, 9, 9,12,
+ 7, 5, 4, 5,10, 7, 6, 8,10, 6, 6, 7,13,10, 9,11,
+ 8, 6, 6, 7,10, 7, 7, 8,10, 7, 7, 7,12,10,10,11,
+ 14,13,12,12,13,11,12,10,14,12,11,10,14,14,12,13,
};
static static_codebook _huff_book_line_128x19_class2 = {
No revision
No revision
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x9_0sub0.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_128x9_1sub1.vqh
1.1.2.1 +38 -0 vorbis/lib/books/floor/Attic/line_128x9_1sub2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x9_1sub3.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_128x9_2sub1.vqh
1.1.2.1 +38 -0 vorbis/lib/books/floor/Attic/line_128x9_2sub2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x9_2sub3.vqh
1.1.2.1 +52 -0 vorbis/lib/books/floor/Attic/line_128x9_class1.vqh
1.1.2.1 +52 -0 vorbis/lib/books/floor/Attic/line_128x9_class2.vqh
No revision
No revision
1.1.2.5 +40 -3 vorbis/lib/modes/Attic/floor_44.h
Index: floor_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/Attic/floor_44.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- floor_44.h 2001/12/11 08:19:47 1.1.2.4
+++ floor_44.h 2001/12/12 09:13:56 1.1.2.5
@@ -11,7 +11,7 @@
********************************************************************
function: key floor settings for 44.1/48kHz
- last mod: $Id: floor_44.h,v 1.1.2.4 2001/12/11 08:19:47 xiphmont Exp $
+ last mod: $Id: floor_44.h,v 1.1.2.5 2001/12/12 09:13:56 xiphmont Exp $
********************************************************************/
@@ -29,6 +29,17 @@
#include "books/floor/line_128x7_2sub2.vqh"
#include "books/floor/line_128x7_2sub3.vqh"
+#include "books/floor/line_128x9_class1.vqh"
+#include "books/floor/line_128x9_class2.vqh"
+
+#include "books/floor/line_128x9_0sub0.vqh"
+#include "books/floor/line_128x9_1sub1.vqh"
+#include "books/floor/line_128x9_1sub2.vqh"
+#include "books/floor/line_128x9_1sub3.vqh"
+#include "books/floor/line_128x9_2sub1.vqh"
+#include "books/floor/line_128x9_2sub2.vqh"
+#include "books/floor/line_128x9_2sub3.vqh"
+
#include "books/floor/line_128x19_class1.vqh"
#include "books/floor/line_128x19_class2.vqh"
@@ -68,6 +79,18 @@
&_huff_book_line_128x7_2sub2,
&_huff_book_line_128x7_2sub3,
};
+static static_codebook *_floor_44_128x9_books[]={
+ &_huff_book_line_128x9_class1,
+ &_huff_book_line_128x9_class2,
+
+ &_huff_book_line_128x9_0sub0,
+ &_huff_book_line_128x9_1sub1,
+ &_huff_book_line_128x9_1sub2,
+ &_huff_book_line_128x9_1sub3,
+ &_huff_book_line_128x9_2sub1,
+ &_huff_book_line_128x9_2sub2,
+ &_huff_book_line_128x9_2sub3,
+};
static static_codebook *_floor_44_128x19_books[]={
&_huff_book_line_128x19_class1,
&_huff_book_line_128x19_class2,
@@ -81,8 +104,9 @@
&_huff_book_line_128x19_2sub3,
};
-static static_codebook **_floor_44_128_books[2]={
+static static_codebook **_floor_44_128_books[3]={
_floor_44_128x7_books,
+ _floor_44_128x9_books,
_floor_44_128x19_books,
};
@@ -108,7 +132,7 @@
_floor_44_1024x31_books
};
-static vorbis_info_floor1 _floor_44_128[2]={
+static vorbis_info_floor1 _floor_44_128[3]={
{
3,{0,1,2},{1,3,3},{0,2,2},{-1,0,1},
{{2},{-1,3,4,5},{-1,6,7,8}},
@@ -119,6 +143,19 @@
8,70,
-1 /* lowpass! */
},
+
+ {
+ 3,{0,1,2},{1,4,4},{0,2,2},{-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+ 4,{0,128, 13, 4,2,7,1, 44,30,62,20},
+
+ 60,30,500,
+ 999,999,0,18.,
+ 8,70,
+ -1 /* lowpass! */
+ },
+
+
{
6,{0,1,1,1,2,2},{4,3,3},{0,2,2},{-1,0,1},
{{2},{-1,3,4,5},{-1,6,7,8}},
1.1.2.4 +40 -37 vorbis/lib/modes/Attic/psych_44.h
Index: psych_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/Attic/psych_44.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- psych_44.h 2001/12/11 08:19:47 1.1.2.3
+++ psych_44.h 2001/12/12 09:13:56 1.1.2.4
@@ -11,7 +11,7 @@
********************************************************************
function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: psych_44.h,v 1.1.2.3 2001/12/11 08:19:47 xiphmont Exp $
+ last mod: $Id: psych_44.h,v 1.1.2.4 2001/12/12 09:13:56 xiphmont Exp $
********************************************************************/
@@ -51,15 +51,15 @@
/* mode_Z nominal */
{
0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 6.f, /* 7dB */
- 7.f, 7.f, 8.f, 8.f, 9.f, 9.f,10.f, 11.f, /* 15dB */
- 12.f,12.f,13.f,13.f,14.f,14.f,15.f, 15.f, /* 23dB */
- 16.f,16.f,17.f,17.f,17.f,18.f,18.f, 19.f, /* 31dB */
+ 7.f, 7.f, 7.f, 7.f, 6.f, 6.f, 6.f, 7.f, /* 15dB */
+ 7.f, 8.f, 9.f,10.f,11.f,12.f,13.f, 14.f, /* 23dB */
+ 15.f,16.f,17.f,17.f,17.f,18.f,18.f, 19.f, /* 31dB */
19.f,19.f,20.f,21.f,22.f,23.f,24.f, 25.f, /* 39dB */
},
/* mode A */
{
- 0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, /* 7dB */
- 8.f, 8.f, 7.f, 6.f, 5.f, 4.f, 4.f, 4.f, /* 15dB */
+ 0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 5.f, 5.f, /* 7dB */
+ 6.f, 6.f, 6.f, 5.f, 4.f, 4.f, 4.f, 4.f, /* 15dB */
4.f, 4.f, 5.f, 5.f, 5.f, 6.f, 6.f, 6.f, /* 23dB */
7.f, 7.f, 7.f, 8.f, 8.f, 8.f, 9.f, 10.f, /* 31dB */
11.f,12.f,13.f,14.f,15.f,16.f,17.f, 18.f, /* 39dB */
@@ -491,10 +491,11 @@
static int _psy_noisebias_long[11][17]={
/*63 125 250 500 1k 2k 4k 8k 16k*/
{-20,-20,-18,-18,-18,-16,-14, -8, -6, -2, 0, 2, 3, 3, 4, 4, 10},
- {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, 0, 2, 3, 3, 3, 3, 8},
- {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, 0, 0, 0, 1, 2, 3, 8},
- {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -1, -1, 0, 0, 2, 3, 6},
- {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, 0, 0, 1, 1, 4},
+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -2, -2, 1, 1, 2, 2, 4},
+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, -1, -1, 0, 1, 2},
+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, -1, -1, 0, 1, 2},
+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -3, -4, -4, -2, -1, 0, 0, 2},
+
{-20,-20,-20,-20,-20,-20,-20,-14,-10, -6, -6, -6, -3, 0, 0, 1, 2},
{-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -8, -6, -3, -2, -2, 0, 1},
{-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -8, -6, -3, -2, -2, -1, 0},
@@ -506,11 +507,12 @@
static int _psy_noisebias_impulse[11][17]={
/*63 125 250 500 1k 2k 4k 8k 16k*/
{-20,-20,-20,-20,-20,-18,-14,-10,-10, -2, 0, 0, 0, 0, 0, 3, 6},
- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, 1, 2, 3, 3, 3, 3, 8},
- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, 0, 0, 0, 1, 2, 3, 8},
- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, -1, -1, 0, 0, 2, 3, 6},
- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, -3, -3, 0, 0, 1, 1, 4},
- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -3, 0, 0, 1, 2},
+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -4, -4, -2, -2, -2, -2, 2},
+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0},
+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, -2},
+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -2, -2},
+
+ {-30,-30,-30,-30,-26,-24,-20,-14,-10, -6, -6, -6, -3, 0, 0, 1, 2},
{-34,-34,-34,-34,-30,-26,-24,-18,-14, -8, -8, -6, -3, -2, -2, 0, 1},
{-34,-34,-34,-34,-30,-26,-24,-18,-14, -8, -8, -6, -3, -2, -2, -1, 0},
{-34,-34,-34,-34,-30,-26,-24,-18,-14, -8, -8, -8, -4, -3, -3, -2, -2},
@@ -521,10 +523,11 @@
static int _psy_noisebias_other[11][17]={
/*63 125 250 500 1k 2k 4k 8k 16k*/
{-20,-20,-20,-20,-20,-18,-14,-10, -6, -2, 2, 2, 3, 3, 4, 4, 10},
- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, 1, 2, 3, 3, 3, 3, 8},
- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, 0, 0, 0, 1, 2, 3, 8},
- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, -1, -1, 0, 0, 2, 3, 6},
- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, -3, -3, 0, 0, 1, 1, 4},
+ {-26,-26,-26,-26,-26,-22,-20,-14,-10, -2, -2, -2, 1, 1, 2, 2, 4},
+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, -3, -3, -1, -1, 0, 1, 2},
+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -1, -1, 0, 1, 2},
+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -4, -4, -2, -1, 0, 0, 2},
+
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -3, 0, 0, 1, 2},
{-34,-34,-34,-34,-30,-26,-24,-18,-14, -8, -8, -6, -3, -2, -2, 0, 1},
{-34,-34,-34,-34,-30,-26,-24,-18,-14, -8, -8, -6, -3, -2, -2, -1, 0},
@@ -535,29 +538,29 @@
static int _psy_noiseguards_short[33]={
2,2,-1,
- 2,2,-1,
- 2,2,15,
- 2,2,15,
- 2,2,15,
- 2,2,15,
- 2,2,15,
- 2,2,15,
- 2,2,15,
- 2,2,15,
- 2,2,15,
+ 4,4,-1,
+ 4,4,15,
+ 4,4,15,
+ 4,4,15,
+ 4,4,15,
+ 4,4,15,
+ 4,4,15,
+ 4,4,15,
+ 4,4,15,
+ 4,4,15,
};
static int _psy_noiseguards_long[33]={
10,10,100,
+ 10,10,100,
+ 10,10,100,
+ 10,10,100,
+ 10,10,100,
+ 10,10,100,
+ 10,10,100,
+ 10,10,100,
+ 10,10,100,
+ 10,10,100,
10,10,100,
- 6,6,100,
- 4,4,100,
- 4,4,100,
- 4,4,100,
- 4,4,100,
- 4,4,100,
- 4,4,100,
- 4,4,100,
- 4,4,100,
};
static vorbis_info_psy _psy_settings[11]={
1.1.2.7 +200 -4 vorbis/lib/modes/Attic/residue_44.h
Index: residue_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/Attic/residue_44.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- residue_44.h 2001/12/11 08:19:47 1.1.2.6
+++ residue_44.h 2001/12/12 09:13:56 1.1.2.7
@@ -11,7 +11,7 @@
********************************************************************
function: toplevel residue templates for 32/44.1/48kHz
- last mod: $Id: residue_44.h,v 1.1.2.6 2001/12/11 08:19:47 xiphmont Exp $
+ last mod: $Id: residue_44.h,v 1.1.2.7 2001/12/12 09:13:56 xiphmont Exp $
********************************************************************/
@@ -72,9 +72,9 @@
{0},
{-1},
{9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
- { .5, 1.5, 2.5, 4.5, 1.5, 2.5, 4.5, 16.5, 42.5},
+ { .5, 1.5, 1.5, 2.5, 2.5, 4.5, 4.5, 16.5, 42.5},
{0},
- { 99, -1, -1, -1, 99, 99, 99, 99, 99}
+ { 99, -1, 99, -1, 99, -1, 99, 99, 99}
};
@@ -112,6 +112,65 @@
#include "books/coupled/_44c0_s4_p7_1.vqh"
#include "books/coupled/_44c0_s4_p7_2.vqh"
+#include "books/coupled/_44c1_short.vqh"
+#include "books/coupled/_44c1_long.vqh"
+
+#include "books/coupled/_44c1_s0_p1_0.vqh"
+#include "books/coupled/_44c1_s0_p2_0.vqh"
+#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_s1_p5_0.vqh"
+#include "books/coupled/_44c1_s2_p6_0.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"
+
+#include "books/coupled/_44c2_short.vqh"
+#include "books/coupled/_44c2_long.vqh"
+
+#include "books/coupled/_44c2_s0_p1_0.vqh"
+#include "books/coupled/_44c2_s0_p2_0.vqh"
+#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_s1_p5_0.vqh"
+#include "books/coupled/_44c2_s2_p6_0.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/_44c3_short.vqh"
+#include "books/coupled/_44c3_long.vqh"
+
+#include "books/coupled/_44c3_s0_p1_0.vqh"
+#include "books/coupled/_44c3_s0_p2_0.vqh"
+#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_s1_p5_0.vqh"
+#include "books/coupled/_44c3_s2_p6_0.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/_44c4_short.vqh"
+#include "books/coupled/_44c4_long.vqh"
+
+#include "books/coupled/_44c4_s0_p1_0.vqh"
+#include "books/coupled/_44c4_s1_p2_0.vqh"
+#include "books/coupled/_44c4_s0_p3_0.vqh"
+#include "books/coupled/_44c4_s1_p4_0.vqh"
+#include "books/coupled/_44c4_s0_p5_0.vqh"
+#include "books/coupled/_44c4_s1_p6_0.vqh"
+#include "books/coupled/_44c4_s1_p7_0.vqh"
+#include "books/coupled/_44c4_s1_p7_1.vqh"
+#include "books/coupled/_44c4_s1_p8_0.vqh"
+#include "books/coupled/_44c4_s1_p8_1.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"
+
/* residue backfill is entered in the template array as if stereo
backfill is not in use. It's up to vorbisenc to make the
appropriate index adjustment */
@@ -145,9 +204,146 @@
// {&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 */
},
- }
+ },
/* 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 */
+ {{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 */
+ {{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,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 */
+ },
+ },
+
+ /* 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 */
+ {{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}}, /* 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,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 */
+ },
+ },
+
+ /* 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 */
+ {{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}}, /* 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,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 */
+ },
+ },
+
+ /* 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_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 */
+ {{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,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 */
+ },
+ }
};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- >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