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

Side by Side Diff: media/cast/video_sender/video_sender.cc

Issue 134843005: Cast:Updating logging (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Responding to review and removing unused files 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/cast/test/end2end_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/video_sender/video_sender.h" 5 #include "media/cast/video_sender/video_sender.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 } 267 }
268 sender_log_message.push_back(frame_message); 268 sender_log_message.push_back(frame_message);
269 } 269 }
270 rtcp_->SendRtcpFromRtpSender(&sender_log_message); 270 rtcp_->SendRtcpFromRtpSender(&sender_log_message);
271 if (!sender_log_message.empty()) { 271 if (!sender_log_message.empty()) {
272 VLOG(1) << "Failed to send all log messages"; 272 VLOG(1) << "Failed to send all log messages";
273 } 273 }
274 274
275 // TODO(pwestin): When we start pulling out the logging by other means we need 275 // TODO(pwestin): When we start pulling out the logging by other means we need
276 // to synchronize this. 276 // to synchronize this.
277 cast_environment_->Logging()->Reset(); 277 cast_environment_->Logging()->ResetRaw();
278 ScheduleNextRtcpReport(); 278 ScheduleNextRtcpReport();
279 } 279 }
280 280
281 void VideoSender::ScheduleNextResendCheck() { 281 void VideoSender::ScheduleNextResendCheck() {
282 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 282 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
283 base::TimeDelta time_to_next; 283 base::TimeDelta time_to_next;
284 if (last_send_time_.is_null()) { 284 if (last_send_time_.is_null()) {
285 time_to_next = rtp_max_delay_; 285 time_to_next = rtp_max_delay_;
286 } else { 286 } else {
287 time_to_next = last_send_time_ - cast_environment_->Clock()->NowTicks() + 287 time_to_next = last_send_time_ - cast_environment_->Clock()->NowTicks() +
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 448 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
449 MissingFramesAndPacketsMap missing_frames_and_packets; 449 MissingFramesAndPacketsMap missing_frames_and_packets;
450 PacketIdSet missing; 450 PacketIdSet missing;
451 missing_frames_and_packets.insert(std::make_pair(resend_frame_id, missing)); 451 missing_frames_and_packets.insert(std::make_pair(resend_frame_id, missing));
452 rtp_sender_->ResendPackets(missing_frames_and_packets); 452 rtp_sender_->ResendPackets(missing_frames_and_packets);
453 last_send_time_ = cast_environment_->Clock()->NowTicks(); 453 last_send_time_ = cast_environment_->Clock()->NowTicks();
454 } 454 }
455 455
456 } // namespace cast 456 } // namespace cast
457 } // namespace media 457 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/test/end2end_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698