From 5b84f67fba00aa7572ead322d4272b6c6f8ee50c Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Mon, 1 Apr 2019 17:38:41 +0200 Subject: [PATCH] Cleaner reading of field trials in GoogCcNetworkController. Bug: webrtc:9883 Change-Id: Ib871dfdef6221f2a231f6862edec6ed7db684613 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130515 Commit-Queue: Sebastian Jansson Reviewed-by: Jonas Olsson Cr-Commit-Position: refs/heads/master@{#27420} --- .../goog_cc/goog_cc_network_control.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc index e39d43f615..408df93753 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -69,7 +69,12 @@ int64_t GetBpsOrDefault(const absl::optional& rate, return fallback_bps; } } - +bool IsEnabled(const WebRtcKeyValueConfig* config, absl::string_view key) { + return config->Lookup(key).find("Enabled") == 0; +} +bool IsNotDisabled(const WebRtcKeyValueConfig* config, absl::string_view key) { + return config->Lookup(key).find("Disabled") != 0; +} } // namespace GoogCcNetworkController::GoogCcNetworkController(RtcEventLog* event_log, @@ -82,14 +87,11 @@ GoogCcNetworkController::GoogCcNetworkController(RtcEventLog* event_log, safe_reset_on_route_change_("Enabled"), safe_reset_acknowledged_rate_("ack"), use_stable_bandwidth_estimate_( - key_value_config_->Lookup("WebRTC-Bwe-StableBandwidthEstimate") - .find("Enabled") == 0), + IsEnabled(key_value_config_, "WebRTC-Bwe-StableBandwidthEstimate")), fall_back_to_probe_rate_( - key_value_config_->Lookup("WebRTC-Bwe-ProbeRateFallback") - .find("Enabled") == 0), + IsEnabled(key_value_config_, "WebRTC-Bwe-ProbeRateFallback")), use_min_allocatable_as_lower_bound_( - key_value_config_->Lookup("WebRTC-Bwe-MinAllocAsLowerBound") - .find("Disabled") != 0), + IsNotDisabled(key_value_config_, "WebRTC-Bwe-MinAllocAsLowerBound")), rate_control_settings_( RateControlSettings::ParseFromKeyValueConfig(key_value_config_)), probe_controller_(new ProbeController(key_value_config_, event_log)),