zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete legacy stats minWaitingTimeMs and medianWaitingTimeMs from ACM.

Browse Source 
Bug: None
Change-Id: I0606e8d83f2920e290b40638c9172a0f4286a41a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190740
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32540}
This commit is contained in:
Niels Möller
2020-10-28 17:25:32 +01:00
committed by Commit Bot
parent b0d83cd584
commit 42cafa5696
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
audio/audio_receive_stream_unittest.cc
View File

@ -67,8 +67,8 @@ const std::pair<int, SdpAudioFormat> kReceiveCodec = {
123, 123,
{"codec_name_recv", 96000, 0}}; {"codec_name_recv", 96000, 0}};
const NetworkStatistics kNetworkStats = { const NetworkStatistics kNetworkStats = {
123, 456, false, 789012, 3456, 123, 456, 789, 543, 123, 432, 321, 123, 101, 123, 456, false, 789012, 3456, 123, 456, 789, 543, 123, 432, 321, 123,
789, 12, 345, 678, 901, 0, -1, -1, -1, -1, 0, 0, 0, 0}; 101, 789, 12, 345, 678, 901, 0, -1, -1, 0, 0, 0, 0};
const AudioDecodingCallStats kAudioDecodeStats = MakeAudioDecodeStatsForTest(); const AudioDecodingCallStats kAudioDecodeStats = MakeAudioDecodeStatsForTest();
struct ConfigHelper { struct ConfigHelper {

4
modules/audio_coding/acm2/acm_receiver.cc
View File

@ -260,8 +260,6 @@ void AcmReceiver::GetNetworkStatistics(
acm_stat->currentSecondaryDiscardedRate = acm_stat->currentSecondaryDiscardedRate =
neteq_stat.secondary_discarded_rate; neteq_stat.secondary_discarded_rate;
acm_stat->meanWaitingTimeMs = neteq_stat.mean_waiting_time_ms; 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; acm_stat->maxWaitingTimeMs = neteq_stat.max_waiting_time_ms;
} else { } else {
neteq_stat = neteq_->CurrentNetworkStatistics(); neteq_stat = neteq_->CurrentNetworkStatistics();
@ -272,8 +270,6 @@ void AcmReceiver::GetNetworkStatistics(
acm_stat->currentSecondaryDecodedRate = 0; acm_stat->currentSecondaryDecodedRate = 0;
acm_stat->currentSecondaryDiscardedRate = 0; acm_stat->currentSecondaryDiscardedRate = 0;
acm_stat->meanWaitingTimeMs = -1; acm_stat->meanWaitingTimeMs = -1;
acm_stat->medianWaitingTimeMs = -1;
acm_stat->minWaitingTimeMs = -1;
acm_stat->maxWaitingTimeMs = 1; acm_stat->maxWaitingTimeMs = 1;
} }
acm_stat->currentBufferSize = neteq_stat.current_buffer_size_ms; acm_stat->currentBufferSize = neteq_stat.current_buffer_size_ms;

4
modules/audio_coding/include/audio_coding_module_typedefs.h
View File

@ -117,10 +117,6 @@ struct NetworkStatistics {
uint16_t currentSecondaryDiscardedRate; uint16_t currentSecondaryDiscardedRate;
// average packet waiting time in the jitter buffer (ms) // average packet waiting time in the jitter buffer (ms)
int meanWaitingTimeMs; 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) // max packet waiting time in the jitter buffer (ms)
int maxWaitingTimeMs; int maxWaitingTimeMs;
// count of the number of buffer flushes // count of the number of buffer flushes