diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-28 23:01:13 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-28 23:47:25 +0100 |
| commit | 4728735acf20fba24d0d03ab431160e250325869 (patch) | |
| tree | e1bf60cf4f3fc37b149318d7c774ce3f13b94a16 | |
| parent | 9dcbd005f0087c5644d86db4eb1b24cc0c39d132 (diff) | |
| download | mpd-4728735acf20fba24d0d03ab431160e250325869.tar.gz mpd-4728735acf20fba24d0d03ab431160e250325869.tar.xz mpd-4728735acf20fba24d0d03ab431160e250325869.zip | |
decoder/dsf: don't play junk at the end of the "data" chunk
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/decoder/DsfDecoderPlugin.cxx | 10 |
2 files changed, 10 insertions, 1 deletions
@@ -15,6 +15,7 @@ ver 0.18 (2012/??/??) - lastfm: remove defunct Last.fm support * decoder: - adplug: new decoder plugin using libadplug + - dsf: don't play junk at the end of the "data" chunk - ffmpeg: drop support for pre-0.8 ffmpeg - flac: require libFLAC 1.2 or newer - flac: support FLAC files inside archives diff --git a/src/decoder/DsfDecoderPlugin.cxx b/src/decoder/DsfDecoderPlugin.cxx index a7e2f3d1e..7f47074ee 100644 --- a/src/decoder/DsfDecoderPlugin.cxx +++ b/src/decoder/DsfDecoderPlugin.cxx @@ -156,12 +156,20 @@ dsf_read_metadata(Decoder *decoder, InputStream &is, data_size -= sizeof(data_chunk); - metadata->chunk_size = data_size; /* data_size cannot be bigger or equal to total file size */ const uint64_t size = (uint64_t)is.GetSize(); if (data_size >= size) return false; + /* use the sample count from the DSF header as the upper + bound, because some DSF files contain junk at the end of + the "data" chunk */ + const uint64_t samplecnt = dsf_fmt_chunk.scnt.Read(); + const uint64_t playable_size = samplecnt * 2 / 8; + if (data_size > playable_size) + data_size = playable_size; + + metadata->chunk_size = data_size; metadata->channels = (unsigned) dsf_fmt_chunk.channelnum; metadata->sample_rate = samplefreq; #ifdef HAVE_ID3TAG |