Refactor: simplify interface of SenderRtcpSession and CastTransport.

media/cast/net/cast_transport.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This is the main interface for the cast transport sender.  It accepts encoded
 // frames (both audio and video), encrypts their encoded data, packetizes them
 // and feeds them into a transport (e.g., UDP).
 
 // Construction of the Cast Sender and the Cast Transport should be done
 // in the following order:
 // 1. Create CastTransport.
 // 2. Create CastSender (accepts CastTransport as an input).
 
 // Destruction: The CastTransport is assumed to be valid as long as the
 // CastSender is alive. Therefore the CastSender should be destructed before the
 // CastTransport.
 
 #ifndef MEDIA_CAST_NET_CAST_TRANSPORT_H_
 #define MEDIA_CAST_NET_CAST_TRANSPORT_H_
 
 #include <stdint.h>
 
 #include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/tick_clock.h"
 #include "base/values.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/net/cast_transport_config.h"
 #include "media/cast/net/cast_transport_defines.h"
 #include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h"
 #include "media/cast/net/rtcp/rtcp_defines.h"
 #include "net/base/ip_endpoint.h"
@@ skipping 10 matching lines @@
 namespace cast {
 
 struct RtpReceiverStatistics;
 struct RtcpTimeData;
 
 // Following the initialization of either audio or video an initialization
 // status will be sent via this callback.
 typedef base::Callback<void(CastTransportStatus status)>
     CastTransportStatusCallback;
 
-typedef base::Callback<void(scoped_ptr<std::vector<FrameEvent>>,
-                            scoped_ptr<std::vector<PacketEvent>>)>
+typedef base::Callback<void(std::unique_ptr<std::vector<FrameEvent>>,

[miu, 2016/04/15 23:14:39]

nit: ditto on "using" instead of "typedef" syntax here.

[xjz, 2016/04/20 01:09:02]

Done.

+                            std::unique_ptr<std::vector<PacketEvent>>)>
     BulkRawEventsCallback;
 
+// Interface to handle received RTCP messages on RTP sender.
+class RtpSenderRtcpClient {
+ public:
+  virtual ~RtpSenderRtcpClient() {}
+
+  virtual void OnCastMessageReceived(const RtcpCastMessage& cast_message) = 0;
+  virtual void OnRttReceived(base::TimeDelta round_trip_time) = 0;
+  virtual void OnPliReceived() = 0;
+};
+
 // The application should only trigger this class from the transport thread.
 class CastTransport : public base::NonThreadSafe {
  public:
   // Interface used for receiving status updates, raw events, and RTP packets
   // from CastTransport.
   class Client {
    public:
     virtual ~Client(){};
 
     // Audio and Video transport status change is reported on this callback.
     virtual void OnStatusChanged(CastTransportStatus status) = 0;
 
     // Raw events will be invoked on this callback periodically, according to
     // the configured logging flush interval passed to
     // CastTransport::Create().
     virtual void OnLoggingEventsReceived(
-        scoped_ptr<std::vector<FrameEvent>> frame_events,
-        scoped_ptr<std::vector<PacketEvent>> packet_events) = 0;
+        std::unique_ptr<std::vector<FrameEvent>> frame_events,
+        std::unique_ptr<std::vector<PacketEvent>> packet_events) = 0;
 
     // Called to pass RTP packets to the Client.
-    virtual void ProcessRtpPacket(scoped_ptr<Packet> packet) = 0;
+    virtual void ProcessRtpPacket(std::unique_ptr<Packet> packet) = 0;
   };
 
-  static scoped_ptr<CastTransport> Create(
+  static std::unique_ptr<CastTransport> Create(
       base::TickClock* clock,  // Owned by the caller.
       base::TimeDelta logging_flush_interval,
-      scoped_ptr<Client> client,
-      scoped_ptr<PacketTransport> transport,
+      std::unique_ptr<Client> client,
+      std::unique_ptr<PacketTransport> transport,
       const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner);
 
   virtual ~CastTransport() {}
 
   // Audio/Video initialization.
   // Encoded frames cannot be transmitted until the relevant initialize method
   // is called.
-  virtual void InitializeAudio(const CastTransportRtpConfig& config,
-                               const RtcpCastMessageCallback& cast_message_cb,
-                               const RtcpRttCallback& rtt_cb,
-                               const RtcpPliCallback& pli_cb) = 0;
-  virtual void InitializeVideo(const CastTransportRtpConfig& config,
-                               const RtcpCastMessageCallback& cast_message_cb,
-                               const RtcpRttCallback& rtt_cb,
-                               const RtcpPliCallback& pli_cb) = 0;
+  virtual void InitializeAudio(
+      const CastTransportRtpConfig& config,
+      std::unique_ptr<RtpSenderRtcpClient> rtcp_client) {}
+  virtual void InitializeVideo(
+      const CastTransportRtpConfig& config,
+      std::unique_ptr<RtpSenderRtcpClient> rtcp_client) {}
 
   // Encrypt, packetize and transmit |frame|. |ssrc| must refer to a
   // a channel already established with InitializeAudio / InitializeVideo.
   virtual void InsertFrame(uint32_t ssrc, const EncodedFrame& frame) = 0;
 
   // Sends a RTCP sender report to the receiver.
   // |ssrc| is the SSRC for this report.
   // |current_time| is the current time reported by a tick clock.
   // |current_time_as_rtp_timestamp| is the corresponding RTP timestamp.
   virtual void SendSenderReport(uint32_t ssrc,
@@ skipping 43 matching lines @@
   virtual void SendRtcpFromRtpReceiver() = 0;
 
   // Set options for the PacedSender and Wifi.
   virtual void SetOptions(const base::DictionaryValue& options) = 0;
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_NET_CAST_TRANSPORT_H_