From c003a1f06751a06c6e99c9c1391a9a4076802647 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 6 Sep 2018 15:17:00 +0200 Subject: [PATCH] Fix no_global_constructors in congestion_controller/pcc. Bug: webrtc:9693 Change-Id: I7d654656b4f350c120d25dcc0f66541f47ccc919 Reviewed-on: https://webrtc-review.googlesource.com/98582 Reviewed-by: Sebastian Jansson Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#24609} --- modules/congestion_controller/pcc/BUILD.gn | 1 - .../congestion_controller/pcc/pcc_network_controller.cc | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/congestion_controller/pcc/BUILD.gn b/modules/congestion_controller/pcc/BUILD.gn index 5f78cc663d..0f28d822f7 100644 --- a/modules/congestion_controller/pcc/BUILD.gn +++ b/modules/congestion_controller/pcc/BUILD.gn @@ -26,7 +26,6 @@ rtc_static_library("pcc_controller") { "pcc_network_controller.cc", "pcc_network_controller.h", ] - configs += [ "../../..:no_global_constructors" ] deps = [ ":bitrate_controller", ":monitor_interval", diff --git a/modules/congestion_controller/pcc/pcc_network_controller.cc b/modules/congestion_controller/pcc/pcc_network_controller.cc index ca4af41172..e158844a89 100644 --- a/modules/congestion_controller/pcc/pcc_network_controller.cc +++ b/modules/congestion_controller/pcc/pcc_network_controller.cc @@ -26,11 +26,12 @@ constexpr double kSlowStartModeIncrease = 1.5; constexpr double kAlphaForPacketInterval = 0.9; constexpr int64_t kMinPacketsNumberPerInterval = 20; -const TimeDelta kMinDurationOfMonitorInterval = TimeDelta::ms(50); -const TimeDelta kStartupDuration = TimeDelta::ms(500); +const TimeDelta kMinDurationOfMonitorInterval = TimeDelta::Millis<50>(); +const TimeDelta kStartupDuration = TimeDelta::Millis<500>(); constexpr double kMinRateChangeBps = 4000; -const DataRate kMinRateHaveMultiplicativeRateChange = - DataRate::bps(kMinRateChangeBps / kDefaultSamplingStep); +constexpr DataRate kMinRateHaveMultiplicativeRateChange = + DataRate::BitsPerSec(kMinRateChangeBps / + kDefaultSamplingStep)>(); // Bitrate controller constants. constexpr double kInitialConversionFactor = 5;