Removed the memory pool from the mixer.

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 43 matching lines @@
  private:
   bool _isMixed;
 };
 
 class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
  public:
   // AudioProcessing only accepts 10 ms frames.
   enum { kProcessPeriodicityInMs = 10 };
 
   explicit NewAudioConferenceMixerImpl(int id);
-  ~NewAudioConferenceMixerImpl();
+  // The dtor not needed, because this class does no longer manage
+  // memory.
 
   // Must be called after ctor.
   bool Init();
 
   // NewAudioConferenceMixer functions
   void Mix(AudioFrame*) override;
   int32_t SetMixabilityStatus(MixerAudioSource* participant,
                               bool mixable) override;
   bool MixabilityStatus(const MixerAudioSource& participant) const override;
   int32_t SetMinimumMixingFrequency(Frequency freq) override;
   int32_t SetAnonymousMixabilityStatus(MixerAudioSource* participant,
                                        bool mixable) override;
   bool AnonymousMixabilityStatus(
       const MixerAudioSource& participant) const override;
 
  private:
-  enum { DEFAULT_AUDIO_FRAME_POOLSIZE = 50 };
-
   // Set/get mix frequency
   int32_t SetOutputFrequency(const Frequency& frequency);
   Frequency OutputFrequency() const;
 
   // Fills mixList with the AudioFrames pointers that should be used when
   // mixing.
   // maxAudioFrameCounter both input and output specifies how many more
   // AudioFrames that are allowed to be mixed.
   // rampOutList contain AudioFrames corresponding to an audio stream that
   // used to be mixed but shouldn't be mixed any longer. These AudioFrames
@@ skipping 48 matching lines @@
   std::unique_ptr<CriticalSectionWrapper> _cbCrit;
 
   int32_t _id;
 
   Frequency _minimumMixingFreq;
 
   // The current sample frequency and sample size when mixing.
   Frequency _outputFrequency;
   size_t _sampleSize;
 
-  // Memory pool to avoid allocating/deallocating AudioFrames
-  MemoryPool<AudioFrame>* _audioFramePool;
-
   // List of all participants. Note all lists are disjunct
   MixerAudioSourceList _participantList;  // May be mixed.
   // Always mixed, anonomously.
   MixerAudioSourceList _additionalParticipantList;
 
   size_t _numMixedParticipants;
   // Determines if we will use a limiter for clipping protection during
   // mixing.
   bool use_limiter_;
 
   uint32_t _timeStamp;
 
   // Counter keeping track of concurrent calls to Mix.
   // Note: should never be higher than 1 or lower than 0.
   int16_t mix_calls_;
 
   // 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_