Commit 10545860 authored by Monty's avatar Monty

There's still tuning to do, but things are basically in shape for the
merge with mainline and 1.0.  Everything on the branch should work
properly now.

Monty

svn path=/branches/new_acoustics_pending_merge_20000328/vorbis/; revision=382
parent 9902d4ff
# vorbis makefile configured for use with gcc on any platform
# $Id: Makefile.in,v 1.5.4.1 2000/05/08 08:25:39 xiphmont Exp $
###############################################################################
# #
# To build a production vorbis (preferrably using gmake), just type 'make'. #
# To build with debugging or profiling information, use 'make debug' or #
# 'make profile' respectively. 'make clean' is a good idea between builds #
# with different target names, or before a final build. #
# #
###############################################################################
# DO NOT EDIT BELOW! ##########################################################
# (unless, of course, you know what you are doing :) ##########################
@SET_MAKE@
SUBDIRS = lib examples # cmdline xmms vq huff
all debug profile selftest target clean:
@for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $(MFLAGS) $@) || exit 1; done
-rm -f *~
distclean: clean
-rm -f Makefile config.*
# vorbis makefile configured for use with gcc on any platform
# $Id: Makefile.in,v 1.5.4.2 2000/05/04 23:08:08 xiphmont Exp $
# $Id: Makefile.in,v 1.5.4.3 2000/05/08 08:25:39 xiphmont Exp $
###############################################################################
# #
......@@ -25,7 +25,7 @@ LD=@CC@
LDFLAGS=@LDFLAGS@ $(FLAGS)
AR=@AR@
RANLIB=@RANLIB@
LIBS=@LIBS@ -lm -lefence
LIBS=@LIBS@ -lm
HFILES = ../include/vorbis/codec.h ../include/vorbis/vorbisfile.h \
../include/vorbis/internal.h ../include/vorbis/backends.h \
......
......@@ -13,7 +13,7 @@
function: libvorbis backend and mapping structures; needed for
static mode headers
last mod: $Id: backends.h,v 1.7.4.4 2000/04/21 16:35:38 xiphmont Exp $
last mod: $Id: backends.h,v 1.7.4.5 2000/05/08 08:25:39 xiphmont Exp $
********************************************************************/
......@@ -100,7 +100,6 @@ typedef struct vorbis_info_residue0{
double ampmax[64]; /* book amp threshholds for *encode* */
int secondstages[64]; /* expanded out to pointers in lookup */
long addmullist[64]; /* bitflags for add/mul cascading */
int booklist[256]; /* list of second stage books */
} vorbis_info_residue0;
......
This diff is collapsed.
/********************************************************************
* *
* THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
* THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
* PLEASE READ THESE TERMS DISTRIBUTING. *
* *
* THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
* by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
* http://www.xiph.org/ *
* *
********************************************************************
function: static codebook autogenerated by vq/somethingorother
********************************************************************/
#ifndef _V_lsp20_1_VQH_
#define _V_lsp20_1_VQH_
#include "vorbis/codebook.h"
static long _vq_quantlist_lsp20_1[] = {
143,
129,
147,
126,
151,
124,
153,
127,
165,
149,
186,
132,
176,
101,
198,
75,
127,
72,
124,
52,
190,
34,
137,
109,
135,
124,
166,
126,
190,
147,
176,
132,
170,
129,
158,
117,
115,
21,
130,
93,
140,
128,
144,
122,
146,
138,
160,
117,
153,
148,
182,
130,
173,
119,
147,
111,
148,
6,
126,
92,
170,
135,
166,
129,
151,
141,
176,
129,
178,
135,
210,
154,
164,
110,
147,
106,
114,
37,
136,
102,
145,
22,
130,
99,
142,
135,
181,
137,
202,
150,
214,
127,
184,
141,
163,
125,
122,
50,
138,
109,
200,
9,
131,
93,
139,
141,
149,
129,
147,
144,
169,
120,
149,
93,
168,
80,
171,
92,
156,
56,
126,
114,
128,
117,
120,
137,
131,
128,
137,
127,
171,
135,
130,
129,
184,
160,
143,
81,
139,
76,
157,
33,
134,
104,
118,
127,
130,
129,
153,
131,
158,
137,
191,
118,
217,
82,
152,
73,
135,
40,
195,
118,
157,
107,
134,
121,
137,
123,
127,
74,
153,
119,
128,
122,
169,
154,
175,
102,
219,
92,
255,
27,
139,
108,
138,
124,
141,
119,
121,
114,
164,
140,
193,
116,
200,
63,
178,
0,
127,
89,
160,
84,
148,
54,
167,
41,
139,
114,
209,
130,
212,
71,
190,
51,
140,
118,
122,
142,
134,
129,
128,
124,
129,
124,
142,
137,
189,
152,
176,
100,
177,
62,
229,
15,
134,
100,
139,
132,
178,
128,
137,
120,
150,
133,
163,
124,
204,
158,
125,
149,
140,
130,
137,
91,
211,
118,
};
static long _vq_lengthlist_lsp20_1[] = {
5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7,
};
static long _vq_ptr0_lsp20_1[] = {
-1, -2, -3, -4, -5, -6, -7, 28,
-9, 29, 53, -12, -13, 28, 53, -16,
41, 56, -19, -20, -21, -22, 28, 30,
-25, 5, -27, 30, -416, 44, -29, -32,
-33, -25, 33, 50, 30, -38, 36, -40,
-41, -42, -13, -34, -43, -46, 31, -48,
31, 44, -51, 28, 47, -54, -55, -56,
-57, -58, 6, 28, -61, 28, 18, -64,
-65, 46, -67, -68, -69, 6, -71, 47,
-73, -74, 43, 33, 43, -78, -79, 62,
47, 27, -83, -84, 10, -86, -62, 21,
28, -90, 18, -92, -93, -80, -87, -96,
-84, -94, 54, -100, 62, -97, -103, -104,
-105, -106, 28, -108, -109, 41, -111, 46,
53, -415, -101, -114, -117, -118, 31, -71,
-115, 15, -123, -124, -109, -121, 44, -126,
-129, -111, 12, -130, -113, -131, -133, -136,
-137, -138, -62, 44, 29, 29, 29, -144,
29, -146, 45, 40, -149, -150, -151, -152,
-153, 25, 35, -156, -157, -158, 34, 42,
-161, 35, -147, 15, -165, -166, -167, 5,
-169, -170, 30, -163, -132, 8, 27, -176,
5, 16, -179, 25, 34, -182, -183, -25,
-177, 45, 50, -188, -189, -190, 4, -192,
-193, 4, 20, -196, 14, -163, 9, -200,
-201, 4, 20, -204, 19, 16, -207, -208,
-209, -210, 4, -212, 4, 16, -215, 24,
34, -193, 15, 39, 34, -222, -223, -224,
-225, -226, -227, -228, -229, -230, 1, -232,
11, 26, 37, -236, 3, 11, -239, 3,
11, -242, -243, -244, -245, -246, -247, 1,
11, 1, -251, -252, -230, -218, -253, -172,
-213, 8, -259, -260, -237, -257, -261, -264,
32, -262, -267, -233, -265, -255, 12, -270,
6, -274, 1, 37, -277, -278, -279, 6,
-271, -282, 32, -280, 63, -286, -287, -288,
33, 26, 43, -292, -293, -294, -295, -296,
-297, -249, -283, 6, -298, -302, -303, -304,
-305, -306, -307, 0, -300, -84, 45, 48,
-313, -69, 40, -314, -315, 43, -316, -320,
6, 38, 26, 6, 10, -326, -327, 6,
-321, 11, 43, 63, 11, -279, 23, -336,
6, -334, -339, -340, 11, -342, 13, -337,
-345, -346, -347, 1, -230, -343, -232, 38,
-351, -354, -355, -356, -236, 23, 15, 44,
-358, 33, -363, -364, -365, 21, -360, -288,
-366, -370, 27, 23, -373, -374, -375, -376,
-377, -378, 3, -380, 8, 8, 40, -384,
-385, 8, -387, -388, -389, 3, 12, 48,
-342, 15, 40, 45, -397, -398, -261, -269,
-393, -270, 23, -401, -403, -232, 38, 13,
13, -410, -411, -412, -413, -414, -415, 2,
38, -418, 17, -130, -421, -422, 7, 17,
-419, 45, -427, -428, 7, 22, -431, 17,
};
static long _vq_ptr1_lsp20_1[] = {
-221, -148, -53, -37, -18, -11, -8, 29,
-10, 58, 58, -15, -14, 55, 55, -14,
55, 61, -31, -12, -24, -23, 42, 42,
-26, 53, 42, 53, -29, 61, -17, -36,
-35, 58, 61, 53, 50, -39, 42, -50,
53, -45, -16, -17, -30, -47, 36, -16,
55, 63, -52, 53, 53, -135, -82, -63,
-60, -59, 18, 46, -62, 63, 57, -77,
-66, 47, -72, -70, 63, 60, 63, 60,
-76, -71, 60, 44, 63, -71, -80, 54,
54, 37, -91, -85, 60, -89, -88, 37,
57, 53, 60, -102, 28, -95, -81, -99,
-98, 59, 60, -98, 60, 44, -116, -50,
-107, 53, 41, -110, 53, 60, -112, 60,
60, -28, -75, -49, -122, -119, 54, -98,
-44, -17, -128, -71, -98, -29, 56, 61,
-119, -98, 61, -17, -402, -127, -125, -143,
-142, -141, -140, 48, 57, 53, 46, -145,
45, -10, 58, 48, -187, -181, -164, -155,
-154, 39, 39, -154, -160, -159, 51, 51,
-159, 51, -139, 44, -178, -175, -168, 34,
-157, -159, 51, -162, -424, -139, 44, -36,
50, 44, -180, 51, 50, -185, 50, 51,
-174, -186, 58, -206, -198, -191, 9, -195,
-194, 49, 49, -194, 49, -184, -199, -203,
-202, 24, 24, -202, 24, 27, -220, -217,
-214, -211, 34, -154, 39, 37, -216, 35,
35, -219, 37, 49, 42, -409, -344, -291,
-241, -238, -235, -234, -231, 26, 37, -233,
37, 37, 59, -237, 59, 59, -240, 13,
13, -289, -285, -276, -272, -250, -248, 6,
-249, 26, -258, -231, -233, -213, -205, -404,
-81, 37, -266, -263, -234, -81, -256, -234,
59, -254, -263, 59, -197, -368, 44, -163,
-273, -275, 43, 43, -284, -281, -76, 63,
-268, -76, 63, -173, 59, 37, 63, 43,
59, -290, 62, -338, -332, -330, -325, -301,
-58, -299, -171, 26, -134, -323, -319, -317,
-312, -309, -100, 60, -120, -100, 52, 52,
-100, -84, 52, -311, -310, -307, -139, -322,
-290, 52, 62, -324, 18, -329, -322, 62,
-311, 26, -331, 60, -333, -335, 52, -62,
57, 48, 45, -341, 57, -62, 57, -328,
-372, -353, -348, 3, -350, -318, -81, 48,
-139, -362, -361, -359, -284, 48, 48, -284,
-139, 63, -369, -367, -234, 59, -357, 37,
-352, -234, 59, 44, -396, -386, -383, -381,
-379, 27, 44, 27, 44, -382, 44, 45,
48, 40, -394, -392, -391, -147, -371, 57,
40, 61, -395, 57, -408, -405, -350, -349,
-29, 61, -416, -400, -390, -407, -29, 37,
40, -308, -399, -425, -420, -417, -416, 61,
61, -416, 61, 23, -418, -423, 38, 38,
-406, -426, -430, -429, 52, 52, -429, 52,
};
static long _vq_p_lsp20_1[] = {
56, 40, 168, 120, 116, 116, 112, 112,
116, 116, 212, 112, 112, 112, 212, 164,
164, 224, 112, 120, 112, 112, 112, 120,
20, 20, 120, 120, 152, 176, 176, 20,
20, 212, 132, 200, 120, 168, 144, 144,
164, 112, 112, 132, 132, 144, 124, 124,
124, 176, 112, 112, 188, 112, 24, 112,
24, 24, 24, 112, 252, 112, 72, 24,
184, 184, 24, 24, 24, 24, 188, 188,
188, 172, 172, 132, 172, 248, 248, 248,
188, 108, 72, 40, 40, 112, 72, 84,
112, 72, 72, 40, 40, 188, 84, 40,
40, 84, 216, 248, 248, 84, 112, 184,
112, 112, 112, 164, 164, 164, 184, 184,
212, 8, 84, 132, 124, 124, 124, 188,
84, 60, 164, 164, 164, 60, 176, 176,
184, 184, 48, 48, 8, 48, 48, 72,
72, 72, 72, 176, 116, 116, 116, 116,
116, 180, 180, 160, 100, 100, 156, 100,
100, 100, 140, 136, 136, 136, 136, 168,
140, 140, 160, 60, 20, 136, 20, 20,
120, 120, 120, 60, 8, 32, 108, 20,
20, 64, 100, 100, 136, 20, 20, 20,
64, 180, 200, 80, 56, 36, 16, 16,
16, 16, 80, 56, 56, 60, 36, 16,
16, 16, 80, 76, 76, 64, 96, 140,
16, 136, 16, 16, 16, 64, 96, 96,
136, 16, 60, 156, 136, 72, 0, 12,
12, 4, 4, 44, 4, 4, 4, 44,
44, 104, 148, 12, 12, 44, 12, 12,
44, 128, 128, 4, 128, 24, 24, 4,
44, 4, 4, 4, 4, 60, 60, 8,
64, 32, 44, 44, 44, 32, 32, 128,
128, 32, 104, 104, 32, 48, 48, 48,
24, 4, 4, 148, 128, 24, 24, 24,
48, 128, 128, 64, 252, 132, 172, 132,
132, 104, 172, 4, 4, 24, 4, 4,
4, 4, 32, 24, 64, 0, 0, 24,
0, 0, 0, 0, 64, 40, 180, 192,
24, 24, 160, 160, 160, 172, 160, 24,
24, 152, 104, 24, 40, 24, 24, 24,
152, 44, 172, 252, 44, 252, 92, 24,
24, 92, 72, 44, 44, 52, 52, 92,
4, 44, 12, 4, 4, 92, 44, 152,
152, 12, 12, 12, 12, 92, 60, 176,
60, 132, 84, 84, 84, 84, 60, 132,
92, 108, 108, 92, 12, 32, 12, 12,
12, 12, 12, 32, 32, 32, 160, 160,
160, 32, 52, 12, 12, 12, 48, 192,
52, 60, 160, 180, 32, 32, 32, 60,
60, 48, 92, 48, 60, 44, 152, 52,
52, 28, 28, 152, 8, 8, 8, 8,
152, 68, 68, 48, 28, 28, 28, 68,
48, 180, 28, 28, 28, 88, 68, 68,
};
static long _vq_q_lsp20_1[] = {
88, 140, 252, 144, 200, 164, 212, 116,
212, 232, 232, 164, 212, 220, 220, 212,
220, 244, 200, 220, 212, 120, 168, 168,
120, 212, 168, 212, 176, 244, 224, 120,
200, 232, 244, 212, 200, 188, 168, 188,
212, 144, 164, 224, 176, 220, 144, 164,
220, 252, 188, 212, 212, 116, 40, 188,
252, 112, 72, 184, 228, 252, 228, 248,
240, 188, 172, 188, 252, 240, 252, 240,
252, 188, 240, 176, 252, 240, 188, 216,
216, 148, 184, 72, 240, 212, 112, 148,
228, 212, 240, 184, 112, 240, 108, 248,
216, 236, 240, 216, 240, 176, 124, 188,
184, 212, 164, 184, 212, 240, 212, 240,
240, 152, 132, 252, 164, 188, 216, 216,
224, 224, 184, 188, 216, 176, 224, 244,
188, 216, 244, 224, 92, 176, 60, 180,
184, 212, 116, 192, 228, 212, 184, 212,
180, 212, 232, 192, 196, 232, 200, 204,
140, 156, 156, 156, 140, 168, 204, 204,
168, 204, 176, 176, 100, 200, 204, 136,
136, 168, 204, 160, 48, 176, 176, 120,
200, 176, 200, 204, 200, 232, 200, 204,
108, 232, 232, 140, 76, 56, 36, 56,
80, 196, 196, 80, 196, 64, 76, 76,
80, 96, 96, 80, 96, 108, 168, 196,
96, 156, 136, 140, 156, 148, 136, 140,
140, 156, 148, 196, 168, 244, 32, 228,
252, 52, 12, 236, 44, 104, 148, 104,
148, 148, 236, 44, 236, 236, 44, 52,
52, 248, 132, 252, 172, 128, 104, 24,
104, 104, 128, 44, 104, 64, 108, 60,
108, 148, 104, 128, 148, 108, 64, 148,
236, 60, 128, 236, 176, 192, 176, 60,
172, 148, 172, 172, 236, 128, 172, 252,
64, 172, 252, 192, 236, 148, 252, 172,
236, 248, 248, 52, 228, 252, 44, 0,
72, 24, 160, 104, 224, 72, 104, 172,
24, 40, 248, 240, 84, 248, 208, 208,
248, 40, 208, 192, 180, 240, 176, 104,
248, 208, 248, 72, 72, 44, 104, 248,
192, 104, 252, 240, 228, 228, 208, 72,
228, 192, 180, 52, 228, 72, 228, 152,
52, 236, 44, 12, 44, 160, 108, 192,
176, 108, 132, 176, 252, 192, 192, 252,
176, 252, 108, 132, 148, 236, 92, 148,
152, 148, 236, 176, 44, 52, 192, 160,
32, 108, 176, 108, 176, 160, 176, 180,
192, 160, 180, 52, 228, 160, 92, 228,
160, 244, 180, 228, 160, 52, 44, 160,
176, 244, 152, 60, 92, 52, 176, 148,
160, 132, 92, 208, 28, 68, 152, 244,
244, 152, 244, 92, 244, 68, 152, 152,
176, 208, 68, 88, 208, 208, 88, 208,
};
static encode_aux_nearestmatch _vq_auxn_lsp20_1 = {
_vq_ptr0_lsp20_1,
_vq_ptr1_lsp20_1,
_vq_p_lsp20_1,
_vq_q_lsp20_1,
432, 432
};
static static_codebook _vq_book_lsp20_1 = {
4, 64,
_vq_lengthlist_lsp20_1,
2, 1605458492, 1582935470, 8, 1,
_vq_quantlist_lsp20_1,
&_vq_auxn_lsp20_1,
NULL,
};
#endif
This diff is collapsed.
This diff is collapsed.
/********************************************************************
* *
* THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
* THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
* PLEASE READ THESE TERMS DISTRIBUTING. *
* *
* THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
* by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
* http://www.xiph.org/ *
* *
********************************************************************
function: static codebook autogenerated by huff/huffbuld
********************************************************************/
#ifndef _V_res0a0aux_VQH_
#define _V_res0a0aux_VQH_
#include "vorbis/codebook.h"
static long _huff_lengthlist_res0a0aux[] = {
15,15,15,15,15,15,14,14,14,14,14,14,14,14,14,14,
14,14,14,14,13,14,14,14,14,14,13,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,14,14,14,12,14,14,
14,14,14,14,14,12,10,14,14,14,14,14,14,14,14,14,
14,14,14,14,14,14,14,14,14,14,13,14,14,14,14,14,
14,14,14,14,14,14,13,14,14,14,13,13,14,14,13,14,
14,14,14,14,13,14,13,14,14,14,13,13,13,14,14,13,
14,14,13,14,14,13,11,14,14,14,14,14,14,14,13,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,14,13,14,
1