diff --git a/src/voice_engine/main/source/channel.cc b/src/voice_engine/main/source/channel.cc index d5490a897..c27acde53 100644 --- a/src/voice_engine/main/source/channel.cc +++ b/src/voice_engine/main/source/channel.cc @@ -1802,16 +1802,26 @@ Channel::StopReceiving() { _engineStatisticsPtr->SetLastError( VE_SOCKET_TRANSPORT_MODULE_ERROR, kTraceError, - "StopReceiving() failed to stop receiving"); + "StopReceiving() failed to stop receiving."); return -1; } } #endif - bool dtmfDetection = _rtpRtcpModule.TelephoneEvent(); - _rtpRtcpModule.InitReceiver(); - // Recover Dtmf detection status - _rtpRtcpModule.SetTelephoneEventStatus(dtmfDetection, true, true); + WebRtc_Word32 ret = _rtpRtcpModule.InitReceiver(); + if (ret != 0) { + _engineStatisticsPtr->SetLastError( + VE_RTP_RTCP_MODULE_ERROR, kTraceError, + "StopReceiving() failed to reinitialize the RTP receiver."); + return -1; + } + // Recover DTMF detection status. + ret = _rtpRtcpModule.SetTelephoneEventStatus(dtmfDetection, true, true); + if (ret != 0) { + _engineStatisticsPtr->SetLastError( + VE_INVALID_OPERATION, kTraceWarning, + "StopReceiving() failed to restore telephone-event status."); + } RegisterReceiveCodecsToRTPModule(); _receiving = false; return 0; diff --git a/src/voice_engine/main/source/transmit_mixer.cc b/src/voice_engine/main/source/transmit_mixer.cc index cace13c38..294ccb699 100644 --- a/src/voice_engine/main/source/transmit_mixer.cc +++ b/src/voice_engine/main/source/transmit_mixer.cc @@ -195,7 +195,8 @@ TransmitMixer::TransmitMixer(const WebRtc_UWord32 instanceId) : _externalMediaCallbackPtr(NULL), _mute(false), _remainingMuteMicTimeMs(0), - _mixingFrequency(0) + _mixingFrequency(0), + _includeAudioLevelIndication(false) { WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1), "TransmitMixer::TransmitMixer() - ctor");