From a89800cae9cde6095b4fa8cb01afe0aad1fef124 Mon Sep 17 00:00:00 2001
From: Sergey Silkin <ssilkin@webrtc.org>
Date: Tue, 19 Feb 2019 12:52:56 +0100
Subject: [PATCH] Parse params of 3rd spatial layer from command line.

Bug: none
Change-Id: I52cef97ac0a891bee15a5a3ef5a66549cab6237e
Reviewed-on: https://webrtc-review.googlesource.com/c/123420
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26751}
---
 video/video_loopback.cc     |  9 +++++++++
 video/video_quality_test.cc | 13 +++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/video/video_loopback.cc b/video/video_loopback.cc
index f3c8a870be..ef32ae64dd 100644
--- a/video/video_loopback.cc
+++ b/video/video_loopback.cc
@@ -245,6 +245,14 @@ std::string SL1() {
   return static_cast<std::string>(FLAG_sl1);
 }
 
+WEBRTC_DEFINE_string(
+    sl2,
+    "",
+    "Comma separated values describing SpatialLayer for layer #2.");
+std::string SL2() {
+  return static_cast<std::string>(FLAG_sl2);
+}
+
 WEBRTC_DEFINE_string(
     encoded_frame_path,
     "",
@@ -368,6 +376,7 @@ void Loopback() {
   std::vector<std::string> SL_descriptors;
   SL_descriptors.push_back(flags::SL0());
   SL_descriptors.push_back(flags::SL1());
+  SL_descriptors.push_back(flags::SL2());
   VideoQualityTest::FillScalabilitySettings(
       &params, 0, stream_descriptors, flags::NumStreams(),
       flags::SelectedStream(), flags::NumSpatialLayers(), flags::SelectedSL(),
diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index 494182704c..0ac5cc2233 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -649,16 +649,17 @@ void VideoQualityTest::FillScalabilitySettings(
     if (descriptor.empty())
       continue;
     std::vector<int> v = VideoQualityTest::ParseCSV(descriptor);
-    RTC_CHECK_EQ(v.size(), 7);
+    RTC_CHECK_EQ(v.size(), 8);
 
     SpatialLayer layer = {0};
     layer.width = v[0];
     layer.height = v[1];
-    layer.numberOfTemporalLayers = v[2];
-    layer.maxBitrate = v[3];
-    layer.minBitrate = v[4];
-    layer.targetBitrate = v[5];
-    layer.qpMax = v[6];
+    layer.maxFramerate = v[2];
+    layer.numberOfTemporalLayers = v[3];
+    layer.maxBitrate = v[4];
+    layer.minBitrate = v[5];
+    layer.targetBitrate = v[6];
+    layer.qpMax = v[7];
     layer.active = true;
 
     params->ss[video_idx].spatial_layers.push_back(layer);