Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h

Issue 2127763002: Removed the memory pool from the mixer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@removed_time_scheduler
Patch Set: Removed '_pointer'. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 88b06ce00e5a2dc046a5d38740a79c6f843fad76..de6b9f4ad00b5560f3b41e740c5787e031506eeb 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
@@ -62,7 +62,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();
@@ -79,8 +80,6 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
const MixerAudioSource& audio_source) const override;
private:
- enum { DEFAULT_AUDIO_FRAME_POOLSIZE = 50 };
-
// Set/get mix frequency
int32_t SetOutputFrequency(const Frequency& frequency);
Frequency OutputFrequency() const;
@@ -151,11 +150,9 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
Frequency _outputFrequency;
size_t _sampleSize;
- // Memory pool to avoid allocating/deallocating AudioFrames
- MemoryPool<AudioFrame>* _audioFramePool;
-
// 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_;

Powered by Google App Engine
This is Rietveld 408576698