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

Delete SignalDataChannelTransportNegotiated

Browse Source 
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 <deadbeef@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31753}
This commit is contained in:
Niels Möller
2020-07-15 14:11:45 +02:00
committed by Commit Bot
parent 6b8271638b
commit 1a09faed62
3 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pc/jsep_transport.h
View File

@ -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<JsepTransport*, webrtc::DataChannelTransportInterface*>
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.

14
pc/jsep_transport_controller.cc
View File

@ -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());

4
pc/jsep_transport_controller.h
View File

@ -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,