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

webrtc/modules/audio_mixer/audio_mixer.cc

 /*
  *  Copyright (c) 2012 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
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/audio_mixer/audio_mixer.h"
 
 #include "webrtc/base/format_macros.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/utility/include/audio_frame_operations.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/include/voe_external_media.h"
 #include "webrtc/voice_engine/statistics.h"
 #include "webrtc/voice_engine/utility.h"
 
 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,
                durationMs);
   // Not implement yet
 }
 
 void AudioMixer::RecordNotification(int32_t id, uint32_t durationMs) {
   WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
                "AudioMixer::RecordNotification(id=%d, durationMs=%d)", id,
@@ skipping 40 matching lines @@
       _instanceId(instanceId),
       _externalMediaCallbackPtr(NULL),
       _externalMedia(false),
       _panLeft(1.0f),
       _panRight(1.0f),
       _mixingFrequencyHz(8000),
       _outputFileRecorderPtr(NULL),
       _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) {
   if (mixer) {
     delete mixer;
     mixer = NULL;
   }
 }
 
 AudioMixer::~AudioMixer() {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1),
                "AudioMixer::~AudioMixer() - dtor");
   if (_externalMedia) {
     DeRegisterExternalMediaProcessing();
   }
   {
     rtc::CritScope cs(&_fileCritSect);
     if (_outputFileRecorderPtr) {
       _outputFileRecorderPtr->RegisterModuleFileCallback(NULL);
       _outputFileRecorderPtr->StopRecording();
       FileRecorder::DestroyFileRecorder(_outputFileRecorderPtr);
       _outputFileRecorderPtr = NULL;
     }
   }
-  _mixerModule.UnRegisterMixedStreamCallback();
   delete &_mixerModule;
 }
 
 int32_t AudioMixer::SetEngineInformation(voe::Statistics& engineStatistics) {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
                "AudioMixer::SetEngineInformation()");
   _engineStatisticsPtr = &engineStatistics;
   return 0;
 }
 
@@ skipping 34 matching lines @@
                                         bool mixable) {
   return _mixerModule.SetMixabilityStatus(&participant, mixable);
 }
 
 int32_t AudioMixer::SetAnonymousMixabilityStatus(MixerAudioSource& participant,
                                                  bool mixable) {
   return _mixerModule.SetAnonymousMixabilityStatus(&participant, mixable);
 }
 
 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;
 }
 
 int AudioMixer::GetSpeechOutputLevel(uint32_t& level) {
   int8_t currentLevel = _audioLevel.Level();
   level = static_cast<uint32_t>(currentLevel);
   WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId, -1),
                "GetSpeechOutputLevel() => level=%u", level);
   return 0;
 }
@@ skipping 250 matching lines @@
     }
   }
 
   // --- Measure audio level (0-9) for the combined signal
   _audioLevel.ComputeLevel(_audioFrame);
 
   return 0;
 }
 }  // namespace voe
 }  // namespace webrtc