[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:39 UTC 2009
The following commit has been merged in the master branch:
commit 5a10e0e4c7d3e8b25c1d7cdc1701c97823e7d4a9
Author: Andres Mejia <mcitadel at gmail.com>
Date: Mon May 18 15:32:41 2009 -0400
Partial revert of compiler warning fixes.
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h
index 66c7d45..46f1035 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h
@@ -276,7 +276,7 @@ extern "C"
{
Word16 var_out = 0;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
if (var2 < 0)
{
@@ -328,7 +328,7 @@ extern "C"
{
Word32 L_var_out = 0;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
if (var2 > 0)
{
@@ -381,7 +381,7 @@ extern "C"
{
Word32 L_var_out = 0;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
if (var2 > 0)
{
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 ff6035c..ddf320a 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
@@ -328,7 +328,7 @@ extern "C"
Word32 L_sum;
Word32 product32;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
L_product = (Word32) L_var1_hi * L_var2_hi;
if (L_product != (Word32) 0x40000000L)
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/az_lsp.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/az_lsp.cpp
index 2bf850e..bd99b30 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/az_lsp.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/az_lsp.cpp
@@ -251,7 +251,7 @@ static Word16 Chebps(Word16 x,
Word32 L_temp;
Word16 *p_f = &f[1];
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
/* L_temp = 1.0 */
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/inv_sqrt.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/inv_sqrt.cpp
index be3904f..83f4d0c 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/inv_sqrt.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/inv_sqrt.cpp
@@ -228,7 +228,7 @@ Word32 Inv_sqrt( /* (o) : output value */
Word16 a;
Word16 tmp;
Word32 L_y;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
if (L_x <= (Word32) 0)
{
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/log2.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/log2.cpp
index 141d585..6007b3f 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/log2.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/log2.cpp
@@ -169,7 +169,7 @@ void Log2(
{
Word16 exp;
Word32 result;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
exp = norm_l(L_x);
result = L_x << exp;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsfwt.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsfwt.cpp
index a29d287..6b511f7 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsfwt.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsfwt.cpp
@@ -196,7 +196,7 @@ void Lsf_wt(
Word16 *p_lsf = &lsf[0];
Word16 *p_lsf_2 = &lsf[1];
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
/* wf[0] = lsf[1] - 0 */
*(p_wf++) = *(p_lsf_2++);
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsp_az.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsp_az.cpp
index 5863fb7..6b7b471 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsp_az.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsp_az.cpp
@@ -260,7 +260,7 @@ static void Get_lsp_pol(
Word16 hi;
Word16 lo;
Word32 t0;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
/* f[0] = 1.0; */
*f++ = (Word32) 0x01000000;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsp_lsf.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsp_lsf.cpp
index 44c2e77..39d6eda 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsp_lsf.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/lsp_lsf.cpp
@@ -356,7 +356,7 @@ void Lsp_lsf(
Word32 L_tmp;
Word16 *p_lsp = &lsp[m-1];
Word16 *p_lsf = &lsf[m-1];
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
ind = 63; /* begin at end of table -1 */
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/pred_lt.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/pred_lt.cpp
index 9f0110a..a18b838 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/pred_lt.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/pred_lt.cpp
@@ -276,7 +276,7 @@ void Pred_lt_3or6(
Word32 s1;
Word32 s2;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
pX0 = &(exc[-T0]);
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/q_plsf_3.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/q_plsf_3.cpp
index 3c85795..cc06454 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/q_plsf_3.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/q_plsf_3.cpp
@@ -296,7 +296,7 @@ static Word16 Vq_subvec4( /* o: quantization index, Q0 */
Word16 wf1_2;
Word16 wf1_3;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
dist_min = MAX_32;
p_dico = dico;
@@ -624,7 +624,7 @@ static Word16 Vq_subvec3( /* o: quantization index, Q0 */
Word16 wf1_1;
Word16 wf1_2;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
dist_min = MAX_32;
p_dico = dico;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/q_plsf_5.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/q_plsf_5.cpp
index 50fb364..2f9e40e 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/q_plsf_5.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/q_plsf_5.cpp
@@ -227,7 +227,7 @@ static Word16 Vq_subvec( /* o : quantization index, Q0 */
Word32 aux3;
Word32 aux4;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
dist_min = MAX_32;
p_dico = dico;
@@ -398,7 +398,7 @@ static Word16 Vq_subvec_s( /* o : quantization index Q0 */
Word16 wf2_0;
Word16 wf2_1;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
dist_min = MAX_32;
p_dico = dico;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/reorder.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/reorder.cpp
index abc872b..b1e4711 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/reorder.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/reorder.cpp
@@ -180,7 +180,7 @@ void Reorder_lsf(
Word16 i;
Word16 lsf_min;
Word16 *p_lsf = &lsf[0];
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
lsf_min = min_dist;
for (i = 0; i < n; i++)
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/sp_dec.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/sp_dec.cpp
index 11f8383..b685b5e 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/sp_dec.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/sp_dec.cpp
@@ -245,7 +245,7 @@ Word16 GSMInitDecode(void **state_data,
Word8 * id)
{
Speech_Decode_FrameState* s;
- (void)(id);
+ OSCL_UNUSED_ARG(id);
if (state_data == NULL)
{
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/autocorr.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/autocorr.cpp
index 731e3f8..0d3acac 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/autocorr.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/autocorr.cpp
@@ -333,7 +333,7 @@ Word16 Autocorr(
* Windowing of the signal
*/
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
sum = 0L;
j = 0;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c1035pf.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c1035pf.cpp
index 6487366..83c7a71 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c1035pf.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c1035pf.cpp
@@ -413,7 +413,7 @@ static void build_code(
Word16 *p_y;
Word16 *p_codvec;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
oscl_memset(cod, 0, L_CODE*sizeof(*cod));
oscl_memset(indx, 0xFF, NB_TRACK*sizeof(*indx));
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c2_9pf.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c2_9pf.cpp
index ddae56a..a33cdf7 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c2_9pf.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c2_9pf.cpp
@@ -612,7 +612,7 @@ extern "C"
Word32 L_temp;
Word16 *p_codvec = &codvec[0];
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
psk = -1;
alpk = 1;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c4_17pf.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c4_17pf.cpp
index 9a8fc07..d52b43b 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c4_17pf.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c4_17pf.cpp
@@ -419,7 +419,7 @@ extern "C"
Word32 alp0;
Word32 alp1;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
/* Default value */
psk = -1;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c8_31pf.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c8_31pf.cpp
index acb3484..07c2efd 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c8_31pf.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/c8_31pf.cpp
@@ -446,7 +446,7 @@ static Word16 compress10(
Word32 tempWord32;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
ia = pos_indxA >> 1;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/g_code.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/g_code.cpp
index b6de23c..f937cb7 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/g_code.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/g_code.cpp
@@ -241,7 +241,7 @@ Word16 G_code( /* o : Gain of innovation code */
Word16 temp;
Word32 temp2;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
/* Compute scalar product <X[],Y[]> */
s = 0;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/inter_36.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/inter_36.cpp
index 9a6c8ce..87766a9 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/inter_36.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/inter_36.cpp
@@ -207,7 +207,7 @@ Word16 Interpol_3or6( /* o : interpolated value */
Word32 s;
Word16 temp1;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
if (flag3 != 0)
{
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/l_extract.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/l_extract.cpp
index 007f8cc..39155db 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/l_extract.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/l_extract.cpp
@@ -163,7 +163,7 @@ void L_Extract(Word32 L_var,
Word32 temp;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
temp = (L_var >> 16);
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/pitch_fr.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/pitch_fr.cpp
index 47b49a0..1b28397 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/pitch_fr.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/pitch_fr.cpp
@@ -727,7 +727,7 @@ static void getRange(
{
Word16 temp;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
temp = *t0_min;
temp = T0 - delta_low;
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/s10_8pf.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/s10_8pf.cpp
index ddcf74d..117f78a 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/s10_8pf.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/s10_8pf.cpp
@@ -585,7 +585,7 @@ void search_10and8i40(
Word16 index[10];
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
if (nbPulse == 10)
{
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/sp_enc.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/sp_enc.cpp
index 4f60a58..124673f 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/sp_enc.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/sp_enc.cpp
@@ -217,7 +217,7 @@ Word16 GSMInitEncode(void **state_data,
{
Speech_Encode_FrameState* s;
- (void)(id);
+ OSCL_UNUSED_ARG(id);
if (state_data == NULL)
{
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/spstproc.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/spstproc.cpp
index b54d66d..b9574aa 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/spstproc.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/spstproc.cpp
@@ -200,7 +200,7 @@ void subframePostProc(
Word16 *p_exc;
Word16 *p_code;
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
if (mode != MR122)
{
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/ton_stab.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/ton_stab.cpp
index 346e86e..ec20bf3 100644
--- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/ton_stab.cpp
+++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/ton_stab.cpp
@@ -534,7 +534,7 @@ Word16 check_lsp(tonStabState *st, /* i/o : State struct */
Word16 *p_lsp = &lsp[3];
Word16 *p_lsp_1 = &lsp[4];
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
/* Check for a resonance: */
/* Find minimum distance between lsp[i] and lsp[i+1] */
@@ -789,7 +789,7 @@ void update_gp_clipping(tonStabState *st, /* i/o : State struct */
Flag *pOverflow
)
{
- (void)(pOverflow);
+ OSCL_UNUSED_ARG(pOverflow);
for (int i = 0; i < N_FRAME - 1; i++)
{
st->gp[i] = st->gp[i+1];
--
opencore-amr packaging
More information about the pkg-multimedia-commits
mailing list