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

AEC3: Configuration parameter for disabling linear filter

Browse Source 
The configuration parameter filter.use_linear_filter can be used to
disable the linear filtering. Disabling the linear filter is equivalent
to runing in non-linear mode.

Bug: b/130016532
Change-Id: I8ffdf474822888b9915444bba6cc1c25ec1efe5a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132552
Reviewed-by: Per Åhgren <peah@webrtc.org>
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27566}
This commit is contained in:
Gustaf Ullberg
2019-04-11 14:43:17 +02:00
committed by Commit Bot
parent 7aacdd9515
commit 52caa0ef58
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/audio/echo_canceller3_config.h
View File

@ -76,6 +76,7 @@ struct RTC_EXPORT EchoCanceller3Config {
float initial_state_seconds = 2.5f;
bool conservative_initial_phase = false;
bool enable_shadow_filter_output_usage = true;
bool use_linear_filter = true;
} filter;
struct Erle {

4
api/audio/echo_canceller3_config_json.cc
View File

@ -167,6 +167,9 @@ void Aec3ConfigFromJsonString(absl::string_view json_string,
ReadParam(subsection, "converged",
&cfg.delay.delay_selection_thresholds.converged);
}
ReadParam(section, "use_external_delay_estimator",
&cfg.delay.use_external_delay_estimator);
}
if (rtc::GetValueFromJsonObject(aec3_root, "filter", &section)) {
@ -182,6 +185,7 @@ void Aec3ConfigFromJsonString(absl::string_view json_string,
&cfg.filter.conservative_initial_phase);
ReadParam(section, "enable_shadow_filter_output_usage",
&cfg.filter.enable_shadow_filter_output_usage);
ReadParam(section, "use_linear_filter", &cfg.filter.use_linear_filter);
}
if (rtc::GetValueFromJsonObject(aec3_root, "erle", &section)) {

4
modules/audio_processing/aec3/aec_state.cc
View File

@ -118,7 +118,9 @@ void AecState::Update(
// Estimate the direct path delay of the filter.
delay_state_.Update(filter_analyzer_, external_delay,
strong_not_saturated_render_blocks_);
config_.filter.use_linear_filter
? strong_not_saturated_render_blocks_
: 0);
const std::vector<float>& aligned_render_block =
render_buffer.Block(-delay_state_.DirectPathFilterDelay())[0];

6
modules/audio_processing/aec3/aec_state.h
View File

@ -45,12 +45,14 @@ class AecState {
// Returns whether the echo subtractor can be used to determine the residual
// echo.
bool UsableLinearEstimate() const {
return filter_quality_state_.LinearFilterUsable();
return filter_quality_state_.LinearFilterUsable() &&
config_.filter.use_linear_filter;
}
// Returns whether the echo subtractor output should be used as output.
bool UseLinearFilterOutput() const {
return filter_quality_state_.LinearFilterUsable();
return filter_quality_state_.LinearFilterUsable() &&
config_.filter.use_linear_filter;
}
// Returns the estimated echo path gain.