Cast: Restructure RTCP interface to better fit our usage.

media/cast/rtcp/rtcp.h

 // Copyright 2013 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.
 
 #ifndef MEDIA_CAST_RTCP_RTCP_H_
 #define MEDIA_CAST_RTCP_RTCP_H_
 
 #include <list>
 #include <map>
 #include <queue>
@@ skipping 21 matching lines @@
 typedef std::map<uint32, base::TimeTicks> RtcpSendTimeMap;
 typedef std::queue<RtcpSendTimePair> RtcpSendTimeQueue;
 
 class RtcpSenderFeedback {
  public:
   virtual void OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback) = 0;
 
   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,
                              RtcpSenderInfo* sender_info) = 0;
 
   virtual ~RtpSenderStatistics() {}
 };
 
 class RtpReceiverStatistics {
  public:
   virtual void GetStatistics(uint8* fraction_lost,
                              uint32* cumulative_lost,  // 24 bits valid.
                              uint32* extended_high_sequence_number,
                              uint32* jitter) = 0;
 
   virtual ~RtpReceiverStatistics() {}
 };
 
 class Rtcp {
  public:
   Rtcp(base::TickClock* clock,
        RtcpSenderFeedback* sender_feedback,
        PacedPacketSender* paced_packet_sender,
        RtpSenderStatistics* rtp_sender_statistics,
        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();
 
   static bool IsRtcpPacket(const uint8* rtcp_buffer, size_t length);
 
   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);
+  // |sender_log_message| is optional; without it no log messages will be
+  // attached to the RTCP report; instead a normal RTCP send report will be
+  // sent.
+  void SendRtcpFromRtpSender(const RtcpSenderLogMessage* sender_log_message);
+
+  // |cast_message| and |receiver_log| is optional; if |cast_message| is
+  // provided the RTCP receiver report will append a Cast message containing
+  // Acks and Nacks; if |receiver_log| is provided the RTCP receiver report will
+  // append the log messages. If no argument is set a normal RTCP receiver
+  // report will be sent.
+  void SendRtcpFromRtpReceiver(const RtcpCastMessage* cast_message,
+                               const RtcpReceiverLogMessage* receiver_log);
 
   void IncomingRtcpPacket(const uint8* rtcp_buffer, size_t length);
   bool Rtt(base::TimeDelta* rtt, base::TimeDelta* avg_rtt,
            base::TimeDelta* min_rtt,  base::TimeDelta* max_rtt) const;
   bool RtpTimestampInSenderTime(int frequency,
                                 uint32 rtp_timestamp,
                                 base::TimeTicks* rtp_timestamp_in_ticks) const;
 
  protected:
   int CheckForWrapAround(uint32 new_timestamp,
@@ skipping 24 matching lines @@
                  const base::TimeDelta& receiver_delay);
 
   void UpdateNextTimeToSendRtcp();
 
   void SaveLastSentNtpTime(const base::TimeTicks& now, uint32 last_ntp_seconds,
                            uint32 last_ntp_fraction);
 
   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_;
   RtpReceiverStatistics* const rtp_receiver_statistics_;
 
   scoped_ptr<LocalRtcpRttFeedback> rtt_feedback_;
   scoped_ptr<LocalRtcpReceiverFeedback> receiver_feedback_;
   scoped_ptr<RtcpSender> rtcp_sender_;
   scoped_ptr<RtcpReceiver> rtcp_receiver_;
 
@@ skipping 13 matching lines @@
   int number_of_rtt_in_avg_;
   float avg_rtt_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(Rtcp);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_RTCP_RTCP_H_