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 |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
272 } | 272 } |
273 | 273 |
274 void SendSideCongestionController::OnTransportFeedback( | 274 void SendSideCongestionController::OnTransportFeedback( |
275 const rtcp::TransportFeedback& feedback) { | 275 const rtcp::TransportFeedback& feedback) { |
276 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 276 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
277 transport_feedback_adapter_.OnTransportFeedback(feedback); | 277 transport_feedback_adapter_.OnTransportFeedback(feedback); |
278 std::vector<PacketFeedback> feedback_vector = ReceivedPacketFeedbackVector( | 278 std::vector<PacketFeedback> feedback_vector = ReceivedPacketFeedbackVector( |
279 transport_feedback_adapter_.GetTransportFeedbackVector()); | 279 transport_feedback_adapter_.GetTransportFeedbackVector()); |
280 SortPacketFeedbackVector(&feedback_vector); | 280 SortPacketFeedbackVector(&feedback_vector); |
281 acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( | 281 acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( |
282 feedback_vector); | 282 feedback_vector, |
283 static_cast<bool>(pacer_->GetApplicationLimitedRegionStartTime())); | |
minyue-webrtc
2017/06/12 10:08:07
no need for explicit cast
tschumi
2017/06/12 11:33:28
It seams its needed, the compiler don't do a impli
| |
283 DelayBasedBwe::Result result; | 284 DelayBasedBwe::Result result; |
284 { | 285 { |
285 rtc::CritScope cs(&bwe_lock_); | 286 rtc::CritScope cs(&bwe_lock_); |
286 result = delay_based_bwe_->IncomingPacketFeedbackVector( | 287 result = delay_based_bwe_->IncomingPacketFeedbackVector( |
287 feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps()); | 288 feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps()); |
288 } | 289 } |
289 if (result.updated) | 290 if (result.updated) |
290 bitrate_controller_->OnDelayBasedBweResult(result); | 291 bitrate_controller_->OnDelayBasedBweResult(result); |
291 } | 292 } |
292 | 293 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
348 bool SendSideCongestionController::IsSendQueueFull() const { | 349 bool SendSideCongestionController::IsSendQueueFull() const { |
349 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; | 350 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; |
350 } | 351 } |
351 | 352 |
352 bool SendSideCongestionController::IsNetworkDown() const { | 353 bool SendSideCongestionController::IsNetworkDown() const { |
353 rtc::CritScope cs(&network_state_lock_); | 354 rtc::CritScope cs(&network_state_lock_); |
354 return network_state_ == kNetworkDown; | 355 return network_state_ == kNetworkDown; |
355 } | 356 } |
356 | 357 |
357 } // namespace webrtc | 358 } // namespace webrtc |
OLD | NEW |