commit c0734715d1c05b1613e44594184cefb31a785e7b
author Per Åhgren <peah@webrtc.org> Thu Jan 02 15:15:36 2020 +0100
committer Commit Bot <commit-bot@chromium.org> Fri Jan 03 08:48:54 2020 +0000
tree be3ec13374e829736740c54bad15b43b3a58a540
parent 045c36d17c632ec6e19ce137d6a163fdcf1e13cb

APM: Move the TransientSuppression activation to the apm_config

This CL moves the activation of the transient suppression to the APM
config.

Bug: webrtc:5298
Change-Id: Iba7975bec4654c3df8834fd5b7d1082ff53641dd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/163985
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Commit-Queue: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30137}

modules/audio_processing/audio_processing_impl.cc

diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index db9b789..ed1715c 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -350,11 +350,6 @@
                  !field_trial::IsEnabled(
                      "WebRTC-ApmExperimentalMultiChannelCaptureKillSwitch"),
                  EnforceSplitBandHpf()),
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
-      capture_(false),
-#else
-      capture_(config.Get<ExperimentalNs>().enabled),
-#endif
       capture_nonlocked_() {
   RTC_LOG(LS_INFO) << "Injected APM submodules:"
                    << "\nEcho control factory: " << !!echo_control_factory_
@@ -381,7 +376,11 @@
   // implemented.
   submodules_.gain_controller2.reset(new GainController2());
 
-  SetExtraOptions(config);
+  // TODO(webrtc:5298): Remove once the use of ExperimentalNs has been
+  // deprecated.
+#if !(defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS))
+  config_.transient_suppression.enabled = config.Get<ExperimentalNs>().enabled;
+#endif
 }
 
 AudioProcessingImpl::~AudioProcessingImpl() = default;
@@ -513,7 +512,7 @@
         submodules_.gain_control.get());
     submodules_.agc_manager->SetCaptureMuted(capture_.output_will_be_muted);
   }
-  InitializeTransient();
+  InitializeTransientSuppressor();
   InitializeHighPassFilter();
   InitializeVoiceDetector();
   InitializeResidualEchoDetector();
@@ -664,6 +663,9 @@
       config_.noise_suppression.enabled != config.noise_suppression.enabled ||
       config_.noise_suppression.level != config.noise_suppression.level;
 
+  const bool ts_config_changed = config_.transient_suppression.enabled !=
+                                 config.transient_suppression.enabled;
+
   config_ = config;
 
   if (aec_config_changed) {
@@ -674,6 +676,10 @@
     InitializeNoiseSuppressor();
   }
 
+  if (ts_config_changed) {
+    InitializeTransientSuppressor();
+  }
+
   InitializeHighPassFilter();
 
   if (agc1_config_changed) {
@@ -730,17 +736,8 @@
   }
 }
 
+// TODO(webrtc:5298): Remove.
 void AudioProcessingImpl::SetExtraOptions(const webrtc::Config& config) {
-  // Run in a single-threaded manner when setting the extra options.
-  rtc::CritScope cs_render(&crit_render_);
-  rtc::CritScope cs_capture(&crit_capture_);
-
-  if (capture_.transient_suppressor_enabled !=
-      config.Get<ExperimentalNs>().enabled) {
-    capture_.transient_suppressor_enabled =
-        config.Get<ExperimentalNs>().enabled;
-    InitializeTransient();
-  }
 }
 
 int AudioProcessingImpl::proc_sample_rate_hz() const {
@@ -1394,7 +1391,7 @@
 
   // TODO(aluebs): Investigate if the transient suppression placement should be
   // before or after the AGC.
-  if (capture_.transient_suppressor_enabled) {
+  if (submodules_.transient_suppressor) {
     float voice_probability = submodules_.agc_manager.get()
                                   ? submodules_.agc_manager->voice_probability()
                                   : 1.f;
@@ -1766,17 +1763,19 @@
       !!submodules_.legacy_noise_suppressor || !!submodules_.noise_suppressor,
       submodules_.gain_control->is_enabled(), config_.gain_controller2.enabled,
       config_.pre_amplifier.enabled, capture_nonlocked_.echo_controller_enabled,
-      config_.voice_detection.enabled, capture_.transient_suppressor_enabled);
+      config_.voice_detection.enabled, !!submodules_.transient_suppressor);
 }
 
-void AudioProcessingImpl::InitializeTransient() {
-  if (capture_.transient_suppressor_enabled) {
-    if (!submodules_.transient_suppressor.get()) {
+void AudioProcessingImpl::InitializeTransientSuppressor() {
+  if (config_.transient_suppression.enabled) {
+    if (!submodules_.transient_suppressor) {
       submodules_.transient_suppressor.reset(new TransientSuppressor());
     }
     submodules_.transient_suppressor->Initialize(proc_fullband_sample_rate_hz(),
                                                  capture_nonlocked_.split_rate,
                                                  num_proc_channels());
+  } else {
+    submodules_.transient_suppressor.reset();
   }
 }
 
@@ -2019,7 +2018,7 @@
   apm_config.ns_level = static_cast<int>(config_.noise_suppression.level);
 
   apm_config.transient_suppression_enabled =
-      capture_.transient_suppressor_enabled;
+      config_.transient_suppression.enabled;
   apm_config.experiments_description = experiments_description;
   apm_config.pre_amplifier_enabled = config_.pre_amplifier.enabled;
   apm_config.pre_amplifier_fixed_gain_factor =
@@ -2083,13 +2082,11 @@
   aec_dump_->AddAudioProcessingState(audio_proc_state);
 }
 
-AudioProcessingImpl::ApmCaptureState::ApmCaptureState(
-    bool transient_suppressor_enabled)
+AudioProcessingImpl::ApmCaptureState::ApmCaptureState()
     : delay_offset_ms(0),
       was_stream_delay_set(false),
       output_will_be_muted(false),
       key_pressed(false),
-      transient_suppressor_enabled(transient_suppressor_enabled),
       capture_processing_format(kSampleRate16kHz),
       split_rate(kSampleRate16kHz),
       echo_path_gain_change(false),