From 96e14c82b93fd44f30cfe0a0423d355e917900bf Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Tue, 28 Nov 2023 07:49:51 +0100 Subject: [PATCH] Remove WebRTC-Stats-RtxReceiveStats killswitch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the rollout happened in M115 without known issues. BUG=webrtc:15096 Change-Id: I10961bfcc50450360cbf22cd60561ea3dc7e5594 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/329000 Reviewed-by: Henrik Boström Reviewed-by: Harald Alvestrand Commit-Queue: Philipp Hancke Cr-Commit-Position: refs/heads/main@{#41269} --- experiments/field_trials.py | 3 --- video/video_receive_stream2.cc | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/experiments/field_trials.py b/experiments/field_trials.py index 5b2dd7fb34..567cafc058 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -110,9 +110,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ FieldTrial('WebRTC-SrtpRemoveReceiveStream', 'webrtc:15604', date(2024, 10, 1)), - FieldTrial('WebRTC-Stats-RtxReceiveStats', - 'webrtc:15096', - date(2024, 4, 1)), FieldTrial('WebRTC-TaskQueue-ReplaceLibeventWithStdlib', 'webrtc:14389', date(2024, 4, 1)), diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc index 6c1df7d874..2696647616 100644 --- a/video/video_receive_stream2.cc +++ b/video/video_receive_stream2.cc @@ -567,10 +567,7 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const { rtp_receive_statistics_->GetStatistician(rtx_ssrc()); if (rtx_statistician) { stats.total_bitrate_bps += rtx_statistician->BitrateReceived(); - // TODO(bugs.webrtc.org/15096): remove kill-switch after rollout. - if (!call_->trials().IsDisabled("WebRTC-Stats-RtxReceiveStats")) { - stats.rtx_rtp_stats = rtx_statistician->GetStats(); - } + stats.rtx_rtp_stats = rtx_statistician->GetStats(); } } return stats;