Chromium Code Reviews| Index: webrtc/modules/audio_processing/test/audio_processing_simulator.cc |
| diff --git a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc |
| index 57b03ed4b29cb2ef70c9debf3e8aedc7d1974dba..0fb6d4a55419c1d90cb028c3c0c5a3ad6ac429b0 100644 |
| --- a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc |
| +++ b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc |
| @@ -208,6 +208,7 @@ void AudioProcessingSimulator::DestroyAudioProcessor() { |
| void AudioProcessingSimulator::CreateAudioProcessor() { |
| Config config; |
| + AudioProcessing::Config apm_config; |
| if (settings_.use_bf && *settings_.use_bf) { |
| config.Set<Beamforming>(new Beamforming( |
| true, ParseArrayGeometry(*settings_.microphone_positions), |
| @@ -224,7 +225,7 @@ void AudioProcessingSimulator::CreateAudioProcessor() { |
| config.Set<EchoCanceller3>(new EchoCanceller3(*settings_.use_aec3)); |
| } |
| if (settings_.use_lc) { |
| - config.Set<LevelControl>(new LevelControl(true)); |
| + apm_config.level_controller.enabled = *settings_.use_lc; |
| } |
| if (settings_.use_refined_adaptive_filter) { |
| config.Set<RefinedAdaptiveFilter>( |
| @@ -236,6 +237,10 @@ void AudioProcessingSimulator::CreateAudioProcessor() { |
| *settings_.use_delay_agnostic)); |
| ap_.reset(AudioProcessing::Create(config)); |
| + RTC_CHECK(ap_); |
| + |
| + RTC_DCHECK(apm_config.Validate()); |
|
the sun
2016/09/01 13:48:01
dd
peah-webrtc
2016/09/02 08:22:03
Done.
|
| + RTC_DCHECK(ap_->ApplyConfig(apm_config)); |
| if (settings_.use_aec) { |
| RTC_CHECK_EQ(AudioProcessing::kNoError, |