From 3a5a8a8bcce1879e0a052f9a8bb67cefe7179e5b Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Fri, 7 Dec 2012 19:37:16 +0000 Subject: [PATCH] Properly zero out unmixed frames. BUG=6770157 Review URL: https://webrtc-codereview.appspot.com/933037 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3248 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../source/audio_conference_mixer_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc index 1fdd9dc229..fb5203746f 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc @@ -350,8 +350,8 @@ WebRtc_Word32 AudioConferenceMixerImpl::Process() if(mixedAudio->samples_per_channel_ == 0) { // Nothing was mixed, set the audio samples to silence. - memset(mixedAudio->data_, 0, _sampleSize); mixedAudio->samples_per_channel_ = _sampleSize; + mixedAudio->Mute(); } else {