From 42cafa5696f516712bbe6709fedeedffac61544c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 28 Oct 2020 17:25:32 +0100 Subject: [PATCH] Delete legacy stats minWaitingTimeMs and medianWaitingTimeMs from ACM. Bug: None Change-Id: I0606e8d83f2920e290b40638c9172a0f4286a41a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190740 Reviewed-by: Ivo Creusen Reviewed-by: Sam Zackrisson Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#32540} --- audio/audio_receive_stream_unittest.cc | 4 ++-- modules/audio_coding/acm2/acm_receiver.cc | 4 ---- modules/audio_coding/include/audio_coding_module_typedefs.h | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc index b0269cd423..f0f150a0b5 100644 --- a/audio/audio_receive_stream_unittest.cc +++ b/audio/audio_receive_stream_unittest.cc @@ -67,8 +67,8 @@ const std::pair kReceiveCodec = { 123, {"codec_name_recv", 96000, 0}}; const NetworkStatistics kNetworkStats = { - 123, 456, false, 789012, 3456, 123, 456, 789, 543, 123, 432, 321, 123, 101, - 789, 12, 345, 678, 901, 0, -1, -1, -1, -1, 0, 0, 0, 0}; + 123, 456, false, 789012, 3456, 123, 456, 789, 543, 123, 432, 321, 123, + 101, 789, 12, 345, 678, 901, 0, -1, -1, 0, 0, 0, 0}; const AudioDecodingCallStats kAudioDecodeStats = MakeAudioDecodeStatsForTest(); struct ConfigHelper { diff --git a/modules/audio_coding/acm2/acm_receiver.cc b/modules/audio_coding/acm2/acm_receiver.cc index 651e135246..0e615cae82 100644 --- a/modules/audio_coding/acm2/acm_receiver.cc +++ b/modules/audio_coding/acm2/acm_receiver.cc @@ -260,8 +260,6 @@ void AcmReceiver::GetNetworkStatistics( acm_stat->currentSecondaryDiscardedRate = neteq_stat.secondary_discarded_rate; acm_stat->meanWaitingTimeMs = neteq_stat.mean_waiting_time_ms; - acm_stat->medianWaitingTimeMs = neteq_stat.median_waiting_time_ms; - acm_stat->minWaitingTimeMs = neteq_stat.min_waiting_time_ms; acm_stat->maxWaitingTimeMs = neteq_stat.max_waiting_time_ms; } else { neteq_stat = neteq_->CurrentNetworkStatistics(); @@ -272,8 +270,6 @@ void AcmReceiver::GetNetworkStatistics( acm_stat->currentSecondaryDecodedRate = 0; acm_stat->currentSecondaryDiscardedRate = 0; acm_stat->meanWaitingTimeMs = -1; - acm_stat->medianWaitingTimeMs = -1; - acm_stat->minWaitingTimeMs = -1; acm_stat->maxWaitingTimeMs = 1; } acm_stat->currentBufferSize = neteq_stat.current_buffer_size_ms; diff --git a/modules/audio_coding/include/audio_coding_module_typedefs.h b/modules/audio_coding/include/audio_coding_module_typedefs.h index 4c5f251a81..07aa8c956f 100644 --- a/modules/audio_coding/include/audio_coding_module_typedefs.h +++ b/modules/audio_coding/include/audio_coding_module_typedefs.h @@ -117,10 +117,6 @@ struct NetworkStatistics { uint16_t currentSecondaryDiscardedRate; // average packet waiting time in the jitter buffer (ms) int meanWaitingTimeMs; - // median packet waiting time in the jitter buffer (ms) - int medianWaitingTimeMs; - // min packet waiting time in the jitter buffer (ms) - int minWaitingTimeMs; // max packet waiting time in the jitter buffer (ms) int maxWaitingTimeMs; // count of the number of buffer flushes