Make RtpTransport actually implement RtpTransportInterface

webrtc/pc/rtptransport.h

 /*
  *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_PC_RTPTRANSPORT_H_
 #define WEBRTC_PC_RTPTRANSPORT_H_
 
+#include "webrtc/api/ortc/rtptransportinterface.h"
+
 namespace rtc {
 
 class PacketTransportInternal;
 
 }  // namespace rtc
 
 namespace webrtc {
 
-class RtpTransport {
+class PacketTransportWrapper : public PacketTransportInterface {

[Taylor Brandstetter, 2017/04/07 04:16:03]

I was confused about why this was necessary until I realized
PacketTransportInternal doesn't subclass from PacketTransportInterface. I think
this is just something I overlooked at some point; it was definitely intended
to.

We do have a diamond inheritance situation here, where UdpTransport would
inherit from PacketTransportInternal and UdpTransportInterface, which both
inherit from PacketTransportInterface. But I think we can solve that with
virtual inheritance? This worked in my local build; I just scheduled a try run
which is green so far: https://codereview.webrtc.org/2806463003/

[Zach Stein, 2017/04/10 22:37:43]

Done.

+ public:
+  PacketTransportWrapper() = default;
+  explicit PacketTransportWrapper(rtc::PacketTransportInternal* transport)
+      : transport_(transport) {}
+
+  rtc::PacketTransportInternal* transport() const { return transport_; }
+
+  void set_transport(rtc::PacketTransportInternal* transport) {
+    transport_ = transport;
+  }
+
+ protected:
+  rtc::PacketTransportInternal* GetInternal() { return transport_; }
+
+ private:
+  rtc::PacketTransportInternal* transport_ = nullptr;
+};
+
+class RtpTransport : public RtpTransportInterface {
  public:
   RtpTransport(const RtpTransport&) = delete;
   RtpTransport& operator=(const RtpTransport&) = delete;
 
-  explicit RtpTransport(bool rtcp_mux_required)
-      : rtcp_mux_required_(rtcp_mux_required) {}
+  explicit RtpTransport(bool rtcp_mux_required);
 
   bool rtcp_mux_required() const { return rtcp_mux_required_; }
 
   rtc::PacketTransportInternal* rtp_packet_transport() const {
-    return rtp_packet_transport_;
+    return rtp_packet_transport_wrapper_->transport();
   }
-  void set_rtp_packet_transport(rtc::PacketTransportInternal* rtp) {
-    rtp_packet_transport_ = rtp;
-  }
+  void set_rtp_packet_transport(rtc::PacketTransportInternal* rtp);
 
   rtc::PacketTransportInternal* rtcp_packet_transport() const {
-    return rtcp_packet_transport_;
+    return rtcp_packet_transport_wrapper_->transport();
   }
   void set_rtcp_packet_transport(rtc::PacketTransportInternal* rtcp);
 
+  PacketTransportInterface* GetRtpPacketTransport() const override;
+  PacketTransportInterface* GetRtcpPacketTransport() const override;
+
+  RTCError SetRtcpParameters(const RtcpParameters& parameters) override;
+  RtcpParameters GetRtcpParameters() const override;

[Taylor Brandstetter, 2017/04/07 04:16:03]

Since these methods aren't used anywhere yet, can you add a TODO as a reminder
of what needs to be done?

[Zach Stein, 2017/04/10 22:37:43]

Done.

+
+ protected:
+  // TODO(zstein): Remove this when we remove RtpTransportAdapter.
+  RtpTransportAdapter* GetInternal() override;
+
  private:
   // True if RTCP-multiplexing is required. rtcp_packet_transport_ should
   // always be null in this case.
   const bool rtcp_mux_required_;
 
-  // TODO(zstein): Revisit ownership here - transports are currently owned by
-  // TransportController
-  rtc::PacketTransportInternal* rtp_packet_transport_ = nullptr;
-  rtc::PacketTransportInternal* rtcp_packet_transport_ = nullptr;
+  std::unique_ptr<PacketTransportWrapper> rtp_packet_transport_wrapper_;
+  std::unique_ptr<PacketTransportWrapper> rtcp_packet_transport_wrapper_;
+
+  RtcpParameters rtcp_parameters_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_PC_RTPTRANSPORT_H_