Add VideoSendStream::Stats::prefered_media_bitrate_bps

webrtc/modules/video_coding/utility/simulcast_rate_allocator.cc

 /*
  *  Copyright (c) 2016 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 11 matching lines @@
   // Always allocate enough bitrate for the minimum bitrate of the first layer.
   // Suspending below min bitrate is controlled outside the codec implementation
   // and is not overridden by this.
   const uint32_t min_bitrate_bps = codec_.numberOfSimulcastStreams == 0
                                        ? codec_.minBitrate
                                        : codec_.simulcastStream[0].minBitrate;
   uint32_t left_to_allocate = std::max(min_bitrate_bps, bitrate_kbps);
   if (codec_.maxBitrate)
     left_to_allocate = std::min(left_to_allocate, codec_.maxBitrate);
 
-  if (codec_.numberOfSimulcastStreams == 0) {
+  if (codec_.numberOfSimulcastStreams < 2) {
     // No simulcast, just set the target as this has been capped already.
     return std::vector<uint32_t>(1, left_to_allocate);
   }
 
   // Initialize bitrates with zeroes.
   std::vector<uint32_t> allocated_bitrates_bps(codec_.numberOfSimulcastStreams,
                                                0);
 
   // First try to allocate up to the target bitrate for each substream.
   size_t layer = 0;
@@ skipping 15 matching lines @@
     uint32_t allocation =
         std::min(left_to_allocate,
                  stream.maxBitrate - allocated_bitrates_bps[active_layer]);
     left_to_allocate -= allocation;
     allocated_bitrates_bps[active_layer] += allocation;
   }
 
   return allocated_bitrates_bps;
 }
 
+uint32_t SimulcastRateAllocator::GetPreferedBitrate() const {
+  std::vector<uint32_t> rates = GetAllocation(codec_.maxBitrate);
+  uint32_t preferred_bitrate = 0;
+  for (auto& rate : rates) {

[sprang_webrtc, 2016/09/27 10:55:07]

Prefer not using auto unless type is very verbose.

[perkj_webrtc, 2016/09/27 11:33:12]

Done.

+    preferred_bitrate += rate;
+  }
+  return preferred_bitrate;
+}
+
 const VideoCodec& webrtc::SimulcastRateAllocator::GetCodec() const {
   return codec_;
 }
 
 }  // namespace webrtc