Avoid that previous settings in APM are overwritten by WebRtcVoiceEngine

webrtc/media/engine/webrtcvoiceengine.cc

 /*
  *  Copyright (c) 2004 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 583 matching lines @@
     LOG(LS_INFO) << "Intelligibility Enhancer is enabled? "
                  << *intelligibility_enhancer_;
     config.Set<webrtc::Intelligibility>(
         new webrtc::Intelligibility(*intelligibility_enhancer_));
   }
 
   if (options.level_control) {
     level_control_ = options.level_control;
   }
 
+  webrtc::AudioProcessing::Config apm_config = apm()->GetConfig();
+
   LOG(LS_INFO) << "Level control: "
                << (!!level_control_ ? *level_control_ : -1);
   if (level_control_) {
-    apm_config_.level_controller.enabled = *level_control_;
+    apm_config.level_controller.enabled = *level_control_;
     if (options.level_control_initial_peak_level_dbfs) {
-      apm_config_.level_controller.initial_peak_level_dbfs =
+      apm_config.level_controller.initial_peak_level_dbfs =
           *options.level_control_initial_peak_level_dbfs;
     }
   }
 
   if (options.highpass_filter) {
-    apm_config_.high_pass_filter.enabled = *options.highpass_filter;
+    apm_config.high_pass_filter.enabled = *options.highpass_filter;
   }
 
   if (options.residual_echo_detector) {
-    apm_config_.residual_echo_detector.enabled =
-        *options.residual_echo_detector;
+    apm_config.residual_echo_detector.enabled = *options.residual_echo_detector;
   }
 
   apm()->SetExtraOptions(config);
-  apm()->ApplyConfig(apm_config_);
+  apm()->ApplyConfig(apm_config);
 
   if (options.recording_sample_rate) {
     LOG(LS_INFO) << "Recording sample rate is "
                  << *options.recording_sample_rate;
     if (adm()->SetRecordingSampleRate(*options.recording_sample_rate)) {
       LOG_RTCERR1(SetRecordingSampleRate, *options.recording_sample_rate);
     }
   }
 
   if (options.playout_sample_rate) {
@@ skipping 110 matching lines @@
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   return voe_wrapper_->base()->CreateChannel(channel_config_);
 }
 
 webrtc::AudioDeviceModule* WebRtcVoiceEngine::adm() {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   RTC_DCHECK(adm_);
   return adm_;
 }
 
-webrtc::AudioProcessing* WebRtcVoiceEngine::apm() {
+webrtc::AudioProcessing* WebRtcVoiceEngine::apm() const {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   return apm_.get();
 }
 
 webrtc::voe::TransmitMixer* WebRtcVoiceEngine::transmit_mixer() {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   RTC_DCHECK(transmit_mixer_);
   return transmit_mixer_;
 }
 
@@ skipping 1606 matching lines @@
                       ssrc);
   if (it != unsignaled_recv_ssrcs_.end()) {
     unsignaled_recv_ssrcs_.erase(it);
     return true;
   }
   return false;
 }
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE