Move BitrateAllocator from BitrateController logic to Call.

webrtc/call/bitrate_allocator.cc

 /*
  *  Copyright (c) 2015 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.
  *
  */
 
-#include "webrtc/modules/bitrate_controller/include/bitrate_allocator.h"
+#include "webrtc/call/bitrate_allocator.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 
 namespace webrtc {
 
 // Allow packets to be transmitted in up to 2 times max video bitrate if the
 // bandwidth estimate allows it.
@@ skipping 106 matching lines @@
 }
 
 void BitrateAllocator::EnforceMinBitrate(bool enforce_min_bitrate) {
   CriticalSectionScoped lock(crit_sect_.get());
   enforce_min_bitrate_ = enforce_min_bitrate;
 }
 
 BitrateAllocator::ObserverBitrateMap BitrateAllocator::NormalRateAllocation(
     uint32_t bitrate,
     uint32_t sum_min_bitrates) {
-  uint32_t number_of_observers = bitrate_observers_.size();
+  uint32_t number_of_observers =
+      static_cast<uint32_t>(bitrate_observers_.size());

[mflodman, 2015/11/12 13:52:50]

call-folder has stricter compile settings than modules/bitrate_controller and
this fails to compile otherwise.

   uint32_t bitrate_per_observer =
       (bitrate - sum_min_bitrates) / number_of_observers;
   // Use map to sort list based on max bitrate.
   ObserverSortingMap list_max_bitrates;
   for (const auto& observer : bitrate_observers_) {
     list_max_bitrates.insert(std::pair<uint32_t, ObserverConfiguration>(
         observer.second.max_bitrate,
         ObserverConfiguration(observer.first, observer.second.min_bitrate)));
   }
   ObserverBitrateMap allocation;
@@ skipping 34 matching lines @@
     for (const auto& observer : bitrate_observers_) {
       uint32_t allocated_bitrate =
           std::min(remainder, observer.second.min_bitrate);
       allocation[observer.first] = allocated_bitrate;
       remainder -= allocated_bitrate;
     }
   }
   return allocation;
 }
 }  // namespace webrtc