Reland of added functionality for specifying the initial signal level to use for the gain estimation

webrtc/modules/audio_processing/audio_processing_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 506 matching lines @@
     capture_nonlocked_.split_rate = kSampleRate16kHz;
   } else {
     capture_nonlocked_.split_rate =
         capture_nonlocked_.fwd_proc_format.sample_rate_hz();
   }
 
   return InitializeLocked();
 }
 
 void AudioProcessingImpl::ApplyConfig(const AudioProcessing::Config& config) {
-  AudioProcessing::Config config_to_use = config;
-
-  bool config_ok = LevelController::Validate(config_to_use.level_controller);
-  if (!config_ok) {
-    LOG(LS_ERROR) << "AudioProcessing module config error" << std::endl
-                  << "level_controller: "
-                  << LevelController::ToString(config_to_use.level_controller)
-                  << std::endl
-                  << "Reverting to default parameter set";
-    config_to_use.level_controller = AudioProcessing::Config::LevelController();
-  }
-
   // Run in a single-threaded manner when applying the settings.
   rtc::CritScope cs_render(&crit_render_);
   rtc::CritScope cs_capture(&crit_capture_);
 
+  bool config_ok = LevelController::Validate(config.level_controller);
+  if (!config_ok) {
+    LOG(LS_ERROR) << "AudioProcessing module config error" << std::endl
+                  << "level_controller: "
+                  << LevelController::ToString(config.level_controller)
+                  << std::endl
+                  << "Reverting to default parameter set";
+    AudioProcessing::Config::LevelController default_config;
+    private_submodules_->level_controller->ApplyConfig(default_config);
+  } else {
+    private_submodules_->level_controller->ApplyConfig(config.level_controller);
+  }
+
   if (config.level_controller.enabled !=
       capture_nonlocked_.level_controller_enabled) {
     InitializeLevelController();
     LOG(LS_INFO) << "Level controller activated: "
                  << capture_nonlocked_.level_controller_enabled;
     capture_nonlocked_.level_controller_enabled =
         config.level_controller.enabled;
   }
 }
 
@@ skipping 1055 matching lines @@
       fwd_proc_format(kSampleRate16kHz),
       split_rate(kSampleRate16kHz) {}
 
 AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default;
 
 AudioProcessingImpl::ApmRenderState::ApmRenderState() = default;
 
 AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default;
 
 }  // namespace webrtc