Fixes for memory and threading issues in cast

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/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"
 
 static const size_t kRtcpCastLogHeaderSize = 12;
 static const size_t kRtcpSenderFrameLogSize = 4;
 static const size_t kRtcpReceiverFrameLogSize = 8;
 static const size_t kRtcpReceiverEventLogSize = 4;
 
 namespace {
+
+// Converts a log event type to an integer value.
+int ConvertEventTypeToWireFormat(const media::cast::CastLoggingEvent& event) {
+  switch (event) {
+    case media::cast::kAudioAckSent:
+      return 1;
+    case media::cast::kAudioPlayoutDelay:
+      return 2;
+    case media::cast::kAudioFrameDecoded:
+      return 3;
+    case media::cast::kAudioPacketReceived:
+      return 4;
+    case media::cast::kVideoAckSent:
+      return 5;
+    case media::cast::kVideoFrameDecoded:
+      return 6;
+    case media::cast::kVideoRenderDelay:
+      return 7;
+    case media::cast::kVideoPacketReceived:
+      return 8;
+    case media::cast::kDuplicatePacketReceived:
+      return 9;
+    default:
+      return 0;  // Not an interesting event.
+  }
+}
+
 uint16 MergeEventTypeAndTimestampForWireFormat(
     const media::cast::CastLoggingEvent& event,
     const base::TimeDelta& time_delta) {
   int64 time_delta_ms = time_delta.InMilliseconds();
   // Max delta is 4096 milliseconds.
   DCHECK_GE(GG_INT64_C(0xfff), time_delta_ms);
 
   uint16 event_type_and_timestamp_delta =
       static_cast<uint16>(time_delta_ms & 0xfff);
 
-  uint16 event_type = 0;
-  switch (event) {
-    case media::cast::kAudioAckSent:
-      event_type = 1;
-      break;
-    case media::cast::kAudioPlayoutDelay:
-      event_type = 2;
-      break;
-    case media::cast::kAudioFrameDecoded:
-      event_type = 3;
-      break;
-    case media::cast::kAudioPacketReceived:
-      event_type = 4;
-      break;
-    case media::cast::kVideoAckSent:
-      event_type = 5;
-      break;
-    case media::cast::kVideoFrameDecoded:
-      event_type = 6;
-      break;
-    case media::cast::kVideoRenderDelay:
-      event_type = 7;
-      break;
-    case media::cast::kVideoPacketReceived:
-      event_type = 8;
-      break;
-    case media::cast::kDuplicatePacketReceived:
-      event_type = 9;
-      break;
-    default:
-      NOTREACHED();
-  }
+  uint16 event_type = ConvertEventTypeToWireFormat(event);
+  DCHECK(event_type);
   DCHECK(!(event_type & 0xfff0));
   return (event_type << 12) + event_type_and_timestamp_delta;
 }
 
 bool ScanRtcpReceiverLogMessage(
     const media::cast::RtcpReceiverLogMessage& receiver_log_message,
     size_t start_size,
     size_t* number_of_frames,
     size_t* total_number_of_messages_to_send,
     size_t* rtcp_log_size) {
@@ skipping 65 matching lines @@
                        const std::string& c_name)
      : ssrc_(sending_ssrc),
        c_name_(c_name),
        transport_(outgoing_transport),
        cast_environment_(cast_environment) {
   DCHECK_LT(c_name_.length(), kRtcpCnameSize) << "Invalid config";
 }
 
 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,
     const RtcpReceiverReferenceTimeReport* rrtr,
     const RtcpCastMessage* cast_message,
     RtcpReceiverLogMessage* receiver_log) {
   if (packet_type_flags & kRtcpSr ||
       packet_type_flags & kRtcpDlrr ||
       packet_type_flags & kRtcpSenderLog) {
     NOTREACHED() << "Invalid argument";
@@ skipping 502 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