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

Fixes two minor issues reported by the Coverty Integration Manager.

Browse Source 
BUG=none
TEST=voe_auto_test
Review URL: http://webrtc-codereview.appspot.com/302002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1098 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrika@webrtc.org 2011-12-05 07:02:22 +00:00
parent c9cc3750cf
commit af71f0e5d9
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/voice_engine/main/source/channel.cc
View File

@ -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;

3
src/voice_engine/main/source/transmit_mixer.cc
View File

@ -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");