Removals and renamings in the new 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_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_
-#define WEBRTC_MODULES_AUDIO_MIXER_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_
+#ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
+#define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
 
 #include <list>
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/engine_configurations.h"
-#include "webrtc/modules/audio_mixer/new_audio_conference_mixer.h"
+#include "webrtc/modules/audio_mixer/audio_mixer.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/voice_engine/level_indicator.h"
 
 namespace webrtc {
 class AudioProcessing;
 class CriticalSectionWrapper;
 
 struct FrameAndMuteInfo {
   FrameAndMuteInfo(AudioFrame* f, bool m) : frame(f), muted(m) {}
   AudioFrame* frame;
   bool muted;
 };
 
 typedef std::list<FrameAndMuteInfo> AudioFrameList;
 typedef std::list<MixerAudioSource*> MixerAudioSourceList;
 
 // Cheshire cat implementation of MixerAudioSource's non virtual functions.

[ivoc, 2016/08/18 15:47:23]

Not sure what "Cheshire cat" means here.

[aleloi, 2016/08/19 12:06:09]

I looked it up when reading the mixer code for the first time. It means that the
declaration & definition of MixHistory is only visible in this file, but the
fact that AudioMixerSource has a MixHistory* is visible publicly.

Ref: https://en.wikipedia.org/wiki/Opaque_pointer

[ivoc, 2016/08/19 12:37:37]

Okay, I'm familiar with opaque pointers, but I've just never heard them being
called "cheshire cat" before, but if that's a common term for it then that's
fine.

 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 NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
+class AudioMixerImpl : public AudioMixer {
  public:
   // AudioProcessing only accepts 10 ms frames.
   enum { kProcessPeriodicityInMs = 10 };
 
-  explicit NewAudioConferenceMixerImpl(int id);
+  explicit AudioMixerImpl(int id);
 
-  ~NewAudioConferenceMixerImpl() override;
+  ~AudioMixerImpl() override;
 
   // Must be called after ctor.
   bool Init();
 
-  // NewAudioConferenceMixer functions
+  // 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,
                                        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;
@@ skipping 74 matching lines @@
   rtc::ThreadChecker thread_checker_;
 
   // Used for inhibiting saturation in mixing.
   std::unique_ptr<AudioProcessing> limiter_;
 
   // Measures audio level for the combined signal.
   voe::AudioLevel audio_level_;
 };
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_AUDIO_MIXER_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_
+#endif  // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_