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..c373f50127b61459425b363ff97bf6a97410d616 100644
--- a/webrtc/modules/audio_mixer/audio_mixer.cc
+++ b/webrtc/modules/audio_mixer/audio_mixer.cc
@@ -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,
@@ -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);

[tommi, 2016/07/06 19:42:17]

On what thread is this method called?  Since there's no lock I'm guessing it's
the same as all the other methods that touch _audioFrame, but if there's more to
it, it would be good to understand.

[aleloi, 2016/07/07 09:20:16]

Every method related to mixing in OutputMixer and AudioConferenceMixer (from
which this code is copied) runs on the sound card / OS thread. I am planning to
add ThreadChecks for this in a later CL.

An exception is adding and removing participants
(AudioConferenceMixer::SetMixingStatus), which should be possible to do from
anywhere.

   return 0;
 }