Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc

Issue 2692333002: Optionally disable APM limiter in AudioMixer. (Closed)
Patch Set: Deprecated old factory method. Created 3 years, 10 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
Index: webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc
diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc b/webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc
index e90dac1e70e9839f032da4db4f91b8eb0d002686..f902eb6ea307c75e5c84e54258b56cc792851bc3 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc
+++ b/webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc
@@ -456,9 +456,10 @@ TEST(AudioMixer, UnmutedShouldMixBeforeLoud) {
TEST(AudioMixer, MixingRateShouldBeDecidedByRateCalculator) {
constexpr int kOutputRate = 22000;
- const auto mixer = AudioMixerImpl::CreateWithOutputRateCalculator(
+ const auto mixer = AudioMixerImpl::CreateWithOutputRateCalculatorAndLimiter(
std::unique_ptr<OutputRateCalculator>(
- new CustomRateCalculator(kOutputRate)));
+ new CustomRateCalculator(kOutputRate)),
+ true);
MockMixerAudioSource audio_source;
mixer->AddSource(&audio_source);
ResetFrame(audio_source.fake_frame());
@@ -471,9 +472,10 @@ TEST(AudioMixer, MixingRateShouldBeDecidedByRateCalculator) {
TEST(AudioMixer, ZeroSourceRateShouldBeDecidedByRateCalculator) {
ivoc 2017/02/15 16:58:46 Can you add a unit test that doesn't use a limiter
aleloi 2017/02/16 14:01:35 Testing that it doesn't limit is pretty hard, I th
constexpr int kOutputRate = 8000;
- const auto mixer = AudioMixerImpl::CreateWithOutputRateCalculator(
+ const auto mixer = AudioMixerImpl::CreateWithOutputRateCalculatorAndLimiter(
std::unique_ptr<OutputRateCalculator>(
- new CustomRateCalculator(kOutputRate)));
+ new CustomRateCalculator(kOutputRate)),
+ true);
mixer->Mix(1, &frame_for_mixing);

Powered by Google App Engine
This is Rietveld 408576698