commit 7a82467d0db0d61f466a1da54b94f6a136726a3c
author Ilya Nikolaevskiy <ilnik@webrtc.org> Thu Jun 18 19:16:53 2020 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Jun 18 21:24:46 2020 +0000
tree 95a4f96e6c350fd6bab03dea5ce8447e5a3afebd
parent 79ca92d952ae489e88cfac20058ab45d2f87368d

Fix vp9 svc singlecast mode and enable quality scaler for vp9

1) Fix several typos and small mistakes which could lead to crashes
2) Adjust bitrates if leading layers are disabled
3) Wire up webrtc quality scaler

Bug: webrtc:11319
Change-Id: I16e52bdb1c315d64906288e4f2be55fe698d5ceb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/177525
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31546}

modules/video_coding/video_codec_initializer.cc

diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc
index 8671df7..7f36f99 100644
--- a/modules/video_coding/video_codec_initializer.cc
+++ b/modules/video_coding/video_codec_initializer.cc
@@ -75,7 +75,9 @@
       static_cast<unsigned char>(streams.size());
   video_codec.minBitrate = streams[0].min_bitrate_bps / 1000;
   bool codec_active = false;
-  for (const VideoStream& stream : streams) {
+  // Active configuration might not be fully copied to |streams| for SVC yet.
+  // Therefore the |config| is checked here.
+  for (const VideoStream& stream : config.simulcast_layers) {
     if (stream.active) {
       codec_active = true;
       break;
@@ -205,7 +207,7 @@
           spatial_layers.back().maxBitrate = video_codec.maxBitrate;
         }
 
-        for (size_t spatial_idx = 0;
+        for (size_t spatial_idx = first_active_layer;
              spatial_idx < config.simulcast_layers.size() &&
              spatial_idx < spatial_layers.size();
              ++spatial_idx) {