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

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

Issue 1980343002: Add FrameAndMuteInfo to AudioConferenceMixer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@mixer-mod-1
Patch Set: Don't create zero-samples for muted frames Created 4 years, 7 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 | « no previous file | webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
index 22c6a2353518c683ac87fccfdcde5cd9f328c530..e726c08f75aa41744bdd942cf80f16168ecfa498 100644
--- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
+++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
@@ -25,7 +25,13 @@ namespace webrtc {
class AudioProcessing;
class CriticalSectionWrapper;
-typedef std::list<AudioFrame*> AudioFrameList;
+struct FrameAndMuteInfo {
+ FrameAndMuteInfo(AudioFrame* f, bool m) : frame(f), muted(m) {}
+ AudioFrame* frame;
+ bool muted;
+};
+
+typedef std::list<FrameAndMuteInfo> AudioFrameList;
typedef std::list<MixerParticipant*> MixerParticipantList;
// Cheshire cat implementation of MixerParticipant's non virtual functions.
« no previous file with comments | « no previous file | webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698