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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 &bitrate_bps, &fraction_loss, &rtt); | 335 &bitrate_bps, &fraction_loss, &rtt); |
336 if (estimate_changed) { | 336 if (estimate_changed) { |
337 pacer_->SetEstimatedBitrate(bitrate_bps); | 337 pacer_->SetEstimatedBitrate(bitrate_bps); |
338 probe_controller_->SetEstimatedBitrate(bitrate_bps); | 338 probe_controller_->SetEstimatedBitrate(bitrate_bps); |
339 retransmission_rate_limiter_->SetMaxRate(bitrate_bps); | 339 retransmission_rate_limiter_->SetMaxRate(bitrate_bps); |
340 } | 340 } |
341 | 341 |
342 bitrate_bps = IsNetworkDown() || IsSendQueueFull() ? 0 : bitrate_bps; | 342 bitrate_bps = IsNetworkDown() || IsSendQueueFull() ? 0 : bitrate_bps; |
343 | 343 |
344 if (HasNetworkParametersToReportChanged(bitrate_bps, fraction_loss, rtt)) { | 344 if (HasNetworkParametersToReportChanged(bitrate_bps, fraction_loss, rtt)) { |
345 observer_->OnNetworkChanged( | 345 observer_->OnNetworkChanged(bitrate_bps, fraction_loss, rtt); |
346 bitrate_bps, fraction_loss, rtt, | |
347 transport_feedback_adapter_.GetProbingIntervalMs()); | |
348 remote_estimator_proxy_.OnBitrateChanged(bitrate_bps); | 346 remote_estimator_proxy_.OnBitrateChanged(bitrate_bps); |
349 } | 347 } |
350 } | 348 } |
351 | 349 |
352 bool CongestionController::HasNetworkParametersToReportChanged( | 350 bool CongestionController::HasNetworkParametersToReportChanged( |
353 uint32_t bitrate_bps, | 351 uint32_t bitrate_bps, |
354 uint8_t fraction_loss, | 352 uint8_t fraction_loss, |
355 int64_t rtt) { | 353 int64_t rtt) { |
356 rtc::CritScope cs(&critsect_); | 354 rtc::CritScope cs(&critsect_); |
357 bool changed = | 355 bool changed = |
(...skipping 13 matching lines...) Expand all Loading... |
371 bool CongestionController::IsSendQueueFull() const { | 369 bool CongestionController::IsSendQueueFull() const { |
372 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; | 370 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; |
373 } | 371 } |
374 | 372 |
375 bool CongestionController::IsNetworkDown() const { | 373 bool CongestionController::IsNetworkDown() const { |
376 rtc::CritScope cs(&critsect_); | 374 rtc::CritScope cs(&critsect_); |
377 return network_state_ == kNetworkDown; | 375 return network_state_ == kNetworkDown; |
378 } | 376 } |
379 | 377 |
380 } // namespace webrtc | 378 } // namespace webrtc |
OLD | NEW |