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

Revert "Remove another DCHECK that fails during renegotiation."

Browse Source 
This reverts commit 907b5920912dcec98e677621cd65efefb9dc0eab.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Remove another DCHECK that fails during renegotiation.
> 
> Also adds a test case that catches both this DCHECK and the previous
> one.
> 
> Bug: webrtc:9719
> Change-Id: I590544a13cd178274e9c11b698c4694fd5cf0d59
> No-Try: True
> Tbr: steveanton@webrtc.org
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140802
> Reviewed-by: Bjorn Mellem <mellem@webrtc.org>
> Commit-Queue: Bjorn Mellem <mellem@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#28185}

TBR=steveanton@webrtc.org,mellem@webrtc.org,sukhanov@webrtc.org

Change-Id: I2f01f720ffe6b9a3d5dd412b607f4e31e8cb1f97
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9719
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140823
Reviewed-by: Bjorn Mellem <mellem@webrtc.org>
Commit-Queue: Bjorn Mellem <mellem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28186}
This commit is contained in:
Bjorn Mellem 2019-06-07 06:15:34 +00:00 committed by Commit Bot
parent 907b592091
commit dea0a0c338
2 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc/composite_rtp_transport.cc
View File

@ -73,6 +73,8 @@ void CompositeRtpTransport::RemoveTransport(RtpTransportInternal* transport) {
auto it = absl::c_find(transports_, transport);
if (it == transports_.end()) {
RTC_NOTREACHED() << "Callers should not remove transports they did not "
"include in the composite";
return;
}

45
pc/jsep_transport_controller_unittest.cc
View File

@ -2415,51 +2415,6 @@ TEST_P(JsepTransportControllerDatagramTest, RenegotiationCannotRemoveDatagram) {
fake_params);
}
TEST_P(JsepTransportControllerDatagramTest,
RenegotiationKeepsDatagramTransport) {
cricket::OpaqueTransportParameters fake_params = CreateTransportParameters();
if (IsOfferer()) {
EXPECT_EQ(transport_controller_->GetTransportParameters(kAudioMid1),
fake_params);
EXPECT_EQ(transport_controller_->GetTransportParameters(kVideoMid1),
fake_params);
}
auto offer = CreateSessionDescriptionForDatagramTransport(fake_params);
EXPECT_TRUE(SetDescription(SdpType::kOffer, offer.get()).ok());
EXPECT_EQ(transport_controller_->GetTransportParameters(kAudioMid1),
fake_params);
EXPECT_EQ(transport_controller_->GetTransportParameters(kVideoMid1),
fake_params);
auto answer = CreateSessionDescriptionForDatagramTransport(fake_params);
EXPECT_TRUE(SetDescription(SdpType::kAnswer, answer.get()).ok());
EXPECT_EQ(transport_controller_->GetTransportParameters(kAudioMid1),
fake_params);
EXPECT_EQ(transport_controller_->GetTransportParameters(kVideoMid1),
fake_params);
// Attempting to remove a datagram transport on a re-offer does not cause an
// error, but also does not remove the datagram transport.
auto reoffer = CreateSessionDescriptionForDatagramTransport(fake_params);
EXPECT_TRUE(SetDescription(SdpType::kOffer, reoffer.get()).ok());
EXPECT_EQ(transport_controller_->GetTransportParameters(kAudioMid1),
fake_params);
EXPECT_EQ(transport_controller_->GetTransportParameters(kVideoMid1),
fake_params);
auto reanswer = CreateSessionDescriptionForDatagramTransport(fake_params);
EXPECT_TRUE(SetDescription(SdpType::kAnswer, reanswer.get()).ok());
EXPECT_EQ(transport_controller_->GetTransportParameters(kAudioMid1),
fake_params);
EXPECT_EQ(transport_controller_->GetTransportParameters(kVideoMid1),
fake_params);
}
INSTANTIATE_TEST_SUITE_P(
JsepTransportControllerDatagramTests,
JsepTransportControllerDatagramTest,