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