From 0cd95081c053c9ab781a8e070162da4a424239ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 22 Mar 2019 10:51:47 +0100 Subject: [PATCH] Delete last traces of RtpTransportAdapter Bug: None Change-Id: I6bfac26ebd924c83f2f8a3adae983feb7d5bf00e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128770 Reviewed-by: Karl Wiberg Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#27258} --- api/ortc/packet_transport_interface.h | 1 - api/ortc/rtp_transport_interface.h | 7 ------- pc/rtp_transport.cc | 4 ---- pc/rtp_transport.h | 3 --- 4 files changed, 15 deletions(-) diff --git a/api/ortc/packet_transport_interface.h b/api/ortc/packet_transport_interface.h index 8fef2701c2..78e280a8ab 100644 --- a/api/ortc/packet_transport_interface.h +++ b/api/ortc/packet_transport_interface.h @@ -31,7 +31,6 @@ class PacketTransportInterface { // Classes that can use this internal interface. friend class RtpTransportControllerAdapter; - friend class RtpTransportAdapter; }; } // namespace webrtc diff --git a/api/ortc/rtp_transport_interface.h b/api/ortc/rtp_transport_interface.h index ac43831d2d..2e168858dc 100644 --- a/api/ortc/rtp_transport_interface.h +++ b/api/ortc/rtp_transport_interface.h @@ -21,8 +21,6 @@ namespace webrtc { -class RtpTransportAdapter; - struct RtpTransportParameters final { RtcpParameters rtcp; @@ -73,16 +71,11 @@ class RtpTransportInterface { virtual RtpTransportParameters GetParameters() const = 0; protected: - // Only for internal use. Returns a pointer to an internal interface, for use - // by the implementation. - virtual RtpTransportAdapter* GetInternal() = 0; - // Classes that can use this internal interface. friend class OrtcFactory; friend class OrtcRtpSenderAdapter; friend class OrtcRtpReceiverAdapter; friend class RtpTransportControllerAdapter; - friend class RtpTransportAdapter; }; } // namespace webrtc diff --git a/pc/rtp_transport.cc b/pc/rtp_transport.cc index bd11e57cbf..f7a27be332 100644 --- a/pc/rtp_transport.cc +++ b/pc/rtp_transport.cc @@ -199,10 +199,6 @@ void RtpTransport::DemuxPacket(rtc::CopyOnWriteBuffer packet, rtp_demuxer_.OnRtpPacket(parsed_packet); } -RtpTransportAdapter* RtpTransport::GetInternal() { - return nullptr; -} - bool RtpTransport::IsTransportWritable() { auto rtcp_packet_transport = rtcp_mux_enabled_ ? nullptr : rtcp_packet_transport_; diff --git a/pc/rtp_transport.h b/pc/rtp_transport.h index dfdabbc7fe..4573d3cce2 100644 --- a/pc/rtp_transport.h +++ b/pc/rtp_transport.h @@ -83,9 +83,6 @@ class RtpTransport : public RtpTransportInternal { bool UnregisterRtpDemuxerSink(RtpPacketSinkInterface* sink) override; protected: - // TODO(zstein): Remove this when we remove RtpTransportAdapter. - RtpTransportAdapter* GetInternal() override; - // These methods will be used in the subclasses. void DemuxPacket(rtc::CopyOnWriteBuffer packet, int64_t packet_time_us);