Make NoiseSuppression not a processing component (bit exact).
BUG=webrtc:5298
patch from issue 1490333004 at patchset 1 (http://crrev.com/1490333004#ps1)
Review URL: https://codereview.webrtc.org/1507683006
Cr-Commit-Position: refs/heads/master@{#10944}
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index a38d73e..805e05e 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -76,38 +76,6 @@
}
} // namespace
-struct AudioProcessingImpl::ApmPublicSubmodules {
- ApmPublicSubmodules()
- : echo_cancellation(nullptr),
- echo_control_mobile(nullptr),
- gain_control(nullptr),
- level_estimator(nullptr),
- noise_suppression(nullptr),
- voice_detection(nullptr) {}
- // Accessed externally of APM without any lock acquired.
- EchoCancellationImpl* echo_cancellation;
- EchoControlMobileImpl* echo_control_mobile;
- GainControlImpl* gain_control;
- rtc::scoped_ptr<HighPassFilterImpl> high_pass_filter;
- LevelEstimatorImpl* level_estimator;
- NoiseSuppressionImpl* noise_suppression;
- VoiceDetectionImpl* voice_detection;
- rtc::scoped_ptr<GainControlForNewAgc> gain_control_for_new_agc;
-
- // Accessed internally from both render and capture.
- rtc::scoped_ptr<TransientSuppressor> transient_suppressor;
- rtc::scoped_ptr<IntelligibilityEnhancer> intelligibility_enhancer;
-};
-
-struct AudioProcessingImpl::ApmPrivateSubmodules {
- explicit ApmPrivateSubmodules(Beamformer<float>* beamformer)
- : beamformer(beamformer) {}
- // Accessed internally from capture or during initialization
- std::list<ProcessingComponent*> component_list;
- rtc::scoped_ptr<Beamformer<float>> beamformer;
- rtc::scoped_ptr<AgcManagerDirect> agc_manager;
-};
-
// Throughout webrtc, it's assumed that success is represented by zero.
static_assert(AudioProcessing::kNoError == 0, "kNoError must be zero");
@@ -177,6 +145,37 @@
int volume_;
};
+struct AudioProcessingImpl::ApmPublicSubmodules {
+ ApmPublicSubmodules()
+ : echo_cancellation(nullptr),
+ echo_control_mobile(nullptr),
+ gain_control(nullptr),
+ level_estimator(nullptr),
+ voice_detection(nullptr) {}
+ // Accessed externally of APM without any lock acquired.
+ EchoCancellationImpl* echo_cancellation;
+ EchoControlMobileImpl* echo_control_mobile;
+ GainControlImpl* gain_control;
+ rtc::scoped_ptr<HighPassFilterImpl> high_pass_filter;
+ LevelEstimatorImpl* level_estimator;
+ rtc::scoped_ptr<NoiseSuppressionImpl> noise_suppression;
+ VoiceDetectionImpl* voice_detection;
+ rtc::scoped_ptr<GainControlForNewAgc> gain_control_for_new_agc;
+
+ // Accessed internally from both render and capture.
+ rtc::scoped_ptr<TransientSuppressor> transient_suppressor;
+ rtc::scoped_ptr<IntelligibilityEnhancer> intelligibility_enhancer;
+};
+
+struct AudioProcessingImpl::ApmPrivateSubmodules {
+ explicit ApmPrivateSubmodules(Beamformer<float>* beamformer)
+ : beamformer(beamformer) {}
+ // Accessed internally from capture or during initialization
+ std::list<ProcessingComponent*> component_list;
+ rtc::scoped_ptr<Beamformer<float>> beamformer;
+ rtc::scoped_ptr<AgcManagerDirect> agc_manager;
+};
+
const int AudioProcessing::kNativeSampleRatesHz[] = {
AudioProcessing::kSampleRate8kHz,
AudioProcessing::kSampleRate16kHz,
@@ -246,8 +245,8 @@
new HighPassFilterImpl(&crit_capture_));
public_submodules_->level_estimator =
new LevelEstimatorImpl(this, &crit_capture_);
- public_submodules_->noise_suppression =
- new NoiseSuppressionImpl(this, &crit_capture_);
+ public_submodules_->noise_suppression.reset(
+ new NoiseSuppressionImpl(&crit_capture_));
public_submodules_->voice_detection =
new VoiceDetectionImpl(this, &crit_capture_);
public_submodules_->gain_control_for_new_agc.reset(
@@ -262,8 +261,6 @@
private_submodules_->component_list.push_back(
public_submodules_->level_estimator);
private_submodules_->component_list.push_back(
- public_submodules_->noise_suppression);
- private_submodules_->component_list.push_back(
public_submodules_->voice_detection);
}
@@ -396,14 +393,11 @@
}
InitializeExperimentalAgc();
-
InitializeTransient();
-
InitializeBeamformer();
-
InitializeIntelligibility();
-
InitializeHighPassFilter();
+ InitializeNoiseSuppression();
#ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
if (debug_dump_.debug_file->Open()) {
@@ -768,14 +762,14 @@
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));
+ public_submodules_->noise_suppression->AnalyzeCaptureAudio(ca);
RETURN_ON_ERR(public_submodules_->echo_cancellation->ProcessCaptureAudio(ca));
if (public_submodules_->echo_control_mobile->is_enabled() &&
public_submodules_->noise_suppression->is_enabled()) {
ca->CopyLowPassToReference();
}
- RETURN_ON_ERR(public_submodules_->noise_suppression->ProcessCaptureAudio(ca));
+ 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));
@@ -1158,7 +1152,7 @@
NoiseSuppression* AudioProcessingImpl::noise_suppression() const {
// Adding a lock here has no effect as it allows any access to the submodule
// from the returned pointer.
- return public_submodules_->noise_suppression;
+ return public_submodules_->noise_suppression.get();
}
VoiceDetection* AudioProcessingImpl::voice_detection() const {
@@ -1181,6 +1175,9 @@
if (public_submodules_->high_pass_filter->is_enabled()) {
enabled_count++;
}
+ if (public_submodules_->noise_suppression->is_enabled()) {
+ enabled_count++;
+ }
// Data is unchanged if no components are enabled, or if only
// public_submodules_->level_estimator
@@ -1300,6 +1297,11 @@
proc_sample_rate_hz());
}
+void AudioProcessingImpl::InitializeNoiseSuppression() {
+ public_submodules_->noise_suppression->Initialize(num_output_channels(),
+ proc_sample_rate_hz());
+}
+
void AudioProcessingImpl::MaybeUpdateHistograms() {
static const int kMinDiffDelayMs = 60;