Nico Grunbaum
6c85fae793
Upstream commit: https://webrtc.googlesource.com/src/+/90f56c51f2bafcc460b0ab2ce77c243dcf217a8f Refactor vp9 low tier logic when dynamic speed is enabled. If dynamic speed is enabled by no specific vp9 speed is configured, use the current default - including the "low speed for <= cpu cores" logic. Bug: webrtc:443906251 Change-Id: Ibe44044d2dddb2775e85905c8f16b030f60c5aaf Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/475002 Commit-Queue: Erik Språng <sprang@webrtc.org> Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47792}
25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Wed, 5 Jul 2023 19:15:00 +0000
|
|
Subject: Bug 1841864 - upstream commit 4baea5b07f should properly check size
|
|
of encoder_config_.simulcast_layers. r=jib
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D182813
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/a7179d8d75313b6c9c76a496e10d102da019ff4f
|
|
---
|
|
video/video_stream_encoder.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
|
|
index f930b1e3b7..782d57695b 100644
|
|
--- a/video/video_stream_encoder.cc
|
|
+++ b/video/video_stream_encoder.cc
|
|
@@ -1490,7 +1490,7 @@ void VideoStreamEncoder::ReconfigureEncoder() {
|
|
|
|
bool is_svc = false;
|
|
bool single_stream_or_non_first_inactive = true;
|
|
- for (size_t i = 1; i < encoder_config_.number_of_streams; ++i) {
|
|
+ for (size_t i = 1; i < encoder_config_.simulcast_layers.size(); ++i) {
|
|
if (encoder_config_.simulcast_layers[i].active) {
|
|
single_stream_or_non_first_inactive = false;
|
|
break;
|