From 37242cbc412243120801d5d643dfc909a2833dc4 Mon Sep 17 00:00:00 2001 From: Sam Zackrisson Date: Thu, 18 Apr 2019 13:54:45 +0200 Subject: [PATCH] Remove logging of metrics no longer relevant for AEC2 usage (UMA). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The acoustic echo canceler AEC2 is being deprecated. The routing for reporting these metrics as UMA stats has outlived the metrics'usefulness. Bug: webrtc:10563 Change-Id: Ib96693dfc43e25a0cfecad7d5d2043116ca7e6b5 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133573 Reviewed-by: Per Ã…hgren Commit-Queue: Sam Zackrisson Cr-Commit-Position: refs/heads/master@{#27699} --- modules/audio_processing/aec/aec_core.cc | 32 ------------------------ 1 file changed, 32 deletions(-) diff --git a/modules/audio_processing/aec/aec_core.cc b/modules/audio_processing/aec/aec_core.cc index 49971ff655..f0deddc2aa 100644 --- a/modules/audio_processing/aec/aec_core.cc +++ b/modules/audio_processing/aec/aec_core.cc @@ -36,34 +36,6 @@ extern "C" { #include "system_wrappers/include/metrics.h" namespace webrtc { -namespace { -enum class DelaySource { - kSystemDelay, // The delay values come from the OS. - kDelayAgnostic, // The delay values come from the DA-AEC. -}; - -constexpr int kMinDelayLogValue = -200; -constexpr int kMaxDelayLogValue = 200; -constexpr int kNumDelayLogBuckets = 100; - -void MaybeLogDelayAdjustment(int moved_ms, DelaySource source) { - if (moved_ms == 0) - return; - switch (source) { - case DelaySource::kSystemDelay: - RTC_HISTOGRAM_COUNTS("WebRTC.Audio.AecDelayAdjustmentMsSystemValue", - moved_ms, kMinDelayLogValue, kMaxDelayLogValue, - kNumDelayLogBuckets); - return; - case DelaySource::kDelayAgnostic: - RTC_HISTOGRAM_COUNTS("WebRTC.Audio.AecDelayAdjustmentMsAgnosticValue", - moved_ms, kMinDelayLogValue, kMaxDelayLogValue, - kNumDelayLogBuckets); - return; - } -} -} // namespace - // Buffer size (samples) static const size_t kBufferSizeBlocks = 250; // 1 second of audio in 16 kHz. @@ -1864,15 +1836,11 @@ void WebRtcAec_ProcessFrames(AecCore* aec, // rounding, like -16. int move_elements = (aec->knownDelay - knownDelay - 32) / PART_LEN; int moved_elements = aec->farend_block_buffer_.AdjustSize(move_elements); - MaybeLogDelayAdjustment(moved_elements * (aec->sampFreq == 8000 ? 8 : 4), - DelaySource::kSystemDelay); aec->knownDelay -= moved_elements * PART_LEN; } else { // 2 b) Apply signal based delay correction. int move_elements = SignalBasedDelayCorrection(aec); int moved_elements = aec->farend_block_buffer_.AdjustSize(move_elements); - MaybeLogDelayAdjustment(moved_elements * (aec->sampFreq == 8000 ? 8 : 4), - DelaySource::kDelayAgnostic); int far_near_buffer_diff = aec->farend_block_buffer_.Size() - (aec->nearend_buffer_size + FRAME_LEN) / PART_LEN;