Skip to content

M
mpd
Commit 9d44a6d2 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/mad: use Clamp()

parent 10da9ee7
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
src/decoder/plugins/MadDecoderPlugin.cxx
View file @ 9d44a6d2
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "tag/ReplayGain.hxx" #include "tag/ReplayGain.hxx"
#include "tag/MixRamp.hxx" #include "tag/MixRamp.hxx"
#include "CheckAudioFormat.hxx" #include "CheckAudioFormat.hxx"
#include "util/Clamp.hxx"
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
...@@ -84,14 +85,9 @@ mad_fixed_to_24_sample(mad_fixed_t sample) ...@@ -84,14 +85,9 @@ mad_fixed_to_24_sample(mad_fixed_t sample)
/* round */ /* round */
sample = sample + (1L << (MAD_F_FRACBITS - bits)); sample = sample + (1L << (MAD_F_FRACBITS - bits));
/* clip */
if (gcc_unlikely(sample > MAX))
sample = MAX;
else if (gcc_unlikely(sample < MIN))
sample = MIN;
/* quantize */ /* quantize */
return sample >> (MAD_F_FRACBITS + 1 - bits); return Clamp(sample, MIN, MAX)
>> (MAD_F_FRACBITS + 1 - bits);
} }
static void static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment