Adding support for simulcast and spatial layers into VideoQualityTest

webrtc/common_types.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 541 matching lines @@
     kVideoNV12     = 11,
     kVideoNV21     = 12,
     kVideoBGRA     = 13,
     kVideoUnknown  = 99
 };
 
 // Video codec
 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
 {
     kComplexityNormal = 0,
     kComplexityHigh    = 1,
     kComplexityHigher  = 2,
     kComplexityMax     = 3
 };
 
 enum VideoCodecProfile
@@ skipping 108 matching lines @@
            targetBitrate == other.targetBitrate &&
            minBitrate == other.minBitrate &&
            qpMax == other.qpMax;
   }
 
   bool operator!=(const SimulcastStream& other) const {
     return !(*this == other);
   }
 };
 
+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
 };
 
 // Common video codec properties
 struct VideoCodec {
   VideoCodecType      codecType;
   char                plName[kPayloadNameSize];
   unsigned char       plType;
 
   unsigned short      width;
   unsigned short      height;
 
   unsigned int        startBitrate;  // kilobits/sec.
   unsigned int        maxBitrate;  // kilobits/sec.
   unsigned int        minBitrate;  // kilobits/sec.
   unsigned int        targetBitrate;  // kilobits/sec.
 
   unsigned char       maxFramerate;
 
   VideoCodecUnion     codecSpecific;
 
   unsigned int        qpMax;
   unsigned char       numberOfSimulcastStreams;
   SimulcastStream     simulcastStream[kMaxSimulcastStreams];
+  SpatialLayer        spatialLayers[kMaxSpatialLayers];
 
   VideoCodecMode      mode;
 
   // When using an external encoder/decoder this allows to pass
   // extra options without requiring webrtc to be aware of them.
   Config*  extra_options;
 
   bool operator==(const VideoCodec& other) const {
     bool ret = codecType == other.codecType &&
                (STR_CASE_CMP(plName, other.plName) == 0) &&
@@ skipping 173 matching lines @@
 class StreamDataCountersCallback {
  public:
   virtual ~StreamDataCountersCallback() {}
 
   virtual void DataCountersUpdated(const StreamDataCounters& counters,
                                    uint32_t ssrc) = 0;
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_TYPES_H_