From c5efb0c080204ea4f9a8172ff18977b0aa748671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85hgren?= Date: Mon, 28 May 2018 09:10:59 +0200 Subject: [PATCH] Added an audioproc option to not report the stream delay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9316 Change-Id: If7a20bbac998e9a779579650f3eb9019f974e9a8 Reviewed-on: https://webrtc-review.googlesource.com/79141 Reviewed-by: Jesus de Vicente Pena Commit-Queue: Per Åhgren Cr-Commit-Position: refs/heads/master@{#23415} --- .../test/aec_dump_based_simulator.cc | 14 ++++++++------ .../test/audio_processing_simulator.h | 1 + .../audio_processing/test/audioproc_float_impl.cc | 4 ++++ .../audio_processing/test/wav_based_simulator.cc | 8 +++++--- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/modules/audio_processing/test/aec_dump_based_simulator.cc b/modules/audio_processing/test/aec_dump_based_simulator.cc index 9ddf294d65..495318a73c 100644 --- a/modules/audio_processing/test/aec_dump_based_simulator.cc +++ b/modules/audio_processing/test/aec_dump_based_simulator.cc @@ -133,14 +133,16 @@ void AecDumpBasedSimulator::PrepareProcessStreamCall( } } - if (!settings_.stream_delay) { - if (msg.has_delay()) { + if (!settings_.use_stream_delay || *settings_.use_stream_delay) { + if (!settings_.stream_delay) { + if (msg.has_delay()) { + RTC_CHECK_EQ(AudioProcessing::kNoError, + ap_->set_stream_delay_ms(msg.delay())); + } + } else { RTC_CHECK_EQ(AudioProcessing::kNoError, - ap_->set_stream_delay_ms(msg.delay())); + ap_->set_stream_delay_ms(*settings_.stream_delay)); } - } else { - RTC_CHECK_EQ(AudioProcessing::kNoError, - ap_->set_stream_delay_ms(*settings_.stream_delay)); } if (!settings_.stream_drift_samples) { diff --git a/modules/audio_processing/test/audio_processing_simulator.h b/modules/audio_processing/test/audio_processing_simulator.h index 446244d7f4..996df71710 100644 --- a/modules/audio_processing/test/audio_processing_simulator.h +++ b/modules/audio_processing/test/audio_processing_simulator.h @@ -35,6 +35,7 @@ struct SimulationSettings { SimulationSettings(const SimulationSettings&); ~SimulationSettings(); rtc::Optional stream_delay; + rtc::Optional use_stream_delay; rtc::Optional stream_drift_samples; rtc::Optional output_sample_rate_hz; rtc::Optional output_num_channels; diff --git a/modules/audio_processing/test/audioproc_float_impl.cc b/modules/audio_processing/test/audioproc_float_impl.cc index 6d84a8ddc4..57fcdfb975 100644 --- a/modules/audio_processing/test/audioproc_float_impl.cc +++ b/modules/audio_processing/test/audioproc_float_impl.cc @@ -165,6 +165,9 @@ DEFINE_int(ns_level, DEFINE_int(stream_delay, kParameterNotSpecifiedValue, "Specify the stream delay in ms to use"); +DEFINE_int(use_stream_delay, + kParameterNotSpecifiedValue, + "Activate (1) or deactivate(0) reporting the stream delay"); DEFINE_int(stream_drift_samples, kParameterNotSpecifiedValue, "Specify the number of stream drift samples to use"); @@ -286,6 +289,7 @@ SimulationSettings CreateSettings() { SetSettingIfSpecified(FLAG_vad_likelihood, &settings.vad_likelihood); SetSettingIfSpecified(FLAG_ns_level, &settings.ns_level); SetSettingIfSpecified(FLAG_stream_delay, &settings.stream_delay); + SetSettingIfFlagSet(FLAG_use_stream_delay, &settings.use_stream_delay); SetSettingIfSpecified(FLAG_stream_drift_samples, &settings.stream_drift_samples); SetSettingIfSpecified(FLAG_custom_call_order_file, diff --git a/modules/audio_processing/test/wav_based_simulator.cc b/modules/audio_processing/test/wav_based_simulator.cc index 7f23c627d8..908a2e6f2a 100644 --- a/modules/audio_processing/test/wav_based_simulator.cc +++ b/modules/audio_processing/test/wav_based_simulator.cc @@ -74,9 +74,11 @@ void WavBasedSimulator::PrepareProcessStreamCall() { } ap_->set_stream_key_pressed(settings_.use_ts && (*settings_.use_ts)); - RTC_CHECK_EQ(AudioProcessing::kNoError, - ap_->set_stream_delay_ms( - settings_.stream_delay ? *settings_.stream_delay : 0)); + if (!settings_.use_stream_delay || *settings_.use_stream_delay) { + RTC_CHECK_EQ(AudioProcessing::kNoError, + ap_->set_stream_delay_ms( + settings_.stream_delay ? *settings_.stream_delay : 0)); + } ap_->echo_cancellation()->set_stream_drift_samples( settings_.stream_drift_samples ? *settings_.stream_drift_samples : 0);