Remove expired WebRTC-Aec3PenalyzeHighDelaysInitialPhase

Bug: webrtc:14919
Change-Id: I06214b7ff10847c55937cea70c6a09db1914efc8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/345482
Commit-Queue: Emil Lundmark <lndmrk@webrtc.org>
Reviewed-by: Jesus de Vicente Pena <devicentepena@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42016}
This commit is contained in:
Emil Lundmark 2024-04-02 16:29:20 +02:00 committed by WebRTC LUCI CQ
parent 3fc8422993
commit e92be7f42f
3 changed files with 1 additions and 9 deletions

View file

@ -38,9 +38,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
FieldTrial('WebRTC-Aec3DelayEstimatorDetectPreEcho', FieldTrial('WebRTC-Aec3DelayEstimatorDetectPreEcho',
'webrtc:14205', 'webrtc:14205',
date(2024, 4, 1)), date(2024, 4, 1)),
FieldTrial('WebRTC-Aec3PenalyzeHighDelaysInitialPhase',
'webrtc:14919',
date(2024, 4, 1)),
FieldTrial('WebRTC-Audio-GainController2', FieldTrial('WebRTC-Audio-GainController2',
'webrtc:7494', 'webrtc:7494',
date(2024, 4, 1)), date(2024, 4, 1)),

View file

@ -15,7 +15,6 @@
#include "modules/audio_processing/logging/apm_data_dumper.h" #include "modules/audio_processing/logging/apm_data_dumper.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/numerics/safe_minmax.h"
#include "system_wrappers/include/field_trial.h"
namespace webrtc { namespace webrtc {
namespace { namespace {
@ -124,8 +123,6 @@ MatchedFilterLagAggregator::PreEchoLagAggregator::PreEchoLagAggregator(
size_t max_filter_lag, size_t max_filter_lag,
size_t down_sampling_factor) size_t down_sampling_factor)
: block_size_log2_(GetDownSamplingBlockSizeLog2(down_sampling_factor)), : block_size_log2_(GetDownSamplingBlockSizeLog2(down_sampling_factor)),
penalize_high_delays_initial_phase_(!field_trial::IsDisabled(
"WebRTC-Aec3PenalyzeHighDelaysInitialPhase")),
histogram_( histogram_(
((max_filter_lag + 1) * down_sampling_factor) >> kBlockSizeLog2, ((max_filter_lag + 1) * down_sampling_factor) >> kBlockSizeLog2,
0) { 0) {
@ -156,8 +153,7 @@ void MatchedFilterLagAggregator::PreEchoLagAggregator::Aggregate(
++histogram_[histogram_data_[histogram_data_index_]]; ++histogram_[histogram_data_[histogram_data_index_]];
histogram_data_index_ = (histogram_data_index_ + 1) % histogram_data_.size(); histogram_data_index_ = (histogram_data_index_ + 1) % histogram_data_.size();
int pre_echo_candidate_block_size = 0; int pre_echo_candidate_block_size = 0;
if (penalize_high_delays_initial_phase_ && if (number_updates_ < kNumBlocksPerSecond * 2) {
number_updates_ < kNumBlocksPerSecond * 2) {
number_updates_++; number_updates_++;
float penalization_per_delay = 1.0f; float penalization_per_delay = 1.0f;
float max_histogram_value = -1.0f; float max_histogram_value = -1.0f;

View file

@ -64,7 +64,6 @@ class MatchedFilterLagAggregator {
private: private:
const int block_size_log2_; const int block_size_log2_;
const bool penalize_high_delays_initial_phase_;
std::array<int, 250> histogram_data_; std::array<int, 250> histogram_data_;
std::vector<int> histogram_; std::vector<int> histogram_;
int histogram_data_index_ = 0; int histogram_data_index_ = 0;