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

pcm/Normalizer: eliminate local variable ap

Browse Source
This commit is contained in:
Max Kellermann 2023-03-13 12:27:10 +01:00
parent 1298a82f4f
commit 941636b87b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pcm/Normalizer.cxx
View File

@ -7,7 +7,6 @@
void void
PcmNormalizer::ProcessS16(int16_t *audio, std::size_t count) noexcept PcmNormalizer::ProcessS16(int16_t *audio, std::size_t count) noexcept
{ {
int16_t *ap;
std::size_t i; std::size_t i;
int curGain = gain[pos]; int curGain = gain[pos];
int newGain; int newGain;
@ -18,10 +17,9 @@ PcmNormalizer::ProcessS16(int16_t *audio, std::size_t count) noexcept
std::size_t ramp = count; std::size_t ramp = count;
int delta; int delta;
ap = audio;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
int val = *ap++; int val = audio[i];
if (val < 0) if (val < 0)
val = -val; val = -val;
if (val > peakVal) if (val > peakVal)
@ -73,14 +71,13 @@ PcmNormalizer::ProcessS16(int16_t *audio, std::size_t count) noexcept
curGain = 1 << 10; curGain = 1 << 10;
delta = (newGain - curGain) / (int)ramp; delta = (newGain - curGain) / (int)ramp;
ap = audio;
*clipped_ = 0; *clipped_ = 0;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
int sample; int sample;
//! Amplify the sample //! Amplify the sample
sample = *ap*curGain >> 10; sample = audio[i] * curGain >> 10;
if (sample < -32768) if (sample < -32768)
{ {
*clipped_ += -32768 - sample; *clipped_ += -32768 - sample;
@ -90,7 +87,7 @@ PcmNormalizer::ProcessS16(int16_t *audio, std::size_t count) noexcept
*clipped_ += sample - 32767; *clipped_ += sample - 32767;
sample = 32767; sample = 32767;
} }
*ap++ = sample; audio[i] = sample;
//! Adjust the gain //! Adjust the gain
if (i < ramp) if (i < ramp)