From fde21162889a2f053bed72a962cbefbff9bf7369 Mon Sep 17 00:00:00 2001 From: brucedawson Date: Tue, 20 Jun 2017 10:57:09 -0700 Subject: [PATCH] Use constexpr to avoid a static initializer Floating-point calculations are not guaranteed to happen at compile time unless you force the issue with constexpr. This initializer was found by running tools\win\static_initializers on a canary build chrome_child.dll. constexpr was added to kSilenceRms for consistency. BUG=chromium:341941 Review-Url: https://codereview.webrtc.org/2943833002 Cr-Commit-Position: refs/heads/master@{#18684} --- webrtc/modules/audio_processing/vad/vad_audio_proc.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc.cc b/webrtc/modules/audio_processing/vad/vad_audio_proc.cc index af1214b99a..b934588597 100644 --- a/webrtc/modules/audio_processing/vad/vad_audio_proc.cc +++ b/webrtc/modules/audio_processing/vad/vad_audio_proc.cc @@ -33,9 +33,9 @@ namespace webrtc { struct VadAudioProc::PitchAnalysisStruct : public ::PitchAnalysisStruct {}; struct VadAudioProc::PreFiltBankstr : public ::PreFiltBankstr {}; -static const float kFrequencyResolution = +static constexpr float kFrequencyResolution = kSampleRateHz / static_cast(VadAudioProc::kDftSize); -static const int kSilenceRms = 5; +static constexpr int kSilenceRms = 5; // TODO(turajs): Make a Create or Init for VadAudioProc. VadAudioProc::VadAudioProc()