From 4b6c8b7bf7d2489c3cda13a5b93f03043fd76584 Mon Sep 17 00:00:00 2001 From: aluebs Date: Mon, 20 Jun 2016 11:02:30 -0700 Subject: [PATCH] Fix ProcessReverseStream usage in audioproc_f Also added IntelligibilityEnhancer setting to aecdump simulator in audioproc_f Review-Url: https://codereview.webrtc.org/2075093003 Cr-Commit-Position: refs/heads/master@{#13220} --- .../audio_processing/test/aec_dump_based_simulator.cc | 10 ++++++++++ .../test/audio_processing_simulator.cc | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) 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 bb666cdce8..adcfd8ec09 100644 --- a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc +++ b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc @@ -386,6 +386,16 @@ void AecDumpBasedSimulator::HandleMessage( } } + if (msg.has_intelligibility_enhancer_enabled() || settings_.use_ie) { + bool enable = settings_.use_ie ? *settings_.use_ie + : msg.intelligibility_enhancer_enabled(); + config.Set(new Intelligibility(enable)); + if (settings_.use_verbose_logging) { + std::cout << " intelligibility_enhancer_enabled: " + << (enable ? "true" : "false") << std::endl; + } + } + if (msg.has_hpf_enabled() || settings_.use_hpf) { bool enable = settings_.use_hpf ? *settings_.use_hpf : msg.hpf_enabled(); RTC_CHECK_EQ(AudioProcessing::kNoError, diff --git a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc index 6cb614db32..65072daf93 100644 --- a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc +++ b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc @@ -86,7 +86,8 @@ void AudioProcessingSimulator::ProcessStream(bool fixed_interface) { void AudioProcessingSimulator::ProcessReverseStream(bool fixed_interface) { if (fixed_interface) { const auto st = ScopedTimer(mutable_proc_time()); - RTC_CHECK_EQ(AudioProcessing::kNoError, ap_->ProcessStream(&rev_frame_)); + RTC_CHECK_EQ(AudioProcessing::kNoError, + ap_->ProcessReverseStream(&rev_frame_)); CopyFromAudioFrame(rev_frame_, reverse_out_buf_.get()); } else {