zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add configuration for capping allocation probes.

Browse Source 
Bug: webrtc:11354
Change-Id: If4d4b6b409da5036e37f288768b43b19531974fc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168440
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Christoffer Rodbro <crodbro@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30506}
This commit is contained in:
Christoffer Rodbro
2020-02-12 10:11:13 +01:00
committed by Commit Bot
parent 02d71fb882
commit 377f5a2197
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/congestion_controller/goog_cc/probe_controller.cc
View File

@ -99,7 +99,8 @@ ProbeControllerConfig::ProbeControllerConfig(
alr_probe_scale("alr_scale", 2),
first_allocation_probe_scale("alloc_p1", 1),
second_allocation_probe_scale("alloc_p2", 2),
allocation_allow_further_probing("alloc_probe_further", false) {
allocation_allow_further_probing("alloc_probe_further", false),
allocation_probe_max("alloc_probe_max", DataRate::PlusInfinity()) {
ParseFieldTrial(
{&first_exponential_probe_scale, &second_exponential_probe_scale,
&further_exponential_probe_scale, &further_probe_threshold,
@ -117,7 +118,7 @@ ProbeControllerConfig::ProbeControllerConfig(
key_value_config->Lookup("WebRTC-Bwe-AlrProbing"));
ParseFieldTrial(
{&first_allocation_probe_scale, &second_allocation_probe_scale,
&allocation_allow_further_probing},
&allocation_allow_further_probing, &allocation_probe_max},
key_value_config->Lookup("WebRTC-Bwe-AllocationProbing"));
}
@ -208,12 +209,18 @@ std::vector<ProbeClusterConfig> ProbeController::OnMaxTotalAllocatedBitrate(
if (!config_.first_allocation_probe_scale)
return std::vector<ProbeClusterConfig>();
std::vector<int64_t> probes = {
static_cast<int64_t>(config_.first_allocation_probe_scale.Value() *
max_total_allocated_bitrate)};
DataRate first_probe_rate = DataRate::bps(max_total_allocated_bitrate) *
config_.first_allocation_probe_scale.Value();
DataRate probe_cap = config_.allocation_probe_max.Get();
first_probe_rate = std::min(first_probe_rate, probe_cap);
std::vector<int64_t> probes = {first_probe_rate.bps()};
if (config_.second_allocation_probe_scale) {
probes.push_back(config_.second_allocation_probe_scale.Value() *
max_total_allocated_bitrate);
DataRate second_probe_rate =
DataRate::bps(max_total_allocated_bitrate) *
config_.second_allocation_probe_scale.Value();
second_probe_rate = std::min(second_probe_rate, probe_cap);
if (second_probe_rate > first_probe_rate)
probes.push_back(second_probe_rate.bps());
}
return InitiateProbing(at_time_ms, probes,
config_.allocation_allow_further_probing);

2
modules/congestion_controller/goog_cc/probe_controller.h
View File

@ -20,6 +20,7 @@
#include "api/rtc_event_log/rtc_event_log.h"
#include "api/transport/network_control.h"
#include "api/transport/webrtc_key_value_config.h"
#include "api/units/data_rate.h"
#include "rtc_base/constructor_magic.h"
#include "rtc_base/experiments/field_trial_parser.h"
#include "rtc_base/system/unused.h"
@ -50,6 +51,7 @@ struct ProbeControllerConfig {
FieldTrialOptional<double> first_allocation_probe_scale;
FieldTrialOptional<double> second_allocation_probe_scale;
FieldTrialFlag allocation_allow_further_probing;
FieldTrialParameter<DataRate> allocation_probe_max;
};
// This class controls initiation of probing to estimate initial channel