Changed mixing api and removed resampler

webrtc/modules/audio_mixer/source/new_audio_conference_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.
  */
 
@@ skipping 44 matching lines @@
  private:
   bool _isMixed;
 };
 
 class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
  public:
   // AudioProcessing only accepts 10 ms frames.
   enum { kProcessPeriodicityInMs = 10 };
 
   explicit NewAudioConferenceMixerImpl(int id);
-  // The dtor not needed, because this class does no longer manage
-  // memory.
 
   // 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(AudioFrame* audio_frame_for_mixing) override;
-  int32_t SetMinimumMixingFrequency(Frequency freq) 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;
 
-  // Clears audioFrameList and reclaims all memory associated with it.
-  void ClearAudioFrameList(AudioFrameList* audioFrameList) 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,
@@ skipping 11 matching lines @@
   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;
-
   // The current sample frequency and sample size when mixing.
   Frequency _outputFrequency;
   size_t _sampleSize;
 
   // 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 _timeStamp;
 
   // Ensures that Mix is called from the same thread.
   rtc::ThreadChecker thread_checker_;
 
   // 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_