aboutsummaryrefslogtreecommitdiff
path: root/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc')
-rw-r--r--webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc6
1 files changed, 3 insertions, 3 deletions
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 fb5203746f..3fedc487ac 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
@@ -173,7 +173,7 @@ bool AudioConferenceMixerImpl::Init()
if (!SetNumLimiterChannels(1))
return false;
- if(_limiter->gain_control()->set_mode(GainControl::kFixedDigital) !=
+ if(_limiter->gain_control()->set_mode(GainControl::kFixedDigital) !=
_limiter->kNoError)
return false;
@@ -1125,7 +1125,7 @@ WebRtc_Word32 AudioConferenceMixerImpl::MixFromList(
{
// No mixing required here; skip the saturation protection.
AudioFrame* audioFrame = static_cast<AudioFrame*>(item->GetItem());
- mixedAudio = *audioFrame;
+ mixedAudio.CopyFrom(*audioFrame);
SetParticipantStatistics(&_scratchMixedParticipants[position],
*audioFrame);
return 0;
@@ -1173,7 +1173,7 @@ WebRtc_Word32 AudioConferenceMixerImpl::MixAnonomouslyFromList(
{
// No mixing required here; skip the saturation protection.
AudioFrame* audioFrame = static_cast<AudioFrame*>(item->GetItem());
- mixedAudio = *audioFrame;
+ mixedAudio.CopyFrom(*audioFrame);
return 0;
}