Commit 8a913936 authored by Andreas Huber's avatar Andreas Huber Committed by Martin Storsjo

Upstream commit "warnings be gone."

Adapted from upstream commits 84333e0475bc911adc16417f4ca327c975cf6c36
and 442cc6dc48f8188e097617f7f804c314a9dacd0e.
parent 080af754
...@@ -112,6 +112,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E ...@@ -112,6 +112,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E
LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV7 LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV7
endif endif
LOCAL_CFLAGS += -Werror
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
################################################################################ ################################################################################
...@@ -126,6 +128,8 @@ LOCAL_C_INCLUDES := \ ...@@ -126,6 +128,8 @@ LOCAL_C_INCLUDES := \
frameworks/av/media/libstagefright/codecs/common/include \ frameworks/av/media/libstagefright/codecs/common/include \
frameworks/native/include/media/openmax frameworks/native/include/media/openmax
LOCAL_CFLAGS += -Werror
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libstagefright_amrwbenc libstagefright_amrwbenc
......
...@@ -317,7 +317,7 @@ OMX_ERRORTYPE SoftAMRWBEncoder::internalSetParameter( ...@@ -317,7 +317,7 @@ OMX_ERRORTYPE SoftAMRWBEncoder::internalSetParameter(
} }
} }
void SoftAMRWBEncoder::onQueueFilled(OMX_U32 portIndex) { void SoftAMRWBEncoder::onQueueFilled(OMX_U32 /* portIndex */) {
if (mSignalledError) { if (mSignalledError) {
return; return;
} }
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include "acelp.h" #include "acelp.h"
#include "ham_wind.tab" #include "ham_wind.tab"
#define UNUSED(x) (void)(x)
void Autocorr( void Autocorr(
Word16 x[], /* (i) : Input signal */ Word16 x[], /* (i) : Input signal */
Word16 m, /* (i) : LPC order */ Word16 m, /* (i) : LPC order */
...@@ -40,6 +42,8 @@ void Autocorr( ...@@ -40,6 +42,8 @@ void Autocorr(
Word32 L_sum, L_sum1, L_tmp, F_LEN; Word32 L_sum, L_sum1, L_tmp, F_LEN;
Word16 *p1,*p2,*p3; Word16 *p1,*p2,*p3;
const Word16 *p4; const Word16 *p4;
UNUSED(m);
/* Windowing of signal */ /* Windowing of signal */
p1 = x; p1 = x;
p4 = vo_window; p4 = vo_window;
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include "typedef.h" #include "typedef.h"
#include "basic_op.h" #include "basic_op.h"
#define UNUSED(x) (void)(x)
void Convolve ( void Convolve (
Word16 x[], /* (i) : input vector */ Word16 x[], /* (i) : input vector */
Word16 h[], /* (i) : impulse response */ Word16 h[], /* (i) : impulse response */
...@@ -35,6 +37,8 @@ void Convolve ( ...@@ -35,6 +37,8 @@ void Convolve (
Word32 i, n; Word32 i, n;
Word16 *tmpH,*tmpX; Word16 *tmpH,*tmpX;
Word32 s; Word32 s;
UNUSED(L);
for (n = 0; n < 64;) for (n = 0; n < 64;)
{ {
tmpH = h+n; tmpH = h+n;
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#define UP_SAMP 4 #define UP_SAMP 4
#define L_INTERPOL1 4 #define L_INTERPOL1 4
#define UNUSED(x) (void)(x)
/* Local functions */ /* Local functions */
#ifdef ASM_OPT #ifdef ASM_OPT
...@@ -171,6 +173,7 @@ static void Norm_Corr( ...@@ -171,6 +173,7 @@ static void Norm_Corr(
Word32 corr, exp_corr, norm, exp, scale; Word32 corr, exp_corr, norm, exp, scale;
Word16 exp_norm, excf[L_SUBFR], tmp; Word16 exp_norm, excf[L_SUBFR], tmp;
Word32 L_tmp, L_tmp1, L_tmp2; Word32 L_tmp, L_tmp1, L_tmp2;
UNUSED(L_subfr);
/* compute the filtered excitation for the first delay t_min */ /* compute the filtered excitation for the first delay t_min */
k = -t_min; k = -t_min;
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include "math_op.h" #include "math_op.h"
#include "cnst.h" #include "cnst.h"
#define UNUSED(x) (void)(x)
void Syn_filt( void Syn_filt(
Word16 a[], /* (i) Q12 : a[m+1] prediction coefficients */ Word16 a[], /* (i) Q12 : a[m+1] prediction coefficients */
Word16 x[], /* (i) : input signal */ Word16 x[], /* (i) : input signal */
...@@ -95,6 +97,8 @@ void Syn_filt_32( ...@@ -95,6 +97,8 @@ void Syn_filt_32(
Word32 i,a0; Word32 i,a0;
Word32 L_tmp, L_tmp1; Word32 L_tmp, L_tmp1;
Word16 *p1, *p2, *p3; Word16 *p1, *p2, *p3;
UNUSED(m);
a0 = a[0] >> (4 + Qnew); /* input / 16 and >>Qnew */ a0 = a[0] >> (4 + Qnew); /* input / 16 and >>Qnew */
/* Do the filtering. */ /* Do the filtering. */
for (i = 0; i < lg; i++) for (i = 0; i < lg; i++)
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#include "mem_align.h" #include "mem_align.h"
#include "cmnMemory.h" #include "cmnMemory.h"
#define UNUSED(x) (void)(x)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -1602,6 +1604,8 @@ VO_U32 VO_API voAMRWB_Init(VO_HANDLE * phCodec, /* o: the audi ...@@ -1602,6 +1604,8 @@ VO_U32 VO_API voAMRWB_Init(VO_HANDLE * phCodec, /* o: the audi
VO_MEM_OPERATOR voMemoprator; VO_MEM_OPERATOR voMemoprator;
#endif #endif
VO_MEM_OPERATOR *pMemOP; VO_MEM_OPERATOR *pMemOP;
UNUSED(vType);
int interMem = 0; int interMem = 0;
if(pUserData == NULL || pUserData->memflag != VO_IMF_USERMEMOPERATOR || pUserData->memData == NULL ) if(pUserData == NULL || pUserData->memflag != VO_IMF_USERMEMOPERATOR || pUserData->memData == NULL )
......
...@@ -14,6 +14,8 @@ LOCAL_STATIC_LIBRARIES := ...@@ -14,6 +14,8 @@ LOCAL_STATIC_LIBRARIES :=
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include $(LOCAL_PATH)/include
LOCAL_CFLAGS += -Werror
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
......
...@@ -26,8 +26,12 @@ ...@@ -26,8 +26,12 @@
//VO_MEM_OPERATOR g_memOP; //VO_MEM_OPERATOR g_memOP;
#define UNUSED(x) (void)(x)
VO_U32 cmnMemAlloc (VO_S32 uID, VO_MEM_INFO * pMemInfo) VO_U32 cmnMemAlloc (VO_S32 uID, VO_MEM_INFO * pMemInfo)
{ {
UNUSED(uID);
if (!pMemInfo) if (!pMemInfo)
return VO_ERR_INVALID_ARG; return VO_ERR_INVALID_ARG;
...@@ -37,34 +41,48 @@ VO_U32 cmnMemAlloc (VO_S32 uID, VO_MEM_INFO * pMemInfo) ...@@ -37,34 +41,48 @@ VO_U32 cmnMemAlloc (VO_S32 uID, VO_MEM_INFO * pMemInfo)
VO_U32 cmnMemFree (VO_S32 uID, VO_PTR pMem) VO_U32 cmnMemFree (VO_S32 uID, VO_PTR pMem)
{ {
UNUSED(uID);
free (pMem); free (pMem);
return 0; return 0;
} }
VO_U32 cmnMemSet (VO_S32 uID, VO_PTR pBuff, VO_U8 uValue, VO_U32 uSize) VO_U32 cmnMemSet (VO_S32 uID, VO_PTR pBuff, VO_U8 uValue, VO_U32 uSize)
{ {
UNUSED(uID);
memset (pBuff, uValue, uSize); memset (pBuff, uValue, uSize);
return 0; return 0;
} }
VO_U32 cmnMemCopy (VO_S32 uID, VO_PTR pDest, VO_PTR pSource, VO_U32 uSize) VO_U32 cmnMemCopy (VO_S32 uID, VO_PTR pDest, VO_PTR pSource, VO_U32 uSize)
{ {
UNUSED(uID);
memcpy (pDest, pSource, uSize); memcpy (pDest, pSource, uSize);
return 0; return 0;
} }
VO_U32 cmnMemCheck (VO_S32 uID, VO_PTR pBuffer, VO_U32 uSize) VO_U32 cmnMemCheck (VO_S32 uID, VO_PTR pBuffer, VO_U32 uSize)
{ {
UNUSED(uID);
UNUSED(pBuffer);
UNUSED(uSize);
return 0; return 0;
} }
VO_S32 cmnMemCompare (VO_S32 uID, VO_PTR pBuffer1, VO_PTR pBuffer2, VO_U32 uSize) VO_S32 cmnMemCompare (VO_S32 uID, VO_PTR pBuffer1, VO_PTR pBuffer2, VO_U32 uSize)
{ {
UNUSED(uID);
return memcmp(pBuffer1, pBuffer2, uSize); return memcmp(pBuffer1, pBuffer2, uSize);
} }
VO_U32 cmnMemMove (VO_S32 uID, VO_PTR pDest, VO_PTR pSource, VO_U32 uSize) VO_U32 cmnMemMove (VO_S32 uID, VO_PTR pDest, VO_PTR pSource, VO_U32 uSize)
{ {
UNUSED(uID);
memmove (pDest, pSource, uSize); memmove (pDest, pSource, uSize);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment