From 21621e9d08d1b28eca51e93b00a625103d6ac888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 26 Jun 2020 14:06:41 +0200 Subject: [PATCH] Delete obsolete method JsepTransport::NegotiateDatagramTransport Left-over from https://webrtc-review.googlesource.com/c/src/+/176500. Bug: webrtc:9719 Change-Id: I9e4c9e149756c0ff194a374c002e7d5ac022cfbd Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178202 Reviewed-by: Taylor Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#31712} --- pc/jsep_transport.cc | 8 -------- pc/jsep_transport.h | 6 ------ 2 files changed, 14 deletions(-) diff --git a/pc/jsep_transport.cc b/pc/jsep_transport.cc index 6864dfc45d..91e6576830 100644 --- a/pc/jsep_transport.cc +++ b/pc/jsep_transport.cc @@ -234,7 +234,6 @@ webrtc::RTCError JsepTransport::SetLocalJsepTransportDescription( // If PRANSWER/ANSWER is set, we should decide transport protocol type. if (type == SdpType::kPrAnswer || type == SdpType::kAnswer) { error = NegotiateAndSetDtlsParameters(type); - NegotiateDatagramTransport(type); } if (!error.ok()) { local_description_.reset(); @@ -312,7 +311,6 @@ webrtc::RTCError JsepTransport::SetRemoteJsepTransportDescription( // If PRANSWER/ANSWER is set, we should decide transport protocol type. if (type == SdpType::kPrAnswer || type == SdpType::kAnswer) { error = NegotiateAndSetDtlsParameters(SdpType::kOffer); - NegotiateDatagramTransport(type); } if (!error.ok()) { remote_description_.reset(); @@ -728,10 +726,4 @@ bool JsepTransport::GetTransportStats(DtlsTransportInternal* dtls_transport, return true; } -// TODO(nisse): Delete. -void JsepTransport::NegotiateDatagramTransport(SdpType type) { - RTC_DCHECK(type == SdpType::kAnswer || type == SdpType::kPrAnswer); - return; // No need to negotiate the use of datagram transport. -} - } // namespace cricket diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h index 27c30a5202..7342c19888 100644 --- a/pc/jsep_transport.h +++ b/pc/jsep_transport.h @@ -307,12 +307,6 @@ class JsepTransport : public sigslot::has_slots<> { TransportStats* stats) RTC_EXCLUSIVE_LOCKS_REQUIRED(accessor_lock_); - // Deactivates, signals removal, and deletes |composite_rtp_transport_| if the - // current state of negotiation is sufficient to determine which rtp_transport - // and data channel transport to use. - void NegotiateDatagramTransport(webrtc::SdpType type) - RTC_RUN_ON(network_thread_) RTC_LOCKS_EXCLUDED(accessor_lock_); - // Returns the default (non-datagram) rtp transport, if any. webrtc::RtpTransportInternal* default_rtp_transport() const RTC_EXCLUSIVE_LOCKS_REQUIRED(accessor_lock_) {