[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Fri Sep 18 20:48:43 UTC 2009
The following commit has been merged in the master branch:
commit 39a283a6ef05c6d1dfef302ca8ac61e9ed89b8eb
Author: Martin Storsjo <martin at martin.st>
Date: Wed May 20 02:13:14 2009 +0300
Changed a few occurrances of __inline into static inline
This fixes compilation without the __inline define on C compilers
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op_c_equivalent.h b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op_c_equivalent.h
index ddf320a..5e847c4 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op_c_equivalent.h
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op_c_equivalent.h
@@ -196,7 +196,7 @@ extern "C"
Returns:
result = 32-bit result of L_var3 + (var1 * var2)(Word32)
*/
- __inline Word32 L_mac(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)
+ static inline Word32 L_mac(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)
{
Word32 result;
Word32 L_sum;
@@ -318,7 +318,7 @@ extern "C"
Returns:
L_product = 32-bit product of L_var1 and L_var2 (Word32)
*/
- __inline Word32 Mpy_32(Word16 L_var1_hi,
+ static inline Word32 Mpy_32(Word16 L_var1_hi,
Word16 L_var1_lo,
Word16 L_var2_hi,
Word16 L_var2_lo,
@@ -392,7 +392,7 @@ extern "C"
product = 32-bit product of the 32-bit L_var1 and 16-bit var1 (Word32)
*/
- __inline Word32 Mpy_32_16(Word16 L_var1_hi,
+ static inline Word32 Mpy_32_16(Word16 L_var1_hi,
Word16 L_var1_lo,
Word16 var2,
Flag *pOverflow)
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op.h b/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op.h
index 48aff1e..7c7e13b 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op.h
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op.h
@@ -81,7 +81,7 @@ terms listed above has been obtained from the copyright holder.
range : 0x8000 <= var_out <= 0x7fff.
----------------------------------------------------------------------------*/
-__inline int16 negate_int16(int16 var1)
+static inline int16 negate_int16(int16 var1)
{
return (((var1 == MIN_16) ? MAX_16 : -var1));
}
@@ -111,7 +111,7 @@ __inline int16 negate_int16(int16 var1)
range : 0x8000 <= var_out <= 0x7fff.
----------------------------------------------------------------------------*/
-__inline int16 shl_int16(int16 var1, int16 var2)
+static inline int16 shl_int16(int16 var1, int16 var2)
{
int16 var_out;
@@ -155,7 +155,7 @@ __inline int16 shl_int16(int16 var1, int16 var2)
----------------------------------------------------------------------------*/
-__inline int32 shl_int32(int32 L_var1, int16 var2)
+static inline int32 shl_int32(int32 L_var1, int16 var2)
{
int32 L_var_out;
@@ -199,7 +199,7 @@ __inline int32 shl_int32(int32 L_var1, int16 var2)
----------------------------------------------------------------------------*/
-__inline int32 shr_int32(int32 L_var1, int16 var2)
+static inline int32 shr_int32(int32 L_var1, int16 var2)
{
int32 L_var_out;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op_cequivalent.h b/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op_cequivalent.h
index 4c198d8..84bd652 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op_cequivalent.h
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op_cequivalent.h
@@ -85,7 +85,7 @@ extern "C"
range : 0xffff 8000 <= var_out <= 0x0000 7fff.
----------------------------------------------------------------------------*/
- __inline int16 add_int16(int16 var1, int16 var2)
+ static inline int16 add_int16(int16 var1, int16 var2)
{
int32 L_sum;
@@ -124,7 +124,7 @@ extern "C"
range : 0xffff 8000 <= var_out <= 0x0000 7fff.
----------------------------------------------------------------------------*/
- __inline int16 sub_int16(int16 var1, int16 var2)
+ static inline int16 sub_int16(int16 var1, int16 var2)
{
int32 L_diff;
@@ -162,7 +162,7 @@ extern "C"
----------------------------------------------------------------------------*/
- __inline int16 mult_int16(int16 var1, int16 var2)
+ static inline int16 mult_int16(int16 var1, int16 var2)
{
int32 L_product;
@@ -202,7 +202,7 @@ extern "C"
----------------------------------------------------------------------------*/
- __inline int32 add_int32(int32 L_var1, int32 L_var2)
+ static inline int32 add_int32(int32 L_var1, int32 L_var2)
{
int32 L_var_out;
@@ -246,7 +246,7 @@ extern "C"
----------------------------------------------------------------------------*/
- __inline int32 sub_int32(int32 L_var1, int32 L_var2)
+ static inline int32 sub_int32(int32 L_var1, int32 L_var2)
{
int32 L_var_out;
@@ -293,7 +293,7 @@ extern "C"
----------------------------------------------------------------------------*/
- __inline int32 mac_16by16_to_int32(int32 L_var3, int16 var1, int16 var2)
+ static inline int32 mac_16by16_to_int32(int32 L_var3, int16 var1, int16 var2)
{
int32 L_var_out;
int32 L_mul;
@@ -352,7 +352,7 @@ extern "C"
----------------------------------------------------------------------------*/
- __inline int32 msu_16by16_from_int32(int32 L_var3, int16 var1, int16 var2)
+ static inline int32 msu_16by16_from_int32(int32 L_var3, int16 var1, int16 var2)
{
int32 L_var_out;
int32 L_mul;
@@ -407,7 +407,7 @@ extern "C"
----------------------------------------------------------------------------*/
- __inline int32 mul_16by16_to_int32(int16 var1, int16 var2)
+ static inline int32 mul_16by16_to_int32(int16 var1, int16 var2)
{
int32 L_mul;
@@ -445,7 +445,7 @@ extern "C"
range : 0xffff 8000 <= var_out <= 0x0000 7fff.
----------------------------------------------------------------------------*/
- __inline int16 amr_wb_round(int32 L_var1)
+ static inline int16 amr_wb_round(int32 L_var1)
{
if (L_var1 != MAX_32)
{
@@ -473,7 +473,7 @@ extern "C"
range : 0xffff 8000 <= var_out <= 0x0000 7fff.
----------------------------------------------------------------------------*/
- __inline int16 amr_wb_shl1_round(int32 L_var1)
+ static inline int16 amr_wb_shl1_round(int32 L_var1)
{
int16 var_out;
@@ -506,12 +506,12 @@ extern "C"
----------------------------------------------------------------------------*/
- __inline int32 mul_32by16(int16 hi, int16 lo, int16 n)
+ static inline int32 mul_32by16(int16 hi, int16 lo, int16 n)
{
return (((((int32)hi*n)) + ((((int32)lo*n) >> 15))) << 1);
}
- __inline int32 fxp_mac_16by16(int16 var1, int16 var2, int32 L_add)
+ static inline int32 fxp_mac_16by16(int16 var1, int16 var2, int32 L_add)
{
L_add += (int32)var1 * var2;
@@ -519,14 +519,14 @@ extern "C"
return L_add;
}
- __inline int32 fxp_mul_16by16(int16 var1, const int16 var2)
+ static inline int32 fxp_mul_16by16(int16 var1, const int16 var2)
{
int32 L_mul = (int32)var1 * var2;
return L_mul;
}
- __inline int32 fxp_mul32_by_16b(int32 L_var1, const int32 L_var2)
+ static inline int32 fxp_mul32_by_16b(int32 L_var1, const int32 L_var2)
{
int32 L_mul = (int32)(((int64)L_var1 * (L_var2 << 16)) >> 32);
--
opencore-amr packaging
More information about the pkg-multimedia-commits
mailing list