| 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 c2afacca9fcc3b3debfcf3f0216425ba570f6c4f..a97760dd0545f36e56c644094f1b774cce0fa69d 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
|
| @@ -18,7 +18,6 @@
|
| #include "webrtc/engine_configurations.h"
|
| #include "webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h"
|
| #include "webrtc/modules/audio_conference_mixer/source/memory_pool.h"
|
| -#include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h"
|
| #include "webrtc/modules/include/module_common_types.h"
|
|
|
| namespace webrtc {
|
| @@ -67,10 +66,6 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
|
| // Must be called after ctor.
|
| bool Init();
|
|
|
| - // Module functions
|
| - int64_t TimeUntilNextProcess() override;
|
| - void Process() override;
|
| -
|
| // NewAudioConferenceMixer functions
|
| void Mix(AudioFrame*) override;
|
| int32_t SetMixabilityStatus(MixerAudioSource* participant,
|
| @@ -168,13 +163,6 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
|
|
|
| uint32_t _timeStamp;
|
|
|
| - // Metronome class.
|
| - TimeScheduler _timeScheduler;
|
| -
|
| - // Counter keeping track of concurrent calls to process.
|
| - // Note: should never be higher than 1 or lower than 0.
|
| - int16_t _processCalls;
|
| -
|
| // Used for inhibiting saturation in mixing.
|
| std::unique_ptr<AudioProcessing> _limiter;
|
| };
|
|
|