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

Unified Diff: webrtc/modules/audio_processing/test/audio_processing_simulator.cc

Issue 2292863002: Introduced new scheme for controlling the functionality inside the audio processing module (Closed)
Patch Set: Fixed bad merge Created 4 years, 3 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_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 a34c3ca78ee2922722031c98df0a76e02d7e3269..778b347091d82a9270a2904e8c4d329061df60c2 100644
--- a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc
+++ b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc
@@ -218,6 +218,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),
@@ -234,7 +235,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>(
@@ -246,6 +247,9 @@ void AudioProcessingSimulator::CreateAudioProcessor() {
*settings_.use_delay_agnostic));
ap_.reset(AudioProcessing::Create(config));
+ RTC_CHECK(ap_);
+
+ ap_->ApplyConfig(apm_config);
if (settings_.use_aec) {
RTC_CHECK_EQ(AudioProcessing::kNoError,

Powered by Google App Engine
This is Rietveld 408576698