From c97d434ec499cbc164ca68f93eb4640f8e66e5a2 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Tue, 23 Apr 2024 10:29:54 -0700 Subject: [PATCH] sdp: cleanup WebRTC-PreventSsrcGroupsWithUnexpectedSize killswitch the rollout has happened a while ago with no issues requiring the use of the killswitch BUG=chromium:40066610 Change-Id: I2c8148976a1da219ebbfbe6908224b6384348194 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/348823 Commit-Queue: Philipp Hancke Reviewed-by: Harald Alvestrand Reviewed-by: Emil Lundmark Cr-Commit-Position: refs/heads/main@{#42164} --- experiments/field_trials.py | 3 --- pc/sdp_offer_answer.cc | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/experiments/field_trials.py b/experiments/field_trials.py index eb99b14877..2ffcbeb89d 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -105,9 +105,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ FieldTrial('WebRTC-PermuteTlsClientHello', 'webrtc:15467', date(2024, 7, 1)), - FieldTrial('WebRTC-PreventSsrcGroupsWithUnexpectedSize', - 'chromium:1459124', - date(2024, 4, 1)), FieldTrial('WebRTC-ReceiveBufferSize', 'webrtc:15585', date(2024, 4, 1)), diff --git a/pc/sdp_offer_answer.cc b/pc/sdp_offer_answer.cc index 95d54978c7..68d89e439f 100644 --- a/pc/sdp_offer_answer.cc +++ b/pc/sdp_offer_answer.cc @@ -3576,10 +3576,9 @@ RTCError SdpOfferAnswerHandler::ValidateSessionDescription( return error; } - // TODO(crbug.com/1459124): remove killswitch after rollout. + // Validate the SSRC groups. error = ValidateSsrcGroups(*sdesc->description()); - if (!error.ok() && - !pc_->trials().IsDisabled("WebRTC-PreventSsrcGroupsWithUnexpectedSize")) { + if (!error.ok()) { return error; }