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

Remove unneeded assert and tracing.

Browse Source 
This is related to r840.

BUG=
TEST=voe_auto_test

Review URL: http://webrtc-codereview.appspot.com/239019

git-svn-id: http://webrtc.googlecode.com/svn/trunk@845 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2011-10-31 19:54:20 +00:00
parent 299e2c9ea4
commit 2c74bab8b9
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -824,15 +824,6 @@ WebRtc_Word32 Channel::GetAudioFrame(const WebRtc_Word32 id,
WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,_channelId), WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,_channelId),
"Channel::GetAudioFrame(id=%d)", id); "Channel::GetAudioFrame(id=%d)", id);
// TODO(zakkhoyt): temporary logs for tracking down an issue. Remove when
// Checking to ensure receive VAD is enabled
if (!_audioCodingModule.ReceiveVADStatus())
{
WEBRTC_TRACE(kTraceWarning, kTraceVoice,
VoEId(_instanceId,_channelId),
"VAD is currently disabled");
}
// Get 10ms raw PCM data from the ACM (mixer limits output frequency) // Get 10ms raw PCM data from the ACM (mixer limits output frequency)
if (_audioCodingModule.PlayoutData10Ms( if (_audioCodingModule.PlayoutData10Ms(
audioFrame._frequencyInHz, (AudioFrame&)audioFrame) == -1) audioFrame._frequencyInHz, (AudioFrame&)audioFrame) == -1)
@ -842,10 +833,6 @@ WebRtc_Word32 Channel::GetAudioFrame(const WebRtc_Word32 id,
"Channel::GetAudioFrame() PlayoutData10Ms() failed!"); "Channel::GetAudioFrame() PlayoutData10Ms() failed!");
} }
// TODO(zakkhoyt): temporary logs for tracking down an issue. Remove when
// possible.
assert(audioFrame._vadActivity != AudioFrame::kVadUnknown);
if (_RxVadDetection) if (_RxVadDetection)
{ {
UpdateRxVadDetection(audioFrame); UpdateRxVadDetection(audioFrame);
@ -1422,18 +1409,6 @@ Channel::Init()
return -1; return -1;
} }
// TODO(zakkhoyt): temporary logs for tracking down an issue. Remove when
// possible.
// enable RX VAD by default (improves output mixing)
if (_audioCodingModule.SetReceiveVADStatus(true) == -1)
{
_engineStatisticsPtr->SetLastError(
VE_AUDIO_CODING_MODULE_ERROR, kTraceError,
"Channel::Init() unable to initialize the ACM - 1. "
"ACM failed to SetReceiveVADStatus");
return -1;
}
// --- RTP/RTCP module initialization // --- RTP/RTCP module initialization
// Ensure that RTCP is enabled by default for the created channel. // Ensure that RTCP is enabled by default for the created channel.