decoder/sndfile: allow partial reads at end of file

While libsndfile doesn't like partial reads in the middle of a file (see commit 95ac6071), it allows partial reads at the end of a file. It doesn't pay attention to the file size when issuing a read. Commit ecb67a1e (MPD 0.18.12) was a regression: previously, partial reads at the end of a file were possible, but switching to decoder_read_full() made this an error condition. This way, a portion at the end of each file was lost, leading to corruption with gapless playback (https://github.com/MusicPlayerDaemon/MPD/issues/936). This fix switches to the newly introduced function decoder_read_much(), which does the same as the code before commit ecb67a1e. Closes https://github.com/MusicPlayerDaemon/MPD/issues/936

decoder/sndfile: allow partial reads at end of file
0aa0ffb6 · Max Kellermann · 33f70931 · 0aa0ffb6 · 0aa0ffb6
Commit 0aa0ffb6 authored Sep 04, 2020 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

NEWS NEWS +2 -0

SndfileDecoderPlugin.cxx src/decoder/plugins/SndfileDecoderPlugin.cxx +1 -3

No files found.
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ ver 0.21.26 (not yet released)
 * output
  - osx: fix crash bug
  - sles: support floating point samples
+* decoder
+  - sndfile: fix lost samples at end of file

 ver 0.21.25 (2020/07/06)
 * protocol:

--- a/src/decoder/plugins/SndfileDecoderPlugin.cxx
+++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx
@@ -46,9 +46,7 @@ struct SndfileInputStream {
 	size_t Read(void *buffer, size_t size) {
 		/* libsndfile chokes on partial reads; therefore
 		   always force full reads */
-		return decoder_read_full(client, is, buffer, size)
-			? size
-			: 0;
+		return decoder_read_much(client, is, buffer, size);
 	}
 };