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

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

Issue 493823002: Implement adaptive target delay extension (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: explicit masking Created 6 years, 4 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 namespace media { 7 namespace media {
8 namespace cast { 8 namespace cast {
9 namespace { 9 namespace {
10 const int kMinSchedulingDelayMs = 1; 10 const int kMinSchedulingDelayMs = 1;
11 } // namespace 11 } // namespace
12 12
13 FrameSender::FrameSender(scoped_refptr<CastEnvironment> cast_environment, 13 FrameSender::FrameSender(scoped_refptr<CastEnvironment> cast_environment,
14 CastTransportSender* const transport_sender, 14 CastTransportSender* const transport_sender,
15 base::TimeDelta rtcp_interval, 15 base::TimeDelta rtcp_interval,
16 int frequency, 16 int frequency,
17 uint32 ssrc) 17 uint32 ssrc,
18 double max_frame_rate,
19 base::TimeDelta playout_delay)
18 : cast_environment_(cast_environment), 20 : cast_environment_(cast_environment),
19 transport_sender_(transport_sender), 21 transport_sender_(transport_sender),
20 ssrc_(ssrc), 22 ssrc_(ssrc),
21 rtp_timestamp_helper_(frequency), 23 rtp_timestamp_helper_(frequency),
22 rtt_available_(false), 24 rtt_available_(false),
23 rtcp_interval_(rtcp_interval), 25 rtcp_interval_(rtcp_interval),
26 max_frame_rate_(max_frame_rate),
24 weak_factory_(this) { 27 weak_factory_(this) {
28 SetTargetPlayoutDelay(playout_delay);
29 send_target_playout_delay_ = false;
25 } 30 }
26 31
27 FrameSender::~FrameSender() { 32 FrameSender::~FrameSender() {
28 } 33 }
29 34
30 void FrameSender::ScheduleNextRtcpReport() { 35 void FrameSender::ScheduleNextRtcpReport() {
31 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 36 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
32 base::TimeDelta time_to_next = rtcp_interval_; 37 base::TimeDelta time_to_next = rtcp_interval_;
33 38
34 time_to_next = std::max( 39 time_to_next = std::max(
(...skipping 26 matching lines...) Expand all
61 base::TimeDelta avg_rtt, 66 base::TimeDelta avg_rtt,
62 base::TimeDelta min_rtt, 67 base::TimeDelta min_rtt,
63 base::TimeDelta max_rtt) { 68 base::TimeDelta max_rtt) {
64 rtt_available_ = true; 69 rtt_available_ = true;
65 rtt_ = rtt; 70 rtt_ = rtt;
66 avg_rtt_ = avg_rtt; 71 avg_rtt_ = avg_rtt;
67 min_rtt_ = min_rtt; 72 min_rtt_ = min_rtt;
68 max_rtt_ = max_rtt; 73 max_rtt_ = max_rtt;
69 } 74 }
70 75
76 void FrameSender::SetTargetPlayoutDelay(
77 base::TimeDelta new_target_playout_delay) {
78 target_playout_delay_ = new_target_playout_delay;
79 max_unacked_frames_ =
80 std::min(kMaxUnackedFrames,
81 1 + static_cast<int>(target_playout_delay_ *
82 max_frame_rate_ /
83 base::TimeDelta::FromSeconds(1)));
84 send_target_playout_delay_ = true;
85 }
86
71 } // namespace cast 87 } // namespace cast
72 } // namespace media 88 } // 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