From bd4494cb20662dc4c5f5762e4fd5ce714850da5e Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Fri, 26 Aug 2011 22:58:00 +0000 Subject: [PATCH] Remove the divide-by-2 when mixing. Review URL: http://webrtc-codereview.appspot.com/137007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@471 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../source/audio_conference_mixer_impl.cc | 5 ----- 1 file changed, 5 deletions(-) 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 d9c4d19279..04766568ac 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 @@ -940,9 +940,6 @@ WebRtc_Word32 AudioConferenceMixerImpl::MixFromList(AudioFrame& mixedAudioFrame, position = 0; } AudioFrame* audioFrame = static_cast(item->GetItem()); - - // Divide the AudioFrame samples by 2 to avoid saturation. - *audioFrame >>= 1; mixedAudioFrame += *audioFrame; _scratchMixedParticipants[position].participant = audioFrame->_id; @@ -964,8 +961,6 @@ WebRtc_Word32 AudioConferenceMixerImpl::MixAnonomouslyFromList( while(item != NULL) { AudioFrame* audioFrame = static_cast(item->GetItem()); - // Divide the AudioFrame samples by 2 to avoid saturation. - *audioFrame >>= 1; mixedAudioFrame += *audioFrame; item = audioFrameList.Next(item); }