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

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

Issue 2394253003: Revert of Made MixerAudioSource a pure interface. (Closed)
Patch Set: Created 4 years, 2 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/audio_mixer.gypi ('k') | webrtc/modules/audio_mixer/audio_mixer_defines.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_mixer/audio_mixer_defines.h
diff --git a/webrtc/modules/audio_mixer/audio_mixer_defines.h b/webrtc/modules/audio_mixer/audio_mixer_defines.h
index 970a01de02e10663f656aad767fa0d1c74d91911..57e7f5027e4bf338843d8e1a3a0a0b48fbd7ef96 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_defines.h
+++ b/webrtc/modules/audio_mixer/audio_mixer_defines.h
@@ -35,8 +35,6 @@
AudioFrameInfo audio_frame_info;
};
- virtual ~MixerAudioSource() = default;
-
// The implementation of GetAudioFrameWithMuted should update
// audio_frame with new audio every time it's called. Implementing
// classes are allowed to return the same AudioFrame pointer on
@@ -45,6 +43,25 @@
// mixer.
virtual AudioFrameWithMuted GetAudioFrameWithMuted(int32_t id,
int sample_rate_hz) = 0;
+
+ // Returns true if the audio source was mixed this mix iteration.
+ bool IsMixed() const;
+
+ // Returns true if the audio source was mixed previous mix
+ // iteration.
+ bool WasMixed() const;
+
+ // Updates the mixed status.
+ int32_t SetIsMixed(bool mixed);
+
+ void ResetMixedStatus();
+
+ private:
+ bool is_mixed_;
+
+ protected:
+ MixerAudioSource();
+ virtual ~MixerAudioSource();
};
} // namespace webrtc
« no previous file with comments | « webrtc/modules/audio_mixer/audio_mixer.gypi ('k') | webrtc/modules/audio_mixer/audio_mixer_defines.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698