oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/dsdiff: use PackedBE64 instead of DffDsdUint64

Browse Source
This commit is contained in:
Max Kellermann 2023-03-12 20:21:37 +01:00
parent 02296adbba
commit c472046cbb
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/decoder/plugins/DsdLib.hxx
View File

@ -31,17 +31,6 @@ public:
} }
}; };
class DffDsdUint64 {
uint32_t hi;
uint32_t lo;
public:
constexpr uint64_t Read() const {
return (uint64_t(FromBE32(hi)) << 32) |
uint64_t(FromBE32(lo));
}
};
bool bool
dsdlib_skip_to(DecoderClient *client, InputStream &is, dsdlib_skip_to(DecoderClient *client, InputStream &is,
offset_type offset); offset_type offset);

6
src/decoder/plugins/DsdiffDecoderPlugin.cxx
View File

@ -22,13 +22,13 @@
struct DsdiffHeader { struct DsdiffHeader {
DsdId id; DsdId id;
DffDsdUint64 size; PackedBE64 size;
DsdId format; DsdId format;
}; };
struct DsdiffChunkHeader { struct DsdiffChunkHeader {
DsdId id; DsdId id;
DffDsdUint64 size; PackedBE64 size;
/** /**
* Read the "size" attribute from the specified header, converting it * Read the "size" attribute from the specified header, converting it
@ -36,7 +36,7 @@ struct DsdiffChunkHeader {
*/ */
[[nodiscard]] constexpr [[nodiscard]] constexpr
uint64_t GetSize() const { uint64_t GetSize() const {
return size.Read(); return size;
} }
/** /**