zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SdpSemantics::kPlanB deprecated usage

Browse Source 
Anything linking to //third_party/jsoncpp is hiding deprecated usage
warnings, so these were not discovered earlier.

Bug: chromium:983223
Change-Id: Ib527710b2688d691250d2b9f4894a9e6726d148f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258123
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Auto-Submit: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36458}
This commit is contained in:
Florent Castelli
2022-04-06 00:38:21 +02:00
committed by WebRTC LUCI CQ
parent df894ad299
commit 15a38de78d
13 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pc/peer_connection_rtp_unittest.cc
View File

@ -108,7 +108,7 @@ class PeerConnectionRtpBaseTest : public ::testing::Test {
std::unique_ptr<PeerConnectionWrapper> CreatePeerConnectionWithPlanB() {
RTCConfiguration config;
config.sdp_semantics = SdpSemantics::kPlanB;
config.sdp_semantics = SdpSemantics::kPlanB_DEPRECATED;
return CreatePeerConnectionInternal(config);
}
@ -154,7 +154,7 @@ class PeerConnectionRtpTest
class PeerConnectionRtpTestPlanB : public PeerConnectionRtpBaseTest {
protected:
PeerConnectionRtpTestPlanB()
: PeerConnectionRtpBaseTest(SdpSemantics::kPlanB) {}
: PeerConnectionRtpBaseTest(SdpSemantics::kPlanB_DEPRECATED) {}
};
class PeerConnectionRtpTestUnifiedPlan : public PeerConnectionRtpBaseTest {
@ -199,7 +199,7 @@ TEST_P(PeerConnectionRtpTest, AddTrackWithoutStreamFiresOnAddTrack) {
const auto& add_track_event = callee->observer()->add_track_events_[0];
EXPECT_EQ(add_track_event.streams, add_track_event.receiver->streams());
if (sdp_semantics_ == SdpSemantics::kPlanB) {
if (sdp_semantics_ == SdpSemantics::kPlanB_DEPRECATED) {
// Since we are not supporting the no stream case with Plan B, there should
// be a generated stream, even though we didn't set one with AddTrack.
ASSERT_EQ(1u, add_track_event.streams.size());
@ -542,7 +542,7 @@ TEST_P(PeerConnectionRtpTest, AddTrackWithoutStreamAddsReceiver) {
auto receiver_added = callee->pc()->GetReceivers()[0];
EXPECT_EQ("audio_track", receiver_added->track()->id());
if (sdp_semantics_ == SdpSemantics::kPlanB) {
if (sdp_semantics_ == SdpSemantics::kPlanB_DEPRECATED) {
// Since we are not supporting the no stream case with Plan B, there should
// be a generated stream, even though we didn't set one with AddTrack.
ASSERT_EQ(1u, receiver_added->streams().size());
@ -1991,7 +1991,7 @@ TEST_P(PeerConnectionRtpTest, CreateTwoSendersWithSameTrack) {
EXPECT_TRUE(sender2);
EXPECT_TRUE(sender1->SetTrack(track));
if (sdp_semantics_ == SdpSemantics::kPlanB) {
if (sdp_semantics_ == SdpSemantics::kPlanB_DEPRECATED) {
// TODO(hbos): When https://crbug.com/webrtc/8734 is resolved, this should
// return true, and doing `callee->SetRemoteDescription()` should work.
EXPECT_FALSE(caller->CreateOfferAndSetAsLocal());
@ -2033,7 +2033,7 @@ TEST_F(PeerConnectionRtpTestUnifiedPlan,
INSTANTIATE_TEST_SUITE_P(PeerConnectionRtpTest,
PeerConnectionRtpTest,
Values(SdpSemantics::kPlanB,
Values(SdpSemantics::kPlanB_DEPRECATED,
SdpSemantics::kUnifiedPlan));
} // namespace webrtc