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

sdp: accept bundle-only media section without rtcp-mux

Browse Source 
following the example C1 in
https://www.rfc-editor.org/rfc/rfc8829.html#section-7.3
and the rules from
https://www.rfc-editor.org/rfc/rfc8843.html#section-9.3.1.1

BUG=chromium:1444615

Change-Id: I6aedc5a669a9c53b9d65fb564804913203a453f0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/304980
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40058}
This commit is contained in:
Philipp Hancke 2023-05-12 06:53:55 +02:00 committed by WebRTC LUCI CQ
parent afdc00f1f6
commit 32dae4b844
4 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc/jsep_transport_controller.cc
View File

@ -854,6 +854,7 @@ RTCError JsepTransportController::ValidateContent(
if (config_.rtcp_mux_policy ==
PeerConnectionInterface::kRtcpMuxPolicyRequire &&
content_info.type == cricket::MediaProtocolType::kRtp &&
!content_info.bundle_only &&
!content_info.media_description()->rtcp_mux()) {
return RTCError(RTCErrorType::INVALID_PARAMETER,
"The m= section with mid='" + content_info.name +

26
pc/jsep_transport_controller_unittest.cc
View File

@ -2701,4 +2701,30 @@ TEST_F(JsepTransportControllerTest, RollbackAndAddToDifferentBundleGroup) {
EXPECT_EQ(mid2_transport, mid3_transport);
}
// Test that a bundle-only offer without rtcp-mux in the bundle-only section
// is accepted.
TEST_F(JsepTransportControllerTest, BundleOnlySectionDoesNotNeedRtcpMux) {
CreateJsepTransportController(JsepTransportController::Config());
cricket::ContentGroup bundle_group(cricket::GROUP_TYPE_BUNDLE);
bundle_group.AddContentName(kAudioMid1);
bundle_group.AddContentName(kVideoMid1);
auto offer = std::make_unique<cricket::SessionDescription>();
AddAudioSection(offer.get(), kAudioMid1, kIceUfrag1, kIcePwd1,
cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_ACTPASS,
nullptr);
AddVideoSection(offer.get(), kVideoMid1, kIceUfrag1, kIcePwd1,
cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_ACTPASS,
nullptr);
offer->AddGroup(bundle_group);
// Remove rtcp-mux and set bundle-only on the second content.
offer->contents()[1].media_description()->set_rtcp_mux(false);
offer->contents()[1].bundle_only = true;
EXPECT_TRUE(
transport_controller_->SetRemoteDescription(SdpType::kOffer, offer.get())
.ok());
}
} // namespace webrtc

3
pc/peer_connection.cc
View File

@ -2570,7 +2570,8 @@ bool PeerConnection::ValidateBundleSettings(
const cricket::ContentInfo* content = (&*citer);
RTC_DCHECK(content != NULL);
auto it = bundle_groups_by_mid.find(content->name);
if (it != bundle_groups_by_mid.end() && !content->rejected &&
if (it != bundle_groups_by_mid.end() &&
!(content->rejected || content->bundle_only) &&
content->type == MediaProtocolType::kRtp) {
if (!HasRtcpMuxEnabled(content))
return false;

13
pc/peer_connection_jsep_unittest.cc
View File

@ -2405,4 +2405,17 @@ TEST_F(PeerConnectionJsepTest,
EXPECT_TRUE(callee->CreateOfferAndSetAsLocal());
}
TEST_F(PeerConnectionJsepTest, BundleOnlySectionDoesNotNeedRtcpMux) {
auto caller = CreatePeerConnection();
auto callee = CreatePeerConnection();
caller->AddTransceiver(cricket::MEDIA_TYPE_AUDIO);
caller->AddTransceiver(cricket::MEDIA_TYPE_VIDEO);
auto offer = caller->CreateOffer();
// Remove rtcp-mux and set bundle-only on the second content.
offer->description()->contents()[1].media_description()->set_rtcp_mux(false);
offer->description()->contents()[1].bundle_only = true;
EXPECT_TRUE(callee->SetRemoteDescription(std::move(offer)));
}
} // namespace webrtc