annotate libfaad2/local_changes.diff @ 16234:31660114d885

silly printf() is the onyl reason avi-fix was so slow, a printf for EVERY byte is pretty hefty...
author ods15
date Tue, 16 Aug 2005 18:19:06 +0000
parents cc0c5443548d
children d47cd711f617
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14712
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
1 --- libfaad/bits.h 2004-03-11 14:32:39.000000000 +0100
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
2 +++ libfaad2/bits.h 2004-06-24 10:47:02.000000000 +0200
14858
cc0c5443548d cosmetics: Make diff -R apply without offsets.
diego
parents: 14712
diff changeset
3 @@ -58,7 +61,7 @@
14712
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
4
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
5 #if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
6 #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
7 -#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
8 +#elif defined(LINUX) || defined(DJGPP)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
9 #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) )
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
10 #else
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
11 #define BSWAP(a) \
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
12 --- libfaad/common.h 2004-06-30 14:45:56.000000000 +0200
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
13 +++ libfaad2/common.h 2004-10-19 03:16:03.000000000 +0200
14858
cc0c5443548d cosmetics: Make diff -R apply without offsets.
diego
parents: 14712
diff changeset
14 @@ -32,10 +35,13 @@
14712
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
15 extern "C" {
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
16 #endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
17
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
18 -#ifdef HAVE_CONFIG_H
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
19 -# include "../config.h"
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
20 +/* Allow build on Cygwin*/
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
21 +#if defined(__CYGWIN__)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
22 +#define __STRICT_ANSI__
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
23 #endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
24
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
25 +#include "../config.h"
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
26 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
27 #define INLINE __inline
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
28 #if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
29 #define ALIGN __declspec(align(16))
14858
cc0c5443548d cosmetics: Make diff -R apply without offsets.
diego
parents: 14712
diff changeset
30 @@ -117,6 +123,9 @@
14712
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
31 # ifdef MAIN_DEC
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
32 # undef MAIN_DEC
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
33 # endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
34 +# ifdef SBR_DEC
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
35 +# undef SBR_DEC
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
36 +# endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
37 #endif // FIXED_POINT
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
38
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
39 #ifdef DRM
14858
cc0c5443548d cosmetics: Make diff -R apply without offsets.
diego
parents: 14712
diff changeset
40 @@ -157,6 +166,7 @@
14712
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
41
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
42 #include <stdlib.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
43
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
44 +#if 0
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
45 typedef unsigned __int64 uint64_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
46 typedef unsigned __int32 uint32_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
47 typedef unsigned __int16 uint16_t;
14858
cc0c5443548d cosmetics: Make diff -R apply without offsets.
diego
parents: 14712
diff changeset
48 @@ -165,11 +175,31 @@
14712
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
49 typedef __int32 int32_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
50 typedef __int16 int16_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
51 typedef __int8 int8_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
52 +#else
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
53 +#include <inttypes.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
54 +#endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
55 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
56 typedef float float32_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
57
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
58
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
59 #else
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
60
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
61 +/* #undef HAVE_FLOAT32_T */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
62 +/* Define if you have the <inttypes.h> header file. */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
63 +#define HAVE_INTTYPES_H 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
64 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
65 +/* Define if you have the `memcpy' function. */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
66 +#define HAVE_MEMCPY 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
67 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
68 +/* Define if you have the <stdint.h> header file. */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
69 +#define HAVE_STDINT_H 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
70 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
71 +/* Define if you have the `strchr' function. */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
72 +#define HAVE_STRCHR 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
73 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
74 +/* Define if you have the ANSI C header files. */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
75 +#define STDC_HEADERS 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
76 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
77 #include <stdio.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
78 #if HAVE_SYS_TYPES_H
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
79 # include <sys/types.h>
14858
cc0c5443548d cosmetics: Make diff -R apply without offsets.
diego
parents: 14712
diff changeset
80 @@ -311,7 +341,7 @@
14712
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
81 }
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
82 return i;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
83 }
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
84 - #elif (defined(__i386__) && defined(__GNUC__))
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
85 + #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
86 #define HAS_LRINTF
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
87 // from http://www.stereopsis.com/FPU.html
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
88 static INLINE int lrintf(float f)
14858
cc0c5443548d cosmetics: Make diff -R apply without offsets.
diego
parents: 14712
diff changeset
89 @@ -340,6 +370,8 @@
14712
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
90
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
91 #else
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
92
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
93 +#include <math.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
94 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
95 #ifdef HAVE_LRINTF
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
96 # define HAS_LRINTF
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
97 # define _ISOC9X_SOURCE 1
14858
cc0c5443548d cosmetics: Make diff -R apply without offsets.
diego
parents: 14712
diff changeset
98 @@ -348,8 +380,6 @@
14712
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
99 # define __USE_ISOC99 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
100 #endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
101
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
102 - #include <math.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
103 -
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
104 #ifdef HAVE_SINF
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
105 # define sin sinf
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
106 #error