From 731ecba47d8488cdd581544473ac29edcf81b2d9 Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Fri, 28 Oct 2011 22:49:24 +0000 Subject: [PATCH] Review URL: http://webrtc-codereview.appspot.com/251002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@840 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../source/audio_conference_mixer_impl.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc index 8be8af5c36..36c4a141f2 100644 --- a/src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc @@ -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) {