diff --git a/experiments/field_trials.py b/experiments/field_trials.py index 1f286d6896..8274c03a8d 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -38,9 +38,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ FieldTrial('WebRTC-Aec3DelayEstimatorDetectPreEcho', 'webrtc:14205', date(2024, 4, 1)), - FieldTrial('WebRTC-Aec3PenalyzeHighDelaysInitialPhase', - 'webrtc:14919', - date(2024, 4, 1)), FieldTrial('WebRTC-Audio-GainController2', 'webrtc:7494', date(2024, 4, 1)), diff --git a/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc b/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc index c8ac417a8b..0ece2a6003 100644 --- a/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc +++ b/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc @@ -15,7 +15,6 @@ #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_minmax.h" -#include "system_wrappers/include/field_trial.h" namespace webrtc { namespace { @@ -124,8 +123,6 @@ MatchedFilterLagAggregator::PreEchoLagAggregator::PreEchoLagAggregator( size_t max_filter_lag, size_t down_sampling_factor) : block_size_log2_(GetDownSamplingBlockSizeLog2(down_sampling_factor)), - penalize_high_delays_initial_phase_(!field_trial::IsDisabled( - "WebRTC-Aec3PenalyzeHighDelaysInitialPhase")), histogram_( ((max_filter_lag + 1) * down_sampling_factor) >> kBlockSizeLog2, 0) { @@ -156,8 +153,7 @@ void MatchedFilterLagAggregator::PreEchoLagAggregator::Aggregate( ++histogram_[histogram_data_[histogram_data_index_]]; histogram_data_index_ = (histogram_data_index_ + 1) % histogram_data_.size(); int pre_echo_candidate_block_size = 0; - if (penalize_high_delays_initial_phase_ && - number_updates_ < kNumBlocksPerSecond * 2) { + if (number_updates_ < kNumBlocksPerSecond * 2) { number_updates_++; float penalization_per_delay = 1.0f; float max_histogram_value = -1.0f; diff --git a/modules/audio_processing/aec3/matched_filter_lag_aggregator.h b/modules/audio_processing/aec3/matched_filter_lag_aggregator.h index 1287b38da0..1e80a21552 100644 --- a/modules/audio_processing/aec3/matched_filter_lag_aggregator.h +++ b/modules/audio_processing/aec3/matched_filter_lag_aggregator.h @@ -64,7 +64,6 @@ class MatchedFilterLagAggregator { private: const int block_size_log2_; - const bool penalize_high_delays_initial_phase_; std::array histogram_data_; std::vector histogram_; int histogram_data_index_ = 0;