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

Set is_highest_layer_max_bitrate_configured outside of loop

Browse Source 
Bug: webrtc:351644568, b/352504711
Change-Id: Ia1798e35adf8b34357103ae3aba8ab16499a458f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357081
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42636}
This commit is contained in:
Sergey Silkin 2024-07-12 16:09:22 +02:00 committed by WebRTC LUCI CQ
parent 108c94b1d4
commit c14e2cc4ca
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
video/config/encoder_stream_factory.cc
View File

@ -337,8 +337,7 @@ EncoderStreamFactory::CreateSimulcastOrConferenceModeScreenshareStreams(
layers[0].min_bitrate_bps =
rtc::saturated_cast<int>(experimental_min_bitrate->bps());
}
// Update the active simulcast layers and configured bitrates.
bool is_highest_layer_max_bitrate_configured = false;
const bool has_scale_resolution_down_by = absl::c_any_of(
encoder_config.simulcast_layers, [](const webrtc::VideoStream& layer) {
return layer.scale_resolution_down_by != -1.;
@ -363,6 +362,8 @@ EncoderStreamFactory::CreateSimulcastOrConferenceModeScreenshareStreams(
? NormalizeSimulcastSize(trials, height,
encoder_config.number_of_streams)
: height;
// Update the active simulcast layers and configured bitrates.
for (size_t i = 0; i < layers.size(); ++i) {
layers[i].active = encoder_config.simulcast_layers[i].active;
layers[i].scalability_mode =
@ -443,12 +444,11 @@ EncoderStreamFactory::CreateSimulcastOrConferenceModeScreenshareStreams(
} else {
layers[i].max_qp = GetDefaultMaxQp(encoder_config.codec_type);
}
if (i == layers.size() - 1) {
is_highest_layer_max_bitrate_configured =
encoder_config.simulcast_layers[i].max_bitrate_bps > 0;
}
}
bool is_highest_layer_max_bitrate_configured =
encoder_config.simulcast_layers[layers.size() - 1].max_bitrate_bps > 0;
if (!is_screencast && !is_highest_layer_max_bitrate_configured &&
encoder_config.max_bitrate_bps > 0) {
// No application-configured maximum for the largest layer.