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

Remove the divide-by-2 when mixing.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/137007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@471 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2011-08-26 22:58:00 +00:00
parent b7ac56d92b
commit bd4494cb20
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -940,9 +940,6 @@ WebRtc_Word32 AudioConferenceMixerImpl::MixFromList(AudioFrame& mixedAudioFrame,
position = 0; position = 0;
} }
AudioFrame* audioFrame = static_cast<AudioFrame*>(item->GetItem()); AudioFrame* audioFrame = static_cast<AudioFrame*>(item->GetItem());
// Divide the AudioFrame samples by 2 to avoid saturation.
*audioFrame >>= 1;
mixedAudioFrame += *audioFrame; mixedAudioFrame += *audioFrame;
_scratchMixedParticipants[position].participant = audioFrame->_id; _scratchMixedParticipants[position].participant = audioFrame->_id;
@@ -964,8 +961,6 @@ WebRtc_Word32 AudioConferenceMixerImpl::MixAnonomouslyFromList(
while(item != NULL) while(item != NULL)
{ {
AudioFrame* audioFrame = static_cast<AudioFrame*>(item->GetItem()); AudioFrame* audioFrame = static_cast<AudioFrame*>(item->GetItem());
// Divide the AudioFrame samples by 2 to avoid saturation.
*audioFrame >>= 1;
mixedAudioFrame += *audioFrame; mixedAudioFrame += *audioFrame;
item = audioFrameList.Next(item); item = audioFrameList.Next(item);
} }