commit f69e768032b513ba079350feb596f3ef3b11619c
author philipel <philipel@webrtc.org> Wed Feb 28 12:06:28 2018
committer Philip Eliasson <philipel@webrtc.org> Wed Feb 28 15:38:15 2018
tree 42ff9ea9b82df06235be75a6985ae661847b8782
parent 27e8a3e223098a023c3b2a0cb3c3ee9268b1cc63

Propagating total_bitrate_bps from BitrateAllocator to ProbeController, part 1.

Added total_bitrate_bps to LimitObserver::OnAllocationLimitsChanged.

Bug: webrtc:8955
Change-Id: Ied9b2d24ab97cff21518ce70d5d35dfd8230ed08
Reviewed-on: https://webrtc-review.googlesource.com/58801
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22233}

call/bitrate_allocator.cc

diff --git a/call/bitrate_allocator.cc b/call/bitrate_allocator.cc
index 0b8ce39..c0a0518 100644
--- a/call/bitrate_allocator.cc
+++ b/call/bitrate_allocator.cc
@@ -179,6 +179,7 @@
   RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_);
   uint32_t total_requested_padding_bitrate = 0;
   uint32_t total_requested_min_bitrate = 0;
+  uint32_t total_requested_bitrate = 0;
 
   for (const auto& config : bitrate_observer_configs_) {
     uint32_t stream_padding = config.pad_up_bitrate_bps;
@@ -189,6 +190,7 @@
           std::max(config.MinBitrateWithHysteresis(), stream_padding);
     }
     total_requested_padding_bitrate += stream_padding;
+    total_requested_bitrate += config.max_bitrate_bps;
   }
 
   if (total_requested_padding_bitrate == total_requested_padding_bitrate_ &&
@@ -204,7 +206,8 @@
                    << "bps, total_requested_padding_bitrate: "
                    << total_requested_padding_bitrate << "bps";
   limit_observer_->OnAllocationLimitsChanged(total_requested_min_bitrate,
-                                             total_requested_padding_bitrate);
+                                             total_requested_padding_bitrate,
+                                             total_requested_bitrate);
 }
 
 void BitrateAllocator::RemoveObserver(BitrateAllocatorObserver* observer) {