commit 70f9903e570931831a027ba6f91c164efc604a85
author solenberg <solenberg@webrtc.org> Tue Dec 08 11:07:32 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Dec 08 19:07:38 2015 +0000
tree ea8f1a2440ae6ae13a546196a7427252a1c85c23
parent 246b8171a6fbb4e37a5491679bc595238f81e490

Make HighPassFilter not a ProcessingComponent anymore (bit exact).

BUG=webrtc:5298

Review URL: https://codereview.webrtc.org/1490333004

Cr-Commit-Position: refs/heads/master@{#10939}

webrtc/modules/audio_processing/audio_processing_impl.cc

diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index 48f23b1..a38d73e 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -81,7 +81,6 @@
       : echo_cancellation(nullptr),
         echo_control_mobile(nullptr),
         gain_control(nullptr),
-        high_pass_filter(nullptr),
         level_estimator(nullptr),
         noise_suppression(nullptr),
         voice_detection(nullptr) {}
@@ -89,7 +88,7 @@
   EchoCancellationImpl* echo_cancellation;
   EchoControlMobileImpl* echo_control_mobile;
   GainControlImpl* gain_control;
-  HighPassFilterImpl* high_pass_filter;
+  rtc::scoped_ptr<HighPassFilterImpl> high_pass_filter;
   LevelEstimatorImpl* level_estimator;
   NoiseSuppressionImpl* noise_suppression;
   VoiceDetectionImpl* voice_detection;
@@ -243,8 +242,8 @@
         new EchoControlMobileImpl(this, &crit_render_, &crit_capture_);
     public_submodules_->gain_control =
         new GainControlImpl(this, &crit_capture_, &crit_capture_);
-    public_submodules_->high_pass_filter =
-        new HighPassFilterImpl(this, &crit_capture_);
+    public_submodules_->high_pass_filter.reset(
+        new HighPassFilterImpl(&crit_capture_));
     public_submodules_->level_estimator =
         new LevelEstimatorImpl(this, &crit_capture_);
     public_submodules_->noise_suppression =
@@ -261,8 +260,6 @@
     private_submodules_->component_list.push_back(
         public_submodules_->gain_control);
     private_submodules_->component_list.push_back(
-        public_submodules_->high_pass_filter);
-    private_submodules_->component_list.push_back(
         public_submodules_->level_estimator);
     private_submodules_->component_list.push_back(
         public_submodules_->noise_suppression);
@@ -406,6 +403,8 @@
 
   InitializeIntelligibility();
 
+  InitializeHighPassFilter();
+
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
   if (debug_dump_.debug_file->Open()) {
     int err = WriteInitMessage();
@@ -767,7 +766,7 @@
     ca->set_num_channels(1);
   }
 
-  RETURN_ON_ERR(public_submodules_->high_pass_filter->ProcessCaptureAudio(ca));
+  public_submodules_->high_pass_filter->ProcessCaptureAudio(ca);
   RETURN_ON_ERR(public_submodules_->gain_control->AnalyzeCaptureAudio(ca));
   RETURN_ON_ERR(public_submodules_->noise_suppression->AnalyzeCaptureAudio(ca));
   RETURN_ON_ERR(public_submodules_->echo_cancellation->ProcessCaptureAudio(ca));
@@ -1147,7 +1146,7 @@
 HighPassFilter* AudioProcessingImpl::high_pass_filter() const {
   // Adding a lock here has no effect as it allows any access to the submodule
   // from the returned pointer.
-  return public_submodules_->high_pass_filter;
+  return public_submodules_->high_pass_filter.get();
 }
 
 LevelEstimator* AudioProcessingImpl::level_estimator() const {
@@ -1179,6 +1178,9 @@
       enabled_count++;
     }
   }
+  if (public_submodules_->high_pass_filter->is_enabled()) {
+    enabled_count++;
+  }
 
   // Data is unchanged if no components are enabled, or if only
   // public_submodules_->level_estimator
@@ -1293,6 +1295,11 @@
   }
 }
 
+void AudioProcessingImpl::InitializeHighPassFilter() {
+  public_submodules_->high_pass_filter->Initialize(num_output_channels(),
+                                                   proc_sample_rate_hz());
+}
+
 void AudioProcessingImpl::MaybeUpdateHistograms() {
   static const int kMinDiffDelayMs = 60;