Fixes for memory and threading issues in cast

media/cast/video_receiver/video_receiver.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/video_receiver/video_receiver.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "crypto/encryptor.h"
 #include "crypto/symmetric_key.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/framer/framer.h"
+#include "media/cast/rtcp/rtcp_sender.h"
 #include "media/cast/video_receiver/video_decoder.h"
 
 namespace media {
 namespace cast {
 
 const int64 kMinSchedulingDelayMs = 1;
 
 static const int64 kMinTimeBetweenOffsetUpdatesMs = 2000;
 static const int kTimeOffsetFilter = 8;
 static const int64_t kMinProcessIntervalMs = 5;
@@ skipping 410 matching lines @@
 // Send a cast feedback message. Actual message created in the framer (cast
 // message builder).
 void VideoReceiver::CastFeedback(const RtcpCastMessage& cast_message) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
 
   RtcpReceiverLogMessage receiver_log;
   VideoRtcpRawMap video_logs =
       cast_environment_->Logging()->GetVideoRtcpRawData();
 
   while (!video_logs.empty()) {
+    // TODO(hclam): Avoid calling begin() within a loop.
     VideoRtcpRawMap::iterator it = video_logs.begin();
     uint32 rtp_timestamp = it->first;
     std::pair<VideoRtcpRawMap::iterator, VideoRtcpRawMap::iterator>
         frame_range = video_logs.equal_range(rtp_timestamp);
 
     RtcpReceiverFrameLogMessage frame_log(rtp_timestamp);
 
     VideoRtcpRawMap::const_iterator event_it = frame_range.first;
     for (; event_it != frame_range.second; ++event_it) {
+      if (!RtcpSender::IsReceiverEvent(event_it->second.type))
+        continue;
       RtcpReceiverEventLogMessage event_log_message;
       event_log_message.type = event_it->second.type;
       event_log_message.event_timestamp = event_it->second.timestamp;
       event_log_message.delay_delta = event_it->second.delay_delta;
       event_log_message.packet_id = event_it->second.packet_id;
       frame_log.event_log_messages_.push_back(event_log_message);
     }
     receiver_log.push_back(frame_log);
     video_logs.erase(rtp_timestamp);
   }
@@ skipping 42 matching lines @@
 }
 
 void VideoReceiver::SendNextRtcpReport() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   rtcp_->SendRtcpFromRtpReceiver(NULL, NULL);
   ScheduleNextRtcpReport();
 }
 
 }  // namespace cast
 }  // namespace media