From 74e5f804e443b4639f3f823ec6cd2f3e187f6ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 25 Apr 2018 14:03:46 +0200 Subject: [PATCH] Make BitrateAllocator::transmission_max_bitrate_multiplier_ const. To make this work, also make the private method GetTransmissionMaxBitrateMultiplier static. Bug: None Change-Id: I1777602b89d404ecbc9956acf9a9c7f852d69911 Reviewed-on: https://webrtc-review.googlesource.com/72440 Reviewed-by: Sebastian Jansson Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#23023} --- call/bitrate_allocator.cc | 1 + call/bitrate_allocator.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/call/bitrate_allocator.cc b/call/bitrate_allocator.cc index 7a84f25206..a300f6d67b 100644 --- a/call/bitrate_allocator.cc +++ b/call/bitrate_allocator.cc @@ -72,6 +72,7 @@ BitrateAllocator::~BitrateAllocator() { num_pause_events_); } +// static uint8_t BitrateAllocator::GetTransmissionMaxBitrateMultiplier() { uint64_t multiplier = strtoul(webrtc::field_trial::FindFullName( "WebRTC-TransmissionMaxBitrateMultiplier") diff --git a/call/bitrate_allocator.h b/call/bitrate_allocator.h index ac98210e2f..9cbdc11695 100644 --- a/call/bitrate_allocator.h +++ b/call/bitrate_allocator.h @@ -219,7 +219,7 @@ class BitrateAllocator : public BitrateAllocatorInterface { // TODO(bugs.webrtc.org/8541): May be worth to refactor to keep this logic in // video send stream. Similar logic is implemented in // AudioPriorityBitrateAllocationStrategy. - uint8_t GetTransmissionMaxBitrateMultiplier(); + static uint8_t GetTransmissionMaxBitrateMultiplier(); rtc::SequencedTaskChecker sequenced_checker_; LimitObserver* const limit_observer_ RTC_GUARDED_BY(&sequenced_checker_); @@ -240,7 +240,7 @@ class BitrateAllocator : public BitrateAllocatorInterface { bool has_packet_feedback_ RTC_GUARDED_BY(&sequenced_checker_); std::unique_ptr bitrate_allocation_strategy_ RTC_GUARDED_BY(&sequenced_checker_); - uint8_t transmission_max_bitrate_multiplier_; + const uint8_t transmission_max_bitrate_multiplier_; }; } // namespace webrtc