zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make HighPassFilter not a ProcessingComponent anymore (bit exact).

Browse Source 
BUG=webrtc:5298

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

Cr-Commit-Position: refs/heads/master@{#10939}
This commit is contained in:
solenberg
2015-12-08 11:07:32 -08:00
committed by Commit bot
parent 246b8171a6
commit 70f9903e57
4 changed files with 113 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
webrtc/modules/audio_processing/audio_processing_impl.cc
View File

@ -81,7 +81,6 @@ struct AudioProcessingImpl::ApmPublicSubmodules {
: 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 @@ struct AudioProcessingImpl::ApmPublicSubmodules {
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 @@ AudioProcessingImpl::AudioProcessingImpl(const Config& config,
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 =
@ -260,8 +259,6 @@ AudioProcessingImpl::AudioProcessingImpl(const Config& config,
public_submodules_->echo_control_mobile);
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(
@ -406,6 +403,8 @@ int AudioProcessingImpl::InitializeLocked() {
InitializeIntelligibility();
InitializeHighPassFilter();
#ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
if (debug_dump_.debug_file->Open()) {
int err = WriteInitMessage();
@ -767,7 +766,7 @@ int AudioProcessingImpl::ProcessStreamLocked() {
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 @@ GainControl* AudioProcessingImpl::gain_control() const {
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 @@ bool AudioProcessingImpl::is_data_processed() const {
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::InitializeIntelligibility() {
}
}
void AudioProcessingImpl::InitializeHighPassFilter() {
public_submodules_->high_pass_filter->Initialize(num_output_channels(),
proc_sample_rate_hz());
}
void AudioProcessingImpl::MaybeUpdateHistograms() {
static const int kMinDiffDelayMs = 60;