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

Remove usage of runtime_enabled_features in WebRTC.

Browse Source 
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 <ilnik@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24868}
This commit is contained in:
Mirko Bonadei
2018-09-27 14:50:30 +02:00
committed by Commit Bot
parent efb94d57eb
commit 068a2e380b
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/congestion_controller/rtp/send_side_congestion_controller.cc
View File

@ -30,7 +30,6 @@
#include "rtc_base/socket.h" #include "rtc_base/socket.h"
#include "rtc_base/timeutils.h" #include "rtc_base/timeutils.h"
#include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/runtime_enabled_features.h"
using absl::make_unique; using absl::make_unique;
@ -52,10 +51,7 @@ const char kPacerPushbackExperiment[] = "WebRTC-PacerPushbackExperiment";
const int64_t PacerQueueUpdateIntervalMs = 25; const int64_t PacerQueueUpdateIntervalMs = 25;
bool IsPacerPushbackExperimentEnabled() { bool IsPacerPushbackExperimentEnabled() {
return webrtc::field_trial::IsEnabled(kPacerPushbackExperiment) || return webrtc::field_trial::IsEnabled(kPacerPushbackExperiment);
(!webrtc::field_trial::IsDisabled(kPacerPushbackExperiment) &&
webrtc::runtime_enabled_features::IsFeatureEnabled(
webrtc::runtime_enabled_features::kDualStreamModeFeatureName));
} }
bool IsCongestionWindowPushbackExperimentEnabled() { bool IsCongestionWindowPushbackExperimentEnabled() {

6
modules/congestion_controller/send_side_congestion_controller.cc
View File

@ -30,7 +30,6 @@
#include "rtc_base/socket.h" #include "rtc_base/socket.h"
#include "rtc_base/timeutils.h" #include "rtc_base/timeutils.h"
#include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/runtime_enabled_features.h"
namespace webrtc { namespace webrtc {
namespace { namespace {
@ -115,10 +114,7 @@ void SortPacketFeedbackVector(
} }
bool IsPacerPushbackExperimentEnabled() { bool IsPacerPushbackExperimentEnabled() {
return webrtc::field_trial::IsEnabled(kPacerPushbackExperiment) || return webrtc::field_trial::IsEnabled(kPacerPushbackExperiment);
(!webrtc::field_trial::IsDisabled(kPacerPushbackExperiment) &&
webrtc::runtime_enabled_features::IsFeatureEnabled(
webrtc::runtime_enabled_features::kDualStreamModeFeatureName));
} }
} // namespace } // namespace

1
modules/pacing/paced_sender.cc
View File

@ -27,7 +27,6 @@
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
#include "system_wrappers/include/clock.h" #include "system_wrappers/include/clock.h"
#include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/runtime_enabled_features.h"
namespace { namespace {
// Time limit in milliseconds between packet bursts. // Time limit in milliseconds between packet bursts.