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/common_types.h b/common_types.h
index 9545284..f41903a 100644
--- a/common_types.h
+++ b/common_types.h
@@ -496,9 +496,7 @@
VideoCodecH264 H264;
};
-// Simulcast is when the same stream is encoded multiple times with different
-// settings such as resolution.
-struct SimulcastStream {
+struct SpatialLayer {
unsigned short width;
unsigned short height;
unsigned char numberOfTemporalLayers;
@@ -509,12 +507,9 @@
bool active; // encoded and sent.
};
-struct SpatialLayer {
- int scaling_factor_num;
- int scaling_factor_den;
- int target_bitrate_bps;
- // TODO(ivica): Add max_quantizer and min_quantizer?
-};
+// Simulcast is when the same stream is encoded multiple times with different
+// settings such as resolution.
+typedef SpatialLayer SimulcastStream;
enum VideoCodecMode { kRealtimeVideo, kScreensharing };