decoder/opus: fix track/album ReplayGain fallback

Fixes regression by commit 23d5a2b8 - that commit always pretended that any Opus file has both track and album gain, and thus disabled the fallback to the other if one is not set. This patch changes the logic to only submit ReplayGain if at least one value is set, and apply the offset only to that value. If none is available, then the new check in HandleAudio() will submit only the output gain. Closes https://github.com/MusicPlayerDaemon/MPD/issues/977

decoder/opus: fix track/album ReplayGain fallback
31268ad7 · Max Kellermann · a0d43dd8 · 31268ad7 · 31268ad7 · 31268ad7
Commit 31268ad7 authored Oct 16, 2020 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

NEWS NEWS +1 -0

OpusDecoderPlugin.cxx src/decoder/plugins/OpusDecoderPlugin.cxx +8 -1

OpusTags.cxx src/decoder/plugins/OpusTags.cxx +2 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.22.1 (not yet released)
 * decoder
  - opus: apply the OpusHead output gain even if there is no EBU R128 tag
+  - opus: fix track/album ReplayGain fallback
 * output
  - alsa: don't deadlock when the ALSA driver is buggy
  - jack, pulse: reduce the delay when stopping or pausing playback

--- a/src/decoder/plugins/OpusDecoderPlugin.cxx
+++ b/src/decoder/plugins/OpusDecoderPlugin.cxx
@@ -268,7 +268,6 @@ MPDOpusDecoder::HandleTags(const ogg_packet &packet)
 {
 	ReplayGainInfo rgi;
 	rgi.Clear();
-	rgi.track.gain = rgi.album.gain = EbuR128ToReplayGain(output_gain);

 	TagBuilder tag_builder;
 	AddTagHandler h(tag_builder);
@@ -276,8 +275,16 @@ MPDOpusDecoder::HandleTags(const ogg_packet &packet)
 	if (!ScanOpusTags(packet.packet, packet.bytes, &rgi, h))
 		return;

+	if (rgi.IsDefined()) {
+		/* submit all valid EBU R128 values with output_gain
+		   applied */
+		if (rgi.track.IsDefined())
+			rgi.track.gain += EbuR128ToReplayGain(output_gain);
+		if (rgi.album.IsDefined())
+			rgi.album.gain += EbuR128ToReplayGain(output_gain);
 		client.SubmitReplayGain(&rgi);
 		submitted_replay_gain = true;
+	}

 	if (!tag_builder.empty()) {
 		Tag tag = tag_builder.Commit();

--- a/src/decoder/plugins/OpusTags.cxx
+++ b/src/decoder/plugins/OpusTags.cxx
@@ -61,7 +61,7 @@ ScanOneOpusTag(StringView name, StringView value,
 		const char *endptr;
 		const auto l = ParseInt64(value, &endptr, 10);
 		if (endptr > value.begin() && endptr == value.end())
-			rgi->track.gain += float(l) / 256.0f;
+			rgi->track.gain = float(l) / 256.0f;
 	} else if (rgi != nullptr &&
 		   name.EqualsIgnoreCase("R128_ALBUM_GAIN")) {
 		/* R128_ALBUM_GAIN is a Q7.8 fixed point number in
@@ -70,7 +70,7 @@ ScanOneOpusTag(StringView name, StringView value,
 		const char *endptr;
 		const auto l = ParseInt64(value, &endptr, 10);
 		if (endptr > value.begin() && endptr == value.end())
-			rgi->album.gain += float(l) / 256.0f;
+			rgi->album.gain = float(l) / 256.0f;
 	}

 	handler.OnPair(name, value);