Merge SimulcastStream and SpatialLayer structures.
Both simulcast stream and spatial layer can be described with the same
set of parameters. There is no need in two separate definitions.
1. Original definition of SpatialLayer is removed.
2. SimulcastStream is renamed to SpatialLayer.
3. SimulcastStream is equated to SpatialLayer using typedef.
Bug: webrtc:8518
Change-Id: I90761952b032a1b71fc4bba11f74a6daaf58880a
Reviewed-on: https://webrtc-review.googlesource.com/57102
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22272}diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index 661363d..8e1990c 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -1326,12 +1326,18 @@
if (descriptor.empty())
continue;
std::vector<int> v = VideoQualityTest::ParseCSV(descriptor);
- RTC_CHECK_GT(v[2], 0);
+ RTC_CHECK_EQ(v.size(), 7);
- SpatialLayer layer;
- layer.scaling_factor_num = v[0] == -1 ? 1 : v[0];
- layer.scaling_factor_den = v[1] == -1 ? 1 : v[1];
- layer.target_bitrate_bps = v[2];
+ 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.active = true;
+
params->ss[video_idx].spatial_layers.push_back(layer);
}
}