From dbce09003d399a29c57e665e7d3f15b7139c5909 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 15 Mar 2019 07:39:02 +0100 Subject: [PATCH] Qualify cmath functions. Use std:: qualified std::log10, std::log, std::floor and std::sin. Bug: None Change-Id: Ia78463f1505fcc5941f4c5ef66fc9346d9523cd4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128080 Reviewed-by: Sam Zackrisson Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#27141} --- modules/audio_processing/aec/aec_core.cc | 13 +++++++------ modules/audio_processing/aec3/decimator_unittest.cc | 5 +++-- modules/audio_processing/aec3/echo_remover.cc | 3 ++- .../audio_processing/aec3/echo_remover_metrics.cc | 3 ++- .../aec3/echo_remover_metrics_unittest.cc | 3 ++- .../aec3/render_signal_analyzer_unittest.cc | 5 +++-- .../aec3/reverb_model_estimator_unittest.cc | 4 ++-- .../aec3/suppression_filter_unittest.cc | 5 +++-- 8 files changed, 24 insertions(+), 17 deletions(-) diff --git a/modules/audio_processing/aec/aec_core.cc b/modules/audio_processing/aec/aec_core.cc index 62b8ad0f7c..49971ff655 100644 --- a/modules/audio_processing/aec/aec_core.cc +++ b/modules/audio_processing/aec/aec_core.cc @@ -19,6 +19,7 @@ #include #include #include +#include #include "rtc_base/checks.h" @@ -446,8 +447,8 @@ static void UpdateLogRatioMetric(Stats* metric, RTC_CHECK(numerator >= 0); RTC_CHECK(denominator >= 0); - const float log_numerator = log10(numerator + 1e-10f); - const float log_denominator = log10(denominator + 1e-10f); + const float log_numerator = std::log10(numerator + 1e-10f); + const float log_denominator = std::log10(denominator + 1e-10f); metric->instant = 10.0f * (log_numerator - log_denominator); // Max. @@ -1110,10 +1111,10 @@ static void FormSuppressionGain(AecCore* aec, // preferred. memcpy(hNlPref, &hNl[minPrefBand], sizeof(float) * prefBandSize); qsort(hNlPref, prefBandSize, sizeof(float), CmpFloat); - hNlFb = - hNlPref[static_cast(floor(prefBandQuant * (prefBandSize - 1)))]; + hNlFb = hNlPref[static_cast( + std::floor(prefBandQuant * (prefBandSize - 1)))]; hNlFbLow = hNlPref[static_cast( - floor(prefBandQuantLow * (prefBandSize - 1)))]; + std::floor(prefBandQuantLow * (prefBandSize - 1)))]; } } @@ -1136,7 +1137,7 @@ static void FormSuppressionGain(AecCore* aec, aec->hNlMinCtr = 0; aec->overDrive = WEBRTC_SPL_MAX( kTargetSupp[aec->nlp_mode] / - static_cast(log(aec->hNlFbMin + 1e-10f) + 1e-10f), + static_cast(std::log(aec->hNlFbMin + 1e-10f) + 1e-10f), min_overdrive[aec->nlp_mode]); } diff --git a/modules/audio_processing/aec3/decimator_unittest.cc b/modules/audio_processing/aec3/decimator_unittest.cc index 08dc428666..79e74403b1 100644 --- a/modules/audio_processing/aec3/decimator_unittest.cc +++ b/modules/audio_processing/aec3/decimator_unittest.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -46,8 +47,8 @@ void ProduceDecimatedSinusoidalOutputPower(int sample_rate_hz, // Produce a sinusoid of the specified frequency. for (size_t k = 0; k < kBlockSize * kNumBlocks; ++k) { - input[k] = - 32767.f * sin(2.f * kPi * sinusoidal_frequency_hz * k / sample_rate_hz); + input[k] = 32767.f * std::sin(2.f * kPi * sinusoidal_frequency_hz * k / + sample_rate_hz); } Decimator decimator(down_sampling_factor); diff --git a/modules/audio_processing/aec3/echo_remover.cc b/modules/audio_processing/aec3/echo_remover.cc index b010152721..534bab5b1c 100644 --- a/modules/audio_processing/aec3/echo_remover.cc +++ b/modules/audio_processing/aec3/echo_remover.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include #include "api/array_view.h" @@ -171,7 +172,7 @@ EchoRemoverImpl::~EchoRemoverImpl() = default; void EchoRemoverImpl::GetMetrics(EchoControl::Metrics* metrics) const { // Echo return loss (ERL) is inverted to go from gain to attenuation. - metrics->echo_return_loss = -10.0 * log10(aec_state_.ErlTimeDomain()); + metrics->echo_return_loss = -10.0 * std::log10(aec_state_.ErlTimeDomain()); metrics->echo_return_loss_enhancement = Log2TodB(aec_state_.FullBandErleLog2()); } diff --git a/modules/audio_processing/aec3/echo_remover_metrics.cc b/modules/audio_processing/aec3/echo_remover_metrics.cc index da7a224e86..71d149eb14 100644 --- a/modules/audio_processing/aec3/echo_remover_metrics.cc +++ b/modules/audio_processing/aec3/echo_remover_metrics.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include #include "rtc_base/checks.h" @@ -314,7 +315,7 @@ int TransformDbMetricForReporting(bool negate, float offset, float scaling, float value) { - float new_value = 10.f * log10(value * scaling + 1e-10f) + offset; + float new_value = 10.f * std::log10(value * scaling + 1e-10f) + offset; if (negate) { new_value = -new_value; } diff --git a/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc b/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc index fb9f151b42..00ce1ea6a9 100644 --- a/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc +++ b/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc @@ -11,6 +11,7 @@ #include "modules/audio_processing/aec3/echo_remover_metrics.h" #include +#include #include "modules/audio_processing/aec3/aec3_fft.h" #include "modules/audio_processing/aec3/aec_state.h" @@ -67,7 +68,7 @@ TEST(TransformDbMetricForReporting, DbFsScaling) { fft.ZeroPaddedFft(x, Aec3Fft::Window::kRectangular, &X); X.Spectrum(Aec3Optimization::kNone, X2); - float offset = -10.f * log10(32768.f * 32768.f); + float offset = -10.f * std::log10(32768.f * 32768.f); EXPECT_NEAR(offset, -90.3f, 0.1f); EXPECT_EQ( static_cast(30.3f), diff --git a/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc b/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc index a15cd9a60a..ffd7fe249c 100644 --- a/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc +++ b/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc @@ -12,6 +12,7 @@ #include #include +#include #include #include "api/array_view.h" @@ -35,8 +36,8 @@ void ProduceSinusoid(int sample_rate_hz, // Produce a sinusoid of the specified frequency. for (size_t k = *sample_counter, j = 0; k < (*sample_counter + kBlockSize); ++k, ++j) { - x[j] = - 32767.f * sin(2.f * kPi * sinusoidal_frequency_hz * k / sample_rate_hz); + x[j] = 32767.f * + std::sin(2.f * kPi * sinusoidal_frequency_hz * k / sample_rate_hz); } *sample_counter = *sample_counter + kBlockSize; } diff --git a/modules/audio_processing/aec3/reverb_model_estimator_unittest.cc b/modules/audio_processing/aec3/reverb_model_estimator_unittest.cc index aa5e96f104..9947ed7052 100644 --- a/modules/audio_processing/aec3/reverb_model_estimator_unittest.cc +++ b/modules/audio_processing/aec3/reverb_model_estimator_unittest.cc @@ -39,8 +39,8 @@ class ReverbModelEstimatorTest { void RunEstimator(); float GetDecay() { return estimated_decay_; } float GetTrueDecay() { return kTruePowerDecay; } - float GetPowerTailDb() { return 10.f * log10(estimated_power_tail_); } - float GetTruePowerTailDb() { return 10.f * log10(true_power_tail_); } + float GetPowerTailDb() { return 10.f * std::log10(estimated_power_tail_); } + float GetTruePowerTailDb() { return 10.f * std::log10(true_power_tail_); } private: void CreateImpulseResponseWithDecay(); diff --git a/modules/audio_processing/aec3/suppression_filter_unittest.cc b/modules/audio_processing/aec3/suppression_filter_unittest.cc index 9e4ff7c28b..2c745ad2c3 100644 --- a/modules/audio_processing/aec3/suppression_filter_unittest.cc +++ b/modules/audio_processing/aec3/suppression_filter_unittest.cc @@ -12,6 +12,7 @@ #include #include +#include #include #include "test/gtest.h" @@ -28,8 +29,8 @@ void ProduceSinusoid(int sample_rate_hz, // Produce a sinusoid of the specified frequency. for (size_t k = *sample_counter, j = 0; k < (*sample_counter + kBlockSize); ++k, ++j) { - x[j] = - 32767.f * sin(2.f * kPi * sinusoidal_frequency_hz * k / sample_rate_hz); + x[j] = 32767.f * + std::sin(2.f * kPi * sinusoidal_frequency_hz * k / sample_rate_hz); } *sample_counter = *sample_counter + kBlockSize; }