From 068a2e380bebc2a0aef86f2c5e85b7ebcfb67095 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 27 Sep 2018 14:50:30 +0200 Subject: [PATCH] Remove usage of runtime_enabled_features in WebRTC. This is the first step in order to remove runtime_enabled_features code from WebRTC. Bug: webrtc:9693 Change-Id: Ic67f770c2166755ea45c782efb3e4184433ac15e Reviewed-on: https://webrtc-review.googlesource.com/102361 Reviewed-by: Ilya Nikolaevskiy Reviewed-by: Sebastian Jansson Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#24868} --- .../rtp/send_side_congestion_controller.cc | 6 +----- .../send_side_congestion_controller.cc | 6 +----- modules/pacing/paced_sender.cc | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/congestion_controller/rtp/send_side_congestion_controller.cc b/modules/congestion_controller/rtp/send_side_congestion_controller.cc index 6e6bf4dc7c..e0d8f145cb 100644 --- a/modules/congestion_controller/rtp/send_side_congestion_controller.cc +++ b/modules/congestion_controller/rtp/send_side_congestion_controller.cc @@ -30,7 +30,6 @@ #include "rtc_base/socket.h" #include "rtc_base/timeutils.h" #include "system_wrappers/include/field_trial.h" -#include "system_wrappers/include/runtime_enabled_features.h" using absl::make_unique; @@ -52,10 +51,7 @@ const char kPacerPushbackExperiment[] = "WebRTC-PacerPushbackExperiment"; const int64_t PacerQueueUpdateIntervalMs = 25; bool IsPacerPushbackExperimentEnabled() { - return webrtc::field_trial::IsEnabled(kPacerPushbackExperiment) || - (!webrtc::field_trial::IsDisabled(kPacerPushbackExperiment) && - webrtc::runtime_enabled_features::IsFeatureEnabled( - webrtc::runtime_enabled_features::kDualStreamModeFeatureName)); + return webrtc::field_trial::IsEnabled(kPacerPushbackExperiment); } bool IsCongestionWindowPushbackExperimentEnabled() { diff --git a/modules/congestion_controller/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc index 0439c1d567..5ff433a1a8 100644 --- a/modules/congestion_controller/send_side_congestion_controller.cc +++ b/modules/congestion_controller/send_side_congestion_controller.cc @@ -30,7 +30,6 @@ #include "rtc_base/socket.h" #include "rtc_base/timeutils.h" #include "system_wrappers/include/field_trial.h" -#include "system_wrappers/include/runtime_enabled_features.h" namespace webrtc { namespace { @@ -115,10 +114,7 @@ void SortPacketFeedbackVector( } bool IsPacerPushbackExperimentEnabled() { - return webrtc::field_trial::IsEnabled(kPacerPushbackExperiment) || - (!webrtc::field_trial::IsDisabled(kPacerPushbackExperiment) && - webrtc::runtime_enabled_features::IsFeatureEnabled( - webrtc::runtime_enabled_features::kDualStreamModeFeatureName)); + return webrtc::field_trial::IsEnabled(kPacerPushbackExperiment); } } // namespace diff --git a/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc index 0862d1d01e..8cc442c228 100644 --- a/modules/pacing/paced_sender.cc +++ b/modules/pacing/paced_sender.cc @@ -27,7 +27,6 @@ #include "rtc_base/logging.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" -#include "system_wrappers/include/runtime_enabled_features.h" namespace { // Time limit in milliseconds between packet bursts.