f69b1b0917
taglib-1.5-kde#161721.patch):
169810)
107659)
Fixed overflow while calculating bitrate of FLAC files with a very high
bitrate.
:year() now falls back to YEAR if DATE doesn't exist and
XiphComment::year() falls back to TRACKNUM if TRACKNUMBER doesn't
exist. (BUG:144396)
:split().
:operator[] and in String::operator+=. (BUG:169389)
176373)
167786)
188578)
168382)
172556)
Added support for PRIV ID3v2 frames.
Empty ID3v2 genres are no longer treated as numeric ID3v1 genres.
Added support for the POPM (rating/playcount) ID3v2 frame.
161721)
134 lines
4.1 KiB
Diff
134 lines
4.1 KiB
Diff
diff -Nur taglib-1.5/taglib/flac/flacfile.cpp taglib/taglib/flac/flacfile.cpp
|
|
--- taglib-1.5/taglib/flac/flacfile.cpp 2008-01-31 06:19:03.000000000 +0100
|
|
+++ taglib/taglib/flac/flacfile.cpp 2009-07-12 23:53:18.000000000 +0200
|
|
@@ -42,6 +42,7 @@
|
|
{
|
|
enum { XiphIndex = 0, ID3v2Index = 1, ID3v1Index = 2 };
|
|
enum { StreamInfo = 0, Padding, Application, SeekTable, VorbisComment, CueSheet };
|
|
+ enum { MinPaddingLength = 4096 };
|
|
}
|
|
|
|
class FLAC::File::FilePrivate
|
|
@@ -167,9 +168,49 @@
|
|
uint blockLength = header.mid(1, 3).toUInt();
|
|
|
|
if(blockType == VorbisComment) {
|
|
- data[0] = header[0];
|
|
- insert(data, nextBlockOffset, blockLength + 4);
|
|
- break;
|
|
+
|
|
+ long paddingBreak = 0;
|
|
+
|
|
+ if(!isLastBlock) {
|
|
+ paddingBreak = findPaddingBreak(nextBlockOffset + blockLength + 4,
|
|
+ nextBlockOffset + d->xiphCommentData.size() + 8,
|
|
+ &isLastBlock);
|
|
+ }
|
|
+
|
|
+ uint paddingLength = 0;
|
|
+
|
|
+ if(paddingBreak) {
|
|
+
|
|
+ // There is space for comment and padding blocks without rewriting the
|
|
+ // whole file. Note: This cannot overflow.
|
|
+
|
|
+ paddingLength = paddingBreak - (nextBlockOffset + d->xiphCommentData.size() + 8);
|
|
+ }
|
|
+ else {
|
|
+
|
|
+ // Not enough space, so we will have to rewrite the whole file
|
|
+ // following this block
|
|
+
|
|
+ paddingLength = d->xiphCommentData.size();
|
|
+
|
|
+ if(paddingLength < MinPaddingLength)
|
|
+ paddingLength = MinPaddingLength;
|
|
+
|
|
+ paddingBreak = nextBlockOffset + blockLength + 4;
|
|
+ }
|
|
+
|
|
+ ByteVector padding = ByteVector::fromUInt(paddingLength);
|
|
+
|
|
+ padding[0] = 1;
|
|
+
|
|
+ if(isLastBlock)
|
|
+ padding[0] |= 0x80;
|
|
+
|
|
+ padding.resize(paddingLength + 4);
|
|
+ ByteVector pair(data);
|
|
+ pair.append(padding);
|
|
+ insert(pair, nextBlockOffset, paddingBreak - nextBlockOffset);
|
|
+ break;
|
|
}
|
|
|
|
nextBlockOffset += blockLength + 4;
|
|
@@ -373,11 +414,8 @@
|
|
isLastBlock = (header[0] & 0x80) != 0;
|
|
length = header.mid(1, 3).toUInt();
|
|
|
|
- if(blockType == Padding) {
|
|
- // debug("FLAC::File::scan() -- Padding found");
|
|
- }
|
|
// Found the vorbis-comment
|
|
- else if(blockType == VorbisComment) {
|
|
+ if(blockType == VorbisComment) {
|
|
d->xiphCommentData = readBlock(length);
|
|
d->hasXiphComment = true;
|
|
}
|
|
@@ -429,3 +467,34 @@
|
|
|
|
return -1;
|
|
}
|
|
+
|
|
+long FLAC::File::findPaddingBreak(long nextBlockOffset, long targetOffset, bool *isLast)
|
|
+{
|
|
+ // Starting from nextBlockOffset, step over padding blocks to find the
|
|
+ // address of a block which is after targetOffset. Return zero if
|
|
+ // a non-padding block occurs before that point.
|
|
+
|
|
+ while(true) {
|
|
+ seek(nextBlockOffset);
|
|
+
|
|
+ ByteVector header = readBlock(4);
|
|
+ char blockType = header[0] & 0x7f;
|
|
+ bool isLastBlock = header[0] & 0x80;
|
|
+ uint length = header.mid(1, 3).toUInt();
|
|
+
|
|
+ if(blockType != Padding)
|
|
+ break;
|
|
+
|
|
+ nextBlockOffset += 4 + length;
|
|
+
|
|
+ if(nextBlockOffset >= targetOffset) {
|
|
+ *isLast = isLastBlock;
|
|
+ return nextBlockOffset;
|
|
+ }
|
|
+
|
|
+ if(isLastBlock)
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
diff -Nur taglib-1.5/taglib/flac/flacfile.h taglib/taglib/flac/flacfile.h
|
|
--- taglib-1.5/taglib/flac/flacfile.h 2008-01-31 05:07:29.000000000 +0100
|
|
+++ taglib/taglib/flac/flacfile.h 2009-07-12 23:53:18.000000000 +0200
|
|
@@ -191,6 +191,7 @@
|
|
long findID3v2();
|
|
long findID3v1();
|
|
ByteVector xiphCommentData() const;
|
|
+ long findPaddingBreak(long nextPageOffset, long targetOffset, bool *isLast);
|
|
|
|
class FilePrivate;
|
|
FilePrivate *d;
|
|
diff -Nur taglib-1.5/taglib/flac/flacproperties.cpp taglib/taglib/flac/flacproperties.cpp
|
|
--- taglib-1.5/taglib/flac/flacproperties.cpp 2008-01-11 01:55:09.000000000 +0100
|
|
+++ taglib/taglib/flac/flacproperties.cpp 2008-04-08 14:15:20.000000000 +0200
|
|
@@ -146,5 +146,5 @@
|
|
|
|
// Real bitrate:
|
|
|
|
- d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
|
|
+ d->bitrate = d->length > 0 ? ((d->streamLength * 8UL) / d->length) / 1000 : 0;
|
|
}
|