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

pcm/Normalizer: use SampleTraits

Browse Source
This commit is contained in:
Max Kellermann 2023-03-13 12:38:48 +01:00
parent fcc9a98cad
commit 738254b2fc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pcm/Normalizer.cxx
View File

@ -11,6 +11,7 @@ void
PcmNormalizer::ProcessS16(int16_t *audio, std::size_t count) noexcept PcmNormalizer::ProcessS16(int16_t *audio, std::size_t count) noexcept
{ {
constexpr SampleFormat format = SampleFormat::S16; constexpr SampleFormat format = SampleFormat::S16;
using Traits = SampleTraits<format>;
const int slot = (pos + 1) % bufsz; const int slot = (pos + 1) % bufsz;
@ -52,9 +53,9 @@ PcmNormalizer::ProcessS16(int16_t *audio, std::size_t count) noexcept
//! Make sure the adjusted gain won't cause clipping //! Make sure the adjusted gain won't cause clipping
std::size_t ramp = count; std::size_t ramp = count;
if ((peakVal*newGain >> 10) > 32767) if ((peakVal*newGain >> 10) > Traits::MAX)
{ {
newGain = (32767 << 10)/peakVal; newGain = (Traits::MAX << 10)/peakVal;
//! Truncate the ramp time //! Truncate the ramp time
ramp = peakPos; ramp = peakPos;
} }