From 44ef3774ce3f327ce085b3ed2fa1d4df221b2cf2 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Wed, 7 Dec 2011 10:43:25 +0000 Subject: [PATCH] Fixing a compiler error in NetEQ This error would only arise when compiling without support for DTMF (which is not the default config). Review URL: http://webrtc-codereview.appspot.com/310001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1118 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_coding/neteq/recout.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/audio_coding/neteq/recout.c b/src/modules/audio_coding/neteq/recout.c index 63296f90e7..38a529bbf7 100644 --- a/src/modules/audio_coding/neteq/recout.c +++ b/src/modules/audio_coding/neteq/recout.c @@ -133,7 +133,9 @@ int WebRtcNetEQ_RecOutInternal(DSPInst_t *inst, WebRtc_Word16 *pw16_outData, WebRtc_Word16 dtmfValue = -1; WebRtc_Word16 dtmfVolume = -1; int playDtmf = 0; +#ifdef NETEQ_ATEVENT_DECODE int dtmfSwitch = 0; +#endif #ifdef NETEQ_STEREO MasterSlaveInfo *msInfo = inst->msInfo; #endif @@ -1272,6 +1274,7 @@ int WebRtcNetEQ_RecOutInternal(DSPInst_t *inst, WebRtc_Word16 *pw16_outData, if (playDtmf != 0) { +#ifdef NETEQ_ATEVENT_DECODE WebRtc_Word16 outDataIndex = 0; WebRtc_Word16 overdubLen = -1; /* default len */ WebRtc_Word16 dtmfLen; @@ -1280,7 +1283,6 @@ int WebRtcNetEQ_RecOutInternal(DSPInst_t *inst, WebRtc_Word16 *pw16_outData, * Overdub the output with DTMF. Note that this is not executed if the * DSP_INSTR_DTMF_GENERATE operation is performed above. */ -#ifdef NETEQ_ATEVENT_DECODE if (inst->DTMFInst.lastDtmfSample - inst->curPosition > 0) { /* special operation for transition from "DTMF only" to "DTMF overdub" */