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

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

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@840 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2011-10-28 22:49:24 +00:00
parent 1f6d740571
commit 731ecba47d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
View File

@ -638,7 +638,15 @@ void AudioConferenceMixerImpl::UpdateToMix(
item = _participantList.Next(item);
continue;
}
assert(audioFrame->_vadActivity != AudioFrame::kVadUnknown);
// TODO(henrike): this assert triggers in some test cases where SRTP is
// used which prevents NetEQ from making a VAD. Temporarily disable this
// assert until the problem is fixed on a higher level.
// assert(audioFrame->_vadActivity != AudioFrame::kVadUnknown);
if (audioFrame->_vadActivity == AudioFrame::kVadUnknown)
{
WEBRTC_TRACE(kTraceWarning, kTraceAudioMixerServer, _id,
"invalid VAD state from participant");
}
if(audioFrame->_vadActivity == AudioFrame::kVadActive)
{