| Index: webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
|
| diff --git a/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h b/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
|
| index de5fd46dfe5a86302d35ae45e75efbb92bba42d6..be70eeef5549082c69344908e4614bdf1147db28 100644
|
| --- a/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
|
| +++ b/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
|
| @@ -61,7 +61,8 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
|
| 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();
|
| @@ -78,8 +79,6 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
|
| 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;
|
| @@ -148,9 +147,6 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
|
| 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.
|
|
|