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

Revert "Use runtime enabled features API to enable dual stream mode"

Browse Source 
This reverts commit 6f011dfdd413a903dcdf5a23a49109e64432326d.

Reason for revert: Broke internal builds

Original change's description:
> Use runtime enabled features API to enable dual stream mode
> 
> Bug: webrtc:8287
> Change-Id: I1a366d959a8b7f2a704baa7ea8ace64c1c398d52
> Reviewed-on: https://webrtc-review.googlesource.com/39008
> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Philip Eliasson <philipel@webrtc.org>
> Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21661}

TBR=phoglund@webrtc.org,ilnik@webrtc.org,nisse@webrtc.org,philipel@webrtc.org

Change-Id: I0af406066231b67dd0b8eb6808bdc3e3f77560b6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8287
Reviewed-on: https://webrtc-review.googlesource.com/40321
Reviewed-by: Lu Liu <lliuu@webrtc.org>
Commit-Queue: Lu Liu <lliuu@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21663}
This commit is contained in:
Lu Liu 2018-01-17 19:45:43 +00:00 committed by Commit Bot
parent 9cdd876548
commit c1094eb81d
17 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.gn
View File

@ -434,7 +434,6 @@ if (rtc_include_tests) {
"rtc_base:sequenced_task_checker_unittests",
"rtc_base:weak_ptr_unittests",
"system_wrappers:metrics_default",
"system_wrappers:runtime_enabled_features_default",
]
if (rtc_enable_protobuf) {

1
call/BUILD.gn
View File

@ -263,7 +263,6 @@ if (rtc_include_tests) {
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:direct_transport",
"../test:fake_audio_device",
"../test:field_trial",

7
examples/BUILD.gn
View File

@ -169,14 +169,12 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
":AppRTCMobile_ios_frameworks",
"../sdk:common_objc",
"../system_wrappers:field_trial_default",
"../system_wrappers:runtime_enabled_features_default",
]
} else {
deps = [
"../sdk:common_objc",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
}
}
@ -558,7 +556,6 @@ if (is_linux || is_win) {
"../rtc_base:rtc_json",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"//third_party/libyuv",
]
}
@ -597,7 +594,6 @@ if (is_linux || is_win) {
"../rtc_base:rtc_base_approved",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@ -616,7 +612,6 @@ if (is_linux || is_win) {
"../rtc_base:rtc_base_approved",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@ -635,7 +630,6 @@ if (is_linux || is_win) {
"../rtc_base:rtc_base_approved",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@ -695,7 +689,6 @@ if (is_win || is_android) {
"../rtc_base:rtc_base",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
if (is_android) {
deps += [ "../sdk/android:libjingle_peerconnection_jni" ]

1
media/BUILD.gn
View File

@ -612,7 +612,6 @@ if (rtc_include_tests) {
"../rtc_base:rtc_base_tests_main",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:audio_codec_mocks",
"../test:test_support",
"../test:video_test_common",

1
modules/congestion_controller/BUILD.gn
View File

@ -48,7 +48,6 @@ rtc_static_library("congestion_controller") {
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
"../../system_wrappers:runtime_enabled_features_api",
"../bitrate_controller",
"../pacing",
"../remote_bitrate_estimator",

10
modules/congestion_controller/send_side_congestion_controller.cc
View File

@ -28,7 +28,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 {
@ -94,13 +93,6 @@ void SortPacketFeedbackVector(
std::sort(input->begin(), input->end(), PacketFeedbackComparator());
}
bool IsPacerPushbackExperimentEnabled() {
return webrtc::field_trial::IsEnabled(kPacerPushbackExperiment) || (
!webrtc::field_trial::IsDisabled(kPacerPushbackExperiment) &&
webrtc::runtime_enabled_features::IsFeatureEnabled(
webrtc::runtime_enabled_features::kDualStreamModeFeatureName));
}
} // namespace
SendSideCongestionController::SendSideCongestionController(
@ -132,7 +124,7 @@ SendSideCongestionController::SendSideCongestionController(
accepted_queue_ms_(kDefaultAcceptedQueueMs),
was_in_alr_(false),
pacer_pushback_experiment_(
IsPacerPushbackExperimentEnabled()) {
webrtc::field_trial::IsEnabled(kPacerPushbackExperiment)) {
delay_based_bwe_->SetMinBitrate(min_bitrate_bps_);
if (in_cwnd_experiment_ &&
!ReadCwndExperimentParameter(&accepted_queue_ms_)) {

2
modules/pacing/BUILD.gn
View File

@ -43,7 +43,6 @@ rtc_static_library("pacing") {
"../../rtc_base/experiments:alr_experiment",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:runtime_enabled_features_api",
"../remote_bitrate_estimator",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
@ -70,7 +69,6 @@ if (rtc_include_tests) {
"../../rtc_base/experiments:alr_experiment",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:runtime_enabled_features_api",
"../../test:field_trial",
"../../test:test_support",
"../rtp_rtcp",

12
modules/pacing/paced_sender.cc
View File

@ -27,7 +27,6 @@
#include "rtc_base/ptr_util.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.
@ -38,15 +37,6 @@ const int64_t kPausedPacketIntervalMs = 500;
// time.
const int64_t kMaxIntervalTimeMs = 30;
const char kRoundRobinExperimentName[] = "WebRTC-RoundRobinPacing";
bool IsRoundRobinPacingEnabled() {
return webrtc::field_trial::IsEnabled(kRoundRobinExperimentName) || (
!webrtc::field_trial::IsDisabled(kRoundRobinExperimentName) &&
webrtc::runtime_enabled_features::IsFeatureEnabled(
webrtc::runtime_enabled_features::kDualStreamModeFeatureName));
}
} // namespace
namespace webrtc {
@ -58,7 +48,7 @@ PacedSender::PacedSender(const Clock* clock,
PacketSender* packet_sender,
RtcEventLog* event_log) :
PacedSender(clock, packet_sender, event_log,
IsRoundRobinPacingEnabled()
webrtc::field_trial::IsEnabled("WebRTC-RoundRobinPacing")
? rtc::MakeUnique<PacketQueue2>(clock)
: rtc::MakeUnique<PacketQueue>(clock)) {}

1
ortc/BUILD.gn
View File

@ -91,7 +91,6 @@ if (rtc_include_tests) {
"../rtc_base:rtc_base_tests_main",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
if (!build_with_chromium && is_clang) {

2
pc/BUILD.gn
View File

@ -309,7 +309,6 @@ if (rtc_include_tests) {
"../rtc_base:rtc_base_tests_main",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:test_support",
]
@ -496,7 +495,6 @@ if (rtc_include_tests) {
"../rtc_base:rtc_base_tests_main",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:audio_codec_mocks",
"../test:test_support",
]

2
sdk/BUILD.gn
View File

@ -751,7 +751,6 @@ if (is_ios || is_mac) {
"../rtc_base:rtc_base_approved",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
libs = [
@ -780,7 +779,6 @@ if (is_ios || is_mac) {
":ui_objc",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
}

1
sdk/android/BUILD.gn
View File

@ -471,7 +471,6 @@ rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
"../../system_wrappers:field_trial_default",
"../../system_wrappers:metrics_api",
"../../system_wrappers:metrics_default",
"../../system_wrappers:runtime_enabled_features_default",
]
}

4
system_wrappers/include/runtime_enabled_features.h
View File

@ -21,12 +21,8 @@
// TODO(ilnik): Find a more flexible way to use Chrome features.
// This interface requires manual translation from feature name to
// Chrome feature class in third_party/webrtc_overrides.
namespace webrtc {
namespace runtime_enabled_features {
const char kDualStreamModeFeatureName[] = "WebRtcDualStreamMode";
bool IsFeatureEnabled(std::string feature_name);
} // namespace runtime_enabled_features

2
system_wrappers/source/runtime_enabled_features_default.cc
View File

@ -22,7 +22,7 @@ namespace webrtc {
namespace runtime_enabled_features {
bool IsFeatureEnabled(std::string feature_name) {
if (feature_name == kDualStreamModeFeatureName)
if (feature_name == "WebRtcDualStreamMode")
return flags::FLAG_enable_dual_stream_mode;
return false;
}

2
test/BUILD.gn
View File

@ -214,7 +214,6 @@ if (rtc_include_tests) {
":perf_test",
"../rtc_base:rtc_base_approved",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"//testing/gmock",
"//testing/gtest",
]
@ -627,7 +626,6 @@ rtc_source_set("test_common") {
"../rtc_base:sequenced_task_checker",
"../system_wrappers",
"../system_wrappers:field_trial_api",
"../system_wrappers:runtime_enabled_features_api",
"../video",
"//testing/gmock",
"//testing/gtest",

1
test/fuzzers/BUILD.gn
View File

@ -18,7 +18,6 @@ rtc_static_library("webrtc_fuzzer_main") {
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:field_trial_default",
"../../system_wrappers:metrics_default",
"../../system_wrappers:runtime_enabled_features_default",
"//testing/libfuzzer:libfuzzer_main",
]
}

4
video/BUILD.gn
View File

@ -169,7 +169,6 @@ if (rtc_include_tests) {
":video_quality_test",
"../rtc_base:rtc_base_approved",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:field_trial",
"../test:run_test",
"../test:run_test_interface",
@ -195,7 +194,6 @@ if (rtc_include_tests) {
":video_quality_test",
"../rtc_base:rtc_base_approved",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:field_trial",
"../test:run_test",
"../test:run_test_interface",
@ -219,7 +217,6 @@ if (rtc_include_tests) {
":video_quality_test",
"../rtc_base:rtc_base_approved",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:field_trial",
"../test:run_test",
"../test:run_test_interface",
@ -252,7 +249,6 @@ if (rtc_include_tests) {
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:field_trial",
"../test:rtp_test_utils",
"../test:run_test",