generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing a compiler error in NetEQ

Browse Source 
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
This commit is contained in:
henrik.lundin@webrtc.org
2011-12-07 10:43:25 +00:00
parent 5b343aedcc
commit 44ef3774ce
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/audio_coding/neteq/recout.c
View File

@@ -133,7 +133,9 @@ int WebRtcNetEQ_RecOutInternal(DSPInst_t *inst, WebRtc_Word16 *pw16_outData,
WebRtc_Word16 dtmfValue = -1; WebRtc_Word16 dtmfValue = -1;
WebRtc_Word16 dtmfVolume = -1; WebRtc_Word16 dtmfVolume = -1;
int playDtmf = 0; int playDtmf = 0;
#ifdef NETEQ_ATEVENT_DECODE
int dtmfSwitch = 0; int dtmfSwitch = 0;
#endif
#ifdef NETEQ_STEREO #ifdef NETEQ_STEREO
MasterSlaveInfo *msInfo = inst->msInfo; MasterSlaveInfo *msInfo = inst->msInfo;
#endif #endif
@@ -1272,6 +1274,7 @@ int WebRtcNetEQ_RecOutInternal(DSPInst_t *inst, WebRtc_Word16 *pw16_outData,
if (playDtmf != 0) if (playDtmf != 0)
{ {
#ifdef NETEQ_ATEVENT_DECODE
WebRtc_Word16 outDataIndex = 0; WebRtc_Word16 outDataIndex = 0;
WebRtc_Word16 overdubLen = -1; /* default len */ WebRtc_Word16 overdubLen = -1; /* default len */
WebRtc_Word16 dtmfLen; 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 * Overdub the output with DTMF. Note that this is not executed if the
* DSP_INSTR_DTMF_GENERATE operation is performed above. * DSP_INSTR_DTMF_GENERATE operation is performed above.
*/ */
#ifdef NETEQ_ATEVENT_DECODE
if (inst->DTMFInst.lastDtmfSample - inst->curPosition > 0) if (inst->DTMFInst.lastDtmfSample - inst->curPosition > 0)
{ {
/* special operation for transition from "DTMF only" to "DTMF overdub" */ /* special operation for transition from "DTMF only" to "DTMF overdub" */