Cast: Re-factor rtcp_sender.cc into rtcp_builder.cc and do some cleanup

Review URL: https://codereview.chromium.org/513313004

Cr-Commit-Position: refs/heads/master@{#293787}

media/cast/BUILD.gn

@@ -72,8 +72,8 @@ source_set("net") {
     "net/rtcp/rtcp_defines.h",
     "net/rtcp/rtcp.h",
     "net/rtcp/rtcp.cc",
-    "net/rtcp/rtcp_sender.cc",
-    "net/rtcp/rtcp_sender.h",
+    "net/rtcp/rtcp_builder.cc",
+    "net/rtcp/rtcp_builder.h",
     "net/rtcp/rtcp_utility.cc",
     "net/rtcp/rtcp_utility.h",
     "net/rtp/packet_storage.cc",
@@ -230,7 +230,7 @@ test("cast_unittests") {
     "net/pacing/mock_paced_packet_sender.cc",
     "net/pacing/mock_paced_packet_sender.h",
     "net/pacing/paced_sender_unittest.cc",
-    "net/rtcp/rtcp_sender_unittest.cc",
+    "net/rtcp/rtcp_builder_unittest.cc",
     "net/rtcp/rtcp_unittest.cc",
     "net/rtcp/rtcp_utility_unittest.cc",
     "net/rtcp/receiver_rtcp_event_subscriber_unittest.cc",

media/cast/cast.gyp

@@ -184,12 +184,12 @@
         'net/pacing/paced_sender.cc',
         'net/pacing/paced_sender.h',
         'net/rtcp/receiver_rtcp_event_subscriber.cc',
+        'net/rtcp/rtcp_builder.cc',
+        'net/rtcp/rtcp_builder.h',
         'net/rtcp/rtcp_defines.cc',
         'net/rtcp/rtcp_defines.h',
         'net/rtcp/rtcp.h',
         'net/rtcp/rtcp.cc',
-        'net/rtcp/rtcp_sender.cc',
-        'net/rtcp/rtcp_sender.h',
         'net/rtcp/rtcp_utility.cc',
         'net/rtcp/rtcp_utility.h',
         'net/rtp/packet_storage.cc',

media/cast/cast_testing.gypi

@@ -86,7 +86,7 @@
         'net/pacing/mock_paced_packet_sender.cc',
         'net/pacing/mock_paced_packet_sender.h',
         'net/pacing/paced_sender_unittest.cc',
-        'net/rtcp/rtcp_sender_unittest.cc',
+        'net/rtcp/rtcp_builder_unittest.cc',
         'net/rtcp/rtcp_unittest.cc',
         'net/rtcp/rtcp_utility_unittest.cc',
         'net/rtcp/receiver_rtcp_event_subscriber_unittest.cc',

media/cast/net/rtcp/rtcp.cc

@@ -8,8 +8,9 @@
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/net/cast_transport_defines.h"
+#include "media/cast/net/pacing/paced_sender.h"
+#include "media/cast/net/rtcp/rtcp_builder.h"
 #include "media/cast/net/rtcp/rtcp_defines.h"
-#include "media/cast/net/rtcp/rtcp_sender.h"
 #include "media/cast/net/rtcp/rtcp_utility.h"
 
 using base::TimeDelta;
@@ -64,7 +65,8 @@ Rtcp::Rtcp(const RtcpCastMessageCallback& cast_callback,
       rtt_callback_(rtt_callback),
       log_callback_(log_callback),
       clock_(clock),
-      rtcp_sender_(new RtcpSender(packet_sender, local_ssrc)),
+      rtcp_builder_(local_ssrc),
+      packet_sender_(packet_sender),
       local_ssrc_(local_ssrc),
       remote_ssrc_(remote_ssrc),
       last_report_truncated_ntp_(0),
@@ -228,12 +230,14 @@ void Rtcp::SendRtcpFromRtpReceiver(
       report_block.delay_since_last_sr = 0;
     }
   }
-  rtcp_sender_->SendRtcpFromRtpReceiver(
-      rtp_receiver_statistics ? &report_block : NULL,
-      &rrtr,
-      cast_message,
-      rtcp_events,
-      target_delay);
+  packet_sender_->SendRtcpPacket(
+      local_ssrc_,
+      rtcp_builder_.BuildRtcpFromReceiver(
+          rtp_receiver_statistics ? &report_block : NULL,
+          &rrtr,
+          cast_message,
+          rtcp_events,
+          target_delay));
 }
 
 void Rtcp::SendRtcpFromRtpSender(base::TimeTicks current_time,
@@ -254,7 +258,9 @@ void Rtcp::SendRtcpFromRtpSender(base::TimeTicks current_time,
   sender_info.send_packet_count = send_packet_count;
   sender_info.send_octet_count = send_octet_count;
 
-  rtcp_sender_->SendRtcpFromRtpSender(sender_info);
+  packet_sender_->SendRtcpPacket(
+      local_ssrc_,
+      rtcp_builder_.BuildRtcpFromSender(sender_info));
 }
 
 void Rtcp::OnReceivedNtp(uint32 ntp_seconds, uint32 ntp_fraction) {

media/cast/net/rtcp/rtcp.h

@@ -23,6 +23,7 @@
 #include "media/cast/net/cast_transport_defines.h"
 #include "media/cast/net/cast_transport_sender.h"
 #include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h"
+#include "media/cast/net/rtcp/rtcp_builder.h"
 #include "media/cast/net/rtcp/rtcp_defines.h"
 
 namespace media {
@@ -31,7 +32,7 @@ namespace cast {
 class LocalRtcpReceiverFeedback;
 class PacedPacketSender;
 class RtcpReceiver;
-class RtcpSender;
+class RtcpBuilder;
 
 typedef std::pair<uint32, base::TimeTicks> RtcpSendTimePair;
 typedef std::map<uint32, base::TimeTicks> RtcpSendTimeMap;
@@ -138,7 +139,8 @@ class Rtcp {
   const RtcpRttCallback rtt_callback_;
   const RtcpLogMessageCallback log_callback_;
   base::TickClock* const clock_;  // Not owned by this class.
-  const scoped_ptr<RtcpSender> rtcp_sender_;
+  RtcpBuilder rtcp_builder_;
+  PacedPacketSender* packet_sender_;  // Not owned.
   const uint32 local_ssrc_;
   const uint32 remote_ssrc_;
 

media/cast/net/rtcp/rtcp_sender.h → media/cast/net/rtcp/rtcp_builder.h

@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CAST_NET_RTCP_RTCP_SENDER_H_
-#define MEDIA_CAST_NET_RTCP_RTCP_SENDER_H_
+#ifndef MEDIA_CAST_NET_RTCP_RTCP_BUILDER_H_
+#define MEDIA_CAST_NET_RTCP_RTCP_BUILDER_H_
 
 #include <deque>
 #include <list>
 #include <string>
 
+#include "base/big_endian.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/net/cast_transport_defines.h"
@@ -38,67 +39,49 @@ COMPILE_ASSERT(kSecondRedundancyOffset >
                    kReceiveLogMessageHistorySize,
                redundancy_offset_out_of_range);
 
-class PacedPacketSender;
 
-// TODO(hclam): This should be renamed to RtcpPacketBuilder. The function
-// of this class is to only to build a RTCP packet but not to send it.
-class RtcpSender {
+class RtcpBuilder {
  public:
-  RtcpSender(PacedPacketSender* outgoing_transport,
-             uint32 sending_ssrc);
-  ~RtcpSender();
+  explicit RtcpBuilder(uint32 sending_ssrc);
+  ~RtcpBuilder();
 
-  // TODO(hclam): This method should be to build a packet instead of
-  // sending it.
-  void SendRtcpFromRtpReceiver(
+  PacketRef BuildRtcpFromReceiver(
       const RtcpReportBlock* report_block,
       const RtcpReceiverReferenceTimeReport* rrtr,
       const RtcpCastMessage* cast_message,
       const ReceiverRtcpEventSubscriber::RtcpEventMultiMap* rtcp_events,
       base::TimeDelta target_delay);
 
-  // TODO(hclam): This method should be to build a packet instead of
-  // sending it.
-  void SendRtcpFromRtpSender(const RtcpSenderInfo& sender_info);
+  PacketRef BuildRtcpFromSender(const RtcpSenderInfo& sender_info);
 
  private:
-  void BuildRR(const RtcpReportBlock* report_block,
-               Packet* packet) const;
-
-  void AddReportBlocks(const RtcpReportBlock& report_block,
-                       Packet* packet) const;
-
-  void BuildRrtr(const RtcpReceiverReferenceTimeReport* rrtr,
-                 Packet* packet) const;
-
-  void BuildCast(const RtcpCastMessage* cast_message,
-                 base::TimeDelta target_delay,
-                 Packet* packet) const;
-
-  void BuildSR(const RtcpSenderInfo& sender_info, Packet* packet) const;
-
-  void BuildDlrrRb(const RtcpDlrrReportBlock& dlrr, Packet* packet) const;
-
-  void BuildReceiverLog(
+  void AddRtcpHeader(RtcpPacketFields payload, int format_or_count);
+  void PatchLengthField();
+  void AddRR(const RtcpReportBlock* report_block);
+  void AddReportBlocks(const RtcpReportBlock& report_block);
+  void AddRrtr(const RtcpReceiverReferenceTimeReport* rrtr);
+  void AddCast(const RtcpCastMessage* cast_message,
+               base::TimeDelta target_delay);
+  void AddSR(const RtcpSenderInfo& sender_info);
+  void AddDlrrRb(const RtcpDlrrReportBlock& dlrr);
+  void AddReceiverLog(
+      const ReceiverRtcpEventSubscriber::RtcpEventMultiMap& rtcp_events);
+
+  bool GetRtcpReceiverLogMessage(
       const ReceiverRtcpEventSubscriber::RtcpEventMultiMap& rtcp_events,
-      Packet* packet);
-
-  bool BuildRtcpReceiverLogMessage(
-      const ReceiverRtcpEventSubscriber::RtcpEventMultiMap& rtcp_events,
-      size_t start_size,
       RtcpReceiverLogMessage* receiver_log_message,
-      size_t* number_of_frames,
-      size_t* total_number_of_messages_to_send,
-      size_t* rtcp_log_size);
+      size_t* total_number_of_messages_to_send);
 
-  const uint32 ssrc_;
-
- // Not owned by this class.
-  PacedPacketSender* const transport_;
+  void Start();
+  PacketRef Finish();
 
+  base::BigEndianWriter writer_;
+  const uint32 ssrc_;
+  char* ptr_of_length_;
+  PacketRef packet_;
   std::deque<RtcpReceiverLogMessage> rtcp_events_history_;
 
-  DISALLOW_COPY_AND_ASSIGN(RtcpSender);
+  DISALLOW_COPY_AND_ASSIGN(RtcpBuilder);
 };
 
 }  // namespace cast