pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 | * |
| 4 | * Use of this source code is governed by a BSD-style license |
| 5 | * that can be found in the LICENSE file in the root of the source |
| 6 | * tree. An additional intellectual property rights grant can be found |
| 7 | * in the file PATENTS. All contributing project authors may |
| 8 | * be found in the AUTHORS file in the root of the source tree. |
| 9 | */ |
| 10 | |
Henrik Kjellander | 0b9e29c | 2015-11-16 11:12:24 +0100 | [diff] [blame] | 11 | #include "webrtc/modules/pacing/paced_sender.h" |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 12 | |
jbauch | d2a2296 | 2016-02-08 23:18:25 -0800 | [diff] [blame] | 13 | #include <algorithm> |
pbos@webrtc.org | 03c817e | 2014-07-07 10:20:35 +0000 | [diff] [blame] | 14 | #include <map> |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 15 | #include <queue> |
pbos@webrtc.org | 03c817e | 2014-07-07 10:20:35 +0000 | [diff] [blame] | 16 | #include <set> |
jbauch | d2a2296 | 2016-02-08 23:18:25 -0800 | [diff] [blame] | 17 | #include <vector> |
pbos@webrtc.org | 03c817e | 2014-07-07 10:20:35 +0000 | [diff] [blame] | 18 | |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 19 | #include "webrtc/base/checks.h" |
Peter Boström | 7c704b8 | 2015-12-04 16:13:05 +0100 | [diff] [blame] | 20 | #include "webrtc/base/logging.h" |
Henrik Kjellander | ff761fb | 2015-11-04 08:31:52 +0100 | [diff] [blame] | 21 | #include "webrtc/modules/include/module_common_types.h" |
isheriff | 3168781 | 2016-10-04 08:43:09 -0700 | [diff] [blame] | 22 | #include "webrtc/modules/pacing/alr_detector.h" |
stefan@webrtc.org | 82462aa | 2014-10-23 11:57:05 +0000 | [diff] [blame] | 23 | #include "webrtc/modules/pacing/bitrate_prober.h" |
tommi | 919dce2 | 2017-03-15 07:45:36 -0700 | [diff] [blame] | 24 | #include "webrtc/modules/utility/include/process_thread.h" |
Henrik Kjellander | 98f5351 | 2015-10-28 18:17:40 +0100 | [diff] [blame] | 25 | #include "webrtc/system_wrappers/include/clock.h" |
| 26 | #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
| 27 | #include "webrtc/system_wrappers/include/field_trial.h" |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 28 | |
| 29 | namespace { |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 30 | // Time limit in milliseconds between packet bursts. |
pkasting@chromium.org | 0b1534c | 2014-12-15 22:09:40 +0000 | [diff] [blame] | 31 | const int64_t kMinPacketLimitMs = 5; |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 32 | |
| 33 | // Upper cap on process interval, in case process has not been called in a long |
| 34 | // time. |
pkasting@chromium.org | 0b1534c | 2014-12-15 22:09:40 +0000 | [diff] [blame] | 35 | const int64_t kMaxIntervalTimeMs = 30; |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 36 | |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 37 | } // namespace |
| 38 | |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 39 | // TODO(sprang): Move at least PacketQueue and MediaBudget out to separate |
| 40 | // files, so that we can more easily test them. |
| 41 | |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 42 | namespace webrtc { |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 43 | namespace paced_sender { |
| 44 | struct Packet { |
sprang | ebbf8a8 | 2015-09-21 15:11:14 -0700 | [diff] [blame] | 45 | Packet(RtpPacketSender::Priority priority, |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 46 | uint32_t ssrc, |
pbos@webrtc.org | 03c817e | 2014-07-07 10:20:35 +0000 | [diff] [blame] | 47 | uint16_t seq_number, |
| 48 | int64_t capture_time_ms, |
| 49 | int64_t enqueue_time_ms, |
pkasting@chromium.org | 4591fbd | 2014-11-20 22:28:14 +0000 | [diff] [blame] | 50 | size_t length_in_bytes, |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 51 | bool retransmission, |
| 52 | uint64_t enqueue_order) |
| 53 | : priority(priority), |
| 54 | ssrc(ssrc), |
pbos@webrtc.org | 03c817e | 2014-07-07 10:20:35 +0000 | [diff] [blame] | 55 | sequence_number(seq_number), |
| 56 | capture_time_ms(capture_time_ms), |
sprang | dc29780 | 2016-03-01 00:46:55 -0800 | [diff] [blame] | 57 | enqueue_time_ms(enqueue_time_ms), |
pbos@webrtc.org | 03c817e | 2014-07-07 10:20:35 +0000 | [diff] [blame] | 58 | bytes(length_in_bytes), |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 59 | retransmission(retransmission), |
| 60 | enqueue_order(enqueue_order) {} |
| 61 | |
sprang | ebbf8a8 | 2015-09-21 15:11:14 -0700 | [diff] [blame] | 62 | RtpPacketSender::Priority priority; |
pbos@webrtc.org | 03c817e | 2014-07-07 10:20:35 +0000 | [diff] [blame] | 63 | uint32_t ssrc; |
| 64 | uint16_t sequence_number; |
| 65 | int64_t capture_time_ms; |
| 66 | int64_t enqueue_time_ms; |
pkasting@chromium.org | 4591fbd | 2014-11-20 22:28:14 +0000 | [diff] [blame] | 67 | size_t bytes; |
pbos@webrtc.org | 03c817e | 2014-07-07 10:20:35 +0000 | [diff] [blame] | 68 | bool retransmission; |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 69 | uint64_t enqueue_order; |
| 70 | std::list<Packet>::iterator this_it; |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 71 | }; |
| 72 | |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 73 | // Used by priority queue to sort packets. |
| 74 | struct Comparator { |
| 75 | bool operator()(const Packet* first, const Packet* second) { |
| 76 | // Highest prio = 0. |
| 77 | if (first->priority != second->priority) |
| 78 | return first->priority > second->priority; |
| 79 | |
| 80 | // Retransmissions go first. |
terelius | f39f7d9 | 2016-07-20 03:36:19 -0700 | [diff] [blame] | 81 | if (second->retransmission != first->retransmission) |
| 82 | return second->retransmission; |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 83 | |
| 84 | // Older frames have higher prio. |
| 85 | if (first->capture_time_ms != second->capture_time_ms) |
| 86 | return first->capture_time_ms > second->capture_time_ms; |
| 87 | |
| 88 | return first->enqueue_order > second->enqueue_order; |
| 89 | } |
| 90 | }; |
| 91 | |
| 92 | // Class encapsulating a priority queue with some extensions. |
| 93 | class PacketQueue { |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 94 | public: |
elad.alon | 61ce37e | 2017-03-09 07:09:31 -0800 | [diff] [blame] | 95 | explicit PacketQueue(const Clock* clock) |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 96 | : bytes_(0), |
| 97 | clock_(clock), |
| 98 | queue_time_sum_(0), |
| 99 | time_last_updated_(clock_->TimeInMilliseconds()) {} |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 100 | virtual ~PacketQueue() {} |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 101 | |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 102 | void Push(const Packet& packet) { |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 103 | if (!AddToDupeSet(packet)) |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 104 | return; |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 105 | |
sprang | dc29780 | 2016-03-01 00:46:55 -0800 | [diff] [blame] | 106 | UpdateQueueTime(packet.enqueue_time_ms); |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 107 | |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 108 | // Store packet in list, use pointers in priority queue for cheaper moves. |
| 109 | // Packets have a handle to its own iterator in the list, for easy removal |
| 110 | // when popping from queue. |
| 111 | packet_list_.push_front(packet); |
| 112 | std::list<Packet>::iterator it = packet_list_.begin(); |
| 113 | it->this_it = it; // Handle for direct removal from list. |
| 114 | prio_queue_.push(&(*it)); // Pointer into list. |
| 115 | bytes_ += packet.bytes; |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 116 | } |
| 117 | |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 118 | const Packet& BeginPop() { |
| 119 | const Packet& packet = *prio_queue_.top(); |
| 120 | prio_queue_.pop(); |
| 121 | return packet; |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 122 | } |
| 123 | |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 124 | void CancelPop(const Packet& packet) { prio_queue_.push(&(*packet.this_it)); } |
| 125 | |
| 126 | void FinalizePop(const Packet& packet) { |
| 127 | RemoveFromDupeSet(packet); |
| 128 | bytes_ -= packet.bytes; |
sprang | dc29780 | 2016-03-01 00:46:55 -0800 | [diff] [blame] | 129 | queue_time_sum_ -= (time_last_updated_ - packet.enqueue_time_ms); |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 130 | packet_list_.erase(packet.this_it); |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 131 | RTC_DCHECK_EQ(packet_list_.size(), prio_queue_.size()); |
| 132 | if (packet_list_.empty()) |
kwiberg | af476c7 | 2016-11-28 15:21:39 -0800 | [diff] [blame] | 133 | RTC_DCHECK_EQ(0, queue_time_sum_); |
stefan@webrtc.org | 82462aa | 2014-10-23 11:57:05 +0000 | [diff] [blame] | 134 | } |
| 135 | |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 136 | bool Empty() const { return prio_queue_.empty(); } |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 137 | |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 138 | size_t SizeInPackets() const { return prio_queue_.size(); } |
| 139 | |
pkasting@chromium.org | 2656bf8 | 2014-11-17 22:21:14 +0000 | [diff] [blame] | 140 | uint64_t SizeInBytes() const { return bytes_; } |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 141 | |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 142 | int64_t OldestEnqueueTimeMs() const { |
sprang | dc29780 | 2016-03-01 00:46:55 -0800 | [diff] [blame] | 143 | auto it = packet_list_.rbegin(); |
| 144 | if (it == packet_list_.rend()) |
| 145 | return 0; |
| 146 | return it->enqueue_time_ms; |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 147 | } |
| 148 | |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 149 | void UpdateQueueTime(int64_t timestamp_ms) { |
sprang | dc29780 | 2016-03-01 00:46:55 -0800 | [diff] [blame] | 150 | RTC_DCHECK_GE(timestamp_ms, time_last_updated_); |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 151 | int64_t delta = timestamp_ms - time_last_updated_; |
| 152 | // Use packet packet_list_.size() not prio_queue_.size() here, as there |
| 153 | // might be an outstanding element popped from prio_queue_ currently in the |
| 154 | // SendPacket() call, while packet_list_ will always be correct. |
| 155 | queue_time_sum_ += delta * packet_list_.size(); |
| 156 | time_last_updated_ = timestamp_ms; |
| 157 | } |
| 158 | |
| 159 | int64_t AverageQueueTimeMs() const { |
| 160 | if (prio_queue_.empty()) |
| 161 | return 0; |
| 162 | return queue_time_sum_ / packet_list_.size(); |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 163 | } |
| 164 | |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 165 | private: |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 166 | // Try to add a packet to the set of ssrc/seqno identifiers currently in the |
| 167 | // queue. Return true if inserted, false if this is a duplicate. |
| 168 | bool AddToDupeSet(const Packet& packet) { |
| 169 | SsrcSeqNoMap::iterator it = dupe_map_.find(packet.ssrc); |
| 170 | if (it == dupe_map_.end()) { |
| 171 | // First for this ssrc, just insert. |
| 172 | dupe_map_[packet.ssrc].insert(packet.sequence_number); |
| 173 | return true; |
| 174 | } |
| 175 | |
| 176 | // Insert returns a pair, where second is a bool set to true if new element. |
| 177 | return it->second.insert(packet.sequence_number).second; |
| 178 | } |
| 179 | |
| 180 | void RemoveFromDupeSet(const Packet& packet) { |
| 181 | SsrcSeqNoMap::iterator it = dupe_map_.find(packet.ssrc); |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 182 | RTC_DCHECK(it != dupe_map_.end()); |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 183 | it->second.erase(packet.sequence_number); |
| 184 | if (it->second.empty()) { |
| 185 | dupe_map_.erase(it); |
| 186 | } |
| 187 | } |
| 188 | |
| 189 | // List of packets, in the order the were enqueued. Since dequeueing may |
| 190 | // occur out of order, use list instead of vector. |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 191 | std::list<Packet> packet_list_; |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 192 | // Priority queue of the packets, sorted according to Comparator. |
| 193 | // Use pointers into list, to avoid moving whole struct within heap. |
| 194 | std::priority_queue<Packet*, std::vector<Packet*>, Comparator> prio_queue_; |
| 195 | // Total number of bytes in the queue. |
| 196 | uint64_t bytes_; |
deadbeef | a24a9e2 | 2017-02-02 16:04:36 -0800 | [diff] [blame] | 197 | // Map<ssrc, std::set<seq_no> >, for checking duplicates. |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 198 | typedef std::map<uint32_t, std::set<uint16_t> > SsrcSeqNoMap; |
| 199 | SsrcSeqNoMap dupe_map_; |
elad.alon | 61ce37e | 2017-03-09 07:09:31 -0800 | [diff] [blame] | 200 | const Clock* const clock_; |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 201 | int64_t queue_time_sum_; |
| 202 | int64_t time_last_updated_; |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 203 | }; |
| 204 | |
| 205 | class IntervalBudget { |
| 206 | public: |
| 207 | explicit IntervalBudget(int initial_target_rate_kbps) |
| 208 | : target_rate_kbps_(initial_target_rate_kbps), |
| 209 | bytes_remaining_(0) {} |
| 210 | |
| 211 | void set_target_rate_kbps(int target_rate_kbps) { |
| 212 | target_rate_kbps_ = target_rate_kbps; |
stefan | c62642c | 2015-07-07 04:20:34 -0700 | [diff] [blame] | 213 | bytes_remaining_ = |
| 214 | std::max(-kWindowMs * target_rate_kbps_ / 8, bytes_remaining_); |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 215 | } |
| 216 | |
pkasting@chromium.org | 0b1534c | 2014-12-15 22:09:40 +0000 | [diff] [blame] | 217 | void IncreaseBudget(int64_t delta_time_ms) { |
| 218 | int64_t bytes = target_rate_kbps_ * delta_time_ms / 8; |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 219 | if (bytes_remaining_ < 0) { |
| 220 | // We overused last interval, compensate this interval. |
| 221 | bytes_remaining_ = bytes_remaining_ + bytes; |
| 222 | } else { |
| 223 | // If we underused last interval we can't use it this interval. |
| 224 | bytes_remaining_ = bytes; |
| 225 | } |
| 226 | } |
| 227 | |
pkasting@chromium.org | 4591fbd | 2014-11-20 22:28:14 +0000 | [diff] [blame] | 228 | void UseBudget(size_t bytes) { |
| 229 | bytes_remaining_ = std::max(bytes_remaining_ - static_cast<int>(bytes), |
stefan | c62642c | 2015-07-07 04:20:34 -0700 | [diff] [blame] | 230 | -kWindowMs * target_rate_kbps_ / 8); |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 231 | } |
| 232 | |
Stefan Holmer | 01b4888 | 2015-05-05 10:21:24 +0200 | [diff] [blame] | 233 | size_t bytes_remaining() const { |
| 234 | return static_cast<size_t>(std::max(0, bytes_remaining_)); |
| 235 | } |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 236 | |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 237 | int target_rate_kbps() const { return target_rate_kbps_; } |
| 238 | |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 239 | private: |
stefan | c62642c | 2015-07-07 04:20:34 -0700 | [diff] [blame] | 240 | static const int kWindowMs = 500; |
| 241 | |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 242 | int target_rate_kbps_; |
| 243 | int bytes_remaining_; |
| 244 | }; |
| 245 | } // namespace paced_sender |
pwestin@webrtc.org | 52aa019 | 2013-04-25 17:35:56 +0000 | [diff] [blame] | 246 | |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 247 | const int64_t PacedSender::kMaxQueueLengthMs = 2000; |
stefan@webrtc.org | 88e0dda | 2014-07-04 09:20:42 +0000 | [diff] [blame] | 248 | const float PacedSender::kDefaultPaceMultiplier = 2.5f; |
| 249 | |
philipel | c3b3f7a | 2017-03-29 01:23:13 -0700 | [diff] [blame] | 250 | PacedSender::PacedSender(const Clock* clock, |
| 251 | PacketSender* packet_sender, |
| 252 | RtcEventLog* event_log) |
stefan@webrtc.org | 88e0dda | 2014-07-04 09:20:42 +0000 | [diff] [blame] | 253 | : clock_(clock), |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 254 | packet_sender_(packet_sender), |
isheriff | 3168781 | 2016-10-04 08:43:09 -0700 | [diff] [blame] | 255 | alr_detector_(new AlrDetector()), |
pbos@webrtc.org | 03c817e | 2014-07-07 10:20:35 +0000 | [diff] [blame] | 256 | critsect_(CriticalSectionWrapper::CreateCriticalSection()), |
pwestin@webrtc.org | db41856 | 2013-03-22 23:39:29 +0000 | [diff] [blame] | 257 | paused_(false), |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 258 | media_budget_(new paced_sender::IntervalBudget(0)), |
| 259 | padding_budget_(new paced_sender::IntervalBudget(0)), |
philipel | c3b3f7a | 2017-03-29 01:23:13 -0700 | [diff] [blame] | 260 | prober_(new BitrateProber(event_log)), |
philipel | b61927c | 2017-02-28 07:05:23 -0800 | [diff] [blame] | 261 | probing_send_failure_(false), |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 262 | estimated_bitrate_bps_(0), |
| 263 | min_send_bitrate_kbps_(0u), |
perkj | 71ee44c | 2016-06-15 00:47:53 -0700 | [diff] [blame] | 264 | max_padding_bitrate_kbps_(0u), |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 265 | pacing_bitrate_kbps_(0), |
stefan@webrtc.org | 89fd1e8 | 2014-07-15 16:40:38 +0000 | [diff] [blame] | 266 | time_last_update_us_(clock->TimeInMicroseconds()), |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 267 | packets_(new paced_sender::PacketQueue(clock)), |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 268 | packet_counter_(0) { |
isheriff | 3168781 | 2016-10-04 08:43:09 -0700 | [diff] [blame] | 269 | UpdateBudgetWithElapsedTime(kMinPacketLimitMs); |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 270 | } |
| 271 | |
stefan@webrtc.org | 89fd1e8 | 2014-07-15 16:40:38 +0000 | [diff] [blame] | 272 | PacedSender::~PacedSender() {} |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 273 | |
philipel | fd58b61 | 2017-01-04 07:05:25 -0800 | [diff] [blame] | 274 | void PacedSender::CreateProbeCluster(int bitrate_bps) { |
philipel | eb680ea | 2016-08-17 11:11:59 +0200 | [diff] [blame] | 275 | CriticalSectionScoped cs(critsect_.get()); |
Stefan Holmer | 0e3213a | 2017-02-08 15:19:05 +0100 | [diff] [blame] | 276 | prober_->CreateProbeCluster(bitrate_bps, clock_->TimeInMilliseconds()); |
philipel | eb680ea | 2016-08-17 11:11:59 +0200 | [diff] [blame] | 277 | } |
| 278 | |
pwestin@webrtc.org | db41856 | 2013-03-22 23:39:29 +0000 | [diff] [blame] | 279 | void PacedSender::Pause() { |
terelius | 8b70faf | 2016-08-01 09:47:31 -0700 | [diff] [blame] | 280 | LOG(LS_INFO) << "PacedSender paused."; |
tommi | 919dce2 | 2017-03-15 07:45:36 -0700 | [diff] [blame] | 281 | { |
| 282 | CriticalSectionScoped cs(critsect_.get()); |
| 283 | paused_ = true; |
| 284 | } |
| 285 | // Tell the process thread to call our TimeUntilNextProcess() method to get |
| 286 | // a new (longer) estimate for when to call Process(). |
| 287 | if (process_thread_) |
| 288 | process_thread_->WakeUp(this); |
pwestin@webrtc.org | db41856 | 2013-03-22 23:39:29 +0000 | [diff] [blame] | 289 | } |
| 290 | |
| 291 | void PacedSender::Resume() { |
terelius | 8b70faf | 2016-08-01 09:47:31 -0700 | [diff] [blame] | 292 | LOG(LS_INFO) << "PacedSender resumed."; |
tommi | 919dce2 | 2017-03-15 07:45:36 -0700 | [diff] [blame] | 293 | { |
| 294 | CriticalSectionScoped cs(critsect_.get()); |
| 295 | paused_ = false; |
| 296 | } |
| 297 | // Tell the process thread to call our TimeUntilNextProcess() method to |
| 298 | // refresh the estimate for when to call Process(). |
| 299 | if (process_thread_) |
| 300 | process_thread_->WakeUp(this); |
pwestin@webrtc.org | db41856 | 2013-03-22 23:39:29 +0000 | [diff] [blame] | 301 | } |
| 302 | |
stefan@webrtc.org | e9f0f59 | 2015-02-16 15:47:51 +0000 | [diff] [blame] | 303 | void PacedSender::SetProbingEnabled(bool enabled) { |
kwiberg | af476c7 | 2016-11-28 15:21:39 -0800 | [diff] [blame] | 304 | RTC_CHECK_EQ(0, packet_counter_); |
Irfan Sheriff | 6e11efa | 2016-08-02 12:57:37 -0700 | [diff] [blame] | 305 | CriticalSectionScoped cs(critsect_.get()); |
| 306 | prober_->SetEnabled(enabled); |
stefan@webrtc.org | e9f0f59 | 2015-02-16 15:47:51 +0000 | [diff] [blame] | 307 | } |
| 308 | |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 309 | void PacedSender::SetEstimatedBitrate(uint32_t bitrate_bps) { |
terelius | 8b70faf | 2016-08-01 09:47:31 -0700 | [diff] [blame] | 310 | if (bitrate_bps == 0) |
| 311 | LOG(LS_ERROR) << "PacedSender is not designed to handle 0 bitrate."; |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 312 | CriticalSectionScoped cs(critsect_.get()); |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 313 | estimated_bitrate_bps_ = bitrate_bps; |
perkj | 71ee44c | 2016-06-15 00:47:53 -0700 | [diff] [blame] | 314 | padding_budget_->set_target_rate_kbps( |
| 315 | std::min(estimated_bitrate_bps_ / 1000, max_padding_bitrate_kbps_)); |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 316 | pacing_bitrate_kbps_ = |
| 317 | std::max(min_send_bitrate_kbps_, estimated_bitrate_bps_ / 1000) * |
| 318 | kDefaultPaceMultiplier; |
isheriff | 3168781 | 2016-10-04 08:43:09 -0700 | [diff] [blame] | 319 | alr_detector_->SetEstimatedBitrate(bitrate_bps); |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 320 | } |
| 321 | |
perkj | 71ee44c | 2016-06-15 00:47:53 -0700 | [diff] [blame] | 322 | void PacedSender::SetSendBitrateLimits(int min_send_bitrate_bps, |
| 323 | int padding_bitrate) { |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 324 | CriticalSectionScoped cs(critsect_.get()); |
perkj | 71ee44c | 2016-06-15 00:47:53 -0700 | [diff] [blame] | 325 | min_send_bitrate_kbps_ = min_send_bitrate_bps / 1000; |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 326 | pacing_bitrate_kbps_ = |
| 327 | std::max(min_send_bitrate_kbps_, estimated_bitrate_bps_ / 1000) * |
| 328 | kDefaultPaceMultiplier; |
perkj | 71ee44c | 2016-06-15 00:47:53 -0700 | [diff] [blame] | 329 | max_padding_bitrate_kbps_ = padding_bitrate / 1000; |
| 330 | padding_budget_->set_target_rate_kbps( |
| 331 | std::min(estimated_bitrate_bps_ / 1000, max_padding_bitrate_kbps_)); |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 332 | } |
| 333 | |
Peter Boström | e23e737 | 2015-10-08 11:44:14 +0200 | [diff] [blame] | 334 | void PacedSender::InsertPacket(RtpPacketSender::Priority priority, |
| 335 | uint32_t ssrc, |
| 336 | uint16_t sequence_number, |
| 337 | int64_t capture_time_ms, |
| 338 | size_t bytes, |
| 339 | bool retransmission) { |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 340 | CriticalSectionScoped cs(critsect_.get()); |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 341 | RTC_DCHECK(estimated_bitrate_bps_ > 0) |
| 342 | << "SetEstimatedBitrate must be called before InsertPacket."; |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 343 | |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 344 | int64_t now_ms = clock_->TimeInMilliseconds(); |
philipel | 4a1ec1e | 2016-08-15 11:51:06 -0700 | [diff] [blame] | 345 | prober_->OnIncomingPacket(bytes); |
Peter Boström | 0453ef8 | 2016-02-16 16:23:08 +0100 | [diff] [blame] | 346 | |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 347 | if (capture_time_ms < 0) |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 348 | capture_time_ms = now_ms; |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 349 | |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 350 | packets_->Push(paced_sender::Packet(priority, ssrc, sequence_number, |
| 351 | capture_time_ms, now_ms, bytes, |
| 352 | retransmission, packet_counter_++)); |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 353 | } |
| 354 | |
pkasting@chromium.org | 2656bf8 | 2014-11-17 22:21:14 +0000 | [diff] [blame] | 355 | int64_t PacedSender::ExpectedQueueTimeMs() const { |
stefan@webrtc.org | 19a40ff | 2013-11-27 14:16:20 +0000 | [diff] [blame] | 356 | CriticalSectionScoped cs(critsect_.get()); |
kwiberg | af476c7 | 2016-11-28 15:21:39 -0800 | [diff] [blame] | 357 | RTC_DCHECK_GT(pacing_bitrate_kbps_, 0); |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 358 | return static_cast<int64_t>(packets_->SizeInBytes() * 8 / |
| 359 | pacing_bitrate_kbps_); |
stefan@webrtc.org | bfacda6 | 2013-03-27 16:36:01 +0000 | [diff] [blame] | 360 | } |
| 361 | |
sergeyu | 80ed35e | 2016-11-28 13:11:13 -0800 | [diff] [blame] | 362 | rtc::Optional<int64_t> PacedSender::GetApplicationLimitedRegionStartTime() |
| 363 | const { |
Irfan Sheriff | 1eb1293 | 2016-10-18 17:04:25 -0700 | [diff] [blame] | 364 | CriticalSectionScoped cs(critsect_.get()); |
sergeyu | 80ed35e | 2016-11-28 13:11:13 -0800 | [diff] [blame] | 365 | return alr_detector_->GetApplicationLimitedRegionStartTime(); |
Irfan Sheriff | 1eb1293 | 2016-10-18 17:04:25 -0700 | [diff] [blame] | 366 | } |
| 367 | |
stefan@webrtc.org | 82462aa | 2014-10-23 11:57:05 +0000 | [diff] [blame] | 368 | size_t PacedSender::QueueSizePackets() const { |
| 369 | CriticalSectionScoped cs(critsect_.get()); |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 370 | return packets_->SizeInPackets(); |
| 371 | } |
| 372 | |
pkasting@chromium.org | 0b1534c | 2014-12-15 22:09:40 +0000 | [diff] [blame] | 373 | int64_t PacedSender::QueueInMs() const { |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 374 | CriticalSectionScoped cs(critsect_.get()); |
| 375 | |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 376 | int64_t oldest_packet = packets_->OldestEnqueueTimeMs(); |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 377 | if (oldest_packet == 0) |
| 378 | return 0; |
| 379 | |
| 380 | return clock_->TimeInMilliseconds() - oldest_packet; |
stefan@webrtc.org | 82462aa | 2014-10-23 11:57:05 +0000 | [diff] [blame] | 381 | } |
| 382 | |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 383 | int64_t PacedSender::AverageQueueTimeMs() { |
| 384 | CriticalSectionScoped cs(critsect_.get()); |
| 385 | packets_->UpdateQueueTime(clock_->TimeInMilliseconds()); |
| 386 | return packets_->AverageQueueTimeMs(); |
| 387 | } |
| 388 | |
pkasting@chromium.org | 0b1534c | 2014-12-15 22:09:40 +0000 | [diff] [blame] | 389 | int64_t PacedSender::TimeUntilNextProcess() { |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 390 | CriticalSectionScoped cs(critsect_.get()); |
tommi | 919dce2 | 2017-03-15 07:45:36 -0700 | [diff] [blame] | 391 | if (paused_) |
| 392 | return 1000 * 60 * 60; |
| 393 | |
stefan@webrtc.org | 82462aa | 2014-10-23 11:57:05 +0000 | [diff] [blame] | 394 | if (prober_->IsProbing()) { |
stefan@webrtc.org | e9f0f59 | 2015-02-16 15:47:51 +0000 | [diff] [blame] | 395 | int64_t ret = prober_->TimeUntilNextProbe(clock_->TimeInMilliseconds()); |
philipel | b61927c | 2017-02-28 07:05:23 -0800 | [diff] [blame] | 396 | if (ret > 0 || (ret == 0 && !probing_send_failure_)) |
stefan@webrtc.org | e9f0f59 | 2015-02-16 15:47:51 +0000 | [diff] [blame] | 397 | return ret; |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 398 | } |
pkasting@chromium.org | 0b1534c | 2014-12-15 22:09:40 +0000 | [diff] [blame] | 399 | int64_t elapsed_time_us = clock_->TimeInMicroseconds() - time_last_update_us_; |
| 400 | int64_t elapsed_time_ms = (elapsed_time_us + 500) / 1000; |
| 401 | return std::max<int64_t>(kMinPacketLimitMs - elapsed_time_ms, 0); |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 402 | } |
| 403 | |
pbos | a26ac92 | 2016-02-25 04:50:01 -0800 | [diff] [blame] | 404 | void PacedSender::Process() { |
stefan@webrtc.org | 89fd1e8 | 2014-07-15 16:40:38 +0000 | [diff] [blame] | 405 | int64_t now_us = clock_->TimeInMicroseconds(); |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 406 | CriticalSectionScoped cs(critsect_.get()); |
pkasting@chromium.org | 0b1534c | 2014-12-15 22:09:40 +0000 | [diff] [blame] | 407 | int64_t elapsed_time_ms = (now_us - time_last_update_us_ + 500) / 1000; |
stefan@webrtc.org | 89fd1e8 | 2014-07-15 16:40:38 +0000 | [diff] [blame] | 408 | time_last_update_us_ = now_us; |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 409 | int target_bitrate_kbps = pacing_bitrate_kbps_; |
Stefan Holmer | b86d4e4 | 2015-12-07 10:26:18 +0100 | [diff] [blame] | 410 | if (!paused_ && elapsed_time_ms > 0) { |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 411 | size_t queue_size_bytes = packets_->SizeInBytes(); |
| 412 | if (queue_size_bytes > 0) { |
| 413 | // Assuming equal size packets and input/output rate, the average packet |
| 414 | // has avg_time_left_ms left to get queue_size_bytes out of the queue, if |
| 415 | // time constraint shall be met. Determine bitrate needed for that. |
Erik Språng | ad113e5 | 2015-11-26 16:26:12 +0100 | [diff] [blame] | 416 | packets_->UpdateQueueTime(clock_->TimeInMilliseconds()); |
sprang | 0a43fef | 2015-11-20 09:00:37 -0800 | [diff] [blame] | 417 | int64_t avg_time_left_ms = std::max<int64_t>( |
| 418 | 1, kMaxQueueLengthMs - packets_->AverageQueueTimeMs()); |
| 419 | int min_bitrate_needed_kbps = |
| 420 | static_cast<int>(queue_size_bytes * 8 / avg_time_left_ms); |
| 421 | if (min_bitrate_needed_kbps > target_bitrate_kbps) |
| 422 | target_bitrate_kbps = min_bitrate_needed_kbps; |
| 423 | } |
| 424 | |
| 425 | media_budget_->set_target_rate_kbps(target_bitrate_kbps); |
| 426 | |
isheriff | 3168781 | 2016-10-04 08:43:09 -0700 | [diff] [blame] | 427 | elapsed_time_ms = std::min(kMaxIntervalTimeMs, elapsed_time_ms); |
| 428 | UpdateBudgetWithElapsedTime(elapsed_time_ms); |
stefan@webrtc.org | 80865fd | 2013-08-09 11:31:23 +0000 | [diff] [blame] | 429 | } |
philipel | a1ed0b3 | 2016-06-01 06:31:17 -0700 | [diff] [blame] | 430 | |
philipel | 1a93cde | 2016-06-03 01:41:45 -0700 | [diff] [blame] | 431 | bool is_probing = prober_->IsProbing(); |
philipel | c7bf32a | 2017-02-17 03:59:43 -0800 | [diff] [blame] | 432 | PacedPacketInfo pacing_info; |
isheriff | cc5903e | 2016-10-04 08:29:38 -0700 | [diff] [blame] | 433 | size_t bytes_sent = 0; |
| 434 | size_t recommended_probe_size = 0; |
| 435 | if (is_probing) { |
philipel | c7bf32a | 2017-02-17 03:59:43 -0800 | [diff] [blame] | 436 | pacing_info = prober_->CurrentCluster(); |
isheriff | cc5903e | 2016-10-04 08:29:38 -0700 | [diff] [blame] | 437 | recommended_probe_size = prober_->RecommendedMinProbeSize(); |
| 438 | } |
Peter Boström | e23e737 | 2015-10-08 11:44:14 +0200 | [diff] [blame] | 439 | while (!packets_->Empty()) { |
Peter Boström | e23e737 | 2015-10-08 11:44:14 +0200 | [diff] [blame] | 440 | // Since we need to release the lock in order to send, we first pop the |
| 441 | // element from the priority queue but keep it in storage, so that we can |
| 442 | // reinsert it if send fails. |
| 443 | const paced_sender::Packet& packet = packets_->BeginPop(); |
Stefan Holmer | b86d4e4 | 2015-12-07 10:26:18 +0100 | [diff] [blame] | 444 | |
philipel | c7bf32a | 2017-02-17 03:59:43 -0800 | [diff] [blame] | 445 | if (SendPacket(packet, pacing_info)) { |
Peter Boström | e23e737 | 2015-10-08 11:44:14 +0200 | [diff] [blame] | 446 | // Send succeeded, remove it from the queue. |
isheriff | cc5903e | 2016-10-04 08:29:38 -0700 | [diff] [blame] | 447 | bytes_sent += packet.bytes; |
Peter Boström | e23e737 | 2015-10-08 11:44:14 +0200 | [diff] [blame] | 448 | packets_->FinalizePop(packet); |
isheriff | cc5903e | 2016-10-04 08:29:38 -0700 | [diff] [blame] | 449 | if (is_probing && bytes_sent > recommended_probe_size) |
| 450 | break; |
Peter Boström | e23e737 | 2015-10-08 11:44:14 +0200 | [diff] [blame] | 451 | } else { |
| 452 | // Send failed, put it back into the queue. |
| 453 | packets_->CancelPop(packet); |
isheriff | cc5903e | 2016-10-04 08:29:38 -0700 | [diff] [blame] | 454 | break; |
Peter Boström | e23e737 | 2015-10-08 11:44:14 +0200 | [diff] [blame] | 455 | } |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 456 | } |
Peter Boström | e23e737 | 2015-10-08 11:44:14 +0200 | [diff] [blame] | 457 | |
isheriff | cc5903e | 2016-10-04 08:29:38 -0700 | [diff] [blame] | 458 | if (packets_->Empty() && !paused_) { |
| 459 | // We can not send padding unless a normal packet has first been sent. If we |
| 460 | // do, timestamps get messed up. |
| 461 | if (packet_counter_ > 0) { |
| 462 | int padding_needed = |
| 463 | static_cast<int>(is_probing ? (recommended_probe_size - bytes_sent) |
| 464 | : padding_budget_->bytes_remaining()); |
Peter Boström | e23e737 | 2015-10-08 11:44:14 +0200 | [diff] [blame] | 465 | |
isheriff | cc5903e | 2016-10-04 08:29:38 -0700 | [diff] [blame] | 466 | if (padding_needed > 0) |
philipel | c7bf32a | 2017-02-17 03:59:43 -0800 | [diff] [blame] | 467 | bytes_sent += SendPadding(padding_needed, pacing_info); |
isheriff | cc5903e | 2016-10-04 08:29:38 -0700 | [diff] [blame] | 468 | } |
perkj | 71ee44c | 2016-06-15 00:47:53 -0700 | [diff] [blame] | 469 | } |
philipel | b61927c | 2017-02-28 07:05:23 -0800 | [diff] [blame] | 470 | if (is_probing) { |
| 471 | probing_send_failure_ = bytes_sent == 0; |
| 472 | if (!probing_send_failure_) |
| 473 | prober_->ProbeSent(clock_->TimeInMilliseconds(), bytes_sent); |
| 474 | } |
nisse | b935984 | 2017-01-19 05:41:25 -0800 | [diff] [blame] | 475 | alr_detector_->OnBytesSent(bytes_sent, now_us / 1000); |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 476 | } |
| 477 | |
tommi | 919dce2 | 2017-03-15 07:45:36 -0700 | [diff] [blame] | 478 | void PacedSender::ProcessThreadAttached(ProcessThread* process_thread) { |
| 479 | LOG(LS_INFO) << "ProcessThreadAttached 0x" << std::hex << process_thread; |
| 480 | process_thread_ = process_thread; |
| 481 | } |
| 482 | |
philipel | 29dca2c | 2016-05-13 11:13:05 +0200 | [diff] [blame] | 483 | bool PacedSender::SendPacket(const paced_sender::Packet& packet, |
philipel | c7bf32a | 2017-02-17 03:59:43 -0800 | [diff] [blame] | 484 | const PacedPacketInfo& pacing_info) { |
stefan | 099110c | 2017-02-01 03:57:42 -0800 | [diff] [blame] | 485 | if (paused_) |
| 486 | return false; |
| 487 | if (media_budget_->bytes_remaining() == 0 && |
philipel | c7bf32a | 2017-02-17 03:59:43 -0800 | [diff] [blame] | 488 | pacing_info.probe_cluster_id == PacedPacketInfo::kNotAProbe) { |
stefan | 099110c | 2017-02-01 03:57:42 -0800 | [diff] [blame] | 489 | return false; |
terelius | 8b70faf | 2016-08-01 09:47:31 -0700 | [diff] [blame] | 490 | } |
philipel | c7bf32a | 2017-02-17 03:59:43 -0800 | [diff] [blame] | 491 | |
stefan@webrtc.org | 19a40ff | 2013-11-27 14:16:20 +0000 | [diff] [blame] | 492 | critsect_->Leave(); |
perkj | ec81bcd | 2016-05-11 06:01:13 -0700 | [diff] [blame] | 493 | const bool success = packet_sender_->TimeToSendPacket( |
| 494 | packet.ssrc, packet.sequence_number, packet.capture_time_ms, |
philipel | c7bf32a | 2017-02-17 03:59:43 -0800 | [diff] [blame] | 495 | packet.retransmission, pacing_info); |
stefan@webrtc.org | 19a40ff | 2013-11-27 14:16:20 +0000 | [diff] [blame] | 496 | critsect_->Enter(); |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 497 | |
Peter Boström | 7ecc163 | 2016-03-02 14:22:25 +0100 | [diff] [blame] | 498 | if (success) { |
Peter Boström | 7ecc163 | 2016-03-02 14:22:25 +0100 | [diff] [blame] | 499 | // TODO(holmer): High priority packets should only be accounted for if we |
| 500 | // are allocating bandwidth for audio. |
| 501 | if (packet.priority != kHighPriority) { |
| 502 | // Update media bytes sent. |
isheriff | 3168781 | 2016-10-04 08:43:09 -0700 | [diff] [blame] | 503 | UpdateBudgetWithBytesSent(packet.bytes); |
Peter Boström | 7ecc163 | 2016-03-02 14:22:25 +0100 | [diff] [blame] | 504 | } |
stefan@webrtc.org | 19a40ff | 2013-11-27 14:16:20 +0000 | [diff] [blame] | 505 | } |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 506 | |
| 507 | return success; |
| 508 | } |
| 509 | |
philipel | c7bf32a | 2017-02-17 03:59:43 -0800 | [diff] [blame] | 510 | size_t PacedSender::SendPadding(size_t padding_needed, |
| 511 | const PacedPacketInfo& pacing_info) { |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 512 | critsect_->Leave(); |
philipel | a1ed0b3 | 2016-06-01 06:31:17 -0700 | [diff] [blame] | 513 | size_t bytes_sent = |
philipel | c7bf32a | 2017-02-17 03:59:43 -0800 | [diff] [blame] | 514 | packet_sender_->TimeToSendPadding(padding_needed, pacing_info); |
sprang@webrtc.org | dcebf2d | 2014-11-04 16:27:16 +0000 | [diff] [blame] | 515 | critsect_->Enter(); |
| 516 | |
Stefan Holmer | 01b4888 | 2015-05-05 10:21:24 +0200 | [diff] [blame] | 517 | if (bytes_sent > 0) { |
isheriff | 3168781 | 2016-10-04 08:43:09 -0700 | [diff] [blame] | 518 | UpdateBudgetWithBytesSent(bytes_sent); |
Stefan Holmer | 01b4888 | 2015-05-05 10:21:24 +0200 | [diff] [blame] | 519 | } |
isheriff | cc5903e | 2016-10-04 08:29:38 -0700 | [diff] [blame] | 520 | return bytes_sent; |
stefan@webrtc.org | 19a40ff | 2013-11-27 14:16:20 +0000 | [diff] [blame] | 521 | } |
| 522 | |
isheriff | 3168781 | 2016-10-04 08:43:09 -0700 | [diff] [blame] | 523 | void PacedSender::UpdateBudgetWithElapsedTime(int64_t delta_time_ms) { |
stefan@webrtc.org | c3cc375 | 2013-06-04 09:36:56 +0000 | [diff] [blame] | 524 | media_budget_->IncreaseBudget(delta_time_ms); |
| 525 | padding_budget_->IncreaseBudget(delta_time_ms); |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 526 | } |
isheriff | 3168781 | 2016-10-04 08:43:09 -0700 | [diff] [blame] | 527 | |
| 528 | void PacedSender::UpdateBudgetWithBytesSent(size_t bytes_sent) { |
| 529 | media_budget_->UseBudget(bytes_sent); |
| 530 | padding_budget_->UseBudget(bytes_sent); |
| 531 | } |
pwestin@webrtc.org | b518017 | 2012-11-09 20:56:23 +0000 | [diff] [blame] | 532 | } // namespace webrtc |