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

Unified Diff: webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h

Issue 2109333006: Removed TimeScheduler, Process() and TimeToNextProcess() from mixer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@remove_callback
Patch Set: Added thread checker. 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/include/new_audio_conference_mixer.h
diff --git a/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h b/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h
index 6a6bf1ea75ab5bda6a9b936c0362b166b20db547..844e9ae0fdb67d7d209f141c33e891370d750148 100644
--- a/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h
+++ b/webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h
@@ -18,7 +18,7 @@
namespace webrtc {
class MixerAudioSource;
-class NewAudioConferenceMixer : public Module {
+class NewAudioConferenceMixer {
public:
enum { kMaximumAmountOfMixedAudioSources = 3 };
enum Frequency {
@@ -34,10 +34,6 @@ class NewAudioConferenceMixer : public Module {
static NewAudioConferenceMixer* Create(int id);
virtual ~NewAudioConferenceMixer() {}
- // Module functions
- int64_t TimeUntilNextProcess() override = 0;
- void Process() override = 0;
-
// Add/remove audio sources as candidates for mixing.
virtual int32_t SetMixabilityStatus(MixerAudioSource* audio_source,
bool mixable) = 0;
@@ -51,8 +47,9 @@ class NewAudioConferenceMixer : public Module {
virtual int32_t SetAnonymousMixabilityStatus(MixerAudioSource* audio_source,
bool mixable) = 0;
- // Performs mixing by asking registered audio sources for audio.
- // The mixed result is placed in the provided AudioFrame.
+ // Performs mixing by asking registered audio sources for audio. The
+ // mixed result is placed in the provided AudioFrame. Can only be
+ // called from a single thread.
virtual void Mix(AudioFrame* audio_frame_for_mixing) = 0;
// Set the minimum sampling frequency at which to mix. The mixing algorithm
« no previous file with comments | « webrtc/modules/audio_mixer/audio_mixer.gypi ('k') | webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698