Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Side by Side Diff: webrtc/modules/congestion_controller/delay_based_bwe.cc

Issue 2708873003: Propagate packet pacing information to SendTimeHistory. (Closed)
Patch Set: TransportFeedbackAdapterTest fix. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 } else { 354 } else {
355 kalman_estimator_->Update(t_delta, ts_delta_ms, size_delta, 355 kalman_estimator_->Update(t_delta, ts_delta_ms, size_delta,
356 detector_.State(), info.arrival_time_ms); 356 detector_.State(), info.arrival_time_ms);
357 detector_.Detect(kalman_estimator_->offset(), ts_delta_ms, 357 detector_.Detect(kalman_estimator_->offset(), ts_delta_ms,
358 kalman_estimator_->num_of_deltas(), 358 kalman_estimator_->num_of_deltas(),
359 info.arrival_time_ms); 359 info.arrival_time_ms);
360 } 360 }
361 } 361 }
362 362
363 int probing_bps = 0; 363 int probing_bps = 0;
364 if (info.probe_cluster_id != PacedPacketInfo::kNotAProbe) { 364 if (info.pacing_info.probe_cluster_id != PacedPacketInfo::kNotAProbe) {
365 probing_bps = probe_bitrate_estimator_.HandleProbeAndEstimateBitrate(info); 365 probing_bps = probe_bitrate_estimator_.HandleProbeAndEstimateBitrate(info);
366 } 366 }
367 rtc::Optional<uint32_t> acked_bitrate_bps = 367 rtc::Optional<uint32_t> acked_bitrate_bps =
368 receiver_incoming_bitrate_.bitrate_bps(); 368 receiver_incoming_bitrate_.bitrate_bps();
369 // Currently overusing the bandwidth. 369 // Currently overusing the bandwidth.
370 if (detector_.State() == kBwOverusing) { 370 if (detector_.State() == kBwOverusing) {
371 if (acked_bitrate_bps && 371 if (acked_bitrate_bps &&
372 rate_control_.TimeToReduceFurther(now_ms, *acked_bitrate_bps)) { 372 rate_control_.TimeToReduceFurther(now_ms, *acked_bitrate_bps)) {
373 result.updated = 373 result.updated =
374 UpdateEstimate(info.arrival_time_ms, now_ms, acked_bitrate_bps, 374 UpdateEstimate(info.arrival_time_ms, now_ms, acked_bitrate_bps,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698