Cast: Rtcp and RtcpSender don't take event logs

media/cast/rtcp/rtcp_sender.cc

 // 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.
 
 #include "media/cast/rtcp/rtcp_sender.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
 #include "media/cast/cast_environment.h"
+#include "media/cast/rtcp/receiver_rtcp_event_subscriber.h"
 #include "media/cast/rtcp/rtcp_defines.h"
 #include "media/cast/rtcp/rtcp_utility.h"
 #include "media/cast/transport/cast_transport_defines.h"
 #include "media/cast/transport/pacing/paced_sender.h"
 #include "net/base/big_endian.h"
 
 namespace {
 
 using media::cast::kRtcpCastLogHeaderSize;
 using media::cast::kRtcpSenderFrameLogSize;
@@ skipping 120 matching lines @@
 }
 
 RtcpSender::~RtcpSender() {}
 
 // static
 bool RtcpSender::IsReceiverEvent(const media::cast::CastLoggingEvent& event) {
   return ConvertEventTypeToWireFormat(event) != 0;
 }
 
 void RtcpSender::SendRtcpFromRtpReceiver(
-    uint32 packet_type_flags, const transport::RtcpReportBlock* report_block,
+    uint32 packet_type_flags,
+    const transport::RtcpReportBlock* report_block,
     const RtcpReceiverReferenceTimeReport* rrtr,
-    const RtcpCastMessage* cast_message, RtcpReceiverLogMessage* receiver_log) {
+    const RtcpCastMessage* cast_message,
+    ReceiverRtcpEventSubscriber* event_subscriber) {
   if (packet_type_flags & kRtcpSr || packet_type_flags & kRtcpDlrr ||
       packet_type_flags & kRtcpSenderLog) {
     NOTREACHED() << "Invalid argument";
   }
   if (packet_type_flags & kRtcpPli || packet_type_flags & kRtcpRpsi ||
       packet_type_flags & kRtcpRemb || packet_type_flags & kRtcpNack) {
     // Implement these for webrtc interop.
     NOTIMPLEMENTED();
   }
   Packet packet;
@@ skipping 10 matching lines @@
   }
   if (packet_type_flags & kRtcpRrtr) {
     DCHECK(rrtr) << "Invalid argument";
     BuildRrtr(rrtr, &packet);
   }
   if (packet_type_flags & kRtcpCast) {
     DCHECK(cast_message) << "Invalid argument";
     BuildCast(cast_message, &packet);
   }
   if (packet_type_flags & kRtcpReceiverLog) {
-    DCHECK(receiver_log) << "Invalid argument";
-    BuildReceiverLog(receiver_log, &packet);
+    DCHECK(event_subscriber) << "Invalid argument";
+    RtcpReceiverLogMessage receiver_log;
+    event_subscriber->GetReceiverLogMessageAndReset(&receiver_log);
+    BuildReceiverLog(&receiver_log, &packet);
   }
   if (packet.empty()) return;  // Sanity don't send empty packets.
 
   transport_->SendRtcpPacket(packet);
 }
 
 void RtcpSender::BuildRR(const transport::RtcpReportBlock* report_block,
                          Packet* packet) const {
   size_t start_size = packet->size();
   DCHECK_LT(start_size + 32, kMaxIpPacketSize) << "Not enough buffer space";
@@ skipping 456 matching lines @@
     if (frame_log_messages.event_log_messages_.empty()) {
       // We sent all messages on this frame; pop the frame header.
       receiver_log_message->pop_front();
     }
   }
   DCHECK_EQ(total_number_of_messages_to_send, 0);
 }
 
 }  // namespace cast
 }  // namespace media