webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h - Issue 2221443002: Changed mixing api and removed resampler

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_mixer/source/new_audio_conference_mixer_impl.h

Issue 2221443002: Changed mixing api and removed resampler (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Removed TODO. Created 4 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

« webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h ('K') | « webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h ('k') | webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.cc » ('j') | webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h

diff --git a/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h b/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h

index f60861b96f45ec92c5b300cd642cbf9c803140b7..9c81cbe0509abfa08a1959b9c065b678810c8f15 100644

--- a/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h

+++ b/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h

@@ -74,7 +74,9 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {

bool MixabilityStatus(const MixerAudioSource& audio_source) const override;

int32_t SetAnonymousMixabilityStatus(MixerAudioSource* audio_source,

bool mixable) override;

- void Mix(AudioFrame* audio_frame_for_mixing) override;

+ void Mix(int sample_rate,

+ size_t number_of_channels,

+ AudioFrame* audio_frame_for_mixing) override;

int32_t SetMinimumMixingFrequency(Frequency freq) override;

bool AnonymousMixabilityStatus(

const MixerAudioSource& audio_source) const override;