[xiph-cvs] cvs commit: vorbis/lib/modes mode_44c_A.h
Monty
xiphmont at xiph.org
Thu Oct 11 13:34:17 PDT 2001
xiphmont 01/10/11 13:34:17
Modified: examples Tag: branch_monty_20011009 encoder_example.c
lib/modes Tag: branch_monty_20011009 mode_44c_A.h
Added: lib/books Tag: branch_monty_20011009 res_Ac_0a.vqh
res_Ac_2a.vqh res_Ac_5a.vqh res_Ac_7b.vqh
Log:
Fixed Chris's encoder_example .WAV header reader; it forgot to abor
tthe loop and caused channel swapping/phase errors by munching one
extra sample (not a sample pair).
Monty
Revision Changes Path
No revision
No revision
1.27.2.2 +2 -1 vorbis/examples/encoder_example.c
Index: encoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/encoder_example.c,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -r1.27.2.1 -r1.27.2.2
--- encoder_example.c 2001/10/09 04:34:44 1.27.2.1
+++ encoder_example.c 2001/10/11 20:34:14 1.27.2.2
@@ -11,7 +11,7 @@
********************************************************************
function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.27.2.1 2001/10/09 04:34:44 xiphmont Exp $
+ last mod: $Id: encoder_example.c,v 1.27.2.2 2001/10/11 20:34:14 xiphmont Exp $
********************************************************************/
@@ -86,6 +86,7 @@
{
founddata = 1;
fread(readbuffer,1,6,stdin);
+ break;
}
}
No revision
No revision
1.1.2.1 +99 -0 vorbis/lib/books/Attic/res_Ac_0a.vqh
1.1.2.1 +65 -0 vorbis/lib/books/Attic/res_Ac_2a.vqh
1.1.2.1 +70 -0 vorbis/lib/books/Attic/res_Ac_5a.vqh
1.1.2.1 +80 -0 vorbis/lib/books/Attic/res_Ac_7b.vqh
No revision
No revision
1.4.2.3 +11 -13 vorbis/lib/modes/mode_44c_A.h
Index: mode_44c_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_44c_A.h,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- mode_44c_A.h 2001/10/11 15:41:55 1.4.2.2
+++ mode_44c_A.h 2001/10/11 20:34:16 1.4.2.3
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_A.h,v 1.4.2.2 2001/10/11 15:41:55 xiphmont Exp $
+ last mod: $Id: mode_44c_A.h,v 1.4.2.3 2001/10/11 20:34:16 xiphmont Exp $
********************************************************************/
@@ -77,7 +77,7 @@
8, /* lines per eighth octave */
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-26.f,-26.f,-26.f,-30.f}, -90.f,
+ 256, {26.f,26.f,26.f,30.f}, {-30.f,-30.f,-30.f,-34.f}, -90.f,
-6.f,
0,
@@ -130,7 +130,7 @@
2, 2, 15,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-30,-30,-30,-30,-26,-22,-20,-14,-10,-2, -3, -3, 0, 0, 0, 0, 2},
+ {-30,-30,-30,-30,-26,-22,-20,-14,-10,-2, -3, -3, 0, 0, 0, 1, 4},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
@@ -155,7 +155,7 @@
4,4,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-30,-30,-30,-30,-26,-20,-20,-10, -6, -2, -5, -5, 0, 0, 0, 0, 2},
+ {-30,-30,-30,-30,-26,-20,-20,-10, -6, -2, -3, -3, 0, 0, 0, 0, 3},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
@@ -172,7 +172,7 @@
0.f,-26.f,-30.f,
&_vp_tonemask_consbass_A,
/* peakattp, curvelimitp */
- 0, 4, &_vp_peakatt_A,
+ 1, 4, &_vp_peakatt_A,
/*noisemaskp */
1, -10.f, /* suppress any noise curve over maxspec+n */
@@ -180,7 +180,7 @@
4,4,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
- {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -5, -5, 0, 0, 0, 0, 2},
+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, 0, 0, 0, 0, 3},
_psy_compand_44c_A,
95.f, /* even decade + 5 is important; saves an rint() later in a
@@ -243,7 +243,7 @@
60,30,400,
20,8,1,18.,
20,600,
- 928};
+ 896};
static vorbis_info_residue0 _residue_set_44c_A0={
0,192, 16, 10,23,
@@ -263,7 +263,7 @@
{99,8,99,3,8,99,99,99,99,99}};
static vorbis_info_residue0 _residue_set_44c_A={
- 0,1856, 32,10,24,
+ 0,1792, 32,10,24,
{64,4,40,
2,2,20,
18,22,22,7},
@@ -365,13 +365,11 @@
4.0,
1.,4.,
- 0,
- 100000,
+ 0,0,
- 0,
- 0000,
+ 0,0,
- 120000,0,
+ 0,0,
{4,7},
2,
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list