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 c11c4d7a734c3fe7bd57e693a11cf030af0b764d..dfbc706de8428aa19a1ae7eae3a5a33695c2c39d 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -548,6 +548,7 @@ enum RawVideoType
 enum { kConfigParameterSize = 128};
 enum { kPayloadNameSize = 32};
 enum { kMaxSimulcastStreams = 4};
+enum { kMaxSpatialLayers = 5};
 enum { kMaxTemporalStreams = 4};
 
 enum VideoCodecComplexity
@@ -677,6 +678,13 @@ struct SimulcastStream {
   }
 };
 
+struct SpatialLayer {
+  int scaling_factor_num;
+  int scaling_factor_den;
+  int target_bitrate_bps;
+  // TODO(ivica): Add max_quantizer and min_quantizer?
+};
+
 enum VideoCodecMode {
   kRealtimeVideo,
   kScreensharing
@@ -703,6 +711,7 @@ struct VideoCodec {
   unsigned int        qpMax;
   unsigned char       numberOfSimulcastStreams;
   SimulcastStream     simulcastStream[kMaxSimulcastStreams];
+  SpatialLayer        spatialLayers[kMaxSpatialLayers];

[mflodman, 2015/10/06 11:27:27]

I know this is following the previous style, but I'd stil prefer to use an
std::vector here instead. But feel free to skip this comment in case that
introduces lots of extra work, I know the code depending on this type of
structure in a few places.

[ivica, 2015/10/06 13:37:24]

It turns out there is a bunch of memcpy calls that copy VideoCodec from one
place to another. Should I replace them with "x = y" and hope I don't break
anything, or just leave C-style array?

[mflodman, 2015/10/07 11:23:43]

Then let's keep it for now and we'll take care of it when fixing
'simulcastStream;.

 
   VideoCodecMode      mode;