mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'filetype-detection' of https://github.com/TsudaKageyu/taglib into filetype-detection

Browse Source
This commit is contained in:
Tsuda Kageyu 2017-02-07 22:37:13 +09:00
commit bf7ee62dc6
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
taglib/mpeg/mpegfile.cpp
View File

@ -105,23 +105,15 @@ bool MPEG::File::isSupported(IOStream *stream)
// MPEG frame headers are really confusing with irrelevant binary data.
// So we check if a frame header is really valid.
long headerOffset;
const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true, &headerOffset);
const long originalPosition = stream->tell();
long bufferOffset = 0;
stream->seek(0);
const ByteVector data = stream->readBlock(ID3v2::Header::size());
if(data.startsWith(ID3v2::Header::fileIdentifier()))
bufferOffset = ID3v2::Header(data).completeTagSize();
stream->seek(bufferOffset);
const ByteVector buffer = stream->readBlock(bufferSize());
AdapterFile file(stream);
for(unsigned int i = 0; i < buffer.size() - 1; ++i) {
if(isFrameSync(buffer, i)) {
const Header header(&file, bufferOffset + i, true);
const Header header(&file, headerOffset + i, true);
if(header.isValid()) {
stream->seek(originalPosition);
return true;

6
taglib/tagutils.cpp
View File

@ -78,7 +78,8 @@ long Utils::findAPE(File *file, long id3v1Location)
return -1;
}
ByteVector TagLib::Utils::readHeader(IOStream *stream, unsigned int length, bool skipID3v2)
ByteVector TagLib::Utils::readHeader(IOStream *stream, unsigned int length,
bool skipID3v2, long *headerOffset)
{
if(!stream || !stream->isOpen())
return ByteVector();
@ -97,5 +98,8 @@ ByteVector TagLib::Utils::readHeader(IOStream *stream, unsigned int length, bool
const ByteVector header = stream->readBlock(length);
stream->seek(originalPosition);
if(headerOffset)
*headerOffset = bufferOffset;
return header;
}

3
taglib/tagutils.h
View File

@ -45,7 +45,8 @@ namespace TagLib {
long findAPE(File *file, long id3v1Location);
ByteVector readHeader(IOStream *stream, unsigned int length, bool skipID3v2);
ByteVector readHeader(IOStream *stream, unsigned int length, bool skipID3v2,
long *headerOffset = 0);
}
}