diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn index 55fec7341c..b690050981 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -147,7 +147,6 @@ rtc_source_set("audio_device_name") { } rtc_source_set("windows_core_audio_utility") { - public_configs = [ "../..:no_global_constructors" ] if (is_win && !build_with_chromium) { sources = [ "win/core_audio_utility_win.cc", diff --git a/modules/audio_device/win/core_audio_output_win.cc b/modules/audio_device/win/core_audio_output_win.cc index e6e84fe03e..d40d4f198b 100644 --- a/modules/audio_device/win/core_audio_output_win.cc +++ b/modules/audio_device/win/core_audio_output_win.cc @@ -16,6 +16,7 @@ #include "rtc_base/bind.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/timeutils.h" using Microsoft::WRL::ComPtr; @@ -359,8 +360,9 @@ int CoreAudioOutput::EstimateOutputLatencyMillis(uint64_t device_frequency) { const uint64_t delay_frames = num_frames_written_ - num_played_out_frames; // Convert latency in number of frames into milliseconds. - webrtc::TimeDelta delay = webrtc::TimeDelta::us( - delay_frames * kNumMicrosecsPerSec / format_.Format.nSamplesPerSec); + webrtc::TimeDelta delay = + webrtc::TimeDelta::us(delay_frames * rtc::kNumMicrosecsPerSec / + format_.Format.nSamplesPerSec); delay_ms = delay.ms(); } return delay_ms; diff --git a/modules/audio_device/win/core_audio_utility_win.h b/modules/audio_device/win/core_audio_utility_win.h index 9cec9ebe6f..aeb89400ac 100644 --- a/modules/audio_device/win/core_audio_utility_win.h +++ b/modules/audio_device/win/core_audio_utility_win.h @@ -32,9 +32,6 @@ namespace webrtc { namespace webrtc_win { -static const int64_t kNumMicrosecsPerSec = webrtc::TimeDelta::seconds(1).us(); -static const int64_t kNumMillisecsPerSec = webrtc::TimeDelta::seconds(1).ms(); - // Utility class which registers a thread with MMCSS in the constructor and // deregisters MMCSS in the destructor. The task name is given by |task_name|. // The Multimedia Class Scheduler service (MMCSS) enables multimedia