[xiph-cvs] cvs commit: vorbis/lib/modes mode_44c_D.h mode_44c_E.h maskadj_A.h mode_44c_C.h mode_D.h modes.h
Monty
xiphmont at xiph.org
Mon Aug 13 01:38:32 PDT 2001
xiphmont 01/08/13 01:38:31
Modified: lib/modes maskadj_A.h mode_44c_C.h mode_D.h modes.h
Added: lib/modes mode_44c_D.h mode_44c_E.h
Log:
Add modes Dc and Ec
Revision Changes Path
1.2 +22 -0 vorbis/lib/modes/maskadj_A.h
Index: maskadj_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/maskadj_A.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maskadj_A.h 2001/08/13 07:43:15 1.1
+++ maskadj_A.h 2001/08/13 08:38:30 1.2
@@ -69,6 +69,28 @@
{-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*16000*/
}};
+static vp_attenblock _vp_tonemask_E={
+ {{-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*63*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*88*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*125*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*175*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*250*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*350*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*500*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*700*/
+
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*1k*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f},
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f}, /*2k*/
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f},
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f}, /*4k*/
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f}, /*8000*/
+
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f}, /*8000*/
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f},
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f},
+}};
+
static vp_attenblock _vp_peakatt_A={
{{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*63*/
{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*88*/
1.2 +29 -29 vorbis/lib/modes/mode_44c_C.h
Index: mode_44c_C.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_44c_C.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mode_44c_C.h 2001/08/13 07:43:15 1.1
+++ mode_44c_C.h 2001/08/13 08:38:30 1.2
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_C.h,v 1.1 2001/08/13 07:43:15 xiphmont Exp $
+ last mod: $Id: mode_44c_C.h,v 1.2 2001/08/13 08:38:30 xiphmont Exp $
********************************************************************/
@@ -49,25 +49,25 @@
#include "books/line_1024x31_3sub2.vqh"
#include "books/line_1024x31_3sub3.vqh"
-#include "books/res_44c_B_128aux.vqh"
-#include "books/res_44c_B_1024aux.vqh"
+#include "books/res_44c_C_128aux.vqh"
+#include "books/res_44c_C_1024aux.vqh"
-#include "books/res_Bc_1.vqh"
-#include "books/res_Bc_2.vqh"
-#include "books/res_Bc_3.vqh"
-#include "books/res_Bc_4.vqh"
-#include "books/res_Bc_5.vqh"
-#include "books/res_Bc_6.vqh"
-#include "books/res_Bc_7.vqh"
-#include "books/res_Bc_8.vqh"
-#include "books/res_Bc_8a.vqh"
-#include "books/res_Bc_9.vqh"
-#include "books/res_Bc_9a.vqh"
-#include "books/res_Bc_9b.vqh"
+#include "books/res_Cc_1.vqh"
+#include "books/res_Cc_2.vqh"
+#include "books/res_Cc_3.vqh"
+#include "books/res_Cc_4.vqh"
+#include "books/res_Cc_5.vqh"
+#include "books/res_Cc_6.vqh"
+#include "books/res_Cc_7.vqh"
+#include "books/res_Cc_8.vqh"
+#include "books/res_Cc_8a.vqh"
+#include "books/res_Cc_9.vqh"
+#include "books/res_Cc_9a.vqh"
+#include "books/res_Cc_9b.vqh"
#include "maskadj_A.h"
-static vorbis_info_psy_global _psy_set_44c_BG={
+static vorbis_info_psy_global _psy_set_44c_CG={
0, /* decaydBpms */
8, /* lines per eighth octave */
@@ -338,21 +338,21 @@
&_huff_book_line_1024x31_3sub2,
&_huff_book_line_1024x31_3sub3, /* 22 */
- &_huff_book_res_44c_B_128aux,
- &_huff_book_res_44c_B_1024aux,
+ &_huff_book_res_44c_C_128aux,
+ &_huff_book_res_44c_C_1024aux,
- &_vq_book_res_Bc_1,
- &_vq_book_res_Bc_2,
- &_vq_book_res_Bc_3,
- &_vq_book_res_Bc_4,
- &_vq_book_res_Bc_5,
- &_vq_book_res_Bc_6,
- &_vq_book_res_Bc_7,
- &_vq_book_res_Bc_8,
- &_vq_book_res_Bc_8a,
- &_vq_book_res_Bc_9,
- &_vq_book_res_Bc_9a,
- &_vq_book_res_Bc_9b,
+ &_vq_book_res_Cc_1,
+ &_vq_book_res_Cc_2,
+ &_vq_book_res_Cc_3,
+ &_vq_book_res_Cc_4,
+ &_vq_book_res_Cc_5,
+ &_vq_book_res_Cc_6,
+ &_vq_book_res_Cc_7,
+ &_vq_book_res_Cc_8,
+ &_vq_book_res_Cc_8a,
+ &_vq_book_res_Cc_9,
+ &_vq_book_res_Cc_9a,
+ &_vq_book_res_Cc_9b,
},
1.17 +3 -2 vorbis/lib/modes/mode_D.h
Index: mode_D.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_D.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mode_D.h 2001/08/13 01:37:14 1.16
+++ mode_D.h 2001/08/13 08:38:30 1.17
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_D.h,v 1.16 2001/08/13 01:37:14 xiphmont Exp $
+ last mod: $Id: mode_D.h,v 1.17 2001/08/13 08:38:30 xiphmont Exp $
********************************************************************/
@@ -286,7 +286,8 @@
20,600,
1024};
-static vorbis_info_residue0 _residue_set0D={0,256,16,10,23,
+static vorbis_info_residue0 _residue_set0D={
+0,256,16,10,23,
{0,1,1,1,1,1,1,1,3,7},
{25,
26,
1.12 +4 -1 vorbis/lib/modes/modes.h
Index: modes.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/modes.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- modes.h 2001/08/13 07:43:15 1.11
+++ modes.h 2001/08/13 08:38:30 1.12
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: modes.h,v 1.11 2001/08/13 07:43:15 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.12 2001/08/13 08:38:30 xiphmont Exp $
********************************************************************/
@@ -24,5 +24,8 @@
#include "modes/mode_44c_X.h"
#include "modes/mode_44c_A.h"
#include "modes/mode_44c_B.h"
+#include "modes/mode_44c_C.h"
+#include "modes/mode_44c_D.h"
+#include "modes/mode_44c_E.h"
#endif
1.1 vorbis/lib/modes/mode_44c_D.h
Index: mode_44c_D.h
===================================================================
/********************************************************************
* *
* 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: predefined encoding modes; 44kHz stereo ~64kbps true VBR
last mod: $Id: mode_44c_D.h,v 1.1 2001/08/13 08:38:30 xiphmont Exp $
********************************************************************/
#ifndef _V_MODES_44c_D_H_
#define _V_MODES_44c_D_H_
#include <stdio.h>
#include "vorbis/codec.h"
#include "backends.h"
#include "books/line_128x19_class1.vqh"
#include "books/line_128x19_class2.vqh"
#include "books/line_128x19_0sub0.vqh"
#include "books/line_128x19_1sub1.vqh"
#include "books/line_128x19_1sub2.vqh"
#include "books/line_128x19_1sub3.vqh"
#include "books/line_128x19_2sub1.vqh"
#include "books/line_128x19_2sub2.vqh"
#include "books/line_128x19_2sub3.vqh"
#include "books/line_1024x31_class0.vqh"
#include "books/line_1024x31_class1.vqh"
#include "books/line_1024x31_class2.vqh"
#include "books/line_1024x31_class3.vqh"
#include "books/line_1024x31_0sub0.vqh"
#include "books/line_1024x31_0sub1.vqh"
#include "books/line_1024x31_1sub0.vqh"
#include "books/line_1024x31_1sub1.vqh"
#include "books/line_1024x31_2sub1.vqh"
#include "books/line_1024x31_2sub2.vqh"
#include "books/line_1024x31_2sub3.vqh"
#include "books/line_1024x31_3sub1.vqh"
#include "books/line_1024x31_3sub2.vqh"
#include "books/line_1024x31_3sub3.vqh"
#include "books/res_44c_C_128aux.vqh"
#include "books/res_44c_C_1024aux.vqh"
#include "books/res_Cc_1.vqh"
#include "books/res_Cc_2.vqh"
#include "books/res_Cc_3.vqh"
#include "books/res_Cc_4.vqh"
#include "books/res_Cc_5.vqh"
#include "books/res_Cc_6.vqh"
#include "books/res_Cc_7.vqh"
#include "books/res_Cc_8.vqh"
#include "books/res_Cc_8a.vqh"
#include "books/res_Cc_9.vqh"
#include "books/res_Cc_9a.vqh"
#include "books/res_Cc_9b.vqh"
#include "maskadj_A.h"
tatic vorbis_info_psy_global _psy_set_44c_DG={
0, /* decaydBpms */
8, /* lines per eighth octave */
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-6.f,
0,
};
tatic vp_couple_pass _psy_pass_44c_D[]={
{1.f,1.f,
{{9999, 0,0, 0,0, 0,0}}
}
};
tatic vorbis_info_psy _psy_set_44c_D0={
ATH_Bark_dB_lineconservative,
-100.,-140.,
/* tonemaskp */
-6.f, -45.f,&_vp_tonemask_consbass_A,
/* peakattp, curvelimitp */
1, 30, &_vp_peakatt_D,
/*noisemaskp */
1,-30.f, /* suppress any noise curve over maxspec+n */
.6f, .6f, /* low/high window */
5, 5, 10,
/*63 125 250 500 1k 2k 4k 8k 16k*/
{-30,-30,-30,-30,-30,-30,-20,-10, 0, 0, 0, 0, 0, 0, 0, 0, 1},
{.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.4f,.5f,.5f,.6f,.7f,.7f},
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
1,
_psy_pass_44c_D
};
tatic vorbis_info_psy _psy_set_44c_DT={
ATH_Bark_dB_lineconservative,
-100.f,-140.f,
/* tonemask */
-5.f,-45.f,&_vp_tonemask_consbass_A,
/* peakattp,curvelimitp */
1, 30, &_vp_peakatt_D,
/*noisemaskp */
1, -30.f, /* suppress any noise curve over maxspec+n */
.4f,.4f, /* low/high window */
10,10,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
{-30,-30,-30,-30,-30,-30,-30,-20,-10,-12,-16,-16, -10, -6, -6, -6, -6},
{.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.4f,.4f,.4f,.4f,.5f,.5f,.6f},
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
1,_psy_pass_44c_D
};
tatic vorbis_info_psy _psy_set_44c_D={
ATH_Bark_dB_lineconservative,
-100.f, -140.f,
/* tonemask */
-6.f,-45.f,&_vp_tonemask_consbass_A,
/* peakattp, curvelimitp */
1, 30, &_vp_peakatt_D,
/*noisemaskp */
1, -30.f, /* suppress any noise curve over maxspec+n */
.4f,.4f, /* low/high window */
10,10,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
{ 0, 0, 0, 0, 0, 0, 0, -3,-10,-10,-12,-12, -6, -3, -2, -1, -0},
{.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.5f,.6f,.7f,.7f},
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
1,_psy_pass_44c_D
};
tatic vorbis_info_time0 _time_set_44c_D={0};
tatic vorbis_info_floor1 _floor_set_44c_D0={
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}},
4,
{0,128,
6,17,30,58,
2,1,4, 11,8,14, 23,20,26,
41,35,48, 84,69,103},
60,30,500,
999,999,1,18.,
8,70,
112};
static vorbis_info_floor1 _floor_set_44c_D={
10,
{0,1,2,2,2,2,2, 3,3,3},
{3,4,3,3},
{1,1,2,2},
{9,10,11,12},
{{13,14},
{15,16},
{-1,17,18,19},
{-1,20,21,22},
},
4,
{0,1024,
88,31,243,
14,54,143,460,
6,3,10, 22,18,26, 41,36,47,
69,61,78, 112,99,126, 185,162,211,
329,282,387, 672,553,825
},
60,30,400,
20,8,1,18.,
20,600,
896};
tatic vorbis_info_residue0 _residue_set_44c_D0={
0,256,16,10,23,
{0,1,1,1,1,1,1,1,3,7},
{25,
26,
27,
28,
29,
30,
31,32,
33,34,
35,36},
{9999,
9999,
12,9999,
18,9999,
28,9999,
9999,9999},
{.5f,
1.5f,
2.5f,2.5f,
4.5f,4.5,
16.5f,16.5,
84.5f},
{0},
{99,
99,
99,99,
99,99,
99,99,
99,99},
{3}};
static vorbis_info_residue0 _residue_set_44c_D={
0,2048, 32,10,24,
{0,1,1,1,1,1,1,1,3,7},
{25,
26,
27,
28,
29,
30,
31,
32,33,
34,35,36},
{9999,
9999,
22,9999,
34,9999,
64,999,
9999,9999},
{.5f,
1.5f,
2.5f,2.5f,
4.5f,4.5,
16.5f,16.5,
84.f},
{0},
{99,
99,
99,99,
99,99,
99,99,
99,99},
{3}};
tatic vorbis_info_mapping0 _mapping_set_44c_D0={
1, {0,0}, {0}, {0}, {0}, {0,0}, 1,{0},{1}};
static vorbis_info_mapping0 _mapping_set_44c_D={
1, {0,0}, {0}, {1}, {1}, {1,2}, 1,{0},{1}};
tatic vorbis_info_mode _mode_set_44c_D0={0,0,0,0};
static vorbis_info_mode _mode_set_44c_D={1,0,0,1};
codec_setup_info info_44c_D={
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
2, 2, 1, 2, 2, 37, 3,
/* modes */
{&_mode_set_44c_D0,&_mode_set_44c_D},
/* maps */
{0,0},{&_mapping_set_44c_D0,&_mapping_set_44c_D},
/* times */
{0,0},{&_time_set_44c_D},
/* floors */
{1,1},{&_floor_set_44c_D0,&_floor_set_44c_D},
/* residue */
{2,2},{&_residue_set_44c_D0,&_residue_set_44c_D},
/* books */
{
&_huff_book_line_128x19_class1,
&_huff_book_line_128x19_class2, /* 1 */
&_huff_book_line_128x19_0sub0, /* 2 */
&_huff_book_line_128x19_1sub1, /* 3 */
&_huff_book_line_128x19_1sub2,
&_huff_book_line_128x19_1sub3, /* 5 */
&_huff_book_line_128x19_2sub1,
&_huff_book_line_128x19_2sub2, /* 7 */
&_huff_book_line_128x19_2sub3,
&_huff_book_line_1024x31_class0,
&_huff_book_line_1024x31_class1, /* 10 */
&_huff_book_line_1024x31_class2,
&_huff_book_line_1024x31_class3, /* 12 */
&_huff_book_line_1024x31_0sub0,
&_huff_book_line_1024x31_0sub1, /* 14 */
&_huff_book_line_1024x31_1sub0,
&_huff_book_line_1024x31_1sub1,
&_huff_book_line_1024x31_2sub1,
&_huff_book_line_1024x31_2sub2, /* 18 */
&_huff_book_line_1024x31_2sub3,
&_huff_book_line_1024x31_3sub1,
&_huff_book_line_1024x31_3sub2,
&_huff_book_line_1024x31_3sub3, /* 22 */
&_huff_book_res_44c_C_128aux,
&_huff_book_res_44c_C_1024aux,
&_vq_book_res_Cc_1,
&_vq_book_res_Cc_2,
&_vq_book_res_Cc_3,
&_vq_book_res_Cc_4,
&_vq_book_res_Cc_5,
&_vq_book_res_Cc_6,
&_vq_book_res_Cc_7,
&_vq_book_res_Cc_8,
&_vq_book_res_Cc_8a,
&_vq_book_res_Cc_9,
&_vq_book_res_Cc_9a,
&_vq_book_res_Cc_9b,
},
/* psy */
{&_psy_set_44c_D0,&_psy_set_44c_DT,&_psy_set_44c_D},
&_psy_set_44c_DG
};
#endif
1.1 vorbis/lib/modes/mode_44c_E.h
Index: mode_44c_E.h
===================================================================
/********************************************************************
* *
* 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: predefined encoding modes; 44kHz stereo ~64kbps true VBR
last mod: $Id: mode_44c_E.h,v 1.1 2001/08/13 08:38:30 xiphmont Exp $
********************************************************************/
#ifndef _V_MODES_44c_E_H_
#define _V_MODES_44c_E_H_
#include <stdio.h>
#include "vorbis/codec.h"
#include "backends.h"
#include "books/line_128x19_class1.vqh"
#include "books/line_128x19_class2.vqh"
#include "books/line_128x19_0sub0.vqh"
#include "books/line_128x19_1sub1.vqh"
#include "books/line_128x19_1sub2.vqh"
#include "books/line_128x19_1sub3.vqh"
#include "books/line_128x19_2sub1.vqh"
#include "books/line_128x19_2sub2.vqh"
#include "books/line_128x19_2sub3.vqh"
#include "books/line_1024x31_class0.vqh"
#include "books/line_1024x31_class1.vqh"
#include "books/line_1024x31_class2.vqh"
#include "books/line_1024x31_class3.vqh"
#include "books/line_1024x31_0sub0.vqh"
#include "books/line_1024x31_0sub1.vqh"
#include "books/line_1024x31_1sub0.vqh"
#include "books/line_1024x31_1sub1.vqh"
#include "books/line_1024x31_2sub1.vqh"
#include "books/line_1024x31_2sub2.vqh"
#include "books/line_1024x31_2sub3.vqh"
#include "books/line_1024x31_3sub1.vqh"
#include "books/line_1024x31_3sub2.vqh"
#include "books/line_1024x31_3sub3.vqh"
#include "books/res_44c_E_128aux.vqh"
#include "books/res_44c_E_1024aux.vqh"
#include "books/res_Ec_1.vqh"
#include "books/res_Ec_2.vqh"
#include "books/res_Ec_3.vqh"
#include "books/res_Ec_4.vqh"
#include "books/res_Ec_5.vqh"
#include "books/res_Ec_6.vqh"
#include "books/res_Ec_7.vqh"
#include "books/res_Ec_8.vqh"
#include "books/res_Ec_8a.vqh"
#include "books/res_Ec_9.vqh"
#include "books/res_Ec_9a.vqh"
#include "books/res_Ec_9b.vqh"
#include "maskadj_A.h"
tatic vorbis_info_psy_global _psy_set_44c_EG={
0, /* decaydBpms */
8, /* lines per eighth octave */
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-6.f,
0,
};
tatic vp_couple_pass _psy_pass_44c_E[]={
{1.f,1.f,
{{9999, 0,0, 0,0, 0,0}}
}
};
tatic vorbis_info_psy _psy_set_44c_E0={
ATH_Bark_dB_lineconservative,
-110.,-140.,
/* tonemaskp */
-6.f, -45.f,&_vp_tonemask_E,
/* peakattp, curvelimitp */
1, 30, &_vp_peakatt_D,
/*noisemaskp */
1,-40.f, /* suppress any noise curve over maxspec+n */
.6f, .6f, /* low/high window */
5, 5, 10,
/*63 125 250 500 1k 2k 4k 8k 16k*/
{-30,-30,-30,-30,-30,-30,-20,-10,-10,-10,-10,-10,-6,-6,-6,-6,-6},
{.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.4f,.5f,.5f,.5f,.5f,.6f},
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
1,
_psy_pass_44c_E
};
tatic vorbis_info_psy _psy_set_44c_E={
ATH_Bark_dB_lineconservative,
-110.f, -140.f,
/* tonemask */
-6.f,-45.f,&_vp_tonemask_consbass_A,
/* peakattp, curvelimitp */
1, 30, &_vp_peakatt_D,
/*noisemaskp */
1, -40.f, /* suppress any noise curve over maxspec+n */
.4f,.4f, /* low/high window */
10,10,100,
/*63 125 250 500 1k 2k 4k 8k 16k*/
{-30,-30,-30,-30,-30,-30,-30,-20,-10,-12,-16,-16, -10, -6, -6, -6, -6},
{.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.4f,.4f,.4f,.4f,.5f,.5f,.6f},
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
1,_psy_pass_44c_E
};
tatic vorbis_info_time0 _time_set_44c_E={0};
tatic vorbis_info_floor1 _floor_set_44c_E0={
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}},
4,
{0,128,
6,17,30,58,
2,1,4, 11,8,14, 23,20,26,
41,35,48, 84,69,103},
60,30,500,
999,999,1,18.,
8,70,
112};
static vorbis_info_floor1 _floor_set_44c_E={
10,
{0,1,2,2,2,2,2, 3,3,3},
{3,4,3,3},
{1,1,2,2},
{9,10,11,12},
{{13,14},
{15,16},
{-1,17,18,19},
{-1,20,21,22},
},
4,
{0,1024,
88,31,243,
14,54,143,460,
6,3,10, 22,18,26, 41,36,47,
69,61,78, 112,99,126, 185,162,211,
329,282,387, 672,553,825
},
60,30,400,
20,8,1,18.,
20,600,
896};
tatic vorbis_info_residue0 _residue_set_44c_E0={
0,256,16,10,23,
{0,1,1,1,1,1,1,1,3,7},
{25,
26,
27,
28,
29,
30,
31,32,
33,34,
35,36},
{9999,
9999,
9999,
9999,
40,9999,
58,9999,
9999,9999},
{.5f,
1.5f,
2.5f,
4.5f,
7.5f,7.5f,
16.5f,16.5,
84.5f},
{0},
{99,
99,
99,
99,
99,99,
99,99,
99,99},
{3}};
tatic vorbis_info_residue0 _residue_set_44c_E={
0,2048, 32,10,24,
{0,1,1,1,1,1,1,1,3,7},
{25,
26,
27,
28,
29,
30,
31,
32,33,
34,35,36},
{9999,
9999,
9999,
9999,
70,9999,
110,9999,
9999,9999},
{.5f,
1.5f,
2.5f,
4.5f,
7.5,7.5,
16.5f,16.5,
84.f},
{0},
{99,
99,
99,
99,
99,99,
99,99,
99,99},
{3}};
tatic vorbis_info_mapping0 _mapping_set_44c_E0={
1, {0,0}, {0}, {0}, {0}, {0,0}, 1,{0},{1}};
static vorbis_info_mapping0 _mapping_set_44c_E={
1, {0,0}, {0}, {1}, {1}, {1,1}, 1,{0},{1}};
tatic vorbis_info_mode _mode_set_44c_E0={0,0,0,0};
static vorbis_info_mode _mode_set_44c_E={1,0,0,1};
codec_setup_info info_44c_E={
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
2, 2, 1, 2, 2, 37, 2,
/* modes */
{&_mode_set_44c_E0,&_mode_set_44c_E},
/* maps */
{0,0},{&_mapping_set_44c_E0,&_mapping_set_44c_E},
/* times */
{0,0},{&_time_set_44c_E},
/* floors */
{1,1},{&_floor_set_44c_E0,&_floor_set_44c_E},
/* residue */
{2,2},{&_residue_set_44c_E0,&_residue_set_44c_E},
/* books */
{
&_huff_book_line_128x19_class1,
&_huff_book_line_128x19_class2, /* 1 */
&_huff_book_line_128x19_0sub0, /* 2 */
&_huff_book_line_128x19_1sub1, /* 3 */
&_huff_book_line_128x19_1sub2,
&_huff_book_line_128x19_1sub3, /* 5 */
&_huff_book_line_128x19_2sub1,
&_huff_book_line_128x19_2sub2, /* 7 */
&_huff_book_line_128x19_2sub3,
&_huff_book_line_1024x31_class0,
&_huff_book_line_1024x31_class1, /* 10 */
&_huff_book_line_1024x31_class2,
&_huff_book_line_1024x31_class3, /* 12 */
&_huff_book_line_1024x31_0sub0,
&_huff_book_line_1024x31_0sub1, /* 14 */
&_huff_book_line_1024x31_1sub0,
&_huff_book_line_1024x31_1sub1,
&_huff_book_line_1024x31_2sub1,
&_huff_book_line_1024x31_2sub2, /* 18 */
&_huff_book_line_1024x31_2sub3,
&_huff_book_line_1024x31_3sub1,
&_huff_book_line_1024x31_3sub2,
&_huff_book_line_1024x31_3sub3, /* 22 */
&_huff_book_res_44c_E_128aux,
&_huff_book_res_44c_E_1024aux,
&_vq_book_res_Ec_1,
&_vq_book_res_Ec_2,
&_vq_book_res_Ec_3,
&_vq_book_res_Ec_4,
&_vq_book_res_Ec_5,
&_vq_book_res_Ec_6,
&_vq_book_res_Ec_7,
&_vq_book_res_Ec_8,
&_vq_book_res_Ec_8a,
&_vq_book_res_Ec_9,
&_vq_book_res_Ec_9a,
&_vq_book_res_Ec_9b,
},
/* psy */
{&_psy_set_44c_E0,&_psy_set_44c_E},
&_psy_set_44c_EG
};
#endif
--- >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