Extract bitrate allocation of spatial/temporal layers out of codec impl.

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 604 matching lines @@
   SimulcastStream simulcastStream[kMaxSimulcastStreams];
   SpatialLayer spatialLayers[kMaxSpatialLayers];
 
   VideoCodecMode mode;
   bool expect_encode_from_texture;
 
   bool operator==(const VideoCodec& other) const = delete;
   bool operator!=(const VideoCodec& other) const = delete;
 };
 
+struct BitrateAllocation {

[perkj_webrtc, 2016/10/21 08:24:28]

please use class.

[sprang_webrtc, 2016/10/25 10:44:25]

Agreed. This started out as a simple struct (that's why the naming a style i
struct-based), but it's grown a bit too large. I'll change it.

+  static const size_t kMaxBitrateBps = 100000000;
+  BitrateAllocation() = default;
+
+  bool set_bitrate(size_t spatial_index,
+                   size_t temporal_index,
+                   uint32_t bitrate_bps) {
+    assert(spatial_index < kMaxSpatialLayers);

[perkj_webrtc, 2016/10/21 08:24:28]

 CHECK or DCHECK instead of assert.

[sprang_webrtc, 2016/10/25 10:44:25]

For some reason, everything here used assert and checks.h wasn't included. I was
assuming there was some dependency reason for this. Changed to DCHECK when I
moved this out to the .cc

+    assert(temporal_index < kMaxTemporalStreams);
+    if (bitrate_bps > kMaxBitrateBps ||
+        sum - bitrates[spatial_index][temporal_index] + bitrate_bps >
+            kMaxBitrateBps) {
+      return false;
+    }
+    sum -= bitrates[spatial_index][temporal_index];

[perkj_webrtc, 2016/10/21 08:24:28]

please move implementation to a cc file.

[sprang_webrtc, 2016/10/25 10:44:25]

Done.

+    bitrates[spatial_index][temporal_index] = bitrate_bps;
+    sum += bitrate_bps;
+    return true;
+  }
+
+  uint32_t get_bitrate(size_t spatial_index, size_t temporal_index) const {
+    assert(spatial_index < kMaxSpatialLayers);

[perkj_webrtc, 2016/10/21 08:24:28]

dito

[sprang_webrtc, 2016/10/25 10:44:25]

Done.

+    assert(temporal_index < kMaxSimulcastStreams);
+    return bitrates[spatial_index][temporal_index];
+  }
+
+  // Get the sum of all the temporal layer for a specific spatial layer.
+  uint32_t get_spatial_layer_sum(size_t spatial_index) const {
+    assert(spatial_index < kMaxSpatialLayers);
+    uint32_t sum = 0;
+    for (int i = 0; i < kMaxTemporalStreams; ++i)
+      sum += bitrates[spatial_index][i];
+    return sum;
+  }
+
+  uint32_t get_sum_bps() const { return sum; }  // Sum of all bitrates.
+  uint32_t get_sum_kbps() const { return (sum + 500) / 1000; }
+
+  inline bool operator==(const BitrateAllocation& other) const {
+    return memcmp(bitrates, other.bitrates, sizeof(bitrates)) == 0;
+  }
+  inline bool operator!=(const BitrateAllocation& other) const {
+    return !(*this == other);
+  }
+
+ private:
+  uint32_t sum = 0;

[perkj_webrtc, 2016/10/21 08:24:28]

sum_

[sprang_webrtc, 2016/10/25 10:44:25]

Done.

+  uint32_t bitrates[kMaxSpatialLayers][kMaxTemporalStreams] = {};

[perkj_webrtc, 2016/10/21 08:24:28]

bitrates_

[sprang_webrtc, 2016/10/25 10:44:25]

Done.

+};
+
 // Bandwidth over-use detector options.  These are used to drive
 // experimentation with bandwidth estimation parameters.
 // See modules/remote_bitrate_estimator/overuse_detector.h
 struct OverUseDetectorOptions {
   OverUseDetectorOptions()
       : initial_slope(8.0 / 512.0),
         initial_offset(0),
         initial_e(),
         initial_process_noise(),
         initial_avg_noise(0.0),
@@ skipping 186 matching lines @@
 enum class RtcpMode { kOff, kCompound, kReducedSize };
 
 enum NetworkState {
   kNetworkUp,
   kNetworkDown,
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_TYPES_H_