Adding support for simulcast and spatial layers into VideoQualityTest

webrtc/common_types.h

Index: webrtc/common_types.h
diff --git a/webrtc/common_types.h b/webrtc/common_types.h
index 7be74e68473c92c51107059c8ee690e9c4aa122a..9ee8fa1f3822d206fdd47d46d84cbb86125db4a8 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -559,6 +559,7 @@ enum RawVideoType
 enum { kConfigParameterSize = 128};
 enum { kPayloadNameSize = 32};
 enum { kMaxSimulcastStreams = 4};
+enum { kMaxSpatialLayers = 5};
 enum { kMaxTemporalStreams = 4};

[sprang_webrtc, 2015/09/29 14:19:33]

Can we make these all static const int?
These don't make sense as enums...

[pbos-webrtc, 2015/09/29 14:38:46]

I think that'll potentially cause linker errors (unless in anonymous
namespaces). Woo.

[ivica, 2015/09/29 15:14:51]

Probably better just to keep them as compile-time constants. Otherwise I would
have to add extern or who knows what.

 
 enum VideoCodecComplexity
@@ -688,6 +689,15 @@ struct SimulcastStream {
   }
 };
 
+struct SpatialLayer {
+  int scaling_factor_num;
+  int scaling_factor_den;
+  int target_bitrate_bps;
+  // TODO(ivica): Add max_quantizer and min_quantizer?
+  // int min_quantizer;
+  // int max_quantizer;

[sprang_webrtc, 2015/09/29 14:19:33]

If you don't include them in this CL, but you think it should be later, just add
a todo to that affect. Don't add commented out code.

[ivica, 2015/09/29 15:14:51]

Removed commented out code.

+};
+
 enum VideoCodecMode {
   kRealtimeVideo,
   kScreensharing
@@ -714,6 +724,7 @@ struct VideoCodec {
   unsigned int        qpMax;
   unsigned char       numberOfSimulcastStreams;
   SimulcastStream     simulcastStream[kMaxSimulcastStreams];
+  SpatialLayer        spatialLayers[kMaxSpatialLayers];
 
   VideoCodecMode      mode;