OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 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 | 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 | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #include "webrtc/modules/congestion_controller/include/send_side_congestion_cont
roller.h" | 11 #include "webrtc/modules/congestion_controller/include/send_side_congestion_cont
roller.h" |
12 | 12 |
13 #include <algorithm> | 13 #include <algorithm> |
14 #include <memory> | 14 #include <memory> |
15 #include <vector> | 15 #include <vector> |
16 | 16 |
17 #include "webrtc/base/checks.h" | 17 #include "webrtc/base/checks.h" |
18 #include "webrtc/base/logging.h" | 18 #include "webrtc/base/logging.h" |
19 #include "webrtc/base/ptr_util.h" | |
20 #include "webrtc/base/rate_limiter.h" | 19 #include "webrtc/base/rate_limiter.h" |
21 #include "webrtc/base/socket.h" | 20 #include "webrtc/base/socket.h" |
22 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" | 21 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" |
23 #include "webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h" | |
24 #include "webrtc/modules/congestion_controller/probe_controller.h" | 22 #include "webrtc/modules/congestion_controller/probe_controller.h" |
25 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" | 23 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" |
26 | 24 |
27 namespace webrtc { | 25 namespace webrtc { |
28 namespace { | 26 namespace { |
29 | 27 |
30 static const int64_t kRetransmitWindowSizeMs = 500; | 28 static const int64_t kRetransmitWindowSizeMs = 500; |
31 | 29 |
32 // Makes sure that the bitrate and the min, max values are in valid range. | 30 // Makes sure that the bitrate and the min, max values are in valid range. |
33 static void ClampBitrates(int* bitrate_bps, | 31 static void ClampBitrates(int* bitrate_bps, |
34 int* min_bitrate_bps, | 32 int* min_bitrate_bps, |
35 int* max_bitrate_bps) { | 33 int* max_bitrate_bps) { |
36 // TODO(holmer): We should make sure the default bitrates are set to 10 kbps, | 34 // TODO(holmer): We should make sure the default bitrates are set to 10 kbps, |
37 // and that we don't try to set the min bitrate to 0 from any applications. | 35 // and that we don't try to set the min bitrate to 0 from any applications. |
38 // The congestion controller should allow a min bitrate of 0. | 36 // The congestion controller should allow a min bitrate of 0. |
39 if (*min_bitrate_bps < congestion_controller::GetMinBitrateBps()) | 37 if (*min_bitrate_bps < congestion_controller::GetMinBitrateBps()) |
40 *min_bitrate_bps = congestion_controller::GetMinBitrateBps(); | 38 *min_bitrate_bps = congestion_controller::GetMinBitrateBps(); |
41 if (*max_bitrate_bps > 0) | 39 if (*max_bitrate_bps > 0) |
42 *max_bitrate_bps = std::max(*min_bitrate_bps, *max_bitrate_bps); | 40 *max_bitrate_bps = std::max(*min_bitrate_bps, *max_bitrate_bps); |
43 if (*bitrate_bps > 0) | 41 if (*bitrate_bps > 0) |
44 *bitrate_bps = std::max(*min_bitrate_bps, *bitrate_bps); | 42 *bitrate_bps = std::max(*min_bitrate_bps, *bitrate_bps); |
45 } | 43 } |
46 | 44 |
47 std::vector<webrtc::PacketFeedback> ReceivedPacketFeedbackVector( | |
48 const std::vector<webrtc::PacketFeedback>& input) { | |
49 std::vector<PacketFeedback> received_packet_feedback_vector; | |
50 auto is_received = [](const webrtc::PacketFeedback& packet_feedback) { | |
51 return packet_feedback.arrival_time_ms != | |
52 webrtc::PacketFeedback::kNotReceived; | |
53 }; | |
54 std::copy_if(input.begin(), input.end(), | |
55 std::back_inserter(received_packet_feedback_vector), | |
56 is_received); | |
57 return received_packet_feedback_vector; | |
58 } | |
59 | |
60 void SortPacketFeedbackVector( | |
61 std::vector<webrtc::PacketFeedback>* const input) { | |
62 RTC_DCHECK(input); | |
63 std::sort(input->begin(), input->end(), PacketFeedbackComparator()); | |
64 } | |
65 | |
66 } // namespace | 45 } // namespace |
67 | 46 |
68 SendSideCongestionController::SendSideCongestionController( | 47 SendSideCongestionController::SendSideCongestionController( |
69 const Clock* clock, | 48 const Clock* clock, |
70 Observer* observer, | 49 Observer* observer, |
71 RtcEventLog* event_log, | 50 RtcEventLog* event_log, |
72 PacketRouter* packet_router) | 51 PacketRouter* packet_router) |
73 : SendSideCongestionController( | 52 : SendSideCongestionController( |
74 clock, | 53 clock, |
75 observer, | 54 observer, |
76 event_log, | 55 event_log, |
77 std::unique_ptr<PacedSender>( | 56 std::unique_ptr<PacedSender>( |
78 new PacedSender(clock, packet_router, event_log))) {} | 57 new PacedSender(clock, packet_router, event_log))) {} |
79 | 58 |
80 SendSideCongestionController::SendSideCongestionController( | 59 SendSideCongestionController::SendSideCongestionController( |
81 const Clock* clock, | 60 const Clock* clock, |
82 Observer* observer, | 61 Observer* observer, |
83 RtcEventLog* event_log, | 62 RtcEventLog* event_log, |
84 std::unique_ptr<PacedSender> pacer) | 63 std::unique_ptr<PacedSender> pacer) |
85 : clock_(clock), | 64 : clock_(clock), |
86 observer_(observer), | 65 observer_(observer), |
87 event_log_(event_log), | 66 event_log_(event_log), |
88 pacer_(std::move(pacer)), | 67 pacer_(std::move(pacer)), |
89 bitrate_controller_( | 68 bitrate_controller_( |
90 BitrateController::CreateBitrateController(clock_, event_log)), | 69 BitrateController::CreateBitrateController(clock_, event_log)), |
91 acknowledged_bitrate_estimator_( | |
92 rtc::MakeUnique<AcknowledgedBitrateEstimator>()), | |
93 probe_controller_(new ProbeController(pacer_.get(), clock_)), | 70 probe_controller_(new ProbeController(pacer_.get(), clock_)), |
94 retransmission_rate_limiter_( | 71 retransmission_rate_limiter_( |
95 new RateLimiter(clock, kRetransmitWindowSizeMs)), | 72 new RateLimiter(clock, kRetransmitWindowSizeMs)), |
96 transport_feedback_adapter_(clock_), | 73 transport_feedback_adapter_(clock_), |
97 last_reported_bitrate_bps_(0), | 74 last_reported_bitrate_bps_(0), |
98 last_reported_fraction_loss_(0), | 75 last_reported_fraction_loss_(0), |
99 last_reported_rtt_(0), | 76 last_reported_rtt_(0), |
100 network_state_(kNetworkUp), | 77 network_state_(kNetworkUp), |
101 min_bitrate_bps_(congestion_controller::GetMinBitrateBps()), | 78 min_bitrate_bps_(congestion_controller::GetMinBitrateBps()), |
102 delay_based_bwe_(new DelayBasedBwe(event_log_, clock_)) { | 79 delay_based_bwe_(new DelayBasedBwe(event_log_, clock_)) { |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 // no longer exposed outside SendSideCongestionController. | 138 // no longer exposed outside SendSideCongestionController. |
162 bitrate_controller_->ResetBitrates(bitrate_bps, min_bitrate_bps, | 139 bitrate_controller_->ResetBitrates(bitrate_bps, min_bitrate_bps, |
163 max_bitrate_bps); | 140 max_bitrate_bps); |
164 | 141 |
165 transport_feedback_adapter_.SetNetworkIds(network_route.local_network_id, | 142 transport_feedback_adapter_.SetNetworkIds(network_route.local_network_id, |
166 network_route.remote_network_id); | 143 network_route.remote_network_id); |
167 { | 144 { |
168 rtc::CritScope cs(&bwe_lock_); | 145 rtc::CritScope cs(&bwe_lock_); |
169 min_bitrate_bps_ = min_bitrate_bps; | 146 min_bitrate_bps_ = min_bitrate_bps; |
170 delay_based_bwe_.reset(new DelayBasedBwe(event_log_, clock_)); | 147 delay_based_bwe_.reset(new DelayBasedBwe(event_log_, clock_)); |
171 acknowledged_bitrate_estimator_.reset(new AcknowledgedBitrateEstimator()); | |
172 delay_based_bwe_->SetStartBitrate(bitrate_bps); | 148 delay_based_bwe_->SetStartBitrate(bitrate_bps); |
173 delay_based_bwe_->SetMinBitrate(min_bitrate_bps); | 149 delay_based_bwe_->SetMinBitrate(min_bitrate_bps); |
174 } | 150 } |
175 | 151 |
176 probe_controller_->Reset(); | 152 probe_controller_->Reset(); |
177 probe_controller_->SetBitrates(min_bitrate_bps, bitrate_bps, max_bitrate_bps); | 153 probe_controller_->SetBitrates(min_bitrate_bps, bitrate_bps, max_bitrate_bps); |
178 | 154 |
179 MaybeTriggerOnNetworkChanged(); | 155 MaybeTriggerOnNetworkChanged(); |
180 } | 156 } |
181 | 157 |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 size_t length, | 244 size_t length, |
269 const PacedPacketInfo& pacing_info) { | 245 const PacedPacketInfo& pacing_info) { |
270 transport_feedback_adapter_.AddPacket(ssrc, sequence_number, length, | 246 transport_feedback_adapter_.AddPacket(ssrc, sequence_number, length, |
271 pacing_info); | 247 pacing_info); |
272 } | 248 } |
273 | 249 |
274 void SendSideCongestionController::OnTransportFeedback( | 250 void SendSideCongestionController::OnTransportFeedback( |
275 const rtcp::TransportFeedback& feedback) { | 251 const rtcp::TransportFeedback& feedback) { |
276 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 252 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
277 transport_feedback_adapter_.OnTransportFeedback(feedback); | 253 transport_feedback_adapter_.OnTransportFeedback(feedback); |
278 std::vector<PacketFeedback> feedback_vector = ReceivedPacketFeedbackVector( | 254 std::vector<PacketFeedback> feedback_vector = |
279 transport_feedback_adapter_.GetTransportFeedbackVector()); | 255 transport_feedback_adapter_.GetTransportFeedbackVector(); |
280 SortPacketFeedbackVector(&feedback_vector); | |
281 acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( | |
282 feedback_vector); | |
283 DelayBasedBwe::Result result; | 256 DelayBasedBwe::Result result; |
284 { | 257 { |
285 rtc::CritScope cs(&bwe_lock_); | 258 rtc::CritScope cs(&bwe_lock_); |
286 result = delay_based_bwe_->IncomingPacketFeedbackVector( | 259 result = delay_based_bwe_->IncomingPacketFeedbackVector(feedback_vector); |
287 feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps()); | |
288 } | 260 } |
289 if (result.updated) | 261 if (result.updated) |
290 bitrate_controller_->OnDelayBasedBweResult(result); | 262 bitrate_controller_->OnDelayBasedBweResult(result); |
291 } | 263 } |
292 | 264 |
293 std::vector<PacketFeedback> | 265 std::vector<PacketFeedback> |
294 SendSideCongestionController::GetTransportFeedbackVector() const { | 266 SendSideCongestionController::GetTransportFeedbackVector() const { |
295 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 267 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
296 return transport_feedback_adapter_.GetTransportFeedbackVector(); | 268 return transport_feedback_adapter_.GetTransportFeedbackVector(); |
297 } | 269 } |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 bool SendSideCongestionController::IsSendQueueFull() const { | 320 bool SendSideCongestionController::IsSendQueueFull() const { |
349 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; | 321 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; |
350 } | 322 } |
351 | 323 |
352 bool SendSideCongestionController::IsNetworkDown() const { | 324 bool SendSideCongestionController::IsNetworkDown() const { |
353 rtc::CritScope cs(&network_state_lock_); | 325 rtc::CritScope cs(&network_state_lock_); |
354 return network_state_ == kNetworkDown; | 326 return network_state_ == kNetworkDown; |
355 } | 327 } |
356 | 328 |
357 } // namespace webrtc | 329 } // namespace webrtc |
OLD | NEW |