OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 result.updated = | 388 result.updated = |
389 UpdateEstimate(info.arrival_time_ms, now_ms, acked_bitrate_bps, | 389 UpdateEstimate(info.arrival_time_ms, now_ms, acked_bitrate_bps, |
390 &result.target_bitrate_bps); | 390 &result.target_bitrate_bps); |
391 } | 391 } |
392 if (result.updated) { | 392 if (result.updated) { |
393 last_update_ms_ = now_ms; | 393 last_update_ms_ = now_ms; |
394 BWE_TEST_LOGGING_PLOT(1, "target_bitrate_bps", now_ms, | 394 BWE_TEST_LOGGING_PLOT(1, "target_bitrate_bps", now_ms, |
395 result.target_bitrate_bps); | 395 result.target_bitrate_bps); |
396 if (event_log_ && (result.target_bitrate_bps != last_logged_bitrate_ || | 396 if (event_log_ && (result.target_bitrate_bps != last_logged_bitrate_ || |
397 detector_.State() != last_logged_state_)) { | 397 detector_.State() != last_logged_state_)) { |
398 event_log_->LogBwePacketDelayEvent(result.target_bitrate_bps, | 398 event_log_->LogDelayBasedBweUpdate(result.target_bitrate_bps, |
399 detector_.State()); | 399 detector_.State()); |
400 last_logged_bitrate_ = result.target_bitrate_bps; | 400 last_logged_bitrate_ = result.target_bitrate_bps; |
401 last_logged_state_ = detector_.State(); | 401 last_logged_state_ = detector_.State(); |
402 } | 402 } |
403 } | 403 } |
404 | 404 |
405 return result; | 405 return result; |
406 } | 406 } |
407 | 407 |
408 bool DelayBasedBwe::UpdateEstimate(int64_t arrival_time_ms, | 408 bool DelayBasedBwe::UpdateEstimate(int64_t arrival_time_ms, |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
445 void DelayBasedBwe::SetMinBitrate(int min_bitrate_bps) { | 445 void DelayBasedBwe::SetMinBitrate(int min_bitrate_bps) { |
446 // Called from both the configuration thread and the network thread. Shouldn't | 446 // Called from both the configuration thread and the network thread. Shouldn't |
447 // be called from the network thread in the future. | 447 // be called from the network thread in the future. |
448 rate_control_.SetMinBitrate(min_bitrate_bps); | 448 rate_control_.SetMinBitrate(min_bitrate_bps); |
449 } | 449 } |
450 | 450 |
451 int64_t DelayBasedBwe::GetProbingIntervalMs() const { | 451 int64_t DelayBasedBwe::GetProbingIntervalMs() const { |
452 return probing_interval_estimator_.GetIntervalMs(); | 452 return probing_interval_estimator_.GetIntervalMs(); |
453 } | 453 } |
454 } // namespace webrtc | 454 } // namespace webrtc |
OLD | NEW |