From 50cfab7d84f5944e1e95486f81df26e4341fd788 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 6 Sep 2018 15:03:52 +0200 Subject: [PATCH] Fix no_global_constructors in congestion_controller/goog_cc. Bug: webrtc:9693 Change-Id: Ic341f3bed2c7c8c4f62363a7344f8524ff561155 Reviewed-on: https://webrtc-review.googlesource.com/98580 Reviewed-by: Sebastian Jansson Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#24607} --- modules/congestion_controller/goog_cc/BUILD.gn | 5 +---- .../congestion_controller/goog_cc/goog_cc_network_control.cc | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn index 10aea3efe3..74219f3de4 100644 --- a/modules/congestion_controller/goog_cc/BUILD.gn +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -17,10 +17,7 @@ config("bwe_test_logging") { } rtc_static_library("goog_cc") { - configs += [ - ":bwe_test_logging", - "../../..:no_global_constructors", - ] + configs += [ ":bwe_test_logging" ] sources = [ "goog_cc_factory.cc", "goog_cc_network_control.cc", diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc index c1abeb322b..be2bdd1ae6 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -39,7 +39,7 @@ const char kCwndExperiment[] = "WebRTC-CwndExperiment"; const int64_t kDefaultAcceptedQueueMs = 250; // From RTCPSender video report interval. -const TimeDelta kLossUpdateInterval = TimeDelta::ms(1000); +constexpr TimeDelta kLossUpdateInterval = TimeDelta::Millis<1000>(); // Pacing-rate relative to our target send rate. // Multiplicative factor that is applied to the target bitrate to calculate