Introduced the new parameter setting scheme for activating the high-pass filter in APM

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 766 matching lines @@
     }
     if (voep->SetNsStatus(*options.noise_suppression, ns_mode) == -1) {
       LOG_RTCERR2(SetNsStatus, *options.noise_suppression, ns_mode);
       return false;
     } else {
       LOG(LS_INFO) << "Noise suppression set to " << *options.noise_suppression
                    << " with mode " << ns_mode;
     }
   }
 
-  if (options.highpass_filter) {
-    LOG(LS_INFO) << "High pass filter enabled? " << *options.highpass_filter;
-    if (voep->EnableHighPassFilter(*options.highpass_filter) == -1) {
-      LOG_RTCERR1(SetHighpassFilterStatus, *options.highpass_filter);
-      return false;
-    }
-  }
-
   if (options.stereo_swapping) {
     LOG(LS_INFO) << "Stereo swapping enabled? " << *options.stereo_swapping;
     voep->EnableStereoChannelSwapping(*options.stereo_swapping);
     if (voep->IsStereoChannelSwappingEnabled() != *options.stereo_swapping) {
       LOG_RTCERR1(EnableStereoChannelSwapping, *options.stereo_swapping);
       return false;
     }
   }
 
   if (options.audio_jitter_buffer_max_packets) {
@@ skipping 57 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;
   }
 
-  LOG(LS_INFO) << "Level control: "
-               << (!!level_control_ ? *level_control_ : -1);
   webrtc::AudioProcessing::Config apm_config;
   if (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 =
           *options.level_control_initial_peak_level_dbfs;
     }
   }
 
-  apm()->SetExtraOptions(config);
-  apm()->ApplyConfig(apm_config);
+  if (options.highpass_filter) {
+    apm_config.high_pass_filter.enabled = *options.highpass_filter;
+  }
+
+  // We check audioproc for the benefit of tests, since FakeWebRtcVoiceEngine
+  // returns NULL on audio_processing().
+  webrtc::AudioProcessing* audioproc = voe_wrapper_->base()->audio_processing();
+  if (audioproc) {

[the sun, 2016/10/28 10:52:53]

Revert back to "apm()->" for these two calls. Remove the conditional. apm()
never returns NULL.

[peah-webrtc, 2016/10/28 12:19:52]

Sorry, this was caused by my manually reverting this during a rebase. That
should not have happened.
Done.

+    audioproc->SetExtraOptions(config);
+    audioproc->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 1617 matching lines @@
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   const auto it = send_streams_.find(ssrc);
   if (it != send_streams_.end()) {
     return it->second->channel();
   }
   return -1;
 }
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE