webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h - Issue 1980343002: Add FrameAndMuteInfo to AudioConferenceMixer

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_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: 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') | webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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.