diff --git a/src/common_audio/vad/include/webrtc_vad.h b/src/common_audio/vad/include/webrtc_vad.h index 6e3eb74ab..733cdca7f 100644 --- a/src/common_audio/vad/include/webrtc_vad.h +++ b/src/common_audio/vad/include/webrtc_vad.h @@ -110,7 +110,7 @@ WebRtc_Word16 WebRtcVad_Free(VadInst *vad_inst); * Return value : 0 - Ok * -1 - Error */ -WebRtc_Word16 WebRtcVad_Init(VadInst *vad_inst); +int WebRtcVad_Init(VadInst *vad_inst); /**************************************************************************** * WebRtcVad_set_mode(...) diff --git a/src/common_audio/vad/webrtc_vad.c b/src/common_audio/vad/webrtc_vad.c index dcfbda112..cd1d95e80 100644 --- a/src/common_audio/vad/webrtc_vad.c +++ b/src/common_audio/vad/webrtc_vad.c @@ -101,7 +101,7 @@ WebRtc_Word16 WebRtcVad_Free(VadInst *vad_inst) return 0; } -WebRtc_Word16 WebRtcVad_Init(VadInst *vad_inst) +int WebRtcVad_Init(VadInst *vad_inst) { short mode = 0; // Default high quality diff --git a/src/modules/audio_coding/neteq/dsp.c b/src/modules/audio_coding/neteq/dsp.c index 73396b2f5..53f7006ca 100644 --- a/src/modules/audio_coding/neteq/dsp.c +++ b/src/modules/audio_coding/neteq/dsp.c @@ -429,7 +429,7 @@ int WebRtcNetEQ_InitVAD(PostDecodeVAD_t *VADInst, WebRtc_UWord16 fs) && VADInst->setmodeFunction != NULL /* ... pointers ... */ && VADInst->VADFunction != NULL) /* ... are defined */ { - res = (int) VADInst->initFunction( VADInst->VADState ); /* call VAD init function */ + res = VADInst->initFunction( VADInst->VADState ); /* call VAD init function */ res |= WebRtcNetEQ_SetVADModeInternal( VADInst, VADInst->VADMode ); if (res!=0) diff --git a/src/modules/audio_coding/neteq/dsp.h b/src/modules/audio_coding/neteq/dsp.h index 0b0422939..ac947b24d 100644 --- a/src/modules/audio_coding/neteq/dsp.h +++ b/src/modules/audio_coding/neteq/dsp.h @@ -188,7 +188,7 @@ typedef struct ExpandInst_t_ * These function pointers match the definitions of WebRtc VAD functions WebRtcVad_Init, * WebRtcVad_set_mode and WebRtcVad_Process, respectively, all found in webrtc_vad.h. */ -typedef WebRtc_Word16 (*VADInitFunction)(void *VAD_inst); +typedef int (*VADInitFunction)(void *VAD_inst); typedef WebRtc_Word16 (*VADSetmodeFunction)(void *VAD_inst, WebRtc_Word16 mode); typedef WebRtc_Word16 (*VADFunction)(void *VAD_inst, WebRtc_Word16 fs, WebRtc_Word16 *frame, WebRtc_Word16 frameLen); diff --git a/src/modules/audio_coding/neteq/interface/webrtc_neteq_internal.h b/src/modules/audio_coding/neteq/interface/webrtc_neteq_internal.h index e7d09cbf8..b67abdd5d 100644 --- a/src/modules/audio_coding/neteq/interface/webrtc_neteq_internal.h +++ b/src/modules/audio_coding/neteq/interface/webrtc_neteq_internal.h @@ -138,7 +138,7 @@ int WebRtcNetEQ_GetRawFrameWaitingTimes(void *inst, * These function pointers match the definitions of webrtc VAD functions WebRtcVad_Init, * WebRtcVad_set_mode and WebRtcVad_Process, respectively, all found in webrtc_vad.h. */ -typedef WebRtc_Word16 (*WebRtcNetEQ_VADInitFunction)(void *VAD_inst); +typedef int (*WebRtcNetEQ_VADInitFunction)(void *VAD_inst); typedef WebRtc_Word16 (*WebRtcNetEQ_VADSetmodeFunction)(void *VAD_inst, WebRtc_Word16 mode); typedef WebRtc_Word16 (*WebRtcNetEQ_VADFunction)(void *VAD_inst, WebRtc_Word16 fs, WebRtc_Word16 *frame, WebRtc_Word16 frameLen);