Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Unified Diff: media/cast/video_sender/video_sender.cc

Issue 145443005: Fixes for memory and threading issues in cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cast/video_sender/video_sender.cc
diff --git a/media/cast/video_sender/video_sender.cc b/media/cast/video_sender/video_sender.cc
index 16f8f6b5fbac8adeef7bce2ed81c8b9c734b7476..a679fa305a1f18ab4db51ce17d914a51648e0f6c 100644
--- a/media/cast/video_sender/video_sender.cc
+++ b/media/cast/video_sender/video_sender.cc
@@ -185,12 +185,14 @@ void VideoSender::SendRtcpReport() {
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;
transport::RtcpSenderFrameLogMessage frame_message;
frame_message.rtp_timestamp = rtp_timestamp;
frame_message.frame_status = transport::kRtcpSenderFrameStatusUnknown;
+ bool ignore_event = false;
switch (it->second.type) {
case kVideoFrameCaptured:
@@ -206,11 +208,11 @@ void VideoSender::SendRtcpReport() {
transport::kRtcpSenderFrameStatusSentToNetwork;
break;
default:
- NOTREACHED();
- break;
+ ignore_event = true;
}
video_logs.erase(rtp_timestamp);
- sender_log_message.push_back(frame_message);
+ if (!ignore_event)
+ sender_log_message.push_back(frame_message);
}
rtcp_->SendRtcpFromRtpSender(sender_log_message);
« no previous file with comments | « media/cast/video_sender/video_encoder_impl_unittest.cc ('k') | media/cast/video_sender/video_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698