From 5e2e66d8a0fd5e1bf9b3efc54a94cba3e7088b00 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 6 Sep 2018 15:27:32 +0200 Subject: [PATCH] Fix no_global_constructors in audio_processing/agc2/rnn_vad. Bug: webrtc:9693 Change-Id: Ica997d5cbe28288720325a51058a40a37c612665 Reviewed-on: https://webrtc-review.googlesource.com/98583 Reviewed-by: Alessio Bazzica Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#24617} --- modules/audio_processing/agc2/rnn_vad/BUILD.gn | 1 - .../agc2/rnn_vad/spectral_features_internal.cc | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/audio_processing/agc2/rnn_vad/BUILD.gn b/modules/audio_processing/agc2/rnn_vad/BUILD.gn index 867a9bb57f..d1edecea33 100644 --- a/modules/audio_processing/agc2/rnn_vad/BUILD.gn +++ b/modules/audio_processing/agc2/rnn_vad/BUILD.gn @@ -9,7 +9,6 @@ import("../../../../webrtc.gni") rtc_source_set("rnn_vad") { - configs += [ "../../../..:no_global_constructors" ] sources = [ "common.h", "features_extraction.cc", diff --git a/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc b/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc index 4cbe48a29e..2d5a46cc2f 100644 --- a/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc +++ b/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc @@ -17,12 +17,6 @@ namespace webrtc { namespace rnn_vad { -namespace { - -// DCT scaling factor. -const float kDctScalingFactor = std::sqrt(2.f / kNumBands); - -} // namespace std::array ComputeBandBoundaryIndexes( size_t sample_rate_hz, @@ -116,6 +110,8 @@ void ComputeDct(rtc::ArrayView in, RTC_DCHECK_LE(1, out.size()); RTC_DCHECK_LE(out.size(), in.size()); std::fill(out.begin(), out.end(), 0.f); + // DCT scaling factor. + const float kDctScalingFactor = std::sqrt(2.f / kNumBands); for (size_t i = 0; i < out.size(); ++i) { for (size_t j = 0; j < in.size(); ++j) { out[i] += in[j] * dct_table[j * in.size() + i];