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

Delete null JsepTransport constructor argument datagram_rtp_transport.

Browse Source 
Bug: None
Change-Id: I97f2024a6d2811fa15bc5c93fd9d85982daa57fa
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/205321
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33175}
This commit is contained in:
Niels Möller
2021-02-02 16:49:02 +01:00
committed by Commit Bot
parent 3b9abd8dee
commit ab9d6e1fd2
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pc/jsep_transport.cc
View File

@ -77,7 +77,6 @@ JsepTransport::JsepTransport(
std::unique_ptr<webrtc::RtpTransport> unencrypted_rtp_transport,
std::unique_ptr<webrtc::SrtpTransport> sdes_transport,
std::unique_ptr<webrtc::DtlsSrtpTransport> dtls_srtp_transport,
std::unique_ptr<webrtc::RtpTransportInternal> datagram_rtp_transport,
std::unique_ptr<DtlsTransportInternal> rtp_dtls_transport,
std::unique_ptr<DtlsTransportInternal> rtcp_dtls_transport,
std::unique_ptr<SctpTransportInternal> sctp_transport)

1
pc/jsep_transport.h
View File

@ -100,7 +100,6 @@ class JsepTransport : public sigslot::has_slots<> {
std::unique_ptr<webrtc::RtpTransport> unencrypted_rtp_transport,
std::unique_ptr<webrtc::SrtpTransport> sdes_transport,
std::unique_ptr<webrtc::DtlsSrtpTransport> dtls_srtp_transport,
std::unique_ptr<webrtc::RtpTransportInternal> datagram_rtp_transport,
std::unique_ptr<DtlsTransportInternal> rtp_dtls_transport,
std::unique_ptr<DtlsTransportInternal> rtcp_dtls_transport,
std::unique_ptr<SctpTransportInternal> sctp_transport);

6
pc/jsep_transport_controller.cc
View File

@ -1015,7 +1015,6 @@ RTCError JsepTransportController::MaybeCreateJsepTransport(
std::unique_ptr<RtpTransport> unencrypted_rtp_transport;
std::unique_ptr<SrtpTransport> sdes_transport;
std::unique_ptr<DtlsSrtpTransport> dtls_srtp_transport;
std::unique_ptr<RtpTransportInternal> datagram_rtp_transport;
rtc::scoped_refptr<webrtc::IceTransportInterface> rtcp_ice;
if (config_.rtcp_mux_policy !=
@ -1051,9 +1050,8 @@ RTCError JsepTransportController::MaybeCreateJsepTransport(
std::make_unique<cricket::JsepTransport>(
content_info.name, certificate_, std::move(ice), std::move(rtcp_ice),
std::move(unencrypted_rtp_transport), std::move(sdes_transport),
std::move(dtls_srtp_transport), std::move(datagram_rtp_transport),
std::move(rtp_dtls_transport), std::move(rtcp_dtls_transport),
std::move(sctp_transport));
std::move(dtls_srtp_transport), std::move(rtp_dtls_transport),
std::move(rtcp_dtls_transport), std::move(sctp_transport));
jsep_transport->rtp_transport()->SignalRtcpPacketReceived.connect(
this, &JsepTransportController::OnRtcpPacketReceived_n);

3
pc/jsep_transport_unittest.cc
View File

@ -118,8 +118,7 @@ class JsepTransport2Test : public ::testing::Test, public sigslot::has_slots<> {
kTransportName, /*local_certificate=*/nullptr, std::move(ice),
std::move(rtcp_ice), std::move(unencrypted_rtp_transport),
std::move(sdes_transport), std::move(dtls_srtp_transport),
/*datagram_rtp_transport=*/nullptr, std::move(rtp_dtls_transport),
std::move(rtcp_dtls_transport),
std::move(rtp_dtls_transport), std::move(rtcp_dtls_transport),
/*sctp_transport=*/nullptr);
signal_rtcp_mux_active_received_ = false;