decoder/opus: ignore case in replay gain tag names

Closes https://github.com/MusicPlayerDaemon/MPD/issues/604
This commit is contained in:
Max Kellermann 2019-07-29 10:40:37 +02:00
parent 90ea3bf985
commit b955334882
2 changed files with 6 additions and 3 deletions

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.21.12 (not yet released) ver 0.21.12 (not yet released)
* decoder
- opus: ignore case in replay gain tag names
* Windows * Windows
- support backslash in relative URIs loaded from playlists - support backslash in relative URIs loaded from playlists

View File

@ -22,12 +22,12 @@
#include "lib/xiph/XiphTags.hxx" #include "lib/xiph/XiphTags.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "tag/ParseName.hxx" #include "tag/ParseName.hxx"
#include "util/ASCII.hxx"
#include "ReplayGainInfo.hxx" #include "ReplayGainInfo.hxx"
#include <string> #include <string>
#include <stdint.h> #include <stdint.h>
#include <string.h>
#include <stdlib.h> #include <stdlib.h>
gcc_pure gcc_pure
@ -46,7 +46,7 @@ ScanOneOpusTag(const char *name, const char *value,
ReplayGainInfo *rgi, ReplayGainInfo *rgi,
TagHandler &handler) noexcept TagHandler &handler) noexcept
{ {
if (rgi != nullptr && strcmp(name, "R128_TRACK_GAIN") == 0) { if (rgi != nullptr && StringEqualsCaseASCII(name, "R128_TRACK_GAIN")) {
/* R128_TRACK_GAIN is a Q7.8 fixed point number in /* R128_TRACK_GAIN is a Q7.8 fixed point number in
dB */ dB */
@ -54,7 +54,8 @@ ScanOneOpusTag(const char *name, const char *value,
long l = strtol(value, &endptr, 10); long l = strtol(value, &endptr, 10);
if (endptr > value && *endptr == 0) if (endptr > value && *endptr == 0)
rgi->track.gain = double(l) / 256.; rgi->track.gain = double(l) / 256.;
} else if (rgi != nullptr && strcmp(name, "R128_ALBUM_GAIN") == 0) { } else if (rgi != nullptr &&
StringEqualsCaseASCII(name, "R128_ALBUM_GAIN")) {
/* R128_ALBUM_GAIN is a Q7.8 fixed point number in /* R128_ALBUM_GAIN is a Q7.8 fixed point number in
dB */ dB */