summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorhubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-09 07:05:22 +0000
committerhubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-09 07:05:22 +0000
commit30c15214001ea95d0b04fab6459f616f191f8d18 (patch)
treeff748bd843582b163ee803d9f9666514c66c9484 /media
parent34ac63497cdbf5879612b0f69fac03d9e79ae50e (diff)
downloadchromium_src-30c15214001ea95d0b04fab6459f616f191f8d18.zip
chromium_src-30c15214001ea95d0b04fab6459f616f191f8d18.tar.gz
chromium_src-30c15214001ea95d0b04fab6459f616f191f8d18.tar.bz2
Cast: Fix another hanging bug
When a feedback message without an updated target delay is received, the video sender will set it's target delay to zero, causing massive retransmissions and all sorts of problems. Review URL: https://codereview.chromium.org/273733003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/cast/video_sender/video_sender.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/media/cast/video_sender/video_sender.cc b/media/cast/video_sender/video_sender.cc
index 29859db..07e34d5 100644
--- a/media/cast/video_sender/video_sender.cc
+++ b/media/cast/video_sender/video_sender.cc
@@ -362,12 +362,6 @@ void VideoSender::OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback) {
base::TimeDelta min_rtt;
base::TimeDelta max_rtt;
- // Update delay and max number of frames in flight based on the the new
- // received target delay.
- rtp_max_delay_ =
- base::TimeDelta::FromMilliseconds(cast_feedback.target_delay_ms_);
- max_unacked_frames_ = 1 + static_cast<uint8>(cast_feedback.target_delay_ms_ *
- max_frame_rate_ / 1000);
if (rtcp_->Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt)) {
// Don't use a RTT lower than our average.
rtt = std::max(rtt, avg_rtt);