From 0bff12a63d64dac902c75e754a5ec0e00de130e8 Mon Sep 17 00:00:00 2001 From: ivoc Date: Thu, 17 Nov 2016 00:55:43 -0800 Subject: [PATCH] Renamed -red to -ed and -red_graph to -ed_graph in audioproc_f. The red acronym is already in use in the context of audio coding, so it is better to avoid reusing it here because it could be confusing. BUG=webrtc:6525 Review-Url: https://codereview.webrtc.org/2505993002 Cr-Commit-Position: refs/heads/master@{#15121} --- .../audio_processing/test/aec_dump_based_simulator.cc | 4 ++-- .../test/audio_processing_simulator.cc | 10 +++++----- .../audio_processing/test/audio_processing_simulator.h | 4 ++-- .../modules/audio_processing/test/audioproc_float.cc | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc index a5f248502f..8580f159c2 100644 --- a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc +++ b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc @@ -450,8 +450,8 @@ void AecDumpBasedSimulator::HandleMessage( apm_config.level_controller.enabled = *settings_.use_lc; } - if (settings_.use_red) { - apm_config.residual_echo_detector.enabled = *settings_.use_red; + if (settings_.use_ed) { + apm_config.residual_echo_detector.enabled = *settings_.use_ed; } ap_->ApplyConfig(apm_config); diff --git a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc index fbf1937097..a341a579c9 100644 --- a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc +++ b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc @@ -79,10 +79,10 @@ void CopyToAudioFrame(const ChannelBuffer& src, AudioFrame* dest) { AudioProcessingSimulator::AudioProcessingSimulator( const SimulationSettings& settings) : settings_(settings) { - if (settings_.red_graph_output_filename && - settings_.red_graph_output_filename->size() > 0) { + if (settings_.ed_graph_output_filename && + settings_.ed_graph_output_filename->size() > 0) { residual_echo_likelihood_graph_writer_.open( - *settings_.red_graph_output_filename); + *settings_.ed_graph_output_filename); RTC_CHECK(residual_echo_likelihood_graph_writer_.is_open()); WriteEchoLikelihoodGraphFileHeader(&residual_echo_likelihood_graph_writer_); } @@ -281,8 +281,8 @@ void AudioProcessingSimulator::CreateAudioProcessor() { !settings_.use_extended_filter || *settings_.use_extended_filter)); config.Set(new DelayAgnostic(!settings_.use_delay_agnostic || *settings_.use_delay_agnostic)); - if (settings_.use_red) { - apm_config.residual_echo_detector.enabled = *settings_.use_red; + if (settings_.use_ed) { + apm_config.residual_echo_detector.enabled = *settings_.use_ed; } ap_.reset(AudioProcessing::Create(config)); diff --git a/webrtc/modules/audio_processing/test/audio_processing_simulator.h b/webrtc/modules/audio_processing/test/audio_processing_simulator.h index 832ab10338..7becdb9a6b 100644 --- a/webrtc/modules/audio_processing/test/audio_processing_simulator.h +++ b/webrtc/modules/audio_processing/test/audio_processing_simulator.h @@ -46,8 +46,8 @@ struct SimulationSettings { rtc::Optional reverse_input_filename; rtc::Optional use_aec; rtc::Optional use_aecm; - rtc::Optional use_red; // Residual Echo Detector. - rtc::Optional red_graph_output_filename; + rtc::Optional use_ed; // Residual Echo Detector. + rtc::Optional ed_graph_output_filename; rtc::Optional use_agc; rtc::Optional use_hpf; rtc::Optional use_ns; diff --git a/webrtc/modules/audio_processing/test/audioproc_float.cc b/webrtc/modules/audio_processing/test/audioproc_float.cc index 201d0fd5d1..a91480d265 100644 --- a/webrtc/modules/audio_processing/test/audioproc_float.cc +++ b/webrtc/modules/audio_processing/test/audioproc_float.cc @@ -70,10 +70,10 @@ DEFINE_int32(aec, DEFINE_int32(aecm, kParameterNotSpecifiedValue, "Activate (1) or deactivate(0) the mobile echo controller"); -DEFINE_int32(red, +DEFINE_int32(ed, kParameterNotSpecifiedValue, "Activate (1) or deactivate (0) the residual echo detector"); -DEFINE_string(red_graph, "", "Output filename for graph of echo likelihood"); +DEFINE_string(ed_graph, "", "Output filename for graph of echo likelihood"); DEFINE_int32(agc, kParameterNotSpecifiedValue, "Activate (1) or deactivate(0) the AGC"); @@ -200,7 +200,7 @@ SimulationSettings CreateSettings() { settings.use_agc = rtc::Optional(true); settings.use_aec = rtc::Optional(true); settings.use_aecm = rtc::Optional(false); - settings.use_red = rtc::Optional(false); + settings.use_ed = rtc::Optional(false); } SetSettingIfSpecified(FLAGS_dump_input, &settings.aec_dump_input_filename); SetSettingIfSpecified(FLAGS_dump_output, &settings.aec_dump_output_filename); @@ -220,8 +220,8 @@ SimulationSettings CreateSettings() { settings.target_angle_degrees = FLAGS_target_angle_degrees; SetSettingIfFlagSet(FLAGS_aec, &settings.use_aec); SetSettingIfFlagSet(FLAGS_aecm, &settings.use_aecm); - SetSettingIfFlagSet(FLAGS_red, &settings.use_red); - SetSettingIfSpecified(FLAGS_red_graph, &settings.red_graph_output_filename); + SetSettingIfFlagSet(FLAGS_ed, &settings.use_ed); + SetSettingIfSpecified(FLAGS_ed_graph, &settings.ed_graph_output_filename); SetSettingIfFlagSet(FLAGS_agc, &settings.use_agc); SetSettingIfFlagSet(FLAGS_hpf, &settings.use_hpf); SetSettingIfFlagSet(FLAGS_ns, &settings.use_ns);