From 5f2ffeec22d1a170f1479a860cab62d4e7dd9ef5 Mon Sep 17 00:00:00 2001 From: Sam Zackrisson Date: Thu, 1 Nov 2018 13:51:24 +0100 Subject: [PATCH] Clean up deprecated APM stats This seems to be the last piece of the puzzle. Deprecation PSA: https://groups.google.com/forum/#!msg/discuss-webrtc/NgqEPvkNuDE/7HtwnMmADgAJ Bug: webrtc:8572 Change-Id: Ib04b843fe50b8f07742c85827af6881dcfdc2991 Reviewed-on: https://webrtc-review.googlesource.com/c/109005 Reviewed-by: Ivo Creusen Reviewed-by: Fredrik Solenberg Reviewed-by: Per Kjellander Commit-Queue: Sam Zackrisson Cr-Commit-Position: refs/heads/master@{#25765} --- media/base/mediachannel.h | 8 -------- pc/statscollector_unittest.cc | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h index 108ae26864..3ab333ec7c 100644 --- a/media/base/mediachannel.h +++ b/media/base/mediachannel.h @@ -428,14 +428,6 @@ struct VoiceSenderInfo : public MediaSenderInfo { // https://w3c.github.io/webrtc-stats/#dom-rtcmediastreamtrackstats-totalaudioenergy double total_input_energy = 0.0; double total_input_duration = 0.0; - // TODO(bugs.webrtc.org/8572): Remove APM stats from this struct, since they - // are no longer needed now that we have apm_statistics. - int echo_delay_median_ms = 0; - int echo_delay_std_ms = 0; - int echo_return_loss = 0; - int echo_return_loss_enhancement = 0; - float residual_echo_likelihood = 0.0f; - float residual_echo_likelihood_recent_max = 0.0f; bool typing_noise_detected = false; webrtc::ANAStats ana_statistics; webrtc::AudioProcessingStats apm_statistics; diff --git a/pc/statscollector_unittest.cc b/pc/statscollector_unittest.cc index 4a4be413d9..53eb2eaa5e 100644 --- a/pc/statscollector_unittest.cc +++ b/pc/statscollector_unittest.cc @@ -479,10 +479,10 @@ void InitVoiceSenderInfo(cricket::VoiceSenderInfo* voice_sender_info) { voice_sender_info->packets_lost = 105; voice_sender_info->ext_seqnum = 106; voice_sender_info->audio_level = 107; - voice_sender_info->echo_return_loss = 108; - voice_sender_info->echo_return_loss_enhancement = 109; - voice_sender_info->echo_delay_median_ms = 110; - voice_sender_info->echo_delay_std_ms = 111; + voice_sender_info->apm_statistics.echo_return_loss = 108; + voice_sender_info->apm_statistics.echo_return_loss_enhancement = 109; + voice_sender_info->apm_statistics.delay_median_ms = 110; + voice_sender_info->apm_statistics.delay_standard_deviation_ms = 111; voice_sender_info->typing_noise_detected = false; voice_sender_info->ana_statistics.bitrate_action_counter = 112; voice_sender_info->ana_statistics.channel_action_counter = 113;