oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm/ReplayGainAnalyzer: remove GCC version checks, assume proper C++17 support

Browse Source
This commit is contained in:
Max Kellermann 2023-03-06 16:34:01 +01:00
parent 8c5ba50840
commit e602bcf41e
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pcm/ReplayGainAnalyzer.cxx
View File

@ -64,17 +64,8 @@ Square(double x) noexcept
static double static double
SquareHypot(ReplayGainAnalyzer::Frame f) noexcept SquareHypot(ReplayGainAnalyzer::Frame f) noexcept
{ {
#if GCC_OLDER_THAN(10,0)
/* GCC 8 doesn't have std::transform_reduce() */
double sum = 0;
for (const auto &i : f)
sum += Square(i);
return sum;
#else
/* proper C++17 */
return std::transform_reduce(f.begin(), f.end(), 0., return std::transform_reduce(f.begin(), f.end(), 0.,
std::plus<double>{}, Square); std::plus<double>{}, Square);
#endif
} }
/* /*
@ -86,18 +77,11 @@ SquareHypot(ReplayGainAnalyzer::Frame f) noexcept
static double static double
CalcStereoRMS(std::span<const ReplayGainAnalyzer::Frame> src) noexcept CalcStereoRMS(std::span<const ReplayGainAnalyzer::Frame> src) noexcept
{ {
#if GCC_OLDER_THAN(10,0)
/* GCC 8 doesn't have std::transform_reduce() */
double sum = 0;
for (const auto &i : src)
sum += SquareHypot(i);
#else
/* proper C++17 */ /* proper C++17 */
double sum = std::transform_reduce(src.begin(), src.end(), double sum = std::transform_reduce(src.begin(), src.end(),
1e-16, 1e-16,
std::plus<double>{}, std::plus<double>{},
SquareHypot); SquareHypot);
#endif
return 10 * std::log10(sum / src.size()) + 90.0 - 3.0; return 10 * std::log10(sum / src.size()) + 90.0 - 3.0;
} }
@ -287,16 +271,8 @@ template<std::size_t size>
static float static float
FindHistogramPercentile95(const std::array<uint_least32_t, size> &histogram) noexcept FindHistogramPercentile95(const std::array<uint_least32_t, size> &histogram) noexcept
{ {
#if GCC_OLDER_THAN(10,0)
/* GCC 8 doesn't have std::reduce() */
uint_fast32_t total_windows = 0;
for (const auto &i : histogram)
total_windows += i;
#else
/* proper C++17 */
const uint_fast32_t total_windows = const uint_fast32_t total_windows =
std::reduce(histogram.begin(), histogram.end()); std::reduce(histogram.begin(), histogram.end());
#endif
uint_fast32_t loud_count = 0; uint_fast32_t loud_count = 0;
std::size_t i = histogram.size(); std::size_t i = histogram.size();