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

Delete obsolete method JsepTransport::NegotiateDatagramTransport

Browse Source 
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 <deadbeef@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31712}
This commit is contained in:
Niels Möller
2020-06-26 14:06:41 +02:00
committed by Commit Bot
parent acc1123a80
commit 21621e9d08
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pc/jsep_transport.cc
View File

@ -234,7 +234,6 @@ webrtc::RTCError JsepTransport::SetLocalJsepTransportDescription(
// If PRANSWER/ANSWER is set, we should decide transport protocol type. // If PRANSWER/ANSWER is set, we should decide transport protocol type.
if (type == SdpType::kPrAnswer || type == SdpType::kAnswer) { if (type == SdpType::kPrAnswer || type == SdpType::kAnswer) {
error = NegotiateAndSetDtlsParameters(type); error = NegotiateAndSetDtlsParameters(type);
NegotiateDatagramTransport(type);
} }
if (!error.ok()) { if (!error.ok()) {
local_description_.reset(); local_description_.reset();
@ -312,7 +311,6 @@ webrtc::RTCError JsepTransport::SetRemoteJsepTransportDescription(
// If PRANSWER/ANSWER is set, we should decide transport protocol type. // If PRANSWER/ANSWER is set, we should decide transport protocol type.
if (type == SdpType::kPrAnswer || type == SdpType::kAnswer) { if (type == SdpType::kPrAnswer || type == SdpType::kAnswer) {
error = NegotiateAndSetDtlsParameters(SdpType::kOffer); error = NegotiateAndSetDtlsParameters(SdpType::kOffer);
NegotiateDatagramTransport(type);
} }
if (!error.ok()) { if (!error.ok()) {
remote_description_.reset(); remote_description_.reset();
@ -728,10 +726,4 @@ bool JsepTransport::GetTransportStats(DtlsTransportInternal* dtls_transport,
return true; 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 } // namespace cricket

6
pc/jsep_transport.h
View File

@ -307,12 +307,6 @@ class JsepTransport : public sigslot::has_slots<> {
TransportStats* stats) TransportStats* stats)
RTC_EXCLUSIVE_LOCKS_REQUIRED(accessor_lock_); 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. // Returns the default (non-datagram) rtp transport, if any.
webrtc::RtpTransportInternal* default_rtp_transport() const webrtc::RtpTransportInternal* default_rtp_transport() const
RTC_EXCLUSIVE_LOCKS_REQUIRED(accessor_lock_) { RTC_EXCLUSIVE_LOCKS_REQUIRED(accessor_lock_) {