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

pcm/Normalizer: use PcmClamp()

Browse Source
This commit is contained in:
Max Kellermann 2023-03-13 12:34:02 +01:00
parent dcf0a3e475
commit fcc9a98cad
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pcm/Normalizer.cxx
View File

@ -3,10 +3,15 @@
// Based on AudioCompress (c)2007 busybee (http://beesbuzz.biz/ // Based on AudioCompress (c)2007 busybee (http://beesbuzz.biz/
#include "Normalizer.hxx" #include "Normalizer.hxx"
#include "Clamp.hxx"
#include "SampleFormat.hxx"
#include "Traits.hxx"
void 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;
const int slot = (pos + 1) % bufsz; const int slot = (pos + 1) % bufsz;
int peakVal = 1, peakPos = 0; int peakVal = 1, peakPos = 0;
@ -64,18 +69,8 @@ PcmNormalizer::ProcessS16(int16_t *audio, std::size_t count) noexcept
const int delta = (newGain - curGain) / (int)ramp; const int delta = (newGain - curGain) / (int)ramp;
for (std::size_t i = 0; i < count; i++) { for (std::size_t i = 0; i < count; i++) {
int sample;
//! Amplify the sample //! Amplify the sample
sample = audio[i] * curGain >> 10; audio[i] = PcmClamp<format>(audio[i] * curGain >> 10);
if (sample < -32768)
{
sample = -32768;
} else if (sample > 32767)
{
sample = 32767;
}
audio[i] = sample;
//! Adjust the gain //! Adjust the gain
if (i < ramp) if (i < ramp)