Mercurial > mplayer.hg
annotate tremor/tremor.diff @ 25581:c7d66b1e270d
Give a sense to this sentence
author | ben |
---|---|
date | Sat, 05 Jan 2008 14:53:13 +0000 |
parents | 8dfda4d651ec |
children | fe50eaad932d |
rev | line source |
---|---|
19257
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
1 --- misc.h 2005-01-04 16:29:01.000000000 +0100 |
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
2 +++ misc.h 2004-12-30 13:09:20.000000000 +0100 |
14369 | 3 @@ -29,8 +29,9 @@ |
4 /* 64 bit multiply */ | |
5 | |
6 #include <sys/types.h> | |
7 +#include "config.h" | |
8 | |
9 -#if BYTE_ORDER==LITTLE_ENDIAN | |
10 +#ifndef WORDS_BIGENDIAN | |
11 union magic { | |
12 struct { | |
13 ogg_int32_t lo; | |
14 @@ -38,9 +39,7 @@ | |
15 } halves; | |
16 ogg_int64_t whole; | |
17 }; | |
18 -#endif | |
19 - | |
20 -#if BYTE_ORDER==BIG_ENDIAN | |
21 +#else | |
22 union magic { | |
23 struct { | |
24 ogg_int32_t hi; | |
19257
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
25 --- os_types.h 2005-01-04 16:29:02.000000000 +0100 |
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
26 +++ os_types.h 2005-01-05 10:39:07.000000000 +0100 |
15455 | 27 @@ -32,57 +32,11 @@ |
14369 | 28 #define _ogg_realloc realloc |
29 #define _ogg_free free | |
30 | |
31 -#ifdef _WIN32 | |
32 - | |
33 -# ifndef __GNUC__ | |
34 - /* MSVC/Borland */ | |
35 - typedef __int64 ogg_int64_t; | |
36 - typedef __int32 ogg_int32_t; | |
37 - typedef unsigned __int32 ogg_uint32_t; | |
38 - typedef __int16 ogg_int16_t; | |
39 -# else | |
40 - /* Cygwin */ | |
41 - #include <_G_config.h> | |
42 - typedef _G_int64_t ogg_int64_t; | |
43 - typedef _G_int32_t ogg_int32_t; | |
44 - typedef _G_uint32_t ogg_uint32_t; | |
45 - typedef _G_int16_t ogg_int16_t; | |
46 -# endif | |
47 - | |
48 -#elif defined(__MACOS__) | |
49 - | |
50 -# include <sys/types.h> | |
51 - typedef SInt16 ogg_int16_t; | |
52 - typedef SInt32 ogg_int32_t; | |
53 - typedef UInt32 ogg_uint32_t; | |
54 - typedef SInt64 ogg_int64_t; | |
55 - | |
56 -#elif defined(__MACOSX__) /* MacOS X Framework build */ | |
57 - | |
58 -# include <sys/types.h> | |
59 - typedef int16_t ogg_int16_t; | |
60 - typedef int32_t ogg_int32_t; | |
61 - typedef u_int32_t ogg_uint32_t; | |
62 + #include <inttypes.h> | |
63 typedef int64_t ogg_int64_t; | |
64 - | |
65 -#elif defined(__BEOS__) | |
66 - | |
67 - /* Be */ | |
68 -# include <inttypes.h> | |
69 - | |
70 -#elif defined (__EMX__) | |
71 - | |
72 - /* OS/2 GCC */ | |
73 - typedef short ogg_int16_t; | |
74 - typedef int ogg_int32_t; | |
75 - typedef unsigned int ogg_uint32_t; | |
76 - typedef long long ogg_int64_t; | |
77 - | |
78 -#else | |
79 - | |
80 -# include <sys/types.h> | |
81 -# include "config_types.h" | |
82 - | |
83 -#endif | |
84 + typedef int32_t ogg_int32_t; | |
85 + typedef uint32_t ogg_uint32_t; | |
15455 | 86 + typedef uint16_t ogg_uint16_t; |
14369 | 87 + typedef int16_t ogg_int16_t; |
88 | |
89 #endif /* _OS_TYPES_H */ | |
16266
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
90 --- sharedbook.c 30 Dec 2004 12:09:20 -0000 1.1 |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
91 +++ sharedbook.c 18 Aug 2005 16:13:54 -0000 |
19257
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
92 @@ -208,7 +211,7 @@ |
16266
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
93 int indexdiv=1; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
94 for(k=0;k<b->dim;k++){ |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
95 int index= (j/indexdiv)%quantvals; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
96 - int point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
97 + ogg_int32_t point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
98 int val=VFLOAT_MULTI(delta,delpoint, |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
99 abs(b->quantlist[index]),&point); |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
100 |
19257
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
101 @@ -242,7 +245,7 @@ |
16266
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
102 int lastpoint=0; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
103 |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
104 for(k=0;k<b->dim;k++){ |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
105 - int point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
106 + ogg_int32_t point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
107 int val=VFLOAT_MULTI(delta,delpoint, |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
108 abs(b->quantlist[j*b->dim+k]),&point); |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
109 |
24796
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
110 --- block.h (revision 0) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
111 +++ block.h (revision 0) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
112 @@ -0,0 +1,24 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
113 +/******************************************************************** |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
114 + * * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
115 + * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
116 + * * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
117 + * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
118 + * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
119 + * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
120 + * * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
121 + * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
122 + * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
123 + * * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
124 + ******************************************************************** |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
125 + |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
126 + function: basic shared block operations |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
127 + |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
128 + ********************************************************************/ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
129 + |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
130 +#ifndef _V_BLOCK_H_ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
131 +#define _V_BLOCK_H_ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
132 + |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
133 +void *_vorbis_block_alloc(vorbis_block *vb,long bytes); |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
134 +void _vorbis_block_ripcord(vorbis_block *vb); |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
135 + |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
136 +#endif |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
137 --- floor0.c (revision 24821) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
138 +++ floor0.c (working copy) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
139 @@ -25,6 +25,7 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
140 #include "codebook.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
141 #include "misc.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
142 #include "os.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
143 +#include "block.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
144 |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
145 #define LSP_FRACBITS 14 |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
146 |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
147 --- floor1.c (revision 24821) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
148 +++ floor1.c (working copy) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
149 @@ -24,6 +24,7 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
150 #include "registry.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
151 #include "codebook.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
152 #include "misc.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
153 +#include "block.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
154 |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
155 #define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
156 |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
157 --- synthesis.c (revision 24821) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
158 +++ synthesis.c (working copy) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
159 @@ -23,6 +23,7 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
160 #include "registry.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
161 #include "misc.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
162 #include "os.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
163 +#include "block.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
164 |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
165 int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
166 vorbis_dsp_state *vd=vb->vd; |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
167 --- res012.c (revision 24821) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
168 +++ res012.c (working copy) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
169 @@ -25,6 +25,7 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
170 #include "codebook.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
171 #include "misc.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
172 #include "os.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
173 +#include "block.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
174 |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
175 typedef struct { |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
176 vorbis_info_residue0 *info; |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
177 --- block.c (revision 24821) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
178 +++ block.c (working copy) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
179 @@ -25,6 +25,7 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
180 #include "window.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
181 #include "registry.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
182 #include "misc.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
183 +#include "block.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
184 |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
185 static int ilog(unsigned int v){ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
186 int ret=0; |