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

For simulcast screenshare, make 2 tl default for high stream.

Browse Source 
Bug: webrtc:9734
Change-Id: I00400782686296b191f0f7a10a65f99253bea929
Reviewed-on: https://webrtc-review.googlesource.com/99101
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24642}
This commit is contained in:
Erik Språng 2018-09-10 09:43:56 +02:00 committed by Commit Bot
parent 76dac9ac2f
commit 7461eff1bd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
media/engine/simulcast.cc
View File

@ -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) {