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

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

Issue 2111293003: Removed callback between old AudioConferenceMixer and OutputMixer. The audio frame with mixed audio… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@new_mixer_format
Patch Set: Added variable name. 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/audio_mixer.h
diff --git a/webrtc/modules/audio_mixer/audio_mixer.h b/webrtc/modules/audio_mixer/audio_mixer.h
index ddcebe56258ae9d89ac862a41c51e64653eb1133..63445f6076c14671e301c0a29c6dab7137a339f5 100644
--- a/webrtc/modules/audio_mixer/audio_mixer.h
+++ b/webrtc/modules/audio_mixer/audio_mixer.h
@@ -32,7 +32,7 @@ class Statistics;
// Note: this class is in the process of being rewritten and merged
// with AudioConferenceMixer. Expect inheritance chains to be changed,
// member functions removed or renamed.
-class AudioMixer : public OldAudioMixerOutputReceiver, public FileCallback {
+class AudioMixer : public FileCallback {
public:
static int32_t Create(AudioMixer*& mixer, uint32_t instanceId); // NOLINT
@@ -79,12 +79,6 @@ class AudioMixer : public OldAudioMixerOutputReceiver, public FileCallback {
virtual ~AudioMixer();
- // from AudioMixerOutputReceiver
- virtual void NewMixedAudio(int32_t id,
- const AudioFrame& generalAudioFrame,
- const AudioFrame** uniqueAudioFrames,
- uint32_t size);
-
// For file recording
void PlayNotification(int32_t id, uint32_t durationMs);

Powered by Google App Engine
This is Rietveld 408576698