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

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

Issue 229503002: Cast: Make castv2 mirroring performance test run again (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 6 years, 8 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
« no previous file with comments | « media/cast/video_receiver/video_receiver.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 fd92619bdce0ff4b70f40ab83ea2748e6599aee1..6bb56274a354debdca0522a83b437c6e5fee1e45 100644
--- a/media/cast/video_sender/video_sender.cc
+++ b/media/cast/video_sender/video_sender.cc
@@ -407,6 +407,11 @@ void VideoSender::OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback) {
void VideoSender::ReceivedAck(uint32 acked_frame_id) {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
+ if (acked_frame_id == UINT32_C(0xFFFFFFFF)) {
+ // Receiver is sending a status message before any frames are ready to
+ // be acked. Ignore.
+ return;
+ }
// Start sending RTCP packets only after receiving the first ACK, i.e. only
// after establishing that the receiver is active.
if (last_acked_frame_id_ == -1) {
@@ -421,8 +426,8 @@ void VideoSender::ReceivedAck(uint32 acked_frame_id) {
now, kVideoAckReceived, rtp_timestamp, acked_frame_id);
VLOG(2) << "ReceivedAck:" << static_cast<int>(acked_frame_id);
- last_acked_frame_id_ = acked_frame_id;
active_session_ = true;
+ DCHECK_NE(-1, last_acked_frame_id_);
UpdateFramesInFlight();
}
« no previous file with comments | « media/cast/video_receiver/video_receiver.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698