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

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: 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..b8ad2099eba7f64cdb38d5070707e62ab808e08f 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

@@ -20,6 +20,7 @@

#include "webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h"

#include "webrtc/modules/audio_conference_mixer/source/memory_pool.h"

#include "webrtc/modules/include/module_common_types.h"

+#include "webrtc/common_audio/resampler/include/push_resampler.h"

namespace webrtc {

class AudioProcessing;

@@ -74,7 +75,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,

+ void* audio_data) override;

int32_t SetMinimumMixingFrequency(Frequency freq) override;

bool AnonymousMixabilityStatus(

const MixerAudioSource& audio_source) const override;

@@ -156,6 +159,8 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {

// Used for inhibiting saturation in mixing.

std::unique_ptr<AudioProcessing> _limiter;

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

aleloi 2016/08/05 09:52:22 Moved here from the former 'OutputMixer'.

the sun 2016/08/05 12:26:00 I thought the idea was that ACM/NetEq could delive

aleloi 2016/08/05 12:37:14 Thank you. I just got reminded of that when workin

+ PushResampler<int16_t> resampler_;

};

} // namespace webrtc