admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdp: remove WebRTC-PreventBundleHeaderExtensionIdCollision killswitch

Browse Source 
and the associated UMA metrics after rollout in M116 stable.

BUG=webrtc:14782

Change-Id: Ib2e0f96e8aa0c1ffbf48aea30f93195aa8b44bb0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/317280
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40754}
This commit is contained in:
Philipp Hancke 2023-08-22 16:05:38 +02:00 committed by WebRTC LUCI CQ
parent ad12dc52b7
commit 745641e589
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pc/sdp_offer_answer.cc
View File

@ -3619,11 +3619,7 @@ RTCError SdpOfferAnswerHandler::ValidateSessionDescription(
// Validate that there are no collisions of bundled header extensions ids.
error = ValidateBundledRtpHeaderExtensions(*sdesc->description());
RTC_HISTOGRAM_BOOLEAN("WebRTC.PeerConnection.ValidBundledExtensionIds",
error.ok());
// TODO(bugs.webrtc.org/14782): remove killswitch after rollout.
if (!error.ok() && !pc_->trials().IsDisabled(
"WebRTC-PreventBundleHeaderExtensionIdCollision")) {
if (!error.ok()) {
return error;
}

9
pc/sdp_offer_answer_unittest.cc
View File

@ -304,9 +304,6 @@ TEST_F(SdpOfferAnswerTest, BundleMeasuresHeaderExtensionIdCollision) {
RTCError error;
pc->SetRemoteDescription(std::move(desc), &error);
EXPECT_TRUE(error.ok());
EXPECT_METRIC_EQ(1,
webrtc::metrics::NumEvents(
"WebRTC.PeerConnection.ValidBundledExtensionIds", true));
}
// extmap:3 is used with two different URIs which is not allowed.
@ -345,9 +342,6 @@ TEST_F(SdpOfferAnswerTest, BundleRejectsHeaderExtensionIdCollision) {
pc->SetRemoteDescription(std::move(desc), &error);
EXPECT_FALSE(error.ok());
EXPECT_EQ(error.type(), RTCErrorType::INVALID_PARAMETER);
EXPECT_METRIC_EQ(
1, webrtc::metrics::NumEvents(
"WebRTC.PeerConnection.ValidBundledExtensionIds", false));
}
// transport-wide cc is negotiated with two different ids 3 and 4.
@ -388,9 +382,6 @@ TEST_F(SdpOfferAnswerTest, BundleAcceptsDifferentIdsForSameExtension) {
RTCError error;
pc->SetRemoteDescription(std::move(desc), &error);
EXPECT_TRUE(error.ok());
EXPECT_METRIC_EQ(1,
webrtc::metrics::NumEvents(
"WebRTC.PeerConnection.ValidBundledExtensionIds", true));
}
TEST_F(SdpOfferAnswerTest, LargeMidsAreRejected) {