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

Write zero lacing value in Ogg header if Vorbis comment size divisible by 255 

See https://github.com/Martchus/tageditor/issues/70
This commit is contained in:
Martchus 2021-08-16 19:22:15 +02:00
parent 0b47186e57
commit ee9aeb00b4
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ogg/oggcontainer.cpp
View File

@ -539,13 +539,13 @@ void OggContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFeedback
} }
// write buffered data to actual stream // write buffered data to actual stream
auto newSegmentSizesIterator = newSegmentSizes.cbegin(), newSegmentSizesEnd = newSegmentSizes.cend(); if (auto newSegmentSizesIterator = newSegmentSizes.cbegin(), newSegmentSizesEnd = newSegmentSizes.cend();
bool continuePreviousSegment = false; newSegmentSizesIterator != newSegmentSizesEnd) {
if (newSegmentSizesIterator != newSegmentSizesEnd) { auto bytesLeft = *newSegmentSizesIterator;
std::uint32_t bytesLeft = *newSegmentSizesIterator; auto continuePreviousSegment = false, needsZeroLacingValue = false;
// write pages until all data in the buffer is written // write pages until all data in the buffer is written
while (newSegmentSizesIterator != newSegmentSizesEnd) { while (newSegmentSizesIterator != newSegmentSizesEnd) {
// write header // write page header
backupStream.seekg(static_cast<streamoff>(currentPage.startOffset())); backupStream.seekg(static_cast<streamoff>(currentPage.startOffset()));
updatedPageOffsets.push_back(static_cast<std::uint64_t>(stream().tellp())); // memorize offset to update checksum later updatedPageOffsets.push_back(static_cast<std::uint64_t>(stream().tellp())); // memorize offset to update checksum later
copyHelper.copy(backupStream, stream(), 27); // just copy header from original file copyHelper.copy(backupStream, stream(), 27); // just copy header from original file
@ -561,21 +561,22 @@ void OggContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFeedback
// write segment sizes as long as there are segment sizes to be written and // write segment sizes as long as there are segment sizes to be written and
// the max number of segment sizes (255) is not exceeded // the max number of segment sizes (255) is not exceeded
std::uint32_t currentSize = 0; std::uint32_t currentSize = 0;
while (bytesLeft && segmentSizesWritten < 0xFF) { while ((bytesLeft || needsZeroLacingValue) && segmentSizesWritten < 0xFF) {
while (bytesLeft >= 0xFF && segmentSizesWritten < 0xFF) { while (bytesLeft > 0xFF && segmentSizesWritten < 0xFF) {
stream().put(static_cast<char>(0xFF)); stream().put(static_cast<char>(0xFF));
currentSize += 0xFF; currentSize += 0xFF;
bytesLeft -= 0xFF; bytesLeft -= 0xFF;
++segmentSizesWritten; ++segmentSizesWritten;
} }
if (bytesLeft && segmentSizesWritten < 0xFF) { if ((bytesLeft || needsZeroLacingValue) && segmentSizesWritten < 0xFF) {
// bytes left is here < 0xFF // bytes left is here <= 0xFF
stream().put(static_cast<char>(bytesLeft)); stream().put(static_cast<char>(bytesLeft));
currentSize += bytesLeft; currentSize += bytesLeft;
needsZeroLacingValue = bytesLeft == 0xFF;
bytesLeft = 0; bytesLeft = 0;
++segmentSizesWritten; ++segmentSizesWritten;
} }
if (!bytesLeft) { if (!bytesLeft && !needsZeroLacingValue) {
// sizes for the segment have been written // sizes for the segment have been written
// -> continue with next segment // -> continue with next segment
if (++newSegmentSizesIterator != newSegmentSizesEnd) { if (++newSegmentSizesIterator != newSegmentSizesEnd) {
@ -586,7 +587,7 @@ void OggContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFeedback
} }
// there are no bytes left in the current segment; remove continue flag // there are no bytes left in the current segment; remove continue flag
if (!bytesLeft) { if (!bytesLeft && !needsZeroLacingValue) {
continuePreviousSegment = false; continuePreviousSegment = false;
} }