diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-04-15 14:45:41 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-04-15 14:45:41 +0000 |
| commit | b20356ecb30f87a4b7aca162dac946c9710e23f3 (patch) | |
| tree | ee64bc0c440a820e1475ddce5de0e099f0dc6847 /third_party/g7221/common | |
| parent | fb257e0aaa5b9b078b57c252acdf69c1ba793513 (diff) | |
Ticket #774:
- Added build config for GNU autoconf & make.
- Fixed some G.722.1 codes for linux & mingw32 targets, e.g: types
defs, collision function name 'round'.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2601 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party/g7221/common')
| -rw-r--r-- | third_party/g7221/common/stl-files/basop32.c | 2 | ||||
| -rw-r--r-- | third_party/g7221/common/stl-files/basop32.h | 2 | ||||
| -rw-r--r-- | third_party/g7221/common/stl-files/typedef.h | 19 |
3 files changed, 21 insertions, 2 deletions
diff --git a/third_party/g7221/common/stl-files/basop32.c b/third_party/g7221/common/stl-files/basop32.c index 86d97dd6..9eb4f380 100644 --- a/third_party/g7221/common/stl-files/basop32.c +++ b/third_party/g7221/common/stl-files/basop32.c @@ -711,7 +711,7 @@ Word16 extract_l (Word32 L_var1) | range : 0xffff 8000 <= var_out <= 0x0000 7fff. | |___________________________________________________________________________| */ -Word16 round (Word32 L_var1) +Word16 itu_round (Word32 L_var1) { Word16 var_out; Word32 L_rounded; diff --git a/third_party/g7221/common/stl-files/basop32.h b/third_party/g7221/common/stl-files/basop32.h index 7b096454..308f8d32 100644 --- a/third_party/g7221/common/stl-files/basop32.h +++ b/third_party/g7221/common/stl-files/basop32.h @@ -54,7 +54,7 @@ Word32 L_mult (Word16 var1, Word16 var2); /* Long mult, 1 */ Word16 negate (Word16 var1); /* Short negate, 1 */ Word16 extract_h (Word32 L_var1); /* Extract high, 1 */ Word16 extract_l (Word32 L_var1); /* Extract low, 1 */ -Word16 round (Word32 L_var1); /* Round, 1 */ +Word16 itu_round (Word32 L_var1); /* Round, 1 */ Word32 L_mac (Word32 L_var3, Word16 var1, Word16 var2); /* Mac, 1 */ Word32 L_msu (Word32 L_var3, Word16 var1, Word16 var2); /* Msu, 1 */ Word32 L_macNs (Word32 L_var3, Word16 var1, Word16 var2); /* Mac without diff --git a/third_party/g7221/common/stl-files/typedef.h b/third_party/g7221/common/stl-files/typedef.h index 6c06541f..9b0ef44c 100644 --- a/third_party/g7221/common/stl-files/typedef.h +++ b/third_party/g7221/common/stl-files/typedef.h @@ -16,6 +16,22 @@ #ifndef TYPEDEF_H #define TYPEDEF_H "$Id $" +#if 1 + +/* Use PJLIB types definitions (for PJLIB sync'd platforms compatibility? + * e.g: mingw32 was not supported by the original version). + */ +#include <pj/types.h> + +typedef pj_int8_t Word8; +typedef pj_int16_t Word16; +typedef pj_int32_t Word32; +typedef pj_uint16_t UWord16; +typedef pj_uint32_t UWord32; +typedef int Flag; + +#else + #include <limits.h> #if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(_MSC_VER) || defined(__ZTC__) || defined(__CYGWIN__) @@ -52,4 +68,7 @@ typedef unsigned int UWord32; typedef unsigned long UWord32; #endif +#endif /* if 0 */ + #endif /* TYPEDEF_H */ + |