From 7461eff1bd762b6509273f5194b24e098524e692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Mon, 10 Sep 2018 09:43:56 +0200 Subject: [PATCH] For simulcast screenshare, make 2 tl default for high stream. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9734 Change-Id: I00400782686296b191f0f7a10a65f99253bea929 Reviewed-on: https://webrtc-review.googlesource.com/99101 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#24642} --- media/engine/simulcast.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/media/engine/simulcast.cc b/media/engine/simulcast.cc index 9c4b233ec4..f818588ea7 100644 --- a/media/engine/simulcast.cc +++ b/media/engine/simulcast.cc @@ -77,6 +77,10 @@ int DefaultNumberOfTemporalLayers(int simulcast_id, bool screenshare) { RTC_CHECK_LT(simulcast_id, webrtc::kMaxSimulcastStreams); const int kDefaultNumTemporalLayers = 3; + const int kDefaultNumScreenshareTemporalLayers = 2; + int default_num_temporal_layers = screenshare + ? kDefaultNumScreenshareTemporalLayers + : kDefaultNumTemporalLayers; const std::string group_name = screenshare ? webrtc::field_trial::FindFullName( @@ -84,9 +88,9 @@ int DefaultNumberOfTemporalLayers(int simulcast_id, bool screenshare) { : webrtc::field_trial::FindFullName( "WebRTC-VP8ConferenceTemporalLayers"); if (group_name.empty()) - return kDefaultNumTemporalLayers; + return default_num_temporal_layers; - int num_temporal_layers = kDefaultNumTemporalLayers; + int num_temporal_layers = default_num_temporal_layers; if (sscanf(group_name.c_str(), "%d", &num_temporal_layers) == 1 && num_temporal_layers > 0 && num_temporal_layers <= webrtc::kMaxTemporalStreams) { @@ -97,7 +101,7 @@ int DefaultNumberOfTemporalLayers(int simulcast_id, bool screenshare) { "incorrect value: " << group_name; - return kDefaultNumTemporalLayers; + return default_num_temporal_layers; } int FindSimulcastFormatIndex(int width, int height) {