Skip to content

M
mpd
Commit 54c591bd authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/mad: fix negative replay gain values

Negating an unsigned integer does not work.
parent 217d88f2
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
NEWS
View file @ 54c591bd
...@@ -5,6 +5,7 @@ ver 0.19.2 (not yet released) ...@@ -5,6 +5,7 @@ ver 0.19.2 (not yet released)
* decoder * decoder
- faad: remove workaround for ancient libfaad2 ABI bug - faad: remove workaround for ancient libfaad2 ABI bug
- ffmpeg: recognize MIME type audio/aacp - ffmpeg: recognize MIME type audio/aacp
- mad: fix negative replay gain values
* output * output
- fix memory leak after filter initialization error - fix memory leak after filter initialization error
- fall back to PCM if given DSD sample rate is not supported - fall back to PCM if given DSD sample rate is not supported
......
src/decoder/plugins/MadDecoderPlugin.cxx
View file @ 54c591bd
...@@ -657,7 +657,7 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen) ...@@ -657,7 +657,7 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
unsigned name = mad_bit_read(ptr, 3); /* gain name */ unsigned name = mad_bit_read(ptr, 3); /* gain name */
unsigned orig = mad_bit_read(ptr, 3); /* gain originator */ unsigned orig = mad_bit_read(ptr, 3); /* gain originator */
unsigned sign = mad_bit_read(ptr, 1); /* sign bit */ unsigned sign = mad_bit_read(ptr, 1); /* sign bit */
unsigned gain = mad_bit_read(ptr, 9); /* gain*10 */ int gain = mad_bit_read(ptr, 9); /* gain*10 */
if (gain && name == 1 && orig != 0) { if (gain && name == 1 && orig != 0) {
lame->track_gain = ((sign ? -gain : gain) / 10.0) + adj; lame->track_gain = ((sign ? -gain : gain) / 10.0) + adj;
FormatDebug(mad_domain, "LAME track gain found: %f", FormatDebug(mad_domain, "LAME track gain found: %f",
......
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