zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed -red to -ed and -red_graph to -ed_graph in audioproc_f.

Browse Source 
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}
This commit is contained in:
ivoc
2016-11-17 00:55:43 -08:00
committed by Commit bot
parent 9af2b6012a
commit 0bff12a63d
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc
View File

@ -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);

10
webrtc/modules/audio_processing/test/audio_processing_simulator.cc
View File

@ -79,10 +79,10 @@ void CopyToAudioFrame(const ChannelBuffer<float>& 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<DelayAgnostic>(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));

4
webrtc/modules/audio_processing/test/audio_processing_simulator.h
View File

@ -46,8 +46,8 @@ struct SimulationSettings {
rtc::Optional<std::string> reverse_input_filename;
rtc::Optional<bool> use_aec;
rtc::Optional<bool> use_aecm;
rtc::Optional<bool> use_red; // Residual Echo Detector.
rtc::Optional<std::string> red_graph_output_filename;
rtc::Optional<bool> use_ed; // Residual Echo Detector.
rtc::Optional<std::string> ed_graph_output_filename;
rtc::Optional<bool> use_agc;
rtc::Optional<bool> use_hpf;
rtc::Optional<bool> use_ns;

10
webrtc/modules/audio_processing/test/audioproc_float.cc
View File

@ -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<bool>(true);
settings.use_aec = rtc::Optional<bool>(true);
settings.use_aecm = rtc::Optional<bool>(false);
settings.use_red = rtc::Optional<bool>(false);
settings.use_ed = rtc::Optional<bool>(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);