Minor code redundancy cleanup.

media/cast/net/rtcp/rtcp_sender.cc

 // 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.
 
 #include "media/cast/net/rtcp/rtcp_sender.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 136 matching lines @@
 
 RtcpSender::RtcpSender(PacedPacketSender* outgoing_transport,
                        uint32 sending_ssrc)
     : ssrc_(sending_ssrc),
       transport_(outgoing_transport) {
 }
 
 RtcpSender::~RtcpSender() {}
 
 void RtcpSender::SendRtcpFromRtpReceiver(
-    uint32 packet_type_flags,
     const RtcpReportBlock* report_block,
     const RtcpReceiverReferenceTimeReport* rrtr,
     const RtcpCastMessage* cast_message,
     const ReceiverRtcpEventSubscriber::RtcpEventMultiMap* rtcp_events,
     base::TimeDelta target_delay) {
-  if (packet_type_flags & kRtcpDlrr) {
-    NOTREACHED() << "Invalid argument";
-  }
   PacketRef packet(new base::RefCountedData<Packet>);
   packet->data.reserve(kMaxIpPacketSize);
-  if (packet_type_flags & kRtcpRr) {
+  if (report_block)
     BuildRR(report_block, &packet->data);
-  }
-  if (packet_type_flags & kRtcpRrtr) {
-    DCHECK(rrtr) << "Invalid argument";
+  if (rrtr)
     BuildRrtr(rrtr, &packet->data);
-  }
-  if (packet_type_flags & kRtcpCast) {
-    DCHECK(cast_message) << "Invalid argument";
+  if (cast_message)
     BuildCast(cast_message, target_delay, &packet->data);
-  }
-  if (packet_type_flags & kRtcpReceiverLog) {
-    DCHECK(rtcp_events) << "Invalid argument";
+  if (rtcp_events)
     BuildReceiverLog(*rtcp_events, &packet->data);
-  }
 
   if (packet->data.empty()) {
     NOTREACHED() << "Empty packet.";
     return;  // Sanity don't send empty packets.
   }
 
   transport_->SendRtcpPacket(ssrc_, packet);
 }
 
 void RtcpSender::SendRtcpFromRtpSender(
-    uint32 packet_type_flags,
-    const RtcpSenderInfo& sender_info,
-    const RtcpDlrrReportBlock& dlrr) {
-  if (packet_type_flags & kRtcpRr ||
-      packet_type_flags & kRtcpRrtr ||
-      packet_type_flags & kRtcpCast ||
-      packet_type_flags & kRtcpReceiverLog) {
-    NOTREACHED() << "Invalid argument";
-  }
+    const RtcpSenderInfo* sender_info,
+    const RtcpDlrrReportBlock* dlrr) {
   PacketRef packet(new base::RefCountedData<Packet>);
   packet->data.reserve(kMaxIpPacketSize);
-  if (packet_type_flags & kRtcpSr) {
-    BuildSR(sender_info, &packet->data);
-  }
-  if (packet_type_flags & kRtcpDlrr) {
-    BuildDlrrRb(dlrr, &packet->data);
-  }
+  if (sender_info)
+    BuildSR(*sender_info, &packet->data);
+  if (dlrr)

[Alpha Left Google, 2014/08/21 20:18:23]

DLRR can be removed.

[hubbe, 2014/08/21 21:34:14]

Done.

+    BuildDlrrRb(*dlrr, &packet->data);
+
   if (packet->data.empty()) {
     NOTREACHED() << "Empty packet.";
     return;  // Sanity - don't send empty packets.
   }
 
   transport_->SendRtcpPacket(ssrc_, packet);
 }
 
 void RtcpSender::BuildRR(const RtcpReportBlock* report_block,
                          Packet* packet) const {
@@ skipping 430 matching lines @@
       << "Not enough buffer space.";
 
   VLOG(3) << "number of frames: " << *number_of_frames;
   VLOG(3) << "total messages to send: " << *total_number_of_messages_to_send;
   VLOG(3) << "rtcp log size: " << *rtcp_log_size;
   return *number_of_frames > 0;
 }
 
 }  // namespace cast
 }  // namespace media