Cast: Restructure RTCP interface to better fit our usage.

media/cast/rtcp/rtcp.h

Index: media/cast/rtcp/rtcp.h
diff --git a/media/cast/rtcp/rtcp.h b/media/cast/rtcp/rtcp.h
index 2e2bc91a673db74a72f870945779e237cdbe640a..f4fbc43df7e4117651b0def8c67fa1a07ed40536 100644
--- a/media/cast/rtcp/rtcp.h
+++ b/media/cast/rtcp/rtcp.h
@@ -34,6 +34,17 @@ class RtcpSenderFeedback {
   virtual ~RtcpSenderFeedback() {}
 };
 
+class RtcpReceivedLog {
+ public:
+  virtual void OnReceivedReceiverLog(
+      const RtcpReceiverLogMessage& receiver_log) = 0;
+
+  virtual void OnReceivedSenderLog(
+      const RtcpSenderLogMessage& sender_log) = 0;
+
+  virtual ~RtcpReceivedLog() {}
+};
+
 class RtpSenderStatistics {
  public:
   virtual void GetStatistics(const base::TimeTicks& now,
@@ -61,8 +72,8 @@ class Rtcp {
        RtpReceiverStatistics* rtp_receiver_statistics,
        RtcpMode rtcp_mode,
        const base::TimeDelta& rtcp_interval,
-       bool sending_media,
        uint32 local_ssrc,
+       uint32 remote_ssrc,
        const std::string& c_name);
 
   virtual ~Rtcp();
@@ -72,10 +83,10 @@ class Rtcp {
   static uint32 GetSsrcOfSender(const uint8* rtcp_buffer, size_t length);
 
   base::TimeTicks TimeToSendNextRtcpReport();
-  void SendRtcpReport(uint32 media_ssrc);
-  void SendRtcpPli(uint32 media_ssrc);
-  void SendRtcpCast(const RtcpCastMessage& cast_message);
-  void SetRemoteSSRC(uint32 ssrc);
+  void SendRtcpFromRtpSender(const RtcpSenderLogMessage* sender_log_message);

[Alpha Left Google, 2013/11/13 23:58:40]

What does it mean if the parameter is NULL? Looks like this sends a SR by
default and sender log is optional. A comment is needed.

[pwestin, 2013/11/15 00:20:32]

Done.

+
+  void SendRtcpFromRtpReceiver(const RtcpCastMessage* cast_message,

[Alpha Left Google, 2013/11/13 23:58:40]

This method looks funny that it takes two const pointer of logs. What happen if
one of the input is NULL? What happen if both input are NULL? Please comment.

[pwestin, 2013/11/15 00:20:32]

Done.

+                               const RtcpReceiverLogMessage* receiver_log);
 
   void IncomingRtcpPacket(const uint8* rtcp_buffer, size_t length);
   bool Rtt(base::TimeDelta* rtt, base::TimeDelta* avg_rtt,
@@ -117,8 +128,8 @@ class Rtcp {
   base::TickClock* const clock_;  // Not owned by this class.
   const base::TimeDelta rtcp_interval_;
   const RtcpMode rtcp_mode_;
-  const bool sending_media_;
   const uint32 local_ssrc_;
+  const uint32 remote_ssrc_;
 
   // Not owned by this class.
   RtpSenderStatistics* const rtp_sender_statistics_;