Removed callback between old AudioConferenceMixer and OutputMixer. The audio frame with mixed audio…

webrtc/modules/audio_mixer/audio_mixer.cc

Index: webrtc/modules/audio_mixer/audio_mixer.cc
diff --git a/webrtc/modules/audio_mixer/audio_mixer.cc b/webrtc/modules/audio_mixer/audio_mixer.cc
index 9048c39a95c2439032267aff65a753d69fffa9c7..d599a8b1cfc2363d5e6ee1d05e84172b771e07f0 100644
--- a/webrtc/modules/audio_mixer/audio_mixer.cc
+++ b/webrtc/modules/audio_mixer/audio_mixer.cc
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -22,17 +22,6 @@
 namespace webrtc {
 namespace voe {
 
-void AudioMixer::NewMixedAudio(int32_t id,
-                               const AudioFrame& generalAudioFrame,
-                               const AudioFrame** uniqueAudioFrames,
-                               uint32_t size) {
-  WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
-               "AudioMixer::NewMixedAudio(id=%d, size=%u)", id, size);
-
-  _audioFrame.CopyFrom(generalAudioFrame);
-  _audioFrame.id_ = id;
-}
-
 void AudioMixer::PlayNotification(int32_t id, uint32_t durationMs) {
   WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
                "AudioMixer::PlayNotification(id=%d, durationMs=%d)", id,
@@ -58,7 +47,7 @@ void AudioMixer::PlayFileEnded(int32_t id) {
 void AudioMixer::RecordFileEnded(int32_t id) {
   WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
                "AudioMixer::RecordFileEnded(id=%d)", id);
-  assert(id == _instanceId);
+  RTC_DCHECK_EQ(id, _instanceId);
 
   rtc::CritScope cs(&_fileCritSect);
   _outputFileRecording = false;
@@ -93,12 +82,6 @@ AudioMixer::AudioMixer(uint32_t instanceId)
       _outputFileRecording(false) {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1),
                "AudioMixer::AudioMixer() - ctor");
-
-  if (_mixerModule.RegisterMixedStreamCallback(this) == -1) {
-    WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId, -1),
-                 "AudioMixer::AudioMixer() failed to register mixer"
-                 "callbacks");
-  }
 }
 
 void AudioMixer::Destroy(AudioMixer*& mixer) {
@@ -123,7 +106,6 @@ AudioMixer::~AudioMixer() {
       _outputFileRecorderPtr = NULL;
     }
   }
-  _mixerModule.UnRegisterMixedStreamCallback();
   delete &_mixerModule;
 }
 
@@ -178,7 +160,7 @@ int32_t AudioMixer::SetAnonymousMixabilityStatus(MixerAudioSource& participant,
 }
 
 int32_t AudioMixer::MixActiveChannels() {
-  _mixerModule.Process();
+  _mixerModule.Mix(&_audioFrame);
   return 0;
 }
 
@@ -414,7 +396,7 @@ int32_t AudioMixer::DoOperationsOnCombinedSignal(bool feed_data_to_apm) {
       // Pure stereo mode (we are receiving a stereo signal).
     }
 
-    assert(_audioFrame.num_channels_ == 2);
+    RTC_DCHECK_EQ(_audioFrame.num_channels_, static_cast<size_t>(2));
     AudioFrameOperations::Scale(_panLeft, _panRight, _audioFrame);
   }