Chromium Code Reviews| 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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 225 bitrate_controller_->ResetBitrates(bitrate_bps, min_bitrate_bps, | 225 bitrate_controller_->ResetBitrates(bitrate_bps, min_bitrate_bps, |
| 226 max_bitrate_bps); | 226 max_bitrate_bps); |
| 227 min_bitrate_bps_ = min_bitrate_bps; | 227 min_bitrate_bps_ = min_bitrate_bps; |
| 228 max_bitrate_bps_ = max_bitrate_bps; | 228 max_bitrate_bps_ = max_bitrate_bps; |
| 229 // TODO(honghaiz): Recreate this object once the remote bitrate estimator is | 229 // TODO(honghaiz): Recreate this object once the remote bitrate estimator is |
| 230 // no longer exposed outside CongestionController. | 230 // no longer exposed outside CongestionController. |
| 231 remote_bitrate_estimator_.SetMinBitrate(min_bitrate_bps); | 231 remote_bitrate_estimator_.SetMinBitrate(min_bitrate_bps); |
| 232 | 232 |
| 233 transport_feedback_adapter_.InitBwe(); | 233 transport_feedback_adapter_.InitBwe(); |
| 234 transport_feedback_adapter_.SetStartBitrate(bitrate_bps); | 234 transport_feedback_adapter_.SetStartBitrate(bitrate_bps); |
| 235 transport_feedback_adapter_.SetMinBitrate(min_bitrate_bps); | 235 transport_feedback_adapter_.SetMinBitrate(min_bitrate_bps); |
|
stefan-webrtc
2017/02/22 14:38:00
Reading this code makes me think... What happens i
philipel
2017/02/23 11:57:01
SendTimeHistory is now also cleared when ResetBweA
| |
| 236 // TODO(holmer): Trigger a new probe once mid-call probing is implemented. | 236 |
| 237 probe_controller_.reset(new ProbeController(pacer_.get(), clock_)); | |
| 238 probe_controller_->SetBitrates(min_bitrate_bps, bitrate_bps, max_bitrate_bps); | |
| 239 | |
| 237 MaybeTriggerOnNetworkChanged(); | 240 MaybeTriggerOnNetworkChanged(); |
| 238 } | 241 } |
| 239 | 242 |
| 240 BitrateController* CongestionController::GetBitrateController() const { | 243 BitrateController* CongestionController::GetBitrateController() const { |
| 241 return bitrate_controller_.get(); | 244 return bitrate_controller_.get(); |
| 242 } | 245 } |
| 243 | 246 |
| 244 RemoteBitrateEstimator* CongestionController::GetRemoteBitrateEstimator( | 247 RemoteBitrateEstimator* CongestionController::GetRemoteBitrateEstimator( |
| 245 bool send_side_bwe) { | 248 bool send_side_bwe) { |
| 246 if (send_side_bwe) { | 249 if (send_side_bwe) { |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 370 bool CongestionController::IsSendQueueFull() const { | 373 bool CongestionController::IsSendQueueFull() const { |
| 371 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; | 374 return pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs; |
| 372 } | 375 } |
| 373 | 376 |
| 374 bool CongestionController::IsNetworkDown() const { | 377 bool CongestionController::IsNetworkDown() const { |
| 375 rtc::CritScope cs(&critsect_); | 378 rtc::CritScope cs(&critsect_); |
| 376 return network_state_ == kNetworkDown; | 379 return network_state_ == kNetworkDown; |
| 377 } | 380 } |
| 378 | 381 |
| 379 } // namespace webrtc | 382 } // namespace webrtc |
| OLD | NEW |