webrtc/modules/audio_mixer/audio_mixer.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/audio_mixer.h

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

Patch Set: Described Mix args in comments. 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:

Index: webrtc/modules/audio_mixer/audio_mixer.h

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

index c50a2cfa708dbf394b6be3b90c284573c41ad6c7..9aabfcca5b751a885e93aa67e11edef5f2ae805d 100644

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

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

@@ -48,8 +48,6 @@ class AudioMixer : public FileCallback {

int DeRegisterExternalMediaProcessing();

- int32_t MixActiveChannels();

int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm);

int32_t SetMixabilityStatus(MixerAudioSource& audio_source, // NOLINT

@@ -100,8 +98,6 @@ class AudioMixer : public FileCallback {

rtc::CriticalSection _fileCritSect;

NewAudioConferenceMixer& _mixerModule;

AudioFrame _audioFrame;

- // Converts mixed audio to the audio device output rate.

- PushResampler<int16_t> resampler_;

// Converts mixed audio to the audio processing rate.

PushResampler<int16_t> audioproc_resampler_;

AudioLevel _audioLevel; // measures audio level for the combined signal

« no previous file with comments | « webrtc/modules/audio_mixer/BUILD.gn ('k') | webrtc/modules/audio_mixer/audio_mixer.cc » ('j') | no next file with comments »