webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h - Issue 1311733003: Stylizing 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/interface/audio_conference_mixer_defines.h

Issue 1311733003: Stylizing AudioConferenceMixer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: refine two commenting Created 5 years, 4 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_conference_mixer/interface/audio_conference_mixer.h ('k') | webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h

diff --git a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h

index 784f63a6612d4f571a02b066dab7af2cd62d7701..d15b7fca02c0537298c8eda457d225d7dee10c39 100644

--- a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h

+++ b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h

@@ -25,14 +25,15 @@ public:

// audio every time it's called.

// If it returns -1, the frame will not be added to the mix.

- virtual int32_t GetAudioFrame(const int32_t id, AudioFrame& audioFrame) = 0;

+ virtual int32_t GetAudioFrame(int32_t id,

+ AudioFrame* audioFrame) = 0;

- // mixed will be set to true if the participant was mixed this mix iteration

- int32_t IsMixed(bool& mixed) const;

+ // Returns true if the participant was mixed this mix iteration.

+ bool IsMixed() const;

// This function specifies the sampling frequency needed for the AudioFrame

// for future GetAudioFrame(..) calls.

- virtual int32_t NeededFrequency(const int32_t id) = 0;

+ virtual int32_t NeededFrequency(int32_t id) const = 0;

MixHistory* _mixHistory;

protected: