diff options
| author | Marcello Desantis <marcello@casadesantis.it> | 2014-04-09 23:58:56 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-04-09 23:58:56 +0200 |
| commit | 95ac6071b9fdaa543bd0c8ab7665d262db708683 (patch) | |
| tree | e8bd8f2548f2f4840596660cb8bf04f9b24d4cc1 | |
| parent | 3a4e667078e13f27b3d196d3b3a56f1f39be2c75 (diff) | |
| download | mpd-95ac6071b9fdaa543bd0c8ab7665d262db708683.tar.gz mpd-95ac6071b9fdaa543bd0c8ab7665d262db708683.tar.xz mpd-95ac6071b9fdaa543bd0c8ab7665d262db708683.zip | |
decoder/sndfile: work around libsndfile bug on partial read
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/decoder/SndfileDecoderPlugin.cxx | 26 |
2 files changed, 21 insertions, 6 deletions
@@ -3,6 +3,7 @@ ver 0.18.10 (not yet released) - ffmpeg: fix seeking bug - ffmpeg: handle unknown stream start time - gme: fix memory leak + - sndfile: work around libsndfile bug on partial read * don't interrupt playback when current song gets deleted ver 0.18.9 (2014/03/02) diff --git a/src/decoder/SndfileDecoderPlugin.cxx b/src/decoder/SndfileDecoderPlugin.cxx index 3360cd1bf..77b132962 100644 --- a/src/decoder/SndfileDecoderPlugin.cxx +++ b/src/decoder/SndfileDecoderPlugin.cxx @@ -55,14 +55,28 @@ sndfile_vio_read(void *ptr, sf_count_t count, void *user_data) { InputStream &is = *(InputStream *)user_data; + sf_count_t total_bytes = 0; Error error; - size_t nbytes = is.LockRead(ptr, count, error); - if (nbytes == 0 && error.IsDefined()) { - LogError(error); - return -1; - } - return nbytes; + /* this loop is necessary because libsndfile chokes on partial + reads */ + + do { + size_t nbytes = is.LockRead((char *)ptr + total_bytes, + count - total_bytes, error); + if (nbytes == 0) { + if (error.IsDefined()) { + LogError(error); + return -1; + } + + break; + } + + total_bytes += nbytes; + } while (total_bytes < count); + + return total_bytes; } static sf_count_t |