commit 72e52ee6191f23dd74b0950ef94b4f1a8558d9fe
author Erik Språng <sprang@webrtc.org> Thu Nov 29 11:41:53 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Thu Nov 29 14:17:41 2018 +0000
tree df944ecb1c303b2626e13a8e58460753891032df
parent c4862f452d1351a7f47d794a937e615107e1f717

Make simulcast screenshare default-on

Bug: chromium:690537
Change-Id: I7380f5e7b3faa20ba60bebee8b8b4d74db885faf
Reviewed-on: https://webrtc-review.googlesource.com/c/112381
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25840}

media/engine/simulcast.cc

diff --git a/media/engine/simulcast.cc b/media/engine/simulcast.cc
index 6a01016..0103051 100644
--- a/media/engine/simulcast.cc
+++ b/media/engine/simulcast.cc
@@ -397,7 +397,7 @@
 }
 
 bool ScreenshareSimulcastFieldTrialEnabled() {
-  return webrtc::field_trial::IsEnabled(kSimulcastScreenshareFieldTrialName);
+  return !webrtc::field_trial::IsDisabled(kSimulcastScreenshareFieldTrialName);
 }
 
 }  // namespace cricket

media/engine/simulcast_unittest.cc

diff --git a/media/engine/simulcast_unittest.cc b/media/engine/simulcast_unittest.cc
index 0c27816..ecc697c 100644
--- a/media/engine/simulcast_unittest.cc
+++ b/media/engine/simulcast_unittest.cc
@@ -222,6 +222,7 @@
 }
 
 TEST(SimulcastTest, GetConfigForScreenshare) {
+  test::ScopedFieldTrials field_trials("WebRTC-SimulcastScreenshare/Disabled/");
   const size_t kMaxLayers = 3;
   std::vector<VideoStream> streams = cricket::GetSimulcastConfig(
       kMaxLayers, 1400, 800, kMaxBitrateBps, kBitratePriority, kQpMax, kMaxFps,
@@ -241,8 +242,6 @@
 }
 
 TEST(SimulcastTest, GetConfigForScreenshareSimulcast) {
-  test::ScopedFieldTrials field_trials("WebRTC-SimulcastScreenshare/Enabled/");
-
   const size_t kMaxLayers = 3;
   std::vector<VideoStream> streams = cricket::GetSimulcastConfig(
       kMaxLayers, 1400, 800, kMaxBitrateBps, kBitratePriority, kQpMax, kMaxFps,
@@ -263,8 +262,6 @@
 }
 
 TEST(SimulcastTest, GetConfigForScreenshareSimulcastWithLimitedMaxLayers) {
-  test::ScopedFieldTrials field_trials("WebRTC-SimulcastScreenshare/Enabled/");
-
   const size_t kMaxLayers = 1;
   std::vector<VideoStream> streams = cricket::GetSimulcastConfig(
       kMaxLayers, 1400, 800, kMaxBitrateBps, kBitratePriority, kQpMax, kMaxFps,
@@ -274,8 +271,6 @@
 }
 
 TEST(SimulcastTest, SimulcastScreenshareMaxBitrateAdjustedForResolution) {
-  test::ScopedFieldTrials field_trials("WebRTC-SimulcastScreenshare/Enabled/");
-
   constexpr int kScreenshareHighStreamMinBitrateBps = 600000;
   constexpr int kScreenshareHighStreamMaxBitrateBps = 1250000;
   constexpr int kMaxBitrate960_540 = 900000;

media/engine/webrtcvideoengine_unittest.cc

diff --git a/media/engine/webrtcvideoengine_unittest.cc b/media/engine/webrtcvideoengine_unittest.cc
index ab04fa6..543fa3a 100644
--- a/media/engine/webrtcvideoengine_unittest.cc
+++ b/media/engine/webrtcvideoengine_unittest.cc
@@ -6976,21 +6976,19 @@
 
 TEST_F(WebRtcVideoChannelSimulcastTest,
        SetSendCodecsForConferenceModeScreenshare) {
+  webrtc::test::ScopedFieldTrials field_trials(
+      "WebRTC-SimulcastScreenshare/Disabled/");
   VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 1, true,
                           true);
 }
 
 TEST_F(WebRtcVideoChannelSimulcastTest, SetSendCodecsForSimulcastScreenshare) {
-  webrtc::test::ScopedFieldTrials override_field_trials_(
-      "WebRTC-SimulcastScreenshare/Enabled/");
   VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 2, true,
                           true);
 }
 
 TEST_F(WebRtcVideoChannelSimulcastTest,
        NoSimulcastScreenshareWithoutConference) {
-  webrtc::test::ScopedFieldTrials override_field_trials_(
-      "WebRTC-SimulcastScreenshare/Enabled/");
   VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 1, true,
                           false);
 }