admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename AudioMixer factory method.

Browse Source 
AudioMixerImpl::CreateWithOutputRateCalculatorAndLimiter(rate_calculator, bool limiter)

was added to create a mixer without the limiter subcomponent. Calling
it "Create with ... *and* limiter" is counterintuitive.

Renamed to simply 'Create'.

TBR=solenberg@webrtc.org

BUG=webrtc:7167

Review-Url: https://codereview.webrtc.org/2709523006
Cr-Commit-Position: refs/heads/master@{#16755}
This commit is contained in:
aleloi 2017-02-21 08:27:08 -08:00 committed by Commit bot
parent 6f142eb36e
commit 087613c8df
3 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/modules/audio_mixer/audio_mixer_impl.cc
View File

@ -113,21 +113,18 @@ AudioMixerImpl::AudioMixerImpl(
AudioMixerImpl::~AudioMixerImpl() {}
rtc::scoped_refptr<AudioMixerImpl> AudioMixerImpl::Create() {
return CreateWithOutputRateCalculatorAndLimiter(
std::unique_ptr<DefaultOutputRateCalculator>(
new DefaultOutputRateCalculator()),
true);
return Create(std::unique_ptr<DefaultOutputRateCalculator>(
new DefaultOutputRateCalculator()),
true);
}
rtc::scoped_refptr<AudioMixerImpl>
AudioMixerImpl::CreateWithOutputRateCalculator(
std::unique_ptr<OutputRateCalculator> output_rate_calculator) {
return CreateWithOutputRateCalculatorAndLimiter(
std::move(output_rate_calculator), true);
return Create(std::move(output_rate_calculator), true);
}
rtc::scoped_refptr<AudioMixerImpl>
AudioMixerImpl::CreateWithOutputRateCalculatorAndLimiter(
rtc::scoped_refptr<AudioMixerImpl> AudioMixerImpl::Create(
std::unique_ptr<OutputRateCalculator> output_rate_calculator,
bool use_limiter) {
return rtc::scoped_refptr<AudioMixerImpl>(

5
webrtc/modules/audio_mixer/audio_mixer_impl.h
View File

@ -51,13 +51,12 @@ class AudioMixerImpl : public AudioMixer {
static rtc::scoped_refptr<AudioMixerImpl> Create();
// TODO(aleloi): remove this when dependencies have updated to
// use Create..AndLimiter instead. See bugs.webrtc.org/7167.
// use Create(rate_calculator, limiter) instead. See bugs.webrtc.org/7167.
RTC_DEPRECATED static rtc::scoped_refptr<AudioMixerImpl>
CreateWithOutputRateCalculator(
std::unique_ptr<OutputRateCalculator> output_rate_calculator);
static rtc::scoped_refptr<AudioMixerImpl>
CreateWithOutputRateCalculatorAndLimiter(
static rtc::scoped_refptr<AudioMixerImpl> Create(
std::unique_ptr<OutputRateCalculator> output_rate_calculator,
bool use_limiter);

31
webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc
View File

@ -375,7 +375,11 @@ TEST(AudioMixer, ConstructFromOtherThread) {
std::unique_ptr<rtc::Thread> participant_thread = rtc::Thread::Create();
init_thread->Start();
const auto mixer = init_thread->Invoke<rtc::scoped_refptr<AudioMixer>>(
RTC_FROM_HERE, &AudioMixerImpl::Create);
RTC_FROM_HERE,
// Since AudioMixerImpl::Create is overloaded, we have to
// specify the type of which version we want.
static_cast<rtc::scoped_refptr<AudioMixerImpl>(*)()>(
&AudioMixerImpl::Create));
MockMixerAudioSource participant;
ResetFrame(participant.fake_frame());
@ -470,10 +474,10 @@ TEST(AudioMixer, UnmutedShouldMixBeforeLoud) {
TEST(AudioMixer, MixingRateShouldBeDecidedByRateCalculator) {
constexpr int kOutputRate = 22000;
const auto mixer = AudioMixerImpl::CreateWithOutputRateCalculatorAndLimiter(
std::unique_ptr<OutputRateCalculator>(
new CustomRateCalculator(kOutputRate)),
true);
const auto mixer =
AudioMixerImpl::Create(std::unique_ptr<OutputRateCalculator>(
new CustomRateCalculator(kOutputRate)),
true);
MockMixerAudioSource audio_source;
mixer->AddSource(&audio_source);
ResetFrame(audio_source.fake_frame());
@ -486,10 +490,10 @@ TEST(AudioMixer, MixingRateShouldBeDecidedByRateCalculator) {
TEST(AudioMixer, ZeroSourceRateShouldBeDecidedByRateCalculator) {
constexpr int kOutputRate = 8000;
const auto mixer = AudioMixerImpl::CreateWithOutputRateCalculatorAndLimiter(
std::unique_ptr<OutputRateCalculator>(
new CustomRateCalculator(kOutputRate)),
true);
const auto mixer =
AudioMixerImpl::Create(std::unique_ptr<OutputRateCalculator>(
new CustomRateCalculator(kOutputRate)),
true);
mixer->Mix(1, &frame_for_mixing);
@ -497,7 +501,7 @@ TEST(AudioMixer, ZeroSourceRateShouldBeDecidedByRateCalculator) {
}
TEST(AudioMixer, NoLimiterBasicApiCalls) {
const auto mixer = AudioMixerImpl::CreateWithOutputRateCalculatorAndLimiter(
const auto mixer = AudioMixerImpl::Create(
std::unique_ptr<OutputRateCalculator>(new DefaultOutputRateCalculator()),
false);
mixer->Mix(1, &frame_for_mixing);
@ -513,10 +517,9 @@ TEST(AudioMixer, AnyRateIsPossibleWithNoLimiter) {
SCOPED_TRACE(
ProduceDebugText(rate, number_of_sources, number_of_sources));
const auto mixer =
AudioMixerImpl::CreateWithOutputRateCalculatorAndLimiter(
std::unique_ptr<OutputRateCalculator>(
new CustomRateCalculator(rate)),
false);
AudioMixerImpl::Create(std::unique_ptr<OutputRateCalculator>(
new CustomRateCalculator(rate)),
false);
std::vector<MockMixerAudioSource> sources(number_of_sources);
for (auto& source : sources) {