webrtc/modules/audio_mixer/source/audio_conference_mixer_impl.h - Issue 2109333006: Removed TimeScheduler, Process() and TimeToNextProcess() from mixer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2109333006: Removed TimeScheduler, Process() and TimeToNextProcess() from mixer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@remove_callback

Patch Set: Created 4 years, 6 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

« no previous file with comments | « webrtc/modules/audio_mixer/include/audio_conference_mixer_defines.h ('k') | webrtc/modules/audio_mixer/source/audio_conference_mixer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_mixer/source/audio_conference_mixer_impl.h

diff --git a/webrtc/modules/audio_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_mixer/source/audio_conference_mixer_impl.h

index 24c4aa7bdbadb2569fec0fbd278100158e5760d5..2c813d61368641f42cbabdc798a4bd7d9edbafc9 100644

--- a/webrtc/modules/audio_mixer/source/audio_conference_mixer_impl.h

+++ b/webrtc/modules/audio_mixer/source/audio_conference_mixer_impl.h

@@ -67,10 +67,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;

ivoc 2016/07/01 11:35:20 Please add a name for the input variable (i.e. aud

aleloi 2016/07/01 11:42:13 Done.

int32_t RegisterMixedStreamCallback(

@@ -174,13 +170,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;

};