Moved MixerAudioSource and removed audio_mixer_defines.h.

webrtc/modules/audio_mixer/audio_mixer_impl.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/audio_mixer/audio_mixer.h"
-#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
-#include "webrtc/modules/audio_mixer/audio_source_with_mix_status.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/voice_engine/level_indicator.h"
 #include "webrtc/voice_engine_configurations.h"
 
 namespace webrtc {
 
 typedef std::vector<AudioFrame*> AudioFrameList;
-typedef std::vector<AudioSourceWithMixStatus> MixerAudioSourceList;
 
 class AudioMixerImpl : public AudioMixer {
  public:
+  struct SourceStatus {
+    SourceStatus(Source* audio_source, bool is_mixed, float gain)
+        : audio_source_(audio_source), is_mixed_(is_mixed), gain_(gain) {}
+    Source* audio_source_ = nullptr;
+    bool is_mixed_ = false;
+    float gain_ = 0;
+  };
+
+  typedef std::vector<SourceStatus> MixerAudioSourceList;

[aleloi, 2016/10/07 12:59:21]

Question: could we use a type alias instead of typedef here? Or should we remove
the alias completely? Quote from style guide:

"Don't put an alias in your public API just to save typing in the
implementation; do so only if you intend it to be used by your clients."

+
   // AudioProcessing only accepts 10 ms frames.
   static const int kFrameDurationInMs = 10;
 
   static std::unique_ptr<AudioMixerImpl> Create(int id);
 
   ~AudioMixerImpl() override;
 
   // AudioMixer functions
-  int32_t SetMixabilityStatus(MixerAudioSource* audio_source,
-                              bool mixable) override;
-  bool MixabilityStatus(const MixerAudioSource& audio_source) const override;
-  int32_t SetAnonymousMixabilityStatus(MixerAudioSource* audio_source,
+  int32_t SetMixabilityStatus(Source* audio_source, bool mixable) override;
+  bool MixabilityStatus(const Source& audio_source) const override;
+  int32_t SetAnonymousMixabilityStatus(Source* audio_source,
                                        bool mixable) override;
   void Mix(int sample_rate,
            size_t number_of_channels,
            AudioFrame* audio_frame_for_mixing) override;
-  bool AnonymousMixabilityStatus(
-      const MixerAudioSource& audio_source) const override;
+  bool AnonymousMixabilityStatus(const Source& audio_source) const override;
 
   // Returns true if the source was mixed last round. Returns
   // false and logs an error if the source was never added to the
   // mixer.
-  bool GetAudioSourceMixabilityStatusForTest(MixerAudioSource* audio_source);
+  bool GetAudioSourceMixabilityStatusForTest(Source* audio_source);
 
  private:
   AudioMixerImpl(int id, std::unique_ptr<AudioProcessing> limiter);
 
   // Set/get mix frequency
   int32_t SetOutputFrequency(const Frequency& frequency);
   Frequency OutputFrequency() const;
 
   // Compute what audio sources to mix from audio_source_list_. Ramp
   // in and out. Update mixed status. Mixes up to
   // kMaximumAmountOfMixedAudioSources audio sources.
   AudioFrameList GetNonAnonymousAudio() EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Return the AudioFrames that should be mixed anonymously. Ramp in
   // and out. Update mixed status.
   AudioFrameList GetAnonymousAudio() EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Add/remove the MixerAudioSource to the specified
   // MixerAudioSource list.
-  bool AddAudioSourceToList(MixerAudioSource* audio_source,
+  bool AddAudioSourceToList(Source* audio_source,
                             MixerAudioSourceList* audio_source_list) const;
-  bool RemoveAudioSourceFromList(MixerAudioSource* remove_audio_source,
+  bool RemoveAudioSourceFromList(Source* remove_audio_source,
                                  MixerAudioSourceList* audio_source_list) const;
 
   bool LimitMixedAudio(AudioFrame* mixed_audio) const;
 
   // Output level functions for VoEVolumeControl.
   int GetOutputAudioLevel() override;
 
   int GetOutputAudioLevelFullRange() override;
 
   rtc::CriticalSection crit_;
@@ skipping 24 matching lines @@
   std::unique_ptr<AudioProcessing> limiter_ ACCESS_ON(&thread_checker_);
 
   // Measures audio level for the combined signal.
   voe::AudioLevel audio_level_ ACCESS_ON(&thread_checker_);
 
   RTC_DISALLOW_COPY_AND_ASSIGN(AudioMixerImpl);
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_