admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland "Replace field trials with WebRtcKeyValueConfig in LossBasedBandwidthEstimation"

Browse Source 
This reverts commit 7bad75b3906ae78b67b2a8cec095d877deb58215.

Reason for revert: Downstream projects fixed.

Original change's description:
> Revert "Replace field trials with WebRtcKeyValueConfig in LossBasedBandwidthEstimation"
>
> This reverts commit 51f8e09540b1816236ceb1eaa540a7adb019b393.
>
> Reason for revert: Breaks downstream project.
>
> Original change's description:
> > Replace field trials with WebRtcKeyValueConfig in LossBasedBandwidthEstimation
> >
> >
> > Bug: webrtc:10335
> > Change-Id: I85d62b9b63e0b6ec5dd4b957738a67a9a11e3a1f
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/205627
> > Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org>
> > Commit-Queue: Per Kjellander <perkj@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#33210}
>
> TBR=perkj@webrtc.org,crodbro@webrtc.org
>
> Change-Id: I220a0e5316c54c435d04bc2bbd714b9d9b92be26
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:10335
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/206645
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#33214}

TBR=mbonadei@webrtc.org,perkj@webrtc.org,crodbro@webrtc.org

# Not skipping CQ checks because this is a reland.

Bug: webrtc:10335
Change-Id: I894be638d987e1ac39d7e8a9e642622f14e1acd1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/206806
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33221}
This commit is contained in:
Per Kjellander 2021-02-10 15:16:26 +00:00 committed by Commit Bot
parent d15a575ec3
commit 4b1c72c2f9
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc
View File

@ -14,9 +14,9 @@
#include <string>
#include <vector>
#include "absl/strings/match.h"
#include "api/units/data_rate.h"
#include "api/units/time_delta.h"
#include "system_wrappers/include/field_trial.h"
namespace webrtc {
namespace {
@ -71,10 +71,16 @@ double ExponentialUpdate(TimeDelta window, TimeDelta interval) {
return 1.0f - exp(interval / window * -1.0);
}
bool IsEnabled(const webrtc::WebRtcKeyValueConfig& key_value_config,
absl::string_view name) {
return absl::StartsWith(key_value_config.Lookup(name), "Enabled");
}
} // namespace
LossBasedControlConfig::LossBasedControlConfig()
: enabled(field_trial::IsEnabled(kBweLossBasedControl)),
LossBasedControlConfig::LossBasedControlConfig(
const WebRtcKeyValueConfig* key_value_config)
: enabled(IsEnabled(*key_value_config, kBweLossBasedControl)),
min_increase_factor("min_incr", 1.02),
max_increase_factor("max_incr", 1.08),
increase_low_rtt("incr_low_rtt", TimeDelta::Millis(200)),
@ -92,7 +98,6 @@ LossBasedControlConfig::LossBasedControlConfig()
allow_resets("resets", false),
decrease_interval("decr_intvl", TimeDelta::Millis(300)),
loss_report_timeout("timeout", TimeDelta::Millis(6000)) {
std::string trial_string = field_trial::FindFullName(kBweLossBasedControl);
ParseFieldTrial(
{&min_increase_factor, &max_increase_factor, &increase_low_rtt,
&increase_high_rtt, &decrease_factor, &loss_window, &loss_max_window,
@ -100,14 +105,15 @@ LossBasedControlConfig::LossBasedControlConfig()
&loss_bandwidth_balance_increase, &loss_bandwidth_balance_decrease,
&loss_bandwidth_balance_exponent, &allow_resets, &decrease_interval,
&loss_report_timeout},
trial_string);
key_value_config->Lookup(kBweLossBasedControl));
}
LossBasedControlConfig::LossBasedControlConfig(const LossBasedControlConfig&) =
default;
LossBasedControlConfig::~LossBasedControlConfig() = default;
LossBasedBandwidthEstimation::LossBasedBandwidthEstimation()
: config_(LossBasedControlConfig()),
LossBasedBandwidthEstimation::LossBasedBandwidthEstimation(
const WebRtcKeyValueConfig* key_value_config)
: config_(key_value_config),
average_loss_(0),
average_loss_max_(0),
loss_based_bitrate_(DataRate::Zero()),

6
modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.h
View File

@ -14,6 +14,7 @@
#include <vector>
#include "api/transport/network_types.h"
#include "api/transport/webrtc_key_value_config.h"
#include "api/units/data_rate.h"
#include "api/units/time_delta.h"
#include "api/units/timestamp.h"
@ -22,7 +23,7 @@
namespace webrtc {
struct LossBasedControlConfig {
LossBasedControlConfig();
explicit LossBasedControlConfig(const WebRtcKeyValueConfig* key_value_config);
LossBasedControlConfig(const LossBasedControlConfig&);
LossBasedControlConfig& operator=(const LossBasedControlConfig&) = default;
~LossBasedControlConfig();
@ -46,7 +47,8 @@ struct LossBasedControlConfig {
class LossBasedBandwidthEstimation {
public:
LossBasedBandwidthEstimation();
explicit LossBasedBandwidthEstimation(
const WebRtcKeyValueConfig* key_value_config);
void Update(Timestamp at_time,
DataRate min_bitrate,
TimeDelta last_round_trip_time);

1
modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc
View File

@ -226,6 +226,7 @@ SendSideBandwidthEstimation::SendSideBandwidthEstimation(
low_loss_threshold_(kDefaultLowLossThreshold),
high_loss_threshold_(kDefaultHighLossThreshold),
bitrate_threshold_(kDefaultBitrateThreshold),
loss_based_bandwidth_estimation_(key_value_config),
receiver_limit_caps_only_("Enabled") {
RTC_DCHECK(event_log);
if (BweLossExperimentIsEnabled()) {