| Index: webrtc/modules/bitrate_controller/bitrate_allocator.cc
|
| diff --git a/webrtc/modules/bitrate_controller/bitrate_allocator.cc b/webrtc/modules/bitrate_controller/bitrate_allocator.cc
|
| index 0aec528cde170c1e11ab983708c0a3894c5321d5..3b561f21548d1968ae4592e7832a2678dbf80add 100644
|
| --- a/webrtc/modules/bitrate_controller/bitrate_allocator.cc
|
| +++ b/webrtc/modules/bitrate_controller/bitrate_allocator.cc
|
| @@ -32,17 +32,20 @@ BitrateAllocator::BitrateAllocator()
|
| last_rtt_(0) {
|
| }
|
|
|
| -
|
| -void BitrateAllocator::OnNetworkChanged(uint32_t bitrate,
|
| - uint8_t fraction_loss,
|
| - int64_t rtt) {
|
| +uint32_t BitrateAllocator::OnNetworkChanged(uint32_t bitrate,
|
| + uint8_t fraction_loss,
|
| + int64_t rtt) {
|
| CriticalSectionScoped lock(crit_sect_.get());
|
| last_bitrate_bps_ = bitrate;
|
| last_fraction_loss_ = fraction_loss;
|
| last_rtt_ = rtt;
|
| + uint32_t allocated_bitrate = 0;
|
| ObserverBitrateMap allocation = AllocateBitrates();
|
| - for (const auto& kv : allocation)
|
| + for (const auto& kv : allocation) {
|
| kv.first->OnNetworkChanged(kv.second, last_fraction_loss_, last_rtt_);
|
| + allocated_bitrate += kv.second;
|
| + }
|
| + return allocated_bitrate;
|
| }
|
|
|
| BitrateAllocator::ObserverBitrateMap BitrateAllocator::AllocateBitrates() {
|
|
|