From 1a09faed62a4b28140ebd7404345785b52c1aa7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 15 Jul 2020 14:11:45 +0200 Subject: [PATCH] Delete SignalDataChannelTransportNegotiated This negotiation no longer takes place. Bug: webrtc:9719 Change-Id: I33bd985105076fabf3200c31ea06b84b413794e6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179363 Reviewed-by: Taylor Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#31753} --- pc/jsep_transport.h | 9 --------- pc/jsep_transport_controller.cc | 14 -------------- pc/jsep_transport_controller.h | 4 ---- 3 files changed, 27 deletions(-) diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h index 3fa6243e4c..2ba4416665 100644 --- a/pc/jsep_transport.h +++ b/pc/jsep_transport.h @@ -234,15 +234,6 @@ class JsepTransport : public sigslot::has_slots<> { // handle the signal and update the aggregate transport states. sigslot::signal<> SignalRtcpMuxActive; - // Signals that a data channel transport was negotiated and may be used to - // send data. The first parameter is |this|. The second parameter is the - // transport that was negotiated, or null if negotiation rejected the data - // channel transport. The third parameter (bool) indicates whether the - // negotiation was provisional or final. If true, it is provisional, if - // false, it is final. - sigslot::signal2 - SignalDataChannelTransportNegotiated; - // TODO(deadbeef): The methods below are only public for testing. Should make // them utility functions or objects so they can be tested independently from // this class. diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc index dbe7435c02..71dd8acc21 100644 --- a/pc/jsep_transport_controller.cc +++ b/pc/jsep_transport_controller.cc @@ -1026,8 +1026,6 @@ RTCError JsepTransportController::MaybeCreateJsepTransport( jsep_transport->SignalRtcpMuxActive.connect( this, &JsepTransportController::UpdateAggregateStates_n); - jsep_transport->SignalDataChannelTransportNegotiated.connect( - this, &JsepTransportController::OnDataChannelTransportNegotiated_n); SetTransportForMid(content_info.name, jsep_transport.get()); jsep_transports_by_name_[content_info.name] = std::move(jsep_transport); @@ -1208,18 +1206,6 @@ void JsepTransportController::OnTransportStateChanged_n( UpdateAggregateStates_n(); } -void JsepTransportController::OnDataChannelTransportNegotiated_n( - cricket::JsepTransport* transport, - DataChannelTransportInterface* data_channel_transport) { - for (const auto& it : mid_to_transport_) { - if (it.second == transport) { - config_.transport_observer->OnTransportChanged( - it.first, transport->rtp_transport(), transport->RtpDtlsTransport(), - data_channel_transport); - } - } -} - void JsepTransportController::UpdateAggregateStates_n() { RTC_DCHECK(network_thread_->IsCurrent()); diff --git a/pc/jsep_transport_controller.h b/pc/jsep_transport_controller.h index 250501fd05..d95b475969 100644 --- a/pc/jsep_transport_controller.h +++ b/pc/jsep_transport_controller.h @@ -346,10 +346,6 @@ class JsepTransportController : public sigslot::has_slots<> { void OnTransportStateChanged_n(cricket::IceTransportInternal* transport); void OnTransportCandidatePairChanged_n( const cricket::CandidatePairChangeEvent& event); - void OnDataChannelTransportNegotiated_n( - cricket::JsepTransport* transport, - DataChannelTransportInterface* data_channel_transport); - void UpdateAggregateStates_n(); void OnRtcpPacketReceived_n(rtc::CopyOnWriteBuffer* packet,