commit 5f38949c54563e8c021370d9b030109b6e6fa2be
author Philipp Hancke <phancke@microsoft.com> Wed May 17 10:23:53 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 26 06:10:50 2023
tree a2b66f9e436aed58538aae81efc47d0f2c701761
parent dff6e25f9e5ff7b94d29f51dc16f7429674466d7

Allow single-mline offers without BUNDLE group when using max-bundle

since BUNDLE is not meaningful for those cases.
This matches Firefox behavior.

BUG=chromium:1444615

Change-Id: Id841b7e30a1c920efd977caebc71ab25d084577a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/305640
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#40151}

pc/jsep_transport_controller.cc

diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc
index e36ecaf..6676680 100644
--- a/pc/jsep_transport_controller.cc
+++ b/pc/jsep_transport_controller.cc
@@ -813,7 +813,8 @@
 
   if (config_.bundle_policy ==
           PeerConnectionInterface::kBundlePolicyMaxBundle &&
-      !description->HasGroup(cricket::GROUP_TYPE_BUNDLE)) {
+      !description->HasGroup(cricket::GROUP_TYPE_BUNDLE) &&
+      description->contents().size() > 1) {
     return RTCError(RTCErrorType::INVALID_PARAMETER,
                     "max-bundle is used but no bundle group found.");
   }

pc/jsep_transport_controller_unittest.cc

diff --git a/pc/jsep_transport_controller_unittest.cc b/pc/jsep_transport_controller_unittest.cc
index 8aecf63..faa8842 100644
--- a/pc/jsep_transport_controller_unittest.cc
+++ b/pc/jsep_transport_controller_unittest.cc
@@ -2727,4 +2727,20 @@
           .ok());
 }
 
+// Test that with max-bundle a single unbundled m-line is accepted.
+TEST_F(JsepTransportControllerTest,
+       MaxBundleDoesNotRequireBundleForFirstMline) {
+  auto config = JsepTransportController::Config();
+  config.bundle_policy = PeerConnectionInterface::kBundlePolicyMaxBundle;
+  CreateJsepTransportController(std::move(config));
+
+  auto offer = std::make_unique<cricket::SessionDescription>();
+  AddAudioSection(offer.get(), kAudioMid1, kIceUfrag1, kIcePwd1,
+                  cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_ACTPASS,
+                  nullptr);
+  EXPECT_TRUE(
+      transport_controller_->SetRemoteDescription(SdpType::kOffer, offer.get())
+          .ok());
+}
+
 }  // namespace webrtc