mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
ac426265b6
Replace factory that takes optional FieldTrialView with a constructor that takes non-optional reference to the same interface - all callers already guarantee it is not nullptr Replace several local IsEnabled/IsDisabled helpers with the same helpers in FieldTrialView In CongestionWindowPushbackController tests pass field trials bypassing global field trial string Bug: webrtc:42220378 Change-Id: Ic49ad78919d834a5e3b9b69545d3b39088023a75 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349900 Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#42270}
75 lines
2.7 KiB
C++
75 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h"
|
|
|
|
#include <algorithm>
|
|
#include <cstdint>
|
|
|
|
#include "api/field_trials_view.h"
|
|
#include "api/units/data_size.h"
|
|
#include "rtc_base/experiments/rate_control_settings.h"
|
|
|
|
namespace webrtc {
|
|
|
|
CongestionWindowPushbackController::CongestionWindowPushbackController(
|
|
const FieldTrialsView& key_value_config)
|
|
: add_pacing_(key_value_config.IsEnabled(
|
|
"WebRTC-AddPacingToCongestionWindowPushback")),
|
|
min_pushback_target_bitrate_bps_(
|
|
RateControlSettings(key_value_config)
|
|
.CongestionWindowMinPushbackTargetBitrateBps()),
|
|
current_data_window_(RateControlSettings(key_value_config)
|
|
.CongestionWindowInitialDataWindow()) {}
|
|
|
|
void CongestionWindowPushbackController::UpdateOutstandingData(
|
|
int64_t outstanding_bytes) {
|
|
outstanding_bytes_ = outstanding_bytes;
|
|
}
|
|
void CongestionWindowPushbackController::UpdatePacingQueue(
|
|
int64_t pacing_bytes) {
|
|
pacing_bytes_ = pacing_bytes;
|
|
}
|
|
|
|
void CongestionWindowPushbackController::SetDataWindow(DataSize data_window) {
|
|
current_data_window_ = data_window;
|
|
}
|
|
|
|
uint32_t CongestionWindowPushbackController::UpdateTargetBitrate(
|
|
uint32_t bitrate_bps) {
|
|
if (!current_data_window_ || current_data_window_->IsZero())
|
|
return bitrate_bps;
|
|
int64_t total_bytes = outstanding_bytes_;
|
|
if (add_pacing_)
|
|
total_bytes += pacing_bytes_;
|
|
double fill_ratio =
|
|
total_bytes / static_cast<double>(current_data_window_->bytes());
|
|
if (fill_ratio > 1.5) {
|
|
encoding_rate_ratio_ *= 0.9;
|
|
} else if (fill_ratio > 1) {
|
|
encoding_rate_ratio_ *= 0.95;
|
|
} else if (fill_ratio < 0.1) {
|
|
encoding_rate_ratio_ = 1.0;
|
|
} else {
|
|
encoding_rate_ratio_ *= 1.05;
|
|
encoding_rate_ratio_ = std::min(encoding_rate_ratio_, 1.0);
|
|
}
|
|
uint32_t adjusted_target_bitrate_bps =
|
|
static_cast<uint32_t>(bitrate_bps * encoding_rate_ratio_);
|
|
|
|
// Do not adjust below the minimum pushback bitrate but do obey if the
|
|
// original estimate is below it.
|
|
bitrate_bps = adjusted_target_bitrate_bps < min_pushback_target_bitrate_bps_
|
|
? std::min(bitrate_bps, min_pushback_target_bitrate_bps_)
|
|
: adjusted_target_bitrate_bps;
|
|
return bitrate_bps;
|
|
}
|
|
|
|
} // namespace webrtc
|