Cast: Restructure RTCP interface to better fit our usage.

media/cast/rtcp/rtcp_sender.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_SENDER_H_
 #define MEDIA_CAST_RTCP_RTCP_SENDER_H_
 
 #include <list>
 #include <string>
 
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/rtcp/rtcp.h"
 #include "media/cast/rtcp/rtcp_defines.h"
 
 namespace media {
 namespace cast {
 
 class RtcpSender {
  public:
   RtcpSender(PacedPacketSender* const paced_packet_sender,
              uint32 sending_ssrc,
              const std::string& c_name);
 
   virtual ~RtcpSender();
 
-  void SendRtcp(uint32 packet_type_flags,
-                const RtcpSenderInfo* sender_info,
-                const RtcpReportBlock* report_block,
-                uint32 pli_remote_ssrc,
-                const RtcpDlrrReportBlock* dlrr,
-                const RtcpReceiverReferenceTimeReport* rrtr,
-                const RtcpCastMessage* cast_message);
+  void SendRtcpFromRtpSender(uint32 packet_type_flags,
+                             const RtcpSenderInfo* sender_info,
+                             const RtcpDlrrReportBlock* dlrr,
+                             const RtcpSenderLogMessage* sender_log);
+
+  void SendRtcpFromRtpReceiver(uint32 packet_type_flags,
+                               const RtcpReportBlock* report_block,
+                               const RtcpReceiverReferenceTimeReport* rrtr,
+                               const RtcpCastMessage* cast_message,
+                               const RtcpReceiverLogMessage* receiver_log);
 
   enum RtcpPacketType {
     kRtcpSr     = 0x0002,
     kRtcpRr     = 0x0004,
     kRtcpBye    = 0x0008,
     kRtcpPli    = 0x0010,
     kRtcpNack   = 0x0020,
     kRtcpFir    = 0x0040,
     kRtcpSrReq  = 0x0200,
     kRtcpDlrr   = 0x0400,
     kRtcpRrtr   = 0x0800,
     kRtcpRpsi   = 0x8000,
     kRtcpRemb   = 0x10000,
     kRtcpCast   = 0x20000,
+    kRtcpSenderLog = 0x40000,
+    kRtcpReceiverLog = 0x80000,
   };
 
  private:
   void BuildSR(const RtcpSenderInfo& sender_info,
                const RtcpReportBlock* report_block,
                std::vector<uint8>* packet) const;
 
   void BuildRR(const RtcpReportBlock* report_block,
                std::vector<uint8>* packet) const;
 
@@ skipping 18 matching lines @@
 
   void BuildDlrrRb(const RtcpDlrrReportBlock* dlrr,
                    std::vector<uint8>* packet) const;
 
   void BuildRrtr(const RtcpReceiverReferenceTimeReport* rrtr,
                  std::vector<uint8>* packet) const;
 
   void BuildCast(const RtcpCastMessage* cast_message,
                  std::vector<uint8>* packet) const;
 
+  void BuildSenderLog(const RtcpSenderLogMessage* sender_log_message,
+                      std::vector<uint8>* packet) const;
+
+  void BuildReceiverLog(const RtcpReceiverLogMessage* receiver_log_message,
+                        std::vector<uint8>* packet) const;
+
   inline void BitrateToRembExponentBitrate(uint32 bitrate,
                                            uint8* exponent,
                                            uint32* mantissa) const {
     // 6 bit exponent and a 18 bit mantissa.
     *exponent = 0;
     for (int i = 0; i < 64; ++i) {
       if (bitrate <= (262143u << i)) {
         *exponent = i;
         break;
       }
     }
     *mantissa = (bitrate >> *exponent);
   }
 
   const uint32 ssrc_;
   const std::string c_name_;
 
   // Not owned by this class.
   PacedPacketSender* transport_;
 
   DISALLOW_COPY_AND_ASSIGN(RtcpSender);
 };
 
 }  // namespace cast
 }  // namespace media
 #endif  // MEDIA_CAST_RTCP_RTCP_SENDER_H_