commit a29386c26d515be9fbeaeca3e0bc6019f29142c2
author solenberg <solenberg@webrtc.org> Wed Dec 16 03:31:12 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Dec 16 11:31:16 2015 +0000
tree be4b047cd3308751afb9d4367545426297d31109
parent 672aba3f57061e33dd802d9a391c54bdfed952c3

Make VoiceDetection not a ProcessingComponent (bit exact).

BUG=webrtc:5354

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

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

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 67ad266..2143fe1 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -149,8 +149,7 @@
   ApmPublicSubmodules()
       : echo_cancellation(nullptr),
         echo_control_mobile(nullptr),
-        gain_control(nullptr),
-        voice_detection(nullptr) {}
+        gain_control(nullptr) {}
   // Accessed externally of APM without any lock acquired.
   EchoCancellationImpl* echo_cancellation;
   EchoControlMobileImpl* echo_control_mobile;
@@ -158,7 +157,7 @@
   rtc::scoped_ptr<HighPassFilterImpl> high_pass_filter;
   rtc::scoped_ptr<LevelEstimatorImpl> level_estimator;
   rtc::scoped_ptr<NoiseSuppressionImpl> noise_suppression;
-  VoiceDetectionImpl* voice_detection;
+  rtc::scoped_ptr<VoiceDetectionImpl> voice_detection;
   rtc::scoped_ptr<GainControlForNewAgc> gain_control_for_new_agc;
 
   // Accessed internally from both render and capture.
@@ -246,8 +245,8 @@
         new LevelEstimatorImpl(&crit_capture_));
     public_submodules_->noise_suppression.reset(
         new NoiseSuppressionImpl(&crit_capture_));
-    public_submodules_->voice_detection =
-        new VoiceDetectionImpl(this, &crit_capture_);
+    public_submodules_->voice_detection.reset(
+        new VoiceDetectionImpl(&crit_capture_));
     public_submodules_->gain_control_for_new_agc.reset(
         new GainControlForNewAgc(public_submodules_->gain_control));
 
@@ -257,8 +256,6 @@
         public_submodules_->echo_control_mobile);
     private_submodules_->component_list.push_back(
         public_submodules_->gain_control);
-    private_submodules_->component_list.push_back(
-        public_submodules_->voice_detection);
   }
 
   SetExtraOptions(config);
@@ -396,6 +393,7 @@
   InitializeHighPassFilter();
   InitializeNoiseSuppression();
   InitializeLevelEstimator();
+  InitializeVoiceDetection();
 
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
   if (debug_dump_.debug_file->Open()) {
@@ -776,7 +774,7 @@
   public_submodules_->noise_suppression->ProcessCaptureAudio(ca);
   RETURN_ON_ERR(
       public_submodules_->echo_control_mobile->ProcessCaptureAudio(ca));
-  RETURN_ON_ERR(public_submodules_->voice_detection->ProcessCaptureAudio(ca));
+  public_submodules_->voice_detection->ProcessCaptureAudio(ca);
 
   if (constants_.use_new_agc &&
       public_submodules_->gain_control->is_enabled() &&
@@ -1162,7 +1160,7 @@
 VoiceDetection* AudioProcessingImpl::voice_detection() const {
   // Adding a lock here has no effect as it allows any access to the submodule
   // from the returned pointer.
-  return public_submodules_->voice_detection;
+  return public_submodules_->voice_detection.get();
 }
 
 bool AudioProcessingImpl::is_data_processed() const {
@@ -1185,6 +1183,9 @@
   if (public_submodules_->level_estimator->is_enabled()) {
     enabled_count++;
   }
+  if (public_submodules_->voice_detection->is_enabled()) {
+    enabled_count++;
+  }
 
   // Data is unchanged if no components are enabled, or if only
   // public_submodules_->level_estimator
@@ -1313,6 +1314,10 @@
   public_submodules_->level_estimator->Initialize();
 }
 
+void AudioProcessingImpl::InitializeVoiceDetection() {
+  public_submodules_->voice_detection->Initialize(proc_split_sample_rate_hz());
+}
+
 void AudioProcessingImpl::MaybeUpdateHistograms() {
   static const int kMinDiffDelayMs = 60;