From fd71e799cbea097704270c9fab84fd3c98891ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Mon, 7 Sep 2020 15:24:56 +0200 Subject: [PATCH] Delete unused counters added_zero_samples_ and discarded_packets_ Bug: webrtc:11622 Change-Id: I15010f7ebf59377c266863cc67c7ffe0dcb78ace Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/183540 Reviewed-by: Ivo Creusen Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#32052} --- modules/audio_coding/neteq/statistics_calculator.cc | 11 +---------- modules/audio_coding/neteq/statistics_calculator.h | 5 ----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/modules/audio_coding/neteq/statistics_calculator.cc b/modules/audio_coding/neteq/statistics_calculator.cc index fa2925ce46..cd9ea09d71 100644 --- a/modules/audio_coding/neteq/statistics_calculator.cc +++ b/modules/audio_coding/neteq/statistics_calculator.cc @@ -115,10 +115,8 @@ void StatisticsCalculator::PeriodicUmaAverage::Reset() { StatisticsCalculator::StatisticsCalculator() : preemptive_samples_(0), accelerate_samples_(0), - added_zero_samples_(0), expanded_speech_samples_(0), expanded_noise_samples_(0), - discarded_packets_(0), lost_timestamps_(0), timestamps_since_last_report_(0), secondary_decoded_samples_(0), @@ -139,7 +137,6 @@ StatisticsCalculator::~StatisticsCalculator() = default; void StatisticsCalculator::Reset() { preemptive_samples_ = 0; accelerate_samples_ = 0; - added_zero_samples_ = 0; expanded_speech_samples_ = 0; expanded_noise_samples_ = 0; secondary_decoded_samples_ = 0; @@ -148,7 +145,6 @@ void StatisticsCalculator::Reset() { } void StatisticsCalculator::ResetMcu() { - discarded_packets_ = 0; lost_timestamps_ = 0; timestamps_since_last_report_ = 0; } @@ -237,10 +233,6 @@ void StatisticsCalculator::AcceleratedSamples(size_t num_samples) { lifetime_stats_.removed_samples_for_acceleration += num_samples; } -void StatisticsCalculator::AddZeros(size_t num_samples) { - added_zero_samples_ += num_samples; -} - void StatisticsCalculator::PacketsDiscarded(size_t num_packets) { operations_and_state_.discarded_primary_packets += num_packets; } @@ -269,7 +261,6 @@ void StatisticsCalculator::IncreaseCounter(size_t num_samples, int fs_hz) { static_cast(fs_hz * kMaxReportPeriod)) { lost_timestamps_ = 0; timestamps_since_last_report_ = 0; - discarded_packets_ = 0; } lifetime_stats_.total_samples_received += num_samples; } @@ -328,7 +319,7 @@ void StatisticsCalculator::GetNetworkStatistics(int fs_hz, RTC_DCHECK_GT(fs_hz, 0); RTC_DCHECK(stats); - stats->added_zero_samples = added_zero_samples_; + stats->added_zero_samples = 0; stats->current_buffer_size_ms = static_cast(num_samples_in_buffers * 1000 / fs_hz); diff --git a/modules/audio_coding/neteq/statistics_calculator.h b/modules/audio_coding/neteq/statistics_calculator.h index 333f4a76a9..4dfe200d6e 100644 --- a/modules/audio_coding/neteq/statistics_calculator.h +++ b/modules/audio_coding/neteq/statistics_calculator.h @@ -62,9 +62,6 @@ class StatisticsCalculator { // Reports that |num_samples| samples were removed through accelerate. void AcceleratedSamples(size_t num_samples); - // Reports that |num_samples| zeros were inserted into the output. - void AddZeros(size_t num_samples); - // Reports that |num_packets| packets were discarded. virtual void PacketsDiscarded(size_t num_packets); @@ -196,11 +193,9 @@ class StatisticsCalculator { size_t silent_concealed_samples_correction_ = 0; size_t preemptive_samples_; size_t accelerate_samples_; - size_t added_zero_samples_; size_t expanded_speech_samples_; size_t expanded_noise_samples_; size_t concealed_samples_at_event_end_ = 0; - size_t discarded_packets_; size_t lost_timestamps_; uint32_t timestamps_since_last_report_; std::deque waiting_times_;