Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2860)

Unified Diff: webrtc/call/bitrate_allocator.cc

Issue 1441673002: Move BitrateAllocator from BitrateController logic to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/call/bitrate_allocator.cc
diff --git a/webrtc/modules/bitrate_controller/bitrate_allocator.cc b/webrtc/call/bitrate_allocator.cc
similarity index 98%
rename from webrtc/modules/bitrate_controller/bitrate_allocator.cc
rename to webrtc/call/bitrate_allocator.cc
index dc421bb69d8a490d8a37a0630e7a0515ddf875d5..b3789d3bb6830994fd2ca867ff93771ac0b93e5a 100644
--- a/webrtc/modules/bitrate_controller/bitrate_allocator.cc
+++ b/webrtc/call/bitrate_allocator.cc
@@ -9,7 +9,7 @@
*
*/
-#include "webrtc/modules/bitrate_controller/include/bitrate_allocator.h"
+#include "webrtc/call/bitrate_allocator.h"
#include <algorithm>
#include <utility>
@@ -136,7 +136,8 @@ void BitrateAllocator::EnforceMinBitrate(bool 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());
uint32_t bitrate_per_observer =
(bitrate - sum_min_bitrates) / number_of_observers;
// Use map to sort list based on max bitrate.

Powered by Google App Engine
This is Rietveld 408576698