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

webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h

 /*
- *  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
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_MIXER_SOURCE_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_
 #define WEBRTC_MODULES_AUDIO_MIXER_SOURCE_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_
@@ skipping 52 matching lines @@
   ~NewAudioConferenceMixerImpl();
 
   // Must be called after ctor.
   bool Init();
 
   // Module functions
   int64_t TimeUntilNextProcess() override;
   void Process() override;
 
   // NewAudioConferenceMixer functions
-  int32_t RegisterMixedStreamCallback(
-      OldAudioMixerOutputReceiver* mixReceiver) override;
-  int32_t UnRegisterMixedStreamCallback() override;
   int32_t SetMixabilityStatus(MixerAudioSource* participant,
                               bool mixable) override;
   bool MixabilityStatus(const MixerAudioSource& participant) const override;
-  int32_t SetMinimumMixingFrequency(Frequency freq) override;
   int32_t SetAnonymousMixabilityStatus(MixerAudioSource* participant,
                                        bool mixable) override;
+  void Mix(AudioFrame* audio_frame_for_mixing) override;
+  int32_t SetMinimumMixingFrequency(Frequency freq) override;
   bool AnonymousMixabilityStatus(
       const MixerAudioSource& participant) const override;
 
  private:
   enum { DEFAULT_AUDIO_FRAME_POOLSIZE = 50 };
 
   // Set/get mix frequency
   int32_t SetOutputFrequency(const Frequency& frequency);
   Frequency OutputFrequency() const;
 
@@ skipping 32 matching lines @@
                            const MixerAudioSourceList& participantList) const;
 
   // Add/remove the MixerAudioSource to the specified
   // MixerAudioSource list.
   bool AddParticipantToList(MixerAudioSource* participant,
                             MixerAudioSourceList* participantList) const;
   bool RemoveParticipantFromList(MixerAudioSource* removeParticipant,
                                  MixerAudioSourceList* participantList) const;
 
   // Mix the AudioFrames stored in audioFrameList into mixedAudio.
-  int32_t MixFromList(AudioFrame* mixedAudio,
-                      const AudioFrameList& audioFrameList) const;
+  static int32_t MixFromList(AudioFrame* mixedAudio,
+                             const AudioFrameList& audioFrameList,
+                             int32_t id,
+                             bool use_limiter);
 
   // Mix the AudioFrames stored in audioFrameList into mixedAudio. No
   // record will be kept of this mix (e.g. the corresponding MixerAudioSources
   // will not be marked as IsMixed()
   int32_t MixAnonomouslyFromList(AudioFrame* mixedAudio,
                                  const AudioFrameList& audioFrameList) const;
 
   bool LimitMixedAudio(AudioFrame* mixedAudio) const;
 
   std::unique_ptr<CriticalSectionWrapper> _crit;
   std::unique_ptr<CriticalSectionWrapper> _cbCrit;
 
   int32_t _id;
 
   Frequency _minimumMixingFreq;
 
-  // Mix result callback
-  OldAudioMixerOutputReceiver* _mixReceiver;
-
   // The current sample frequency and sample size when mixing.
   Frequency _outputFrequency;
   size_t _sampleSize;
 
   // Memory pool to avoid allocating/deallocating AudioFrames
   MemoryPool<AudioFrame>* _audioFramePool;
 
   // List of all participants. Note all lists are disjunct
   MixerAudioSourceList _participantList;  // May be mixed.
   // Always mixed, anonomously.
@@ skipping 12 matching lines @@
   // Counter keeping track of concurrent calls to process.
   // Note: should never be higher than 1 or lower than 0.
   int16_t _processCalls;
 
   // Used for inhibiting saturation in mixing.
   std::unique_ptr<AudioProcessing> _limiter;
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_MIXER_SOURCE_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_