From f08e2663aae9a323a4e1001e35c1d0ee16433f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Wed, 2 Mar 2022 10:12:56 +0100 Subject: [PATCH] Delete kAlwaysAllowPayloadTypeDemuxingFieldTrialName flag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This flag was used as a kill switch in case turning off payload type demuxing in some Unified Plan cases (https://crbug.com/webrtc/12814) would cause any issues. That landed way back in M93 and no issues were ever reported, so time to clean up the flag. Bug: webrtc:12814 Change-Id: I1970936131384dc0be1cd118e6b0ac877b8c289c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/253240 Auto-Submit: Henrik Boström Commit-Queue: Henrik Boström Reviewed-by: Harald Alvestrand Commit-Queue: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#36109} --- pc/sdp_offer_answer.cc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pc/sdp_offer_answer.cc b/pc/sdp_offer_answer.cc index 2f4a88c68f..69588350ab 100644 --- a/pc/sdp_offer_answer.cc +++ b/pc/sdp_offer_answer.cc @@ -91,9 +91,6 @@ namespace { typedef webrtc::PeerConnectionInterface::RTCOfferAnswerOptions RTCOfferAnswerOptions; -constexpr const char* kAlwaysAllowPayloadTypeDemuxingFieldTrialName = - "WebRTC-AlwaysAllowPayloadTypeDemuxing"; - // Error messages const char kInvalidSdp[] = "Invalid session description."; const char kInvalidCandidates[] = "Description contains invalid candidates."; @@ -5090,13 +5087,6 @@ bool SdpOfferAnswerHandler::UpdatePayloadTypeDemuxingState( bool bundled_pt_demux_allowed_video = !IsUnifiedPlan() || mid_header_extension_missing_video || pt_demuxing_has_been_used_video_; - // Kill switch for the above change. - if (field_trial::IsEnabled(kAlwaysAllowPayloadTypeDemuxingFieldTrialName)) { - // TODO(https://crbug.com/webrtc/12814): If disabling PT-based demux does - // not trigger regressions, remove this kill switch. - bundled_pt_demux_allowed_audio = true; - bundled_pt_demux_allowed_video = true; - } // Gather all updates ahead of time so that all channels can be updated in a // single Invoke; necessary due to thread guards.