Style changes in Audio Mixer

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/engine_configurations.h"
 #include "webrtc/modules/audio_mixer/audio_mixer.h"
+#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"

[aleloi, 2016/09/01 14:12:22]

Should import things we are using and not rely on them being imported by other
headers

+#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"
 
 namespace webrtc {
-class AudioProcessing;
-class CriticalSectionWrapper;
 
 typedef std::vector<AudioFrame*> AudioFrameList;
 typedef std::vector<MixerAudioSource*> MixerAudioSourceList;
 
-// Cheshire cat implementation of MixerAudioSource's non virtual functions.
-class NewMixHistory {
- public:
-  NewMixHistory();
-  ~NewMixHistory();
-
-  // Returns true if the audio source is being mixed.
-  bool IsMixed() const;
-
-  // Returns true if the audio source was mixed previous mix
-  // iteration.
-  bool WasMixed() const;
-
-  // Updates the mixed status.
-  int32_t SetIsMixed(bool mixed);
-
-  void ResetMixedStatus();
-
- private:
-  bool is_mixed_;
-};
-
 class AudioMixerImpl : public AudioMixer {
  public:
   // AudioProcessing only accepts 10 ms frames.
   static const int kFrameDurationInMs = 10;
 
   explicit AudioMixerImpl(int id);
 
   ~AudioMixerImpl() override;
 
   // Must be called after ctor.
@@ skipping 35 matching lines @@
   bool AddAudioSourceToList(MixerAudioSource* audio_source,
                             MixerAudioSourceList* audio_source_list) const;
   bool RemoveAudioSourceFromList(MixerAudioSource* remove_audio_source,
                                  MixerAudioSourceList* audio_source_list) const;
 
   // Mix the AudioFrames stored in audioFrameList into mixed_audio.
   static int32_t MixFromList(AudioFrame* mixed_audio,
                              const AudioFrameList& audio_frame_list,
                              int32_t id,
                              bool use_limiter);
 

[aleloi, 2016/09/01 14:12:22]

Static member changed to non-member in .cc file (it was not clearly connected to
specific instance).

   bool LimitMixedAudio(AudioFrame* mixed_audio) const;
 
   // Output level functions for VoEVolumeControl.
   int GetOutputAudioLevel() override;
 
   int GetOutputAudioLevelFullRange() override;
 
   std::unique_ptr<CriticalSectionWrapper> crit_;
 
   const int32_t id_;
@@ skipping 22 matching lines @@
   std::unique_ptr<AudioProcessing> limiter_;
 
   // 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_