From 09384df32cc6bef40bc3630de1c928d2eb424909 Mon Sep 17 00:00:00 2001 From: Joff Date: Wed, 9 Jul 2014 19:18:36 +0200 Subject: [PATCH] decoder/dsd: use decoder_read_full() where appropriate Addresses Mantis ticket 0004015. [mk: use decoder_read_full() only when needed, and a few formal changes] --- NEWS | 1 + src/decoder/DsdLib.cxx | 10 +--------- src/decoder/DsdLib.hxx | 4 ---- src/decoder/DsdiffDecoderPlugin.cxx | 25 ++++++++++++------------- src/decoder/DsfDecoderPlugin.cxx | 11 ++++++----- 5 files changed, 20 insertions(+), 31 deletions(-) diff --git a/NEWS b/NEWS index d6fd59519..b67eb9314 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ ver 0.18.12 (not yet released) * decoder - audiofile: improve responsiveness - audiofile: fix WAV stream playback + - dsdiff, dsf: fix stream playback ver 0.18.11 (2014/05/12) * decoder diff --git a/src/decoder/DsdLib.cxx b/src/decoder/DsdLib.cxx index 67cc7e945..eafedda8f 100644 --- a/src/decoder/DsdLib.cxx +++ b/src/decoder/DsdLib.cxx @@ -49,14 +49,6 @@ DsdId::Equals(const char *s) const return memcmp(value, s, sizeof(value)) == 0; } -bool -dsdlib_read(Decoder *decoder, InputStream &is, - void *data, size_t length) -{ - size_t nbytes = decoder_read(decoder, is, data, length); - return nbytes == length; -} - /** * Skip the #input_stream to the specified offset. */ @@ -149,7 +141,7 @@ dsdlib_tag_id3(InputStream &is, id3_byte_t *dsdid3data; dsdid3data = dsdid3; - if (!dsdlib_read(nullptr, is, dsdid3data, count)) + if (!decoder_read_full(nullptr, is, dsdid3data, count)) return; id3_tag = id3_tag_parse(dsdid3data, count); diff --git a/src/decoder/DsdLib.hxx b/src/decoder/DsdLib.hxx index 53160cf1e..5c6127149 100644 --- a/src/decoder/DsdLib.hxx +++ b/src/decoder/DsdLib.hxx @@ -58,10 +58,6 @@ public: } }; -bool -dsdlib_read(Decoder *decoder, InputStream &is, - void *data, size_t length); - bool dsdlib_skip_to(Decoder *decoder, InputStream &is, int64_t offset); diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx index a3c0149b9..f8506851a 100644 --- a/src/decoder/DsdiffDecoderPlugin.cxx +++ b/src/decoder/DsdiffDecoderPlugin.cxx @@ -93,14 +93,14 @@ static bool dsdiff_read_id(Decoder *decoder, InputStream &is, DsdId *id) { - return dsdlib_read(decoder, is, id, sizeof(*id)); + return decoder_read_full(decoder, is, id, sizeof(*id)); } static bool dsdiff_read_chunk_header(Decoder *decoder, InputStream &is, DsdiffChunkHeader *header) { - return dsdlib_read(decoder, is, header, sizeof(*header)); + return decoder_read_full(decoder, is, header, sizeof(*header)); } static bool @@ -112,8 +112,7 @@ dsdiff_read_payload(Decoder *decoder, InputStream &is, if (size != (uint64_t)length) return false; - size_t nbytes = decoder_read(decoder, is, data, length); - return nbytes == length; + return decoder_read_full(decoder, is, data, length); } /** @@ -145,8 +144,8 @@ dsdiff_read_prop_snd(Decoder *decoder, InputStream &is, } else if (header.id.Equals("CHNL")) { uint16_t channels; if (header.GetSize() < sizeof(channels) || - !dsdlib_read(decoder, is, - &channels, sizeof(channels)) || + !decoder_read_full(decoder, is, + &channels, sizeof(channels)) || !dsdlib_skip_to(decoder, is, chunk_end_offset)) return false; @@ -154,8 +153,8 @@ dsdiff_read_prop_snd(Decoder *decoder, InputStream &is, } else if (header.id.Equals("CMPR")) { DsdId type; if (header.GetSize() < sizeof(type) || - !dsdlib_read(decoder, is, - &type, sizeof(type)) || + !decoder_read_full(decoder, is, + &type, sizeof(type)) || !dsdlib_skip_to(decoder, is, chunk_end_offset)) return false; @@ -208,7 +207,7 @@ dsdiff_handle_native_tag(InputStream &is, struct dsdiff_native_tag metatag; - if (!dsdlib_read(nullptr, is, &metatag, sizeof(metatag))) + if (!decoder_read_full(nullptr, is, &metatag, sizeof(metatag))) return; uint32_t length = FromBE32(metatag.size); @@ -221,7 +220,7 @@ dsdiff_handle_native_tag(InputStream &is, char *label; label = string; - if (!dsdlib_read(nullptr, is, label, (size_t)length)) + if (!decoder_read_full(nullptr, is, label, (size_t)length)) return; string[length] = '\0'; @@ -328,7 +327,7 @@ dsdiff_read_metadata(Decoder *decoder, InputStream &is, DsdiffChunkHeader *chunk_header) { DsdiffHeader header; - if (!dsdlib_read(decoder, is, &header, sizeof(header)) || + if (!decoder_read_full(decoder, is, &header, sizeof(header)) || !header.id.Equals("FRM8") || !header.format.Equals("DSD ")) return false; @@ -391,10 +390,10 @@ dsdiff_decode_chunk(Decoder &decoder, InputStream &is, now_size = now_frames * frame_size; } - size_t nbytes = decoder_read(decoder, is, buffer, now_size); - if (nbytes != now_size) + if (!decoder_read_full(&decoder, is, buffer, now_size)) return false; + const size_t nbytes = now_size; chunk_size -= nbytes; if (lsbitfirst) diff --git a/src/decoder/DsfDecoderPlugin.cxx b/src/decoder/DsfDecoderPlugin.cxx index 5ef94e647..ad5483c32 100644 --- a/src/decoder/DsfDecoderPlugin.cxx +++ b/src/decoder/DsfDecoderPlugin.cxx @@ -103,7 +103,7 @@ dsf_read_metadata(Decoder *decoder, InputStream &is, DsfMetaData *metadata) { DsfHeader dsf_header; - if (!dsdlib_read(decoder, is, &dsf_header, sizeof(dsf_header)) || + if (!decoder_read_full(decoder, is, &dsf_header, sizeof(dsf_header)) || !dsf_header.id.Equals("DSD ")) return false; @@ -117,7 +117,8 @@ dsf_read_metadata(Decoder *decoder, InputStream &is, /* read the 'fmt ' chunk of the DSF file */ DsfFmtChunk dsf_fmt_chunk; - if (!dsdlib_read(decoder, is, &dsf_fmt_chunk, sizeof(dsf_fmt_chunk)) || + if (!decoder_read_full(decoder, is, + &dsf_fmt_chunk, sizeof(dsf_fmt_chunk)) || !dsf_fmt_chunk.id.Equals("fmt ")) return false; @@ -143,7 +144,7 @@ dsf_read_metadata(Decoder *decoder, InputStream &is, /* read the 'data' chunk of the DSF file */ DsfDataChunk data_chunk; - if (!dsdlib_read(decoder, is, &data_chunk, sizeof(data_chunk)) || + if (!decoder_read_full(decoder, is, &data_chunk, sizeof(data_chunk)) || !data_chunk.id.Equals("data")) return false; @@ -247,10 +248,10 @@ dsf_decode_chunk(Decoder &decoder, InputStream &is, now_size = now_frames * frame_size; } - size_t nbytes = decoder_read(&decoder, is, buffer, now_size); - if (nbytes != now_size) + if (!decoder_read_full(&decoder, is, buffer, now_size)) return false; + const size_t nbytes = now_size; chunk_size -= nbytes; if (bitreverse)