[xiph-cvs] cvs commit: vorbis/lib/modes mode_A.h mode_AA.h mode_B.h mode_C.h mode_D.h mode_E.h
Monty
xiphmont at xiph.org
Sat May 26 23:21:57 PDT 2001
xiphmont 01/05/26 23:21:57
Modified: lib/modes Tag: monty-branch-20010404 mode_A.h mode_AA.h
mode_B.h mode_C.h mode_D.h mode_E.h
Log:
Fixes/updates preparing for merge. floor1/res1 unused for now.
Monty
Revision Changes Path
No revision
No revision
1.14.4.6 +28 -124 vorbis/lib/modes/mode_A.h
Index: mode_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_A.h,v
retrieving revision 1.14.4.5
retrieving revision 1.14.4.6
diff -u -r1.14.4.5 -r1.14.4.6
--- mode_A.h 2001/05/23 02:15:24 1.14.4.5
+++ mode_A.h 2001/05/27 06:21:55 1.14.4.6
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.14.4.5 2001/05/23 02:15:24 xiphmont Exp $
+ last mod: $Id: mode_A.h,v 1.14.4.6 2001/05/27 06:21:55 xiphmont Exp $
********************************************************************/
@@ -22,33 +22,10 @@
#include "vorbis/codec.h"
#include "backends.h"
-#include "books/line0_class0.vqh"
-#include "books/line0_class1.vqh"
-#include "books/line0_class2.vqh"
-#include "books/line1_class0.vqh"
-#include "books/line1_class1.vqh"
-#include "books/line1_class2.vqh"
-#include "books/line1_class3.vqh"
-
-#include "books/line0_0sub0.vqh"
-#include "books/line0_0sub1.vqh"
-#include "books/line0_1sub1.vqh"
-#include "books/line0_1sub2.vqh"
-#include "books/line0_1sub3.vqh"
-#include "books/line0_2sub1.vqh"
-#include "books/line0_2sub2.vqh"
-#include "books/line0_2sub3.vqh"
-
-#include "books/line1_0sub0.vqh"
-#include "books/line1_0sub1.vqh"
-#include "books/line1_1sub0.vqh"
-#include "books/line1_1sub1.vqh"
-#include "books/line1_2sub1.vqh"
-#include "books/line1_2sub2.vqh"
-#include "books/line1_2sub3.vqh"
-#include "books/line1_3sub1.vqh"
-#include "books/line1_3sub2.vqh"
-#include "books/line1_3sub3.vqh"
+#include "books/lsp12_0.vqh"
+#include "books/lsp30_0.vqh"
+#include "books/lsp12_1.vqh"
+#include "books/lsp30_1.vqh"
#include "books/res0_128_128aux.vqh"
#include "books/res0_128_1024aux.vqh"
@@ -222,7 +199,7 @@
.5f, /* high window */
25,
25,
- 40,
+ 50,
{.000f, 0.f, /*63*/
.000f, 0.f, /*88*/
.000f, 0.f, /*125*/
@@ -250,71 +227,22 @@
/* with GNUisms, this could be short and readable. Oh well */
static vorbis_info_time0 _time_set0A={0};
-/*static vorbis_info_floor0 _floor_set0A={12, 44100, 64, 10,130, 2, {0,1},
- 0.199f, .285f};*/
-/*static vorbis_info_floor0 _floor_set1A={30, 44100, 256, 12,150, 2, {2,3},
- .082f, .126f};*/
-
-static vorbis_info_floor1 _floor_set0A={4,
- {0,1,2,2},
-
- {3,3,3},
- {1,2,2},
- {0,1,2},
- {{3,4},{-1,5,6,7},{-1,8,9,10}},
-
- 4,
- {0,128,
- 5,21,
-
- 2,1,3,
- 11,7,15,
- 45,30,73},
-
- 60,30,600,
- 999,999,0,18.,
- 8,96};
-
-static vorbis_info_floor1 _floor_set1A={10,
- {0,1,2,2,2,2,2, 3,3,3},
-
- {3,4,3,3},
- {1,1,2,2},
- {11,12,13,14},
- {{15,16},
- {17,18},
- {-1,19,20,21},
- {-1,22,23,24},
- },
-
- 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,600,
- 20,8,1,18.,
- 20,600};
-
-static vorbis_info_residue0 _residue_set0A={0,96,16,6,25,
+static vorbis_info_floor0 _floor_set0A={12, 44100, 64, 10,130, 2, {0,1},
+ 0.199f, .285f};
+static vorbis_info_floor0 _floor_set1A={30, 44100, 256, 12,150, 2, {2,3},
+ .082f, .126f};
+static vorbis_info_residue0 _residue_set0A={0,96,16,6,4,
{0,1,1,1,1,1},
- {27,28,29,30,31},
+ {6,7,8,9,10},
{0,99999,9999,9999,9999},
{999.f,1.5f,3.5f,15.5f,26.5f},
{4,4,4,4,4},
{99,99,99,99,99}};
-static vorbis_info_residue0 _residue_set1A={0, 960, 32,10,26,
+static vorbis_info_residue0 _residue_set1A={0, 960, 32,10,5,
{0,1,1,1,1,1,1,1,1,1},
- {32,33,34,35,36,37,38,39,40},
+ {11,12,13,14,15,16,17,18,19},
{0,8,9999,16,9999,
24,9999,9999,9999},
@@ -334,7 +262,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 41, 2,
+ 2, 2, 1, 2, 2, 20, 2,
/* modes */
{&_mode_set0A,&_mode_set1A},
/* maps */
@@ -342,56 +270,32 @@
/* times */
{0,0},{&_time_set0A},
/* floors */
- {1,1},{&_floor_set0A,&_floor_set1A},
+ {0,0},{&_floor_set0A,&_floor_set1A},
/* residue */
- {1,1},{&_residue_set0A,&_residue_set1A},
+ {0,0},{&_residue_set0A,&_residue_set1A},
/* books */
- {&_huff_book_line0_class0, /* 0 */
- &_huff_book_line0_class1,
- &_huff_book_line0_class2, /* 2 */
-
- &_huff_book_line0_0sub0, /* 3 */
- &_huff_book_line0_0sub1,
- &_huff_book_line0_1sub1, /* 5 */
- &_huff_book_line0_1sub2,
- &_huff_book_line0_1sub3, /* 7 */
- &_huff_book_line0_2sub1,
- &_huff_book_line0_2sub2, /* 9 */
- &_huff_book_line0_2sub3,
-
- &_huff_book_line1_class0,
- &_huff_book_line1_class1, /* 12 */
- &_huff_book_line1_class2,
- &_huff_book_line1_class3, /* 14 */
-
- &_huff_book_line1_0sub0,
- &_huff_book_line1_0sub1, /* 16 */
- &_huff_book_line1_1sub0,
- &_huff_book_line1_1sub1,
- &_huff_book_line1_2sub1,
- &_huff_book_line1_2sub2, /* 20 */
- &_huff_book_line1_2sub3,
- &_huff_book_line1_3sub1,
- &_huff_book_line1_3sub2,
- &_huff_book_line1_3sub3, /* 24 */
+ {&_vq_book_lsp12_0, /* 0 */
+ &_vq_book_lsp12_1, /* 1 */
+ &_vq_book_lsp30_0, /* 2 */
+ &_vq_book_lsp30_1, /* 3 */
- &_huff_book_res0_128_128aux,
+ &_huff_book_res0_128_128aux,
&_huff_book_res0_128_1024aux,
- &_vq_book_res0_128_128_1,
+ &_vq_book_res0_128_128_1,
&_vq_book_res0_128_128_2,
&_vq_book_res0_128_128_3,
&_vq_book_res0_128_128_4,
- &_vq_book_res0_128_128_5,
+ &_vq_book_res0_128_128_5,
&_vq_book_res0_128_1024_1,
- &_vq_book_res0_128_1024_2,
+ &_vq_book_res0_128_1024_2,
&_vq_book_res0_128_1024_3,
- &_vq_book_res0_128_1024_4,
+ &_vq_book_res0_128_1024_4,
&_vq_book_res0_128_1024_5,
- &_vq_book_res0_128_1024_6,
+ &_vq_book_res0_128_1024_6,
&_vq_book_res0_128_1024_7,
- &_vq_book_res0_128_1024_8,
+ &_vq_book_res0_128_1024_8,
&_vq_book_res0_128_1024_9,
},
1.10.4.1 +3 -5 vorbis/lib/modes/mode_AA.h
Index: mode_AA.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_AA.h,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -r1.10 -r1.10.4.1
--- mode_AA.h 2001/02/26 03:51:10 1.10
+++ mode_AA.h 2001/05/27 06:21:56 1.10.4.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_AA.h,v 1.10 2001/02/26 03:51:10 xiphmont Exp $
+ last mod: $Id: mode_AA.h,v 1.10.4.1 2001/05/27 06:21:56 xiphmont Exp $
********************************************************************/
@@ -109,6 +109,7 @@
.5f, /* high window */
5,
5,
+ 10,
{.000f, 0.f,/*63*/
.000f, 0.f,/*88*/
.000f, 0.f,/*125*/
@@ -131,8 +132,6 @@
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
-22.,
-
- -0., -.004 /* attack/decay control */
};
static vorbis_info_psy _psy_set_AA={
@@ -199,6 +198,7 @@
.7f, /* high window */
25,
25,
+ 50,
{.000f, 0.f, /*63*/
.000f, 0.f, /*88*/
.000f, 0.f, /*125*/
@@ -221,8 +221,6 @@
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
-22.,
-
- -0.f, -.004f, /* attack/decay control */
};
1.13.4.1 +3 -5 vorbis/lib/modes/mode_B.h
Index: mode_B.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_B.h,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- mode_B.h 2001/02/26 03:51:10 1.13
+++ mode_B.h 2001/05/27 06:21:56 1.13.4.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_B.h,v 1.13 2001/02/26 03:51:10 xiphmont Exp $
+ last mod: $Id: mode_B.h,v 1.13.4.1 2001/05/27 06:21:56 xiphmont Exp $
********************************************************************/
@@ -109,6 +109,7 @@
.5f, /* high window */
5,
5,
+ 10,
{.000f, 0.f,/*63*/
.000f, 0.f,/*88*/
.000f, 0.f,/*125*/
@@ -131,8 +132,6 @@
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
-26.,
-
- -0., -.004 /* attack/decay control */
};
static vorbis_info_psy _psy_set_B={
@@ -199,6 +198,7 @@
.5f, /* high window */
25,
25,
+ 40,
{.000f, 0.f, /*63*/
.000f, 0.f, /*88*/
.000f, 0.f, /*125*/
@@ -221,8 +221,6 @@
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
-30.,
-
- -0.f, -.004f, /* attack/decay control */
};
1.12.4.1 +3 -5 vorbis/lib/modes/mode_C.h
Index: mode_C.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_C.h,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -u -r1.12 -r1.12.4.1
--- mode_C.h 2001/02/26 03:51:10 1.12
+++ mode_C.h 2001/05/27 06:21:56 1.12.4.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_C.h,v 1.12 2001/02/26 03:51:10 xiphmont Exp $
+ last mod: $Id: mode_C.h,v 1.12.4.1 2001/05/27 06:21:56 xiphmont Exp $
********************************************************************/
@@ -109,6 +109,7 @@
.5f, /* high window */
5,
5,
+ 10,
{.000f, 0.f,/*63*/
.000f, 0.f,/*88*/
.000f, 0.f,/*125*/
@@ -131,8 +132,6 @@
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
-26.,
-
- -0., -.004 /* attack/decay control */
};
static vorbis_info_psy _psy_set_C={
@@ -199,6 +198,7 @@
.5f, /* high window */
25,
25,
+ 40,
{.000f, 0.f, /*63*/
.000f, 0.f, /*88*/
.000f, 0.f, /*125*/
@@ -221,8 +221,6 @@
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
-32.,
-
- -0.f, -.004f, /* attack/decay control */
};
1.13.4.1 +3 -5 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.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- mode_D.h 2001/02/26 03:51:10 1.13
+++ mode_D.h 2001/05/27 06:21:56 1.13.4.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_D.h,v 1.13 2001/02/26 03:51:10 xiphmont Exp $
+ last mod: $Id: mode_D.h,v 1.13.4.1 2001/05/27 06:21:56 xiphmont Exp $
********************************************************************/
@@ -107,6 +107,7 @@
.5f, /* high window */
5,
5,
+ 10,
{.000f, 0.f,/*63*/
.000f, 0.f,/*88*/
.000f, 0.f,/*125*/
@@ -129,8 +130,6 @@
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
-28.,
-
- -0., -.004 /* attack/decay control */
};
static vorbis_info_psy _psy_set_D={
@@ -197,6 +196,7 @@
.5f, /* high window */
25,
25,
+ 40,
{.000f, 0.f, /*63*/
.000f, 0.f, /*88*/
.000f, 0.f, /*125*/
@@ -219,8 +219,6 @@
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
-32.,
-
- -0.f, -.004f, /* attack/decay control */
};
1.12.4.1 +3 -5 vorbis/lib/modes/mode_E.h
Index: mode_E.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_E.h,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -u -r1.12 -r1.12.4.1
--- mode_E.h 2001/02/26 03:51:10 1.12
+++ mode_E.h 2001/05/27 06:21:56 1.12.4.1
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_E.h,v 1.12 2001/02/26 03:51:10 xiphmont Exp $
+ last mod: $Id: mode_E.h,v 1.12.4.1 2001/05/27 06:21:56 xiphmont Exp $
********************************************************************/
@@ -107,13 +107,12 @@
.5f, /* high window */
5,
5,
+ 10,
{0.f},
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
-28.,
-
- -0., -.004 /* attack/decay control */
};
static vorbis_info_psy _psy_set_E={
@@ -180,13 +179,12 @@
.5f, /* high window */
25,
25,
+ 40,
{0.f},
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
-32.,
-
- -0.f, -.004f, /* attack/decay control */
};
--- >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