Removals and renamings in the new audio mixer.

webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h

Index: webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
diff --git a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
deleted file mode 100644
index 4356ff7ea19c28d9203c7449a7692a2144a8ac9e..0000000000000000000000000000000000000000
--- a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *  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_
-
-#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/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.
-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 {
- public:
-  // AudioProcessing only accepts 10 ms frames.
-  enum { kProcessPeriodicityInMs = 10 };
-
-  explicit NewAudioConferenceMixerImpl(int id);
-
-  ~NewAudioConferenceMixerImpl() override;
-
-  // Must be called after ctor.
-  bool Init();
-
-  // NewAudioConferenceMixer 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;
-
- private:
-  // 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. maxAudioFrameCounter specifies how
-  // many participants are allowed to be mixed.
-  AudioFrameList UpdateToMix(size_t maxAudioFrameCounter) const;
-
-  // Return the lowest mixing frequency that can be used without having to
-  // downsample any audio.
-  int32_t GetLowestMixingFrequency() const;
-  int32_t GetLowestMixingFrequencyFromList(
-      const MixerAudioSourceList& mixList) const;
-
-  // Return the AudioFrames that should be mixed anonymously.
-  void GetAdditionalAudio(AudioFrameList* additionalFramesList) const;
-
-  // This function returns true if it finds the MixerAudioSource in the
-  // specified list of MixerAudioSources.
-  bool IsAudioSourceInList(const MixerAudioSource& audio_source,
-                           const MixerAudioSourceList& audioSourceList) const;
-
-  // Add/remove the MixerAudioSource to the specified
-  // MixerAudioSource list.
-  bool AddAudioSourceToList(MixerAudioSource* audio_source,
-                            MixerAudioSourceList* audioSourceList) const;
-  bool RemoveAudioSourceFromList(MixerAudioSource* removeAudioSource,
-                                 MixerAudioSourceList* audioSourceList) const;
-
-  // Mix the AudioFrames stored in audioFrameList into mixedAudio.
-  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;
-
-  // Output level functions for VoEVolumeControl.
-  int GetOutputAudioLevel() override;
-
-  int GetOutputAudioLevelFullRange() override;
-
-  std::unique_ptr<CriticalSectionWrapper> crit_;
-  std::unique_ptr<CriticalSectionWrapper> cb_crit_;
-
-  int32_t id_;
-
-  // The current sample frequency and sample size when mixing.
-  Frequency output_frequency_;
-  size_t sample_size_;
-
-  // List of all audio sources. Note all lists are disjunct
-  MixerAudioSourceList audio_source_list_;  // May be mixed.
-
-  // Always mixed, anonomously.
-  MixerAudioSourceList additional_audio_source_list_;
-
-  size_t num_mixed_audio_sources_;
-  // Determines if we will use a limiter for clipping protection during
-  // mixing.
-  bool use_limiter_;
-
-  uint32_t time_stamp_;
-
-  // Ensures that Mix is called from the same thread.
-  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_