Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use `std` more consistently in `matroskacontainer.cpp`

This commit is contained in:
Martchus 2023-02-02 00:24:49 +01:00
parent 338011e3eb
commit 205b119416
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
matroska/matroskacontainer.cpp
View File

@ -834,7 +834,7 @@ struct SegmentData {
/// \brief size of the "SegmentInfo"-element /// \brief size of the "SegmentInfo"-element
std::uint64_t infoDataSize; std::uint64_t infoDataSize;
/// \brief cluster sizes /// \brief cluster sizes
vector<std::uint64_t> clusterSizes; std::vector<std::uint64_t> clusterSizes;
/// \brief first "Cluster"-element (original file) /// \brief first "Cluster"-element (original file)
EbmlElement *firstClusterElement; EbmlElement *firstClusterElement;
/// \brief end offset of last "Cluster"-element (original file) /// \brief end offset of last "Cluster"-element (original file)
@ -881,15 +881,15 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee
EbmlElement *level1Element, *level2Element; EbmlElement *level1Element, *level2Element;
// define variables needed for precalculation of "Tags"- and "Attachments"-element // define variables needed for precalculation of "Tags"- and "Attachments"-element
vector<MatroskaTagMaker> tagMaker; std::vector<MatroskaTagMaker> tagMaker;
tagMaker.reserve(tags().size()); tagMaker.reserve(tags().size());
std::uint64_t tagElementsSize = 0; std::uint64_t tagElementsSize = 0;
std::uint64_t tagsSize; std::uint64_t tagsSize;
vector<MatroskaAttachmentMaker> attachmentMaker; std::vector<MatroskaAttachmentMaker> attachmentMaker;
attachmentMaker.reserve(m_attachments.size()); attachmentMaker.reserve(m_attachments.size());
std::uint64_t attachedFileElementsSize = 0; std::uint64_t attachedFileElementsSize = 0;
std::uint64_t attachmentsSize; std::uint64_t attachmentsSize;
vector<MatroskaTrackHeaderMaker> trackHeaderMaker; std::vector<MatroskaTrackHeaderMaker> trackHeaderMaker;
trackHeaderMaker.reserve(tracks().size()); trackHeaderMaker.reserve(tracks().size());
std::uint64_t trackHeaderElementsSize = 0; std::uint64_t trackHeaderElementsSize = 0;
std::uint64_t trackHeaderSize; std::uint64_t trackHeaderSize;
@ -898,7 +898,7 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee
// current segment index // current segment index
unsigned int segmentIndex = 0; unsigned int segmentIndex = 0;
// segment specific data // segment specific data
vector<SegmentData> segmentData; std::vector<SegmentData> segmentData;
// offset of the segment which is currently written / offset of "Cues"-element in segment // offset of the segment which is currently written / offset of "Cues"-element in segment
std::uint64_t offset; std::uint64_t offset;
// current total offset (including EBML header) // current total offset (including EBML header)
@ -906,7 +906,7 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee
// current write offset (used to calculate positions) // current write offset (used to calculate positions)
std::uint64_t currentPosition = 0; std::uint64_t currentPosition = 0;
// holds the offsets of all CRC-32 elements and the length of the enclosing block // holds the offsets of all CRC-32 elements and the length of the enclosing block
vector<tuple<std::uint64_t, std::uint64_t>> crc32Offsets; std::vector<std::tuple<std::uint64_t, std::uint64_t>> crc32Offsets;
// size length used to make size denotations // size length used to make size denotations
std::uint8_t sizeLength; std::uint8_t sizeLength;
// sizes and offsets for cluster calculation // sizes and offsets for cluster calculation