mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-14 06:10:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make simulcast screenshare default-on

Browse source 
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}
This commit is contained in:
Erik Språng 2018-11-29 11:41:53 +01:00 committed by Commit Bot
parent c4862f452d
commit 72e52ee619
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/engine/simulcast.cc
View file

@ -397,7 +397,7 @@ std::vector<webrtc::VideoStream> GetScreenshareLayers(
} }
bool ScreenshareSimulcastFieldTrialEnabled() { bool ScreenshareSimulcastFieldTrialEnabled() {
return webrtc::field_trial::IsEnabled(kSimulcastScreenshareFieldTrialName); return !webrtc::field_trial::IsDisabled(kSimulcastScreenshareFieldTrialName);
} }
} // namespace cricket } // namespace cricket

7
media/engine/simulcast_unittest.cc
View file

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

6
media/engine/webrtcvideoengine_unittest.cc
View file

@ -6976,21 +6976,19 @@ TEST_F(WebRtcVideoChannelSimulcastTest, SetSendCodecsForScreenshare) {
TEST_F(WebRtcVideoChannelSimulcastTest, TEST_F(WebRtcVideoChannelSimulcastTest,
SetSendCodecsForConferenceModeScreenshare) { SetSendCodecsForConferenceModeScreenshare) {
webrtc::test::ScopedFieldTrials field_trials(
"WebRTC-SimulcastScreenshare/Disabled/");
VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 1, true, VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 1, true,
true); true);
} }
TEST_F(WebRtcVideoChannelSimulcastTest, SetSendCodecsForSimulcastScreenshare) { TEST_F(WebRtcVideoChannelSimulcastTest, SetSendCodecsForSimulcastScreenshare) {
webrtc::test::ScopedFieldTrials override_field_trials_(
"WebRTC-SimulcastScreenshare/Enabled/");
VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 2, true, VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 2, true,
true); true);
} }
TEST_F(WebRtcVideoChannelSimulcastTest, TEST_F(WebRtcVideoChannelSimulcastTest,
NoSimulcastScreenshareWithoutConference) { NoSimulcastScreenshareWithoutConference) {
webrtc::test::ScopedFieldTrials override_field_trials_(
"WebRTC-SimulcastScreenshare/Enabled/");
VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 1, true, VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 1, true,
false); false);
} }