Mercurial > mplayer.hg
annotate libfaad2/local_changes.diff @ 19382:7c6c205b88b6
trying to fix the reverting paragraph
if you dissagree, dont hesitate to revert this commit or flame, but at least we should not claim that svn cannot revert commits except by recommiting the old version
author | michael |
---|---|
date | Sun, 13 Aug 2006 22:14:32 +0000 |
parents | 0783dd397f74 |
children | bc29871be2fd |
rev | line source |
---|---|
18141 | 1 --- libfaad2.orig/bits.h 2006-03-16 20:15:04.000000000 +0100 |
2 +++ libfaad2/bits.h 2006-03-16 20:37:21.000000000 +0100 | |
3 @@ -22,7 +22,10 @@ | |
4 ** Commercial non-GPL licensing of this software is possible. | |
5 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | |
6 ** | |
7 +** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30 | |
8 ** $Id: bits.h,v 1.40 2004/09/04 14:56:27 menno Exp $ | |
18783 | 9 +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ |
18141 | 10 +** local_changes.diff contains the exact changes to this file. |
11 **/ | |
12 | |
13 #ifndef __BITS_H__ | |
14858 | 14 @@ -58,7 +61,7 @@ |
14712 | 15 |
16 #if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__) | |
17 #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax | |
18 -#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__) | |
19 +#elif defined(LINUX) || defined(DJGPP) | |
20 #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ) | |
21 #else | |
22 #define BSWAP(a) \ | |
18141 | 23 --- libfaad2.orig/common.h 2006-03-16 20:15:04.000000000 +0100 |
24 +++ libfaad2/common.h 2006-03-16 20:56:56.000000000 +0100 | |
25 @@ -22,7 +22,10 @@ | |
26 ** Commercial non-GPL licensing of this software is possible. | |
27 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | |
28 ** | |
29 +** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30 | |
30 ** $Id: common.h,v 1.65 2004/09/08 09:43:11 gcp Exp $ | |
18783 | 31 +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ |
18141 | 32 +** local_changes.diff contains the exact changes to this file. |
33 **/ | |
34 | |
35 #ifndef __COMMON_H__ | |
14858 | 36 @@ -32,10 +35,13 @@ |
14712 | 37 extern "C" { |
38 #endif | |
39 | |
40 -#ifdef HAVE_CONFIG_H | |
41 -# include "../config.h" | |
42 +/* Allow build on Cygwin*/ | |
43 +#if defined(__CYGWIN__) | |
44 +#define __STRICT_ANSI__ | |
45 #endif | |
46 | |
47 +#include "../config.h" | |
48 + | |
49 #define INLINE __inline | |
50 #if 0 //defined(_WIN32) && !defined(_WIN32_WCE) | |
51 #define ALIGN __declspec(align(16)) | |
18141 | 52 @@ -61,7 +67,7 @@ |
16249 | 53 /* Use if target platform has address generators with autoincrement */ |
54 //#define PREFER_POINTERS | |
55 | |
56 -#ifdef _WIN32_WCE | |
57 +#if defined(_WIN32_WCE) || defined(__arm__) | |
58 #define FIXED_POINT | |
59 #endif | |
18141 | 60 |
14858 | 61 @@ -117,6 +123,9 @@ |
14712 | 62 # ifdef MAIN_DEC |
63 # undef MAIN_DEC | |
64 # endif | |
65 +# ifdef SBR_DEC | |
66 +# undef SBR_DEC | |
67 +# endif | |
68 #endif // FIXED_POINT | |
69 | |
70 #ifdef DRM | |
18141 | 71 @@ -151,6 +160,7 @@ |
14712 | 72 |
73 #include <stdlib.h> | |
74 | |
75 +#if 0 | |
76 typedef unsigned __int64 uint64_t; | |
77 typedef unsigned __int32 uint32_t; | |
78 typedef unsigned __int16 uint16_t; | |
18141 | 79 @@ -159,11 +169,31 @@ |
14712 | 80 typedef __int32 int32_t; |
81 typedef __int16 int16_t; | |
82 typedef __int8 int8_t; | |
83 +#else | |
84 +#include <inttypes.h> | |
85 +#endif | |
86 + | |
87 typedef float float32_t; | |
88 | |
89 | |
90 #else | |
91 | |
92 +/* #undef HAVE_FLOAT32_T */ | |
93 +/* Define if you have the <inttypes.h> header file. */ | |
94 +#define HAVE_INTTYPES_H 1 | |
95 + | |
96 +/* Define if you have the `memcpy' function. */ | |
97 +#define HAVE_MEMCPY 1 | |
98 + | |
99 +/* Define if you have the <stdint.h> header file. */ | |
100 +#define HAVE_STDINT_H 1 | |
101 + | |
102 +/* Define if you have the `strchr' function. */ | |
103 +#define HAVE_STRCHR 1 | |
104 + | |
105 +/* Define if you have the ANSI C header files. */ | |
106 +#define STDC_HEADERS 1 | |
107 + | |
108 #include <stdio.h> | |
109 #if HAVE_SYS_TYPES_H | |
110 # include <sys/types.h> | |
18141 | 111 @@ -289,7 +319,7 @@ |
16249 | 112 } |
113 | |
114 | |
115 - #if defined(_WIN32) && !defined(__MINGW32__) | |
116 + #if defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF) | |
117 #define HAS_LRINTF | |
118 static INLINE int lrintf(float f) | |
119 { | |
18141 | 120 @@ -301,7 +331,7 @@ |
14712 | 121 } |
122 return i; | |
123 } | |
18141 | 124 - #elif (defined(__i386__) && defined(__GNUC__)) |
125 + #elif (defined(__i386__) && defined(__GNUC__)) && !defined(HAVE_LRINTF) | |
14712 | 126 #define HAS_LRINTF |
127 // from http://www.stereopsis.com/FPU.html | |
128 static INLINE int lrintf(float f) | |
18141 | 129 @@ -330,6 +360,8 @@ |
14712 | 130 |
131 #else | |
132 | |
133 +#include <math.h> | |
134 + | |
135 #ifdef HAVE_LRINTF | |
136 # define HAS_LRINTF | |
137 # define _ISOC9X_SOURCE 1 | |
18141 | 138 @@ -338,8 +370,6 @@ |
14712 | 139 # define __USE_ISOC99 1 |
140 #endif | |
141 | |
142 - #include <math.h> | |
143 - | |
144 #ifdef HAVE_SINF | |
145 # define sin sinf | |
146 #error | |
18141 | 147 --- libfaad2.orig/output.c 2006-03-16 20:15:04.000000000 +0100 |
148 +++ libfaad2/output.c 2006-04-18 19:50:26.000000000 +0200 | |
16249 | 149 @@ -19,10 +19,9 @@ |
150 ** Any non-GPL usage of this software or parts of this software is strictly | |
151 ** forbidden. | |
152 ** | |
153 -** Commercial non-GPL licensing of this software is possible. | |
154 -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | |
155 -** | |
17181
53c3eaaf8b49
Unify paths in patch and fix recent breakage, no -ko keyword expansion
diego
parents:
17137
diff
changeset
|
156 -** $Id: output.c,v 1.42 2004/09/04 14:56:28 menno Exp $ |
16249 | 157 +** Initially modified for use with MPlayer by Rich Felker on 2005/03/29 |
17181
53c3eaaf8b49
Unify paths in patch and fix recent breakage, no -ko keyword expansion
diego
parents:
17137
diff
changeset
|
158 +** $Id: output.c,v 1.11 2005/04/05 05:43:41 rfelker Exp $ |
18783 | 159 +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ |
16249 | 160 **/ |
161 | |
162 #include "common.h" | |
18141 | 163 @@ -463,7 +462,7 @@ |
16249 | 164 } |
165 } | |
166 | |
167 -void* output_to_PCM(NeAACDecHandle hDecoder, | |
168 +void* output_to_PCM_sux(NeAACDecHandle hDecoder, | |
169 real_t **input, void *sample_buffer, uint8_t channels, | |
170 uint16_t frame_len, uint8_t format) | |
171 { | |
18141 | 172 @@ -554,4 +553,51 @@ |
16249 | 173 return sample_buffer; |
174 } | |
175 | |
176 +void* output_to_PCM(NeAACDecHandle hDecoder, | |
177 + real_t **input, void *sample_buffer, uint8_t channels, | |
178 + uint16_t frame_len, uint8_t format) | |
179 +{ | |
180 + int ch; | |
181 + int i; | |
182 + int16_t *short_sample_buffer = (int16_t*)sample_buffer; | |
183 + real_t *ch0 = input[hDecoder->internal_channel[0]]; | |
184 + real_t *ch1 = input[hDecoder->internal_channel[1]]; | |
185 + real_t *ch2 = input[hDecoder->internal_channel[2]]; | |
186 + real_t *ch3 = input[hDecoder->internal_channel[3]]; | |
187 + real_t *ch4 = input[hDecoder->internal_channel[4]]; | |
188 + | |
189 + if (format != FAAD_FMT_16BIT) | |
190 + return output_to_PCM_sux(hDecoder, input, sample_buffer, channels, frame_len, format); | |
191 + | |
192 + if (hDecoder->downMatrix) { | |
193 + for(i = 0; i < frame_len; i++) | |
194 + { | |
195 + int32_t tmp; | |
196 + tmp = (ch1[i] + ((ch0[i]+ch3[i])>>1) + ((ch0[i]+ch3[i])>>2) + (1<<(REAL_BITS))) >> (REAL_BITS+1); | |
197 + if ((tmp+0x8000) & ~0xffff) tmp = ~(tmp>>31)-0x8000; | |
198 + short_sample_buffer[0] = tmp; | |
199 + tmp = (ch2[i] + ((ch0[i]+ch4[i])>>1) + ((ch0[i]+ch4[i])>>2) + (1<<(REAL_BITS))) >> (REAL_BITS+1); | |
200 + if ((tmp+0x8000) & ~0xffff) tmp = ~(tmp>>31)-0x8000; | |
201 + short_sample_buffer[1] = tmp; | |
202 + short_sample_buffer += channels; | |
203 + } | |
204 + return sample_buffer; | |
205 + } | |
206 + | |
207 + /* Copy output to a standard PCM buffer */ | |
208 + for(i = 0; i < frame_len; i++) | |
209 + { | |
210 + for (ch = 0; ch < channels; ch++) | |
211 + { | |
18141 | 212 + int32_t tmp = input[hDecoder->internal_channel[ch]][i]; |
16249 | 213 + tmp += (1 << (REAL_BITS-1)); |
214 + tmp >>= REAL_BITS; | |
215 + if ((tmp+0x8000) & ~0xffff) tmp = ~(tmp>>31)-0x8000; | |
216 + *(short_sample_buffer++) = tmp; | |
217 + } | |
218 + } | |
219 + | |
220 + return sample_buffer; | |
221 +} | |
222 + | |
223 #endif | |
18141 | 224 --- libfaad2.orig/ps_dec.c 2006-03-16 20:15:04.000000000 +0100 |
225 +++ libfaad2/ps_dec.c 2006-04-18 20:29:38.000000000 +0200 | |
226 @@ -22,7 +22,10 @@ | |
227 ** Commercial non-GPL licensing of this software is possible. | |
228 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | |
229 ** | |
230 +** Initially modified for use with MPlayer on 2005/12/05 | |
231 ** $Id: ps_dec.c,v 1.10 2004/09/04 14:56:28 menno Exp $ | |
18783 | 232 +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ |
18141 | 233 +** local_changes.diff contains the exact changes to this file. |
234 **/ | |
235 | |
236 #include "common.h" | |
237 @@ -159,7 +162,7 @@ | |
238 | |
239 /* static function declarations */ | |
240 static void ps_data_decode(ps_info *ps); | |
241 -static hyb_info *hybrid_init(); | |
242 +static hyb_info *hybrid_init(void); | |
243 static void channel_filter2(hyb_info *hyb, uint8_t frame_len, const real_t *filter, | |
244 qmf_t *buffer, qmf_t **X_hybrid); | |
245 static void INLINE DCT3_4_unscaled(real_t *y, real_t *x); | |
246 @@ -189,7 +192,7 @@ | |
247 /* */ | |
248 | |
249 | |
250 -static hyb_info *hybrid_init() | |
251 +static hyb_info *hybrid_init(void) | |
252 { | |
253 uint8_t i; | |
254 | |
255 @@ -1935,8 +1938,8 @@ | |
17136 | 256 /* main Parametric Stereo decoding function */ |
257 uint8_t ps_decode(ps_info *ps, qmf_t X_left[38][64], qmf_t X_right[38][64]) | |
258 { | |
259 - qmf_t X_hybrid_left[32][32] = {{0}}; | |
260 - qmf_t X_hybrid_right[32][32] = {{0}}; | |
261 + qmf_t X_hybrid_left[32][32] = {{{0}}}; | |
262 + qmf_t X_hybrid_right[32][32] = {{{0}}}; | |
263 | |
264 /* delta decoding of the bitstream data */ | |
265 ps_data_decode(ps); | |
18141 | 266 --- libfaad2.orig/sbr_dec.c 2006-03-16 20:15:04.000000000 +0100 |
267 +++ libfaad2/sbr_dec.c 2006-04-18 20:33:57.000000000 +0200 | |
268 @@ -22,7 +22,10 @@ | |
269 ** Commercial non-GPL licensing of this software is possible. | |
270 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | |
271 ** | |
272 +** Initially modified for use with MPlayer on 2005/12/05 | |
273 ** $Id: sbr_dec.c,v 1.39 2004/09/04 14:56:28 menno Exp $ | |
18783 | 274 +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ |
18141 | 275 +** local_changes.diff contains the exact changes to this file. |
276 **/ | |
277 | |
278 | |
279 @@ -526,8 +529,8 @@ | |
17137 | 280 uint8_t l, k; |
281 uint8_t dont_process = 0; | |
282 uint8_t ret = 0; | |
283 - ALIGN qmf_t X_left[38][64] = {{0}}; | |
284 - ALIGN qmf_t X_right[38][64] = {{0}}; /* must set this to 0 */ | |
285 + ALIGN qmf_t X_left[38][64] = {{{0}}}; | |
286 + ALIGN qmf_t X_right[38][64] = {{{0}}}; /* must set this to 0 */ | |
287 | |
288 if (sbr == NULL) | |
289 return 20; | |
18141 | 290 --- libfaad2.orig/specrec.c 2006-03-16 20:15:04.000000000 +0100 |
291 +++ libfaad2/specrec.c 2006-04-18 20:38:09.000000000 +0200 | |
292 @@ -19,10 +19,10 @@ | |
293 ** Any non-GPL usage of this software or parts of this software is strictly | |
294 ** forbidden. | |
295 ** | |
296 -** Commercial non-GPL licensing of this software is possible. | |
297 -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | |
298 -** | |
299 +** Initially modified for use with MPlayer on 2006/04/18 | |
300 ** $Id: specrec.c,v 1.56 2004/09/08 09:43:11 gcp Exp $ | |
18783 | 301 +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ |
18141 | 302 +** local_changes.diff contains the exact changes to this file. |
303 **/ | |
304 | |
305 /* | |
306 @@ -673,29 +673,19 @@ | |
307 /* MAIN object type prediction */ | |
308 if (hDecoder->object_type == MAIN) | |
309 { | |
310 - /* allocate the state only when needed */ | |
311 - if (hDecoder->pred_stat[channel] == NULL) | |
312 - { | |
313 - hDecoder->pred_stat[channel] = (pred_state*)faad_malloc(hDecoder->frameLength * sizeof(pred_state)); | |
314 + hDecoder->pred_stat[channel] = (pred_state*)realloc(hDecoder->pred_stat[channel], hDecoder->frameLength * sizeof(pred_state)); | |
315 reset_all_predictors(hDecoder->pred_stat[channel], hDecoder->frameLength); | |
316 - } | |
317 } | |
318 #endif | |
319 | |
320 #ifdef LTP_DEC | |
321 if (is_ltp_ot(hDecoder->object_type)) | |
322 { | |
323 - /* allocate the state only when needed */ | |
324 - if (hDecoder->lt_pred_stat[channel] == NULL) | |
325 - { | |
326 - hDecoder->lt_pred_stat[channel] = (int16_t*)faad_malloc(hDecoder->frameLength*4 * sizeof(int16_t)); | |
327 + hDecoder->lt_pred_stat[channel] = (int16_t*)realloc(hDecoder->lt_pred_stat[channel], hDecoder->frameLength*4 * sizeof(int16_t)); | |
328 memset(hDecoder->lt_pred_stat[channel], 0, hDecoder->frameLength*4 * sizeof(int16_t)); | |
329 - } | |
330 } | |
331 #endif | |
332 | |
333 - if (hDecoder->time_out[channel] == NULL) | |
334 - { | |
335 mul = 1; | |
336 #ifdef SBR_DEC | |
337 hDecoder->sbr_alloced[hDecoder->fr_ch_ele] = 0; | |
338 @@ -706,41 +696,28 @@ | |
339 hDecoder->sbr_alloced[hDecoder->fr_ch_ele] = 1; | |
340 } | |
341 #endif | |
342 - hDecoder->time_out[channel] = (real_t*)faad_malloc(mul*hDecoder->frameLength*sizeof(real_t)); | |
343 + hDecoder->time_out[channel] = (real_t*)realloc(hDecoder->time_out[channel], mul*hDecoder->frameLength*sizeof(real_t)); | |
344 memset(hDecoder->time_out[channel], 0, mul*hDecoder->frameLength*sizeof(real_t)); | |
345 - } | |
346 #if (defined(PS_DEC) || defined(DRM_PS)) | |
347 if (output_channels == 2) | |
348 { | |
349 - if (hDecoder->time_out[channel+1] == NULL) | |
350 - { | |
351 - hDecoder->time_out[channel+1] = (real_t*)faad_malloc(mul*hDecoder->frameLength*sizeof(real_t)); | |
352 + hDecoder->time_out[channel+1] = (real_t*)realloc(hDecoder->time_out[channel+1], mul*hDecoder->frameLength*sizeof(real_t)); | |
353 memset(hDecoder->time_out[channel+1], 0, mul*hDecoder->frameLength*sizeof(real_t)); | |
354 - } | |
355 } | |
356 #endif | |
357 | |
358 - if (hDecoder->fb_intermed[channel] == NULL) | |
359 - { | |
360 - hDecoder->fb_intermed[channel] = (real_t*)faad_malloc(hDecoder->frameLength*sizeof(real_t)); | |
361 + hDecoder->fb_intermed[channel] = (real_t*)realloc(hDecoder->fb_intermed[channel], hDecoder->frameLength*sizeof(real_t)); | |
362 memset(hDecoder->fb_intermed[channel], 0, hDecoder->frameLength*sizeof(real_t)); | |
363 - } | |
364 | |
365 #ifdef SSR_DEC | |
366 if (hDecoder->object_type == SSR) | |
367 { | |
368 - if (hDecoder->ssr_overlap[channel] == NULL) | |
369 - { | |
370 - hDecoder->ssr_overlap[channel] = (real_t*)faad_malloc(2*hDecoder->frameLength*sizeof(real_t)); | |
371 - memset(hDecoder->ssr_overlap[channel], 0, 2*hDecoder->frameLength*sizeof(real_t)); | |
372 - } | |
373 - if (hDecoder->prev_fmd[channel] == NULL) | |
374 - { | |
375 uint16_t k; | |
376 - hDecoder->prev_fmd[channel] = (real_t*)faad_malloc(2*hDecoder->frameLength*sizeof(real_t)); | |
377 + hDecoder->ssr_overlap[channel] = (real_t*)realloc(hDecoder->ssr_overlap[channel], 2*hDecoder->frameLength*sizeof(real_t)); | |
378 + memset(hDecoder->ssr_overlap[channel], 0, 2*hDecoder->frameLength*sizeof(real_t)); | |
379 + hDecoder->prev_fmd[channel] = (real_t*)realloc(hDecoder->prev_fmd[channel], 2*hDecoder->frameLength*sizeof(real_t)); | |
380 for (k = 0; k < 2*hDecoder->frameLength; k++) | |
381 hDecoder->prev_fmd[channel][k] = REAL_CONST(-1); | |
382 - } | |
383 } | |
384 #endif | |
385 | |
386 @@ -865,22 +842,13 @@ | |
387 | |
388 /* always allocate 2 channels, PS can always "suddenly" turn up */ | |
389 #if (defined(PS_DEC) || defined(DRM_PS)) | |
390 - output_channels = 2; | |
391 + output_channels = hDecoder->ps_used[hDecoder->fr_ch_ele] ? 2 : 1; | |
392 #else | |
393 output_channels = 1; | |
394 #endif | |
395 | |
396 - if (hDecoder->element_output_channels[hDecoder->fr_ch_ele] == 0) | |
397 - { | |
398 - /* element_output_channels not set yet */ | |
399 + if (hDecoder->element_output_channels[hDecoder->fr_ch_ele] < output_channels) { | |
400 hDecoder->element_output_channels[hDecoder->fr_ch_ele] = output_channels; | |
401 - } else if (hDecoder->element_output_channels[hDecoder->fr_ch_ele] != output_channels) { | |
402 - /* element inconsistency */ | |
403 - return 21; | |
404 - } | |
405 - | |
406 - if (hDecoder->element_alloced[hDecoder->fr_ch_ele] == 0) | |
407 - { | |
408 retval = allocate_single_channel(hDecoder, sce->channel, output_channels); | |
409 if (retval > 0) | |
410 return retval; | |
411 @@ -1026,11 +994,10 @@ | |
412 { | |
413 return 23; | |
414 } | |
415 -#endif | |
416 | |
417 /* copy L to R when no PS is used */ | |
418 #if (defined(PS_DEC) || defined(DRM_PS)) | |
419 - if ((hDecoder->ps_used[hDecoder->fr_ch_ele] == 0)) | |
420 + if ((hDecoder->ps_used[hDecoder->fr_ch_ele] == 0) && (output_channels == 2)) | |
421 { | |
422 uint8_t ele = hDecoder->fr_ch_ele; | |
423 uint8_t ch = sce->channel; | |
424 @@ -1040,6 +1007,7 @@ | |
425 memcpy(hDecoder->time_out[ch+1], hDecoder->time_out[ch], frame_size); | |
426 } | |
427 #endif | |
428 +#endif | |
429 | |
430 return 0; | |
431 } |