diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/libwebrtc/pc/peer_connection_rtp_unittest.cc | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | third_party/libwebrtc/pc/peer_connection_rtp_unittest.cc | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/third_party/libwebrtc/pc/peer_connection_rtp_unittest.cc b/third_party/libwebrtc/pc/peer_connection_rtp_unittest.cc index 1a97a4bb44..77c8cecbb2 100644 --- a/third_party/libwebrtc/pc/peer_connection_rtp_unittest.cc +++ b/third_party/libwebrtc/pc/peer_connection_rtp_unittest.cc @@ -1836,14 +1836,16 @@ TEST_F(PeerConnectionMsidSignalingTest, UnifiedPlanTalkingToOurself) { // Offer should have had both a=msid and a=ssrc MSID lines. auto* offer = callee->pc()->remote_description(); - EXPECT_EQ((cricket::kMsidSignalingMediaSection | - cricket::kMsidSignalingSsrcAttribute), - offer->description()->msid_signaling()); + EXPECT_EQ( + (cricket::kMsidSignalingSemantic | cricket::kMsidSignalingMediaSection | + cricket::kMsidSignalingSsrcAttribute), + offer->description()->msid_signaling()); // Answer should have had only a=msid lines. auto* answer = caller->pc()->remote_description(); - EXPECT_EQ(cricket::kMsidSignalingMediaSection, - answer->description()->msid_signaling()); + EXPECT_EQ( + cricket::kMsidSignalingSemantic | cricket::kMsidSignalingMediaSection, + answer->description()->msid_signaling()); } TEST_F(PeerConnectionMsidSignalingTest, PlanBOfferToUnifiedPlanAnswer) { @@ -1856,13 +1858,15 @@ TEST_F(PeerConnectionMsidSignalingTest, PlanBOfferToUnifiedPlanAnswer) { // Offer should have only a=ssrc MSID lines. auto* offer = callee->pc()->remote_description(); - EXPECT_EQ(cricket::kMsidSignalingSsrcAttribute, - offer->description()->msid_signaling()); + EXPECT_EQ( + cricket::kMsidSignalingSemantic | cricket::kMsidSignalingSsrcAttribute, + offer->description()->msid_signaling()); // Answer should have only a=ssrc MSID lines to match the offer. auto* answer = caller->pc()->remote_description(); - EXPECT_EQ(cricket::kMsidSignalingSsrcAttribute, - answer->description()->msid_signaling()); + EXPECT_EQ( + cricket::kMsidSignalingSemantic | cricket::kMsidSignalingSsrcAttribute, + answer->description()->msid_signaling()); } // This tests that a Plan B endpoint appropriately sets the remote description @@ -1884,9 +1888,10 @@ TEST_F(PeerConnectionMsidSignalingTest, UnifiedPlanToPlanBAnswer) { // Offer should have had both a=msid and a=ssrc MSID lines. auto* offer = callee->pc()->remote_description(); - EXPECT_EQ((cricket::kMsidSignalingMediaSection | - cricket::kMsidSignalingSsrcAttribute), - offer->description()->msid_signaling()); + EXPECT_EQ( + (cricket::kMsidSignalingSemantic | cricket::kMsidSignalingMediaSection | + cricket::kMsidSignalingSsrcAttribute), + offer->description()->msid_signaling()); // Callee should always have 1 stream for all of it's receivers. const auto& track_events = callee->observer()->add_track_events_; @@ -1907,7 +1912,8 @@ TEST_F(PeerConnectionMsidSignalingTest, PureUnifiedPlanToUs) { auto offer = caller->CreateOffer(); // Simulate a pure Unified Plan offerer by setting the MSID signaling to media // section only. - offer->description()->set_msid_signaling(cricket::kMsidSignalingMediaSection); + offer->description()->set_msid_signaling(cricket::kMsidSignalingSemantic | + cricket::kMsidSignalingMediaSection); ASSERT_TRUE( caller->SetLocalDescription(CloneSessionDescription(offer.get()))); @@ -1915,8 +1921,9 @@ TEST_F(PeerConnectionMsidSignalingTest, PureUnifiedPlanToUs) { // Answer should have only a=msid to match the offer. auto answer = callee->CreateAnswer(); - EXPECT_EQ(cricket::kMsidSignalingMediaSection, - answer->description()->msid_signaling()); + EXPECT_EQ( + cricket::kMsidSignalingSemantic | cricket::kMsidSignalingMediaSection, + answer->description()->msid_signaling()); } // Sender setups in a call. |