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

AEC3: Stationary init: fixing a typo when reading the json configuration

Browse Source 
Bug: webrtc:10554
Change-Id: I8c05b7c654117359ff294c7ae4604d7913505650
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133181
Reviewed-by: Per Åhgren <peah@webrtc.org>
Commit-Queue: Jesus de Vicente Pena <devicentepena@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27726}
This commit is contained in:
Jesús de Vicente Peña
2019-04-16 12:32:15 +02:00
committed by Commit Bot
parent 97df052d47
commit 70a596386d
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/audio/echo_canceller3_config.h
View File

@ -102,7 +102,7 @@ struct RTC_EXPORT EchoCanceller3Config {
float audibility_threshold_lf = 10; float audibility_threshold_lf = 10;
float audibility_threshold_mf = 10; float audibility_threshold_mf = 10;
float audibility_threshold_hf = 10; float audibility_threshold_hf = 10;
bool use_stationary_properties = false; bool use_stationarity_properties = false;
bool use_stationarity_properties_at_init = false; bool use_stationarity_properties_at_init = false;
} echo_audibility; } echo_audibility;

8
api/audio/echo_canceller3_config_json.cc
View File

@ -218,8 +218,8 @@ void Aec3ConfigFromJsonString(absl::string_view json_string,
&cfg.echo_audibility.audibility_threshold_mf); &cfg.echo_audibility.audibility_threshold_mf);
ReadParam(section, "audibility_threshold_hf", ReadParam(section, "audibility_threshold_hf",
&cfg.echo_audibility.audibility_threshold_hf); &cfg.echo_audibility.audibility_threshold_hf);
ReadParam(section, "use_stationary_properties", ReadParam(section, "use_stationarity_properties",
&cfg.echo_audibility.use_stationary_properties); &cfg.echo_audibility.use_stationarity_properties);
ReadParam(section, "use_stationarity_properties_at_init", ReadParam(section, "use_stationarity_properties_at_init",
&cfg.echo_audibility.use_stationarity_properties_at_init); &cfg.echo_audibility.use_stationarity_properties_at_init);
} }
@ -430,8 +430,8 @@ std::string Aec3ConfigToJsonString(const EchoCanceller3Config& config) {
<< config.echo_audibility.audibility_threshold_mf << ","; << config.echo_audibility.audibility_threshold_mf << ",";
ost << "\"audibility_threshold_hf\": " ost << "\"audibility_threshold_hf\": "
<< config.echo_audibility.audibility_threshold_hf << ","; << config.echo_audibility.audibility_threshold_hf << ",";
ost << "\"use_stationary_properties\": " ost << "\"use_stationarity_properties\": "
<< (config.echo_audibility.use_stationary_properties ? "true" : "false") << (config.echo_audibility.use_stationarity_properties ? "true" : "false")
<< ","; << ",";
ost << "\"use_stationarity_properties_at_init\": " ost << "\"use_stationarity_properties_at_init\": "
<< (config.echo_audibility.use_stationarity_properties_at_init ? "true" << (config.echo_audibility.use_stationarity_properties_at_init ? "true"

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

@ -82,10 +82,10 @@ void AecState::HandleEchoPathChange(
blocks_with_active_render_ = 0; blocks_with_active_render_ = 0;
initial_state_.Reset(); initial_state_.Reset();
transparent_state_.Reset(); transparent_state_.Reset();
legacy_saturation_detector_.Reset(); legacy_saturation_detector_.Reset();
erle_estimator_.Reset(true); erle_estimator_.Reset(true);
erl_estimator_.Reset(); erl_estimator_.Reset();
filter_quality_state_.Reset(); filter_quality_state_.Reset();
}; };
// TODO(peah): Refine the reset scheme according to the type of gain and // TODO(peah): Refine the reset scheme according to the type of gain and
@ -143,7 +143,7 @@ void AecState::Update(
config_.ep_strength.reverb_based_on_render ? ReverbDecay() : 0.f, config_.ep_strength.reverb_based_on_render ? ReverbDecay() : 0.f,
X2_reverb); X2_reverb);
if (config_.echo_audibility.use_stationary_properties) { if (config_.echo_audibility.use_stationarity_properties) {
// Update the echo audibility evaluator. // Update the echo audibility evaluator.
echo_audibility_.Update(render_buffer, echo_audibility_.Update(render_buffer,
render_reverb_.GetReverbContributionPowerSpectrum(), render_reverb_.GetReverbContributionPowerSpectrum(),
@ -189,7 +189,7 @@ void AecState::Update(
// Update the reverb estimate. // Update the reverb estimate.
const bool stationary_block = const bool stationary_block =
config_.echo_audibility.use_stationary_properties && config_.echo_audibility.use_stationarity_properties &&
echo_audibility_.IsBlockStationary(); echo_audibility_.IsBlockStationary();
reverb_model_estimator_.Update(filter_analyzer_.GetAdjustedFilter(), reverb_model_estimator_.Update(filter_analyzer_.GetAdjustedFilter(),

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

@ -68,7 +68,7 @@ class AecState {
// Returns whether the stationary properties of the signals are used in the // Returns whether the stationary properties of the signals are used in the
// aec. // aec.
bool UseStationaryProperties() const { bool UseStationaryProperties() const {
return config_.echo_audibility.use_stationary_properties; return config_.echo_audibility.use_stationarity_properties;
} }
// Returns the ERLE. // Returns the ERLE.