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

Side by Side Diff: media/cast/sender/frame_sender.cc

Issue 562653004: Cast: First stab at implementing adaptive latency (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « media/cast/sender/frame_sender.h ('k') | media/cast/sender/video_sender.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/sender/frame_sender.h" 5 #include "media/cast/sender/frame_sender.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 8
9 namespace media { 9 namespace media {
10 namespace cast { 10 namespace cast {
11 namespace { 11 namespace {
12 12
13 const int kMinSchedulingDelayMs = 1; 13 const int kMinSchedulingDelayMs = 1;
14 const int kNumAggressiveReportsSentAtStart = 100; 14 const int kNumAggressiveReportsSentAtStart = 100;
15 const size_t kRTTWindow = 8192;
miu 2014/09/10 19:50:08 This is a pretty huge window. If RTT is updated e
hubbe 2014/09/10 20:40:46 changed to 1200 (10 minutes)
15 16
16 } // namespace 17 } // namespace
17 18
18 FrameSender::FrameSender(scoped_refptr<CastEnvironment> cast_environment, 19 FrameSender::FrameSender(scoped_refptr<CastEnvironment> cast_environment,
19 bool is_audio, 20 bool is_audio,
20 CastTransportSender* const transport_sender, 21 CastTransportSender* const transport_sender,
21 base::TimeDelta rtcp_interval, 22 base::TimeDelta rtcp_interval,
22 int rtp_timebase, 23 int rtp_timebase,
23 uint32 ssrc, 24 uint32 ssrc,
24 double max_frame_rate, 25 double max_frame_rate,
25 base::TimeDelta playout_delay, 26 base::TimeDelta min_playout_delay,
27 base::TimeDelta max_playout_delay,
26 CongestionControl* congestion_control) 28 CongestionControl* congestion_control)
27 : cast_environment_(cast_environment), 29 : cast_environment_(cast_environment),
28 transport_sender_(transport_sender), 30 transport_sender_(transport_sender),
29 ssrc_(ssrc), 31 ssrc_(ssrc),
30 rtcp_interval_(rtcp_interval), 32 rtcp_interval_(rtcp_interval),
33 min_playout_delay_(min_playout_delay),
34 max_playout_delay_(max_playout_delay),
31 max_frame_rate_(max_frame_rate), 35 max_frame_rate_(max_frame_rate),
32 num_aggressive_rtcp_reports_sent_(0), 36 num_aggressive_rtcp_reports_sent_(0),
33 last_sent_frame_id_(0), 37 last_sent_frame_id_(0),
34 latest_acked_frame_id_(0), 38 latest_acked_frame_id_(0),
35 duplicate_ack_counter_(0), 39 duplicate_ack_counter_(0),
36 rtp_timebase_(rtp_timebase), 40 rtp_timebase_(rtp_timebase),
37 congestion_control_(congestion_control), 41 congestion_control_(congestion_control),
38 is_audio_(is_audio), 42 is_audio_(is_audio),
39 weak_factory_(this) { 43 weak_factory_(this) {
40 DCHECK(transport_sender_); 44 DCHECK(transport_sender_);
41 DCHECK_GT(rtp_timebase_, 0); 45 DCHECK_GT(rtp_timebase_, 0);
42 DCHECK(congestion_control_); 46 DCHECK(congestion_control_);
43 SetTargetPlayoutDelay(playout_delay); 47 SetTargetPlayoutDelay(min_playout_delay);
44 send_target_playout_delay_ = false; 48 send_target_playout_delay_ = false;
45 memset(frame_rtp_timestamps_, 0, sizeof(frame_rtp_timestamps_)); 49 memset(frame_rtp_timestamps_, 0, sizeof(frame_rtp_timestamps_));
46 } 50 }
47 51
48 FrameSender::~FrameSender() { 52 FrameSender::~FrameSender() {
49 } 53 }
50 54
51 void FrameSender::ScheduleNextRtcpReport() { 55 void FrameSender::ScheduleNextRtcpReport() {
52 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 56 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
53 base::TimeDelta time_to_next = rtcp_interval_; 57 base::TimeDelta time_to_next = rtcp_interval_;
(...skipping 30 matching lines...) Expand all
84 static_cast<uint32>(rtp_delta); 88 static_cast<uint32>(rtp_delta);
85 transport_sender_->SendSenderReport(ssrc_, now, now_as_rtp_timestamp); 89 transport_sender_->SendSenderReport(ssrc_, now, now_as_rtp_timestamp);
86 90
87 if (schedule_future_reports) 91 if (schedule_future_reports)
88 ScheduleNextRtcpReport(); 92 ScheduleNextRtcpReport();
89 } 93 }
90 94
91 void FrameSender::OnMeasuredRoundTripTime(base::TimeDelta rtt) { 95 void FrameSender::OnMeasuredRoundTripTime(base::TimeDelta rtt) {
92 DCHECK(rtt > base::TimeDelta()); 96 DCHECK(rtt > base::TimeDelta());
93 current_round_trip_time_ = rtt; 97 current_round_trip_time_ = rtt;
98 recent_round_trip_times_.push_back(rtt);
99 recent_round_trip_times_sum_ += rtt;
100 if (recent_round_trip_times_.size() > kRTTWindow) {
101 recent_round_trip_times_sum_ -= recent_round_trip_times_[0];
102 recent_round_trip_times_.pop_front();
103 }
104 }
105
106 base::TimeDelta FrameSender::AverageRTT() {
107 return recent_round_trip_times_sum_ / recent_round_trip_times_.size();
94 } 108 }
95 109
96 void FrameSender::SetTargetPlayoutDelay( 110 void FrameSender::SetTargetPlayoutDelay(
97 base::TimeDelta new_target_playout_delay) { 111 base::TimeDelta new_target_playout_delay) {
112 new_target_playout_delay = std::max(new_target_playout_delay,
113 min_playout_delay_);
114 new_target_playout_delay = std::min(new_target_playout_delay,
115 max_playout_delay_);
98 target_playout_delay_ = new_target_playout_delay; 116 target_playout_delay_ = new_target_playout_delay;
99 max_unacked_frames_ = 117 max_unacked_frames_ =
100 std::min(kMaxUnackedFrames, 118 std::min(kMaxUnackedFrames,
101 1 + static_cast<int>(target_playout_delay_ * 119 1 + static_cast<int>(target_playout_delay_ *
102 max_frame_rate_ / 120 max_frame_rate_ /
103 base::TimeDelta::FromSeconds(1))); 121 base::TimeDelta::FromSeconds(1)));
104 send_target_playout_delay_ = true; 122 send_target_playout_delay_ = true;
105 } 123 }
106 124
107 void FrameSender::ResendCheck() { 125 void FrameSender::ResendCheck() {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 VLOG_IF(1, is_last_aggressive_report) << "Sending last aggressive report."; 235 VLOG_IF(1, is_last_aggressive_report) << "Sending last aggressive report.";
218 SendRtcpReport(is_last_aggressive_report); 236 SendRtcpReport(is_last_aggressive_report);
219 } 237 }
220 238
221 congestion_control_->SendFrameToTransport( 239 congestion_control_->SendFrameToTransport(
222 frame_id, encoded_frame->data.size() * 8, last_send_time_); 240 frame_id, encoded_frame->data.size() * 8, last_send_time_);
223 241
224 if (send_target_playout_delay_) { 242 if (send_target_playout_delay_) {
225 encoded_frame->new_playout_delay_ms = 243 encoded_frame->new_playout_delay_ms =
226 target_playout_delay_.InMilliseconds(); 244 target_playout_delay_.InMilliseconds();
227 } 245 }
miu 2014/09/10 19:50:08 BTW--As I was poking around code recently, I notic
hubbe 2014/09/10 20:40:46 It's intentional. If we allow frame dropping, then
228 transport_sender_->InsertFrame(ssrc_, *encoded_frame); 246 transport_sender_->InsertFrame(ssrc_, *encoded_frame);
229 } 247 }
230 248
231 void FrameSender::OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback) { 249 void FrameSender::OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback) {
232 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 250 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
233 251
234 const bool have_valid_rtt = current_round_trip_time_ > base::TimeDelta(); 252 const bool have_valid_rtt = current_round_trip_time_ > base::TimeDelta();
235 if (have_valid_rtt) { 253 if (have_valid_rtt) {
236 congestion_control_->UpdateRtt(current_round_trip_time_); 254 congestion_control_->UpdateRtt(current_round_trip_time_);
237 255
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 << duration_in_flight.InMicroseconds() << " usec (" 337 << duration_in_flight.InMicroseconds() << " usec ("
320 << (target_playout_delay_ > base::TimeDelta() ? 338 << (target_playout_delay_ > base::TimeDelta() ?
321 100 * duration_in_flight / target_playout_delay_ : 339 100 * duration_in_flight / target_playout_delay_ :
322 kint64max) << "%)"; 340 kint64max) << "%)";
323 return frames_in_flight >= max_unacked_frames_ || 341 return frames_in_flight >= max_unacked_frames_ ||
324 duration_in_flight >= target_playout_delay_; 342 duration_in_flight >= target_playout_delay_;
325 } 343 }
326 344
327 } // namespace cast 345 } // namespace cast
328 } // namespace media 346 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/sender/frame_sender.h ('k') | media/cast/sender/video_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698