mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-06-21 13:49:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support large files over 2GB on Windows (#1089)

Browse Source 
Backport of 4dcf0b41c6
b01f45e141
https://github.com/taglib/taglib/pull/77

Tested with files larger than 2GB which have been created using

sox -n -r 44100 -C 320 large.mp3 synth 58916 sine 440 channels 2
sox -n -r 44100 -C 0 large.flac synth 25459 sine 440 channels 2
sox -n -r 44100 -C 10 large.ogg synth 229806 sine 440 channels 2
sox -n -r 44100 large.wav synth 6692 sine 440 channels 2
ffmpeg -f lavfi -i "sine=frequency=440:duration=244676" -y large.m4a

The only file which was readable with the tagreader example
before this commit was large.ogg. The problem is that long on
Windows is only 32-bit (also in LLP64 data model of 64-bit
compilation target) and all the file offsets using long are
too small for large files. Now long is replaced by offset_t
(defined to be long long on Windows and off_t on UNIX) for such
cases and some unsigned long are now size_t, which has the
correct size even on Windows.
This commit is contained in:
Urs Fleisch
2020-04-19 11:13:55 +02:00
parent bc915f5dc8
commit ca8c2e07ec
72 changed files with 378 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
taglib/ape/apefile.cpp
View File

@@ -69,13 +69,13 @@ public:
delete properties;
}
long APELocation;
offset_t APELocation;
long APESize;
long ID3v1Location;
offset_t ID3v1Location;
ID3v2::Header *ID3v2Header;
long ID3v2Location;
offset_t ID3v2Location;
long ID3v2Size;
TagUnion tag;
@@ -292,7 +292,7 @@ void APE::File::read(bool readProperties)
if(readProperties) {
long streamLength;
offset_t streamLength;
if(d->APELocation >= 0)
streamLength = d->APELocation;

6
taglib/ape/apeproperties.cpp
View File

@@ -70,7 +70,7 @@ APE::Properties::Properties(File *, ReadStyle style) :
debug("APE::Properties::Properties() -- This constructor is no longer used.");
}
APE::Properties::Properties(File *file, long streamLength, ReadStyle style) :
APE::Properties::Properties(File *file, offset_t streamLength, ReadStyle style) :
AudioProperties(style),
d(new PropertiesPrivate())
{
@@ -142,10 +142,10 @@ namespace
}
} // namespace
void APE::Properties::read(File *file, long streamLength)
void APE::Properties::read(File *file, offset_t streamLength)
{
// First, we assume that the file pointer is set at the first descriptor.
long offset = file->tell();
offset_t offset = file->tell();
int version = headerVersion(file->readBlock(6));
// Next, we look for the descriptor.

5
taglib/ape/apeproperties.h
View File

@@ -30,6 +30,7 @@
#ifndef TAGLIB_APEPROPERTIES_H
#define TAGLIB_APEPROPERTIES_H
#include "taglib.h"
#include "taglib_export.h"
#include "audioproperties.h"
@@ -61,7 +62,7 @@ namespace TagLib {
* Create an instance of APE::Properties with the data read from the
* APE::File \a file.
*/
Properties(File *file, long streamLength, ReadStyle style = Average);
Properties(File *file, offset_t streamLength, ReadStyle style = Average);
/*!
* Destroys this APE::Properties instance.
@@ -129,7 +130,7 @@ namespace TagLib {
Properties(const Properties &);
Properties &operator=(const Properties &);
void read(File *file, long streamLength);
void read(File *file, offset_t streamLength);
void analyzeCurrent(File *file);
void analyzeOld(File *file);

4
taglib/ape/apetag.cpp
View File

@@ -80,7 +80,7 @@ public:
footerLocation(0) {}
File *file;
long footerLocation;
offset_t footerLocation;
Footer footer;
ItemListMap itemListMap;
@@ -95,7 +95,7 @@ APE::Tag::Tag() :
{
}
APE::Tag::Tag(TagLib::File *file, long footerLocation) :
APE::Tag::Tag(TagLib::File *file, offset_t footerLocation) :
d(new TagPrivate())
{
d->file = file;

2
taglib/ape/apetag.h
View File

@@ -66,7 +66,7 @@ namespace TagLib {
* Create an APE tag and parse the data in \a file with APE footer at
* \a tagOffset.
*/
Tag(TagLib::File *file, long footerLocation);
Tag(TagLib::File *file, offset_t footerLocation);
/*!
* Destroys this Tag instance.

26
taglib/flac/flacfile.cpp
View File

@@ -79,10 +79,10 @@ public:
}
const ID3v2::FrameFactory *ID3v2FrameFactory;
long ID3v2Location;
offset_t ID3v2Location;
long ID3v2OriginalSize;
long ID3v1Location;
offset_t ID3v1Location;
TagUnion tag;
@@ -90,8 +90,8 @@ public:
ByteVector xiphCommentData;
BlockList blocks;
long flacStart;
long streamStart;
offset_t flacStart;
offset_t streamStart;
bool scanned;
};
@@ -219,8 +219,8 @@ bool FLAC::File::save()
// Compute the amount of padding, and append that to data.
long originalLength = d->streamStart - d->flacStart;
long paddingLength = originalLength - data.size() - 4;
offset_t originalLength = d->streamStart - d->flacStart;
offset_t paddingLength = originalLength - data.size() - 4;
if(paddingLength <= 0) {
paddingLength = MinPaddingLength;
@@ -228,15 +228,15 @@ bool FLAC::File::save()
else {
// Padding won't increase beyond 1% of the file size or 1MB.
long threshold = length() / 100;
threshold = std::max(threshold, MinPaddingLength);
threshold = std::min(threshold, MaxPaddingLegnth);
offset_t threshold = length() / 100;
threshold = std::max<offset_t>(threshold, MinPaddingLength);
threshold = std::min<offset_t>(threshold, MaxPaddingLegnth);
if(paddingLength > threshold)
paddingLength = MinPaddingLength;
}
ByteVector paddingHeader = ByteVector::fromUInt(paddingLength);
ByteVector paddingHeader = ByteVector::fromUInt(static_cast<unsigned int>(paddingLength));
paddingHeader[0] = static_cast<char>(MetadataBlock::Padding | LastBlockFlag);
data.append(paddingHeader);
data.resize(static_cast<unsigned int>(data.size() + paddingLength));
@@ -341,7 +341,7 @@ ByteVector FLAC::File::streamInfoData()
return ByteVector();
}
long FLAC::File::streamLength()
offset_t FLAC::File::streamLength()
{
debug("FLAC::File::streamLength() -- This function is obsolete. Returning zero.");
return 0;
@@ -456,7 +456,7 @@ void FLAC::File::read(bool readProperties)
const ByteVector infoData = d->blocks.front()->render();
long streamLength;
offset_t streamLength;
if(d->ID3v1Location >= 0)
streamLength = d->ID3v1Location - d->streamStart;
@@ -477,7 +477,7 @@ void FLAC::File::scan()
if(!isValid())
return;
long nextBlockOffset;
offset_t nextBlockOffset;
if(d->ID3v2Location >= 0)
nextBlockOffset = find("fLaC", d->ID3v2Location + d->ID3v2OriginalSize);

2
taglib/flac/flacfile.h
View File

@@ -256,7 +256,7 @@ namespace TagLib {
*
* \deprecated Always returns zero.
*/
TAGLIB_DEPRECATED long streamLength(); // BIC: remove
TAGLIB_DEPRECATED offset_t streamLength(); // BIC: remove
/*!
* Returns a list of pictures attached to the FLAC file.

4
taglib/flac/flacproperties.cpp
View File

@@ -55,7 +55,7 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
FLAC::Properties::Properties(ByteVector data, long streamLength, ReadStyle style) :
FLAC::Properties::Properties(ByteVector data, offset_t streamLength, ReadStyle style) :
AudioProperties(style),
d(new PropertiesPrivate())
{
@@ -128,7 +128,7 @@ ByteVector FLAC::Properties::signature() const
// private members
////////////////////////////////////////////////////////////////////////////////
void FLAC::Properties::read(const ByteVector &data, long streamLength)
void FLAC::Properties::read(const ByteVector &data, offset_t streamLength)
{
if(data.size() < 18) {
debug("FLAC::Properties::read() - FLAC properties must contain at least 18 bytes.");

5
taglib/flac/flacproperties.h
View File

@@ -26,6 +26,7 @@
#ifndef TAGLIB_FLACPROPERTIES_H
#define TAGLIB_FLACPROPERTIES_H
#include "tbytevector.h"
#include "taglib_export.h"
#include "audioproperties.h"
@@ -50,7 +51,7 @@ namespace TagLib {
* ByteVector \a data.
*/
// BIC: switch to const reference
Properties(ByteVector data, long streamLength, ReadStyle style = Average);
Properties(ByteVector data, offset_t streamLength, ReadStyle style = Average);
/*!
* Create an instance of FLAC::Properties with the data read from the
@@ -137,7 +138,7 @@ namespace TagLib {
Properties(const Properties &);
Properties &operator=(const Properties &);
void read(const ByteVector &data, long streamLength);
void read(const ByteVector &data, offset_t streamLength);
class PropertiesPrivate;
PropertiesPrivate *d;

2
taglib/it/itfile.cpp
View File

@@ -162,7 +162,7 @@ bool IT::File::save()
if(!readU16L(special))
return false;
unsigned long fileSize = File::length();
unsigned long fileSize = static_cast<unsigned long>(File::length());
if(special & Properties::MessageAttached) {
seek(54);
if(!readU16L(messageLength) || !readU32L(messageOffset))

4
taglib/mp4/mp4atom.cpp
View File

@@ -93,7 +93,7 @@ MP4::Atom::Atom(File *file)
for(int i = 0; i < numContainers; i++) {
if(name == containers[i]) {
if(name == "meta") {
long posAfterMeta = file->tell();
offset_t posAfterMeta = file->tell();
ByteVector nextSize = file->readBlock(8).mid(4, 4);
static const char *const metaChildrenNames[] = {
"hdlr", "ilst", "mhdr", "ctry", "lang"
@@ -182,7 +182,7 @@ MP4::Atoms::Atoms(File *file)
atoms.setAutoDelete(true);
file->seek(0, File::End);
long end = file->tell();
offset_t end = file->tell();
file->seek(0);
while(file->tell() + 8 <= end) {
MP4::Atom *atom = new MP4::Atom(file);

4
taglib/mp4/mp4atom.h
View File

@@ -80,8 +80,8 @@ namespace TagLib {
Atom *find(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
bool path(AtomList &path, const char *name1, const char *name2 = 0, const char *name3 = 0);
AtomList findall(const char *name, bool recursive = false);
long offset;
long length;
offset_t offset;
offset_t length;
TagLib::ByteVector name;
AtomList children;
private:

4
taglib/mp4/mp4properties.cpp
View File

@@ -38,7 +38,7 @@ namespace
{
long long totalLength = 0;
for(MP4::AtomList::ConstIterator it = list.begin(); it != list.end(); ++it) {
long length = (*it)->length;
offset_t length = (*it)->length;
if(length == 0)
return 0; // for safety, see checkValid() in mp4file.cpp
@@ -257,7 +257,7 @@ MP4::Properties::read(File *file, Atoms *atoms)
// There are files which do not contain a nominal bitrate, e.g. those
// generated by refalac64.exe. Calculate the bitrate from the audio
// data size (mdat atoms) and the duration.
d->bitrate = (calculateMdatLength(atoms->atoms) * 8) / d->length;
d->bitrate = static_cast<int>((calculateMdatLength(atoms->atoms) * 8) / d->length);
}
}
}

20
taglib/mp4/mp4tag.cpp
View File

@@ -555,7 +555,7 @@ MP4::Tag::strip()
}
void
MP4::Tag::updateParents(const AtomList &path, long delta, int ignore)
MP4::Tag::updateParents(const AtomList &path, offset_t delta, int ignore)
{
if(static_cast<int>(path.size()) <= ignore)
return;
@@ -577,13 +577,13 @@ MP4::Tag::updateParents(const AtomList &path, long delta, int ignore)
// 32-bit
else {
d->file->seek((*it)->offset);
d->file->writeBlock(ByteVector::fromUInt(size + delta));
d->file->writeBlock(ByteVector::fromUInt(static_cast<unsigned int>(size + delta)));
}
}
}
void
MP4::Tag::updateOffsets(long delta, long offset)
MP4::Tag::updateOffsets(offset_t delta, offset_t offset)
{
MP4::Atom *moov = d->atoms->find("moov");
if(moov) {
@@ -599,11 +599,11 @@ MP4::Tag::updateOffsets(long delta, long offset)
d->file->seek(atom->offset + 16);
unsigned int pos = 4;
while(count--) {
long o = static_cast<long>(data.toUInt(pos));
offset_t o = static_cast<offset_t>(data.toUInt(pos));
if(o > offset) {
o += delta;
}
d->file->writeBlock(ByteVector::fromUInt(o));
d->file->writeBlock(ByteVector::fromUInt(static_cast<unsigned int>(o)));
pos += 4;
}
}
@@ -667,7 +667,7 @@ MP4::Tag::saveNew(ByteVector data)
data = renderAtom("udta", data);
}
long offset = path.back()->offset + 8;
offset_t offset = path.back()->offset + 8;
d->file->insert(data, offset, 0);
updateParents(path, data.size());
@@ -685,8 +685,8 @@ MP4::Tag::saveExisting(ByteVector data, const AtomList &path)
AtomList::ConstIterator it = path.end();
MP4::Atom *ilst = *(--it);
long offset = ilst->offset;
long length = ilst->length;
offset_t offset = ilst->offset;
offset_t length = ilst->length;
MP4::Atom *meta = *(--it);
AtomList::ConstIterator index = meta->children.find(ilst);
@@ -711,14 +711,14 @@ MP4::Tag::saveExisting(ByteVector data, const AtomList &path)
}
}
long delta = data.size() - length;
offset_t delta = data.size() - length;
if(!data.isEmpty()) {
if(delta > 0 || (delta < 0 && delta > -8)) {
data.append(padIlst(data));
delta = data.size() - length;
}
else if(delta < 0) {
data.append(padIlst(data, -delta - 8));
data.append(padIlst(data, static_cast<int>(-delta - 8)));
delta = 0;
}

4
taglib/mp4/mp4tag.h
View File

@@ -148,8 +148,8 @@ namespace TagLib {
ByteVector renderIntPairNoTrailing(const ByteVector &name, const Item &item) const;
ByteVector renderCovr(const ByteVector &name, const Item &item) const;
void updateParents(const AtomList &path, long delta, int ignore = 0);
void updateOffsets(long delta, long offset);
void updateParents(const AtomList &path, offset_t delta, int ignore = 0);
void updateOffsets(offset_t delta, offset_t offset);
void saveNew(ByteVector data);
void saveExisting(ByteVector data, const AtomList &path);

8
taglib/mpc/mpcfile.cpp
View File

@@ -61,13 +61,13 @@ public:
delete properties;
}
long APELocation;
offset_t APELocation;
long APESize;
long ID3v1Location;
offset_t ID3v1Location;
ID3v2::Header *ID3v2Header;
long ID3v2Location;
offset_t ID3v2Location;
long ID3v2Size;
TagUnion tag;
@@ -310,7 +310,7 @@ void MPC::File::read(bool readProperties)
if(readProperties) {
long streamLength;
offset_t streamLength;
if(d->APELocation >= 0)
streamLength = d->APELocation;

8
taglib/mpc/mpcproperties.cpp
View File

@@ -66,14 +66,14 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
MPC::Properties::Properties(const ByteVector &data, long streamLength, ReadStyle style) :
MPC::Properties::Properties(const ByteVector &data, offset_t streamLength, ReadStyle style) :
AudioProperties(style),
d(new PropertiesPrivate())
{
readSV7(data, streamLength);
}
MPC::Properties::Properties(File *file, long streamLength, ReadStyle style) :
MPC::Properties::Properties(File *file, offset_t streamLength, ReadStyle style) :
AudioProperties(style),
d(new PropertiesPrivate())
{
@@ -203,7 +203,7 @@ namespace
const unsigned short sftable [8] = { 44100, 48000, 37800, 32000, 0, 0, 0, 0 };
} // namespace
void MPC::Properties::readSV8(File *file, long streamLength)
void MPC::Properties::readSV8(File *file, offset_t streamLength)
{
bool readSH = false, readRG = false;
@@ -295,7 +295,7 @@ void MPC::Properties::readSV8(File *file, long streamLength)
}
}
void MPC::Properties::readSV7(const ByteVector &data, long streamLength)
void MPC::Properties::readSV7(const ByteVector &data, offset_t streamLength)
{
if(data.startsWith("MP+")) {
if(data.size() < 4)

9
taglib/mpc/mpcproperties.h
View File

@@ -26,6 +26,7 @@
#ifndef TAGLIB_MPCPROPERTIES_H
#define TAGLIB_MPCPROPERTIES_H
#include "tbytevector.h"
#include "taglib_export.h"
#include "audioproperties.h"
@@ -53,13 +54,13 @@ namespace TagLib {
*
* This constructor is deprecated. It only works for MPC version up to 7.
*/
Properties(const ByteVector &data, long streamLength, ReadStyle style = Average);
Properties(const ByteVector &data, offset_t streamLength, ReadStyle style = Average);
/*!
* Create an instance of MPC::Properties with the data read directly
* from a MPC::File.
*/
Properties(File *file, long streamLength, ReadStyle style = Average);
Properties(File *file, offset_t streamLength, ReadStyle style = Average);
/*!
* Destroys this MPC::Properties instance.
@@ -146,8 +147,8 @@ namespace TagLib {
Properties(const Properties &);
Properties &operator=(const Properties &);
void readSV7(const ByteVector &data, long streamLength);
void readSV8(File *file, long streamLength);
void readSV7(const ByteVector &data, offset_t streamLength);
void readSV8(File *file, offset_t streamLength);
class PropertiesPrivate;
PropertiesPrivate *d;

4
taglib/mpeg/id3v1/id3v1tag.cpp
View File

@@ -48,7 +48,7 @@ public:
genre(255) {}
File *file;
long tagOffset;
offset_t tagOffset;
String title;
String artist;
@@ -88,7 +88,7 @@ ID3v1::Tag::Tag() :
{
}
ID3v1::Tag::Tag(File *file, long tagOffset) :
ID3v1::Tag::Tag(File *file, offset_t tagOffset) :
d(new TagPrivate())
{
d->file = file;

2
taglib/mpeg/id3v1/id3v1tag.h
View File

@@ -114,7 +114,7 @@ namespace TagLib {
* Create an ID3v1 tag and parse the data in \a file starting at
* \a tagOffset.
*/
Tag(File *file, long tagOffset);
Tag(File *file, offset_t tagOffset);
/*!
* Destroys this Tag instance.

2
taglib/mpeg/id3v2/id3v2framefactory.cpp
View File

@@ -63,7 +63,7 @@ namespace
int offset = 0;
int end = 0;
while(s.length() > offset && s[offset] == '(' &&
while(static_cast<int>(s.length()) > offset && s[offset] == '(' &&
(end = s.find(")", offset + 1)) > offset) {
// "(12)Genre"
const String genreCode = s.substr(offset + 1, end - 1);

10
taglib/mpeg/id3v2/id3v2tag.cpp
View File

@@ -88,7 +88,7 @@ public:
const FrameFactory *factory;
File *file;
long tagOffset;
offset_t tagOffset;
Header header;
ExtendedHeader *extendedHeader;
@@ -125,7 +125,7 @@ ID3v2::Tag::Tag() :
d->factory = FrameFactory::instance();
}
ID3v2::Tag::Tag(File *file, long tagOffset, const FrameFactory *factory) :
ID3v2::Tag::Tag(File *file, offset_t tagOffset, const FrameFactory *factory) :
d(new TagPrivate())
{
d->factory = factory;
@@ -686,9 +686,9 @@ ByteVector ID3v2::Tag::render(Version version) const
else {
// Padding won't increase beyond 1% of the file size or 1MB.
long threshold = d->file ? d->file->length() / 100 : 0;
threshold = std::max(threshold, MinPaddingSize);
threshold = std::min(threshold, MaxPaddingSize);
offset_t threshold = d->file ? d->file->length() / 100 : 0;
threshold = std::max<offset_t>(threshold, MinPaddingSize);
threshold = std::min<offset_t>(threshold, MaxPaddingSize);
if(paddingSize > threshold)
paddingSize = MinPaddingSize;

2
taglib/mpeg/id3v2/id3v2tag.h
View File

@@ -146,7 +146,7 @@ namespace TagLib {
*
* \see FrameFactory
*/
Tag(File *file, long tagOffset,
Tag(File *file, offset_t tagOffset,
const FrameFactory *factory = FrameFactory::instance());
/*!

26
taglib/mpeg/mpegfile.cpp
View File

@@ -63,13 +63,13 @@ public:
const ID3v2::FrameFactory *ID3v2FrameFactory;
long ID3v2Location;
offset_t ID3v2Location;
long ID3v2OriginalSize;
long APELocation;
offset_t APELocation;
long APEOriginalSize;
long ID3v1Location;
offset_t ID3v1Location;
TagUnion tag;
@@ -105,13 +105,13 @@ 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;
offset_t headerOffset;
const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true, &headerOffset);
if(buffer.isEmpty())
return false;
const long originalPosition = stream->tell();
const offset_t originalPosition = stream->tell();
AdapterFile file(stream);
for(unsigned int i = 0; i < buffer.size() - 1; ++i) {
@@ -406,7 +406,7 @@ void MPEG::File::setID3v2FrameFactory(const ID3v2::FrameFactory *factory)
d->ID3v2FrameFactory = factory;
}
long MPEG::File::nextFrameOffset(long position)
offset_t MPEG::File::nextFrameOffset(offset_t position)
{
ByteVector frameSyncBytes(2, '\0');
@@ -430,12 +430,12 @@ long MPEG::File::nextFrameOffset(long position)
}
}
long MPEG::File::previousFrameOffset(long position)
offset_t MPEG::File::previousFrameOffset(offset_t position)
{
ByteVector frameSyncBytes(2, '\0');
while(position > 0) {
const long bufferLength = std::min<long>(position, bufferSize());
const offset_t bufferLength = std::min<offset_t>(position, bufferSize());
position -= bufferLength;
seek(position);
@@ -455,9 +455,9 @@ long MPEG::File::previousFrameOffset(long position)
return -1;
}
long MPEG::File::firstFrameOffset()
offset_t MPEG::File::firstFrameOffset()
{
long position = 0;
offset_t position = 0;
if(hasID3v2Tag())
position = d->ID3v2Location + ID3v2Tag()->header()->completeTagSize();
@@ -465,9 +465,9 @@ long MPEG::File::firstFrameOffset()
return nextFrameOffset(position);
}
long MPEG::File::lastFrameOffset()
offset_t MPEG::File::lastFrameOffset()
{
long position;
offset_t position;
if(hasAPETag())
position = d->APELocation - 1;
@@ -535,7 +535,7 @@ void MPEG::File::read(bool readProperties)
ID3v1Tag(true);
}
long MPEG::File::findID3v2()
offset_t MPEG::File::findID3v2()
{
if(!isValid())
return -1;

10
taglib/mpeg/mpegfile.h
View File

@@ -322,24 +322,24 @@ namespace TagLib {
/*!
* Returns the position in the file of the first MPEG frame.
*/
long firstFrameOffset();
offset_t firstFrameOffset();
/*!
* Returns the position in the file of the next MPEG frame,
* using the current position as start
*/
long nextFrameOffset(long position);
offset_t nextFrameOffset(offset_t position);
/*!
* Returns the position in the file of the previous MPEG frame,
* using the current position as start
*/
long previousFrameOffset(long position);
offset_t previousFrameOffset(offset_t position);
/*!
* Returns the position in the file of the last MPEG frame.
*/
long lastFrameOffset();
offset_t lastFrameOffset();
/*!
* Returns whether or not the file on disk actually has an ID3v1 tag.
@@ -376,7 +376,7 @@ namespace TagLib {
File &operator=(const File &);
void read(bool readProperties);
long findID3v2();
offset_t findID3v2();
class FilePrivate;
FilePrivate *d;

4
taglib/mpeg/mpegheader.cpp
View File

@@ -75,7 +75,7 @@ MPEG::Header::Header(const ByteVector &data) :
debug("MPEG::Header::Header() - This constructor is no longer used.");
}
MPEG::Header::Header(File *file, long offset, bool checkLength) :
MPEG::Header::Header(File *file, offset_t offset, bool checkLength) :
d(new HeaderPrivate())
{
parse(file, offset, checkLength);
@@ -170,7 +170,7 @@ MPEG::Header &MPEG::Header::operator=(const Header &h)
// private members
////////////////////////////////////////////////////////////////////////////////
void MPEG::Header::parse(File *file, long offset, bool checkLength)
void MPEG::Header::parse(File *file, offset_t offset, bool checkLength)
{
file->seek(offset);
const ByteVector data = file->readBlock(4);

5
taglib/mpeg/mpegheader.h
View File

@@ -26,6 +26,7 @@
#ifndef TAGLIB_MPEGHEADER_H
#define TAGLIB_MPEGHEADER_H
#include "taglib.h"
#include "taglib_export.h"
namespace TagLib {
@@ -61,7 +62,7 @@ namespace TagLib {
* check if the frame length is parsed and calculated correctly. So it's
* suitable for seeking for the first valid frame.
*/
Header(File *file, long offset, bool checkLength = true);
Header(File *file, offset_t offset, bool checkLength = true);
/*!
* Does a shallow copy of \a h.
@@ -167,7 +168,7 @@ namespace TagLib {
Header &operator=(const Header &h);
private:
void parse(File *file, long offset, bool checkLength);
void parse(File *file, offset_t offset, bool checkLength);
class HeaderPrivate;
HeaderPrivate *d;

6
taglib/mpeg/mpegproperties.cpp
View File

@@ -157,7 +157,7 @@ void MPEG::Properties::read(File *file)
{
// Only the first valid frame is required if we have a VBR header.
const long firstFrameOffset = file->firstFrameOffset();
const offset_t firstFrameOffset = file->firstFrameOffset();
if(firstFrameOffset < 0) {
debug("MPEG::Properties::read() -- Could not find an MPEG frame in the stream.");
return;
@@ -197,14 +197,14 @@ void MPEG::Properties::read(File *file)
// Look for the last MPEG audio frame to calculate the stream length.
const long lastFrameOffset = file->lastFrameOffset();
const offset_t lastFrameOffset = file->lastFrameOffset();
if(lastFrameOffset < 0) {
debug("MPEG::Properties::read() -- Could not find an MPEG frame in the stream.");
}
else
{
const Header lastHeader(file, lastFrameOffset, false);
const long streamLength = lastFrameOffset - firstFrameOffset + lastHeader.frameLength();
const offset_t streamLength = lastFrameOffset - firstFrameOffset + lastHeader.frameLength();
if (streamLength > 0)
d->length = static_cast<int>(streamLength * 8.0 / d->bitrate + 0.5);
}

8
taglib/ogg/flac/oggflacfile.cpp
View File

@@ -58,8 +58,8 @@ public:
Properties *properties;
ByteVector streamInfoData;
ByteVector xiphCommentData;
long streamStart;
long streamLength;
offset_t streamStart;
offset_t streamLength;
bool scanned;
bool hasXiphComment;
@@ -206,7 +206,7 @@ ByteVector Ogg::FLAC::File::xiphCommentData()
return d->xiphCommentData;
}
long Ogg::FLAC::File::streamLength()
offset_t Ogg::FLAC::File::streamLength()
{
scan();
return d->streamLength;
@@ -223,7 +223,7 @@ void Ogg::FLAC::File::scan()
return;
int ipacket = 0;
long overhead = 0;
offset_t overhead = 0;
ByteVector metadataHeader = packet(ipacket);
if(metadataHeader.isEmpty())

2
taglib/ogg/flac/oggflacfile.h
View File

@@ -134,7 +134,7 @@ namespace TagLib {
* Returns the length of the audio-stream, used by FLAC::Properties for
* calculating the bitrate.
*/
long streamLength();
offset_t streamLength();
/*!
* Returns whether or not the file on disk actually has a XiphComment.

12
taglib/ogg/oggfile.cpp
View File

@@ -129,7 +129,7 @@ void Ogg::File::setPacket(unsigned int i, const ByteVector &p)
const Ogg::PageHeader *Ogg::File::firstPageHeader()
{
if(!d->firstPageHeader) {
const long firstPageHeaderOffset = find("OggS");
const offset_t firstPageHeaderOffset = find("OggS");
if(firstPageHeaderOffset < 0)
return 0;
@@ -142,7 +142,7 @@ const Ogg::PageHeader *Ogg::File::firstPageHeader()
const Ogg::PageHeader *Ogg::File::lastPageHeader()
{
if(!d->lastPageHeader) {
const long lastPageHeaderOffset = rfind("OggS");
const offset_t lastPageHeaderOffset = rfind("OggS");
if(lastPageHeaderOffset < 0)
return 0;
@@ -192,7 +192,7 @@ bool Ogg::File::readPages(unsigned int i)
{
while(true) {
unsigned int packetIndex;
long offset;
offset_t offset;
if(d->pages.isEmpty()) {
packetIndex = 0;
@@ -275,8 +275,8 @@ void Ogg::File::writePacket(unsigned int i, const ByteVector &packet)
for(it = pages.begin(); it != pages.end(); ++it)
data.append((*it)->render());
const unsigned long originalOffset = firstPage->fileOffset();
const unsigned long originalLength = lastPage->fileOffset() + lastPage->size() - originalOffset;
const offset_t originalOffset = firstPage->fileOffset();
const offset_t originalLength = lastPage->fileOffset() + lastPage->size() - originalOffset;
insert(data, originalOffset, originalLength);
@@ -286,7 +286,7 @@ void Ogg::File::writePacket(unsigned int i, const ByteVector &packet)
= pages.back()->pageSequenceNumber() - lastPage->pageSequenceNumber();
if(numberOfNewPages != 0) {
long pageOffset = originalOffset + data.size();
offset_t pageOffset = originalOffset + data.size();
while(true) {
Page page(this, pageOffset);

8
taglib/ogg/oggpage.cpp
View File

@@ -37,14 +37,14 @@ using namespace TagLib;
class Ogg::Page::PagePrivate
{
public:
PagePrivate(File *f = 0, long pageOffset = -1) :
PagePrivate(File *f = 0, offset_t pageOffset = -1) :
file(f),
fileOffset(pageOffset),
header(f, pageOffset),
firstPacketIndex(-1) {}
File *file;
long fileOffset;
offset_t fileOffset;
PageHeader header;
int firstPacketIndex;
ByteVectorList packets;
@@ -54,7 +54,7 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
Ogg::Page::Page(Ogg::File *file, long pageOffset) :
Ogg::Page::Page(Ogg::File *file, offset_t pageOffset) :
d(new PagePrivate(file, pageOffset))
{
}
@@ -64,7 +64,7 @@ Ogg::Page::~Page()
delete d;
}
long Ogg::Page::fileOffset() const
offset_t Ogg::Page::fileOffset() const
{
return d->fileOffset;
}

4
taglib/ogg/oggpage.h
View File

@@ -55,14 +55,14 @@ namespace TagLib {
/*!
* Read an Ogg page from the \a file at the position \a pageOffset.
*/
Page(File *file, long pageOffset);
Page(File *file, offset_t pageOffset);
virtual ~Page();
/*!
* Returns the page's position within the file (in bytes).
*/
long fileOffset() const;
offset_t fileOffset() const;
/*!
* Returns a pointer to the header for this page. This pointer will become

4
taglib/ogg/oggpageheader.cpp
View File

@@ -66,7 +66,7 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
Ogg::PageHeader::PageHeader(Ogg::File *file, long pageOffset) :
Ogg::PageHeader::PageHeader(Ogg::File *file, offset_t pageOffset) :
d(new PageHeaderPrivate())
{
if(file && pageOffset >= 0)
@@ -225,7 +225,7 @@ ByteVector Ogg::PageHeader::render() const
// private members
////////////////////////////////////////////////////////////////////////////////
void Ogg::PageHeader::read(Ogg::File *file, long pageOffset)
void Ogg::PageHeader::read(Ogg::File *file, offset_t pageOffset)
{
file->seek(pageOffset);

4
taglib/ogg/oggpageheader.h
View File

@@ -52,7 +52,7 @@ namespace TagLib {
* create a page with no (and as such, invalid) data that must be set
* later.
*/
PageHeader(File *file = 0, long pageOffset = -1);
PageHeader(File *file = 0, offset_t pageOffset = -1);
/*!
* Deletes this instance of the PageHeader.
@@ -219,7 +219,7 @@ namespace TagLib {
PageHeader(const PageHeader &);
PageHeader &operator=(const PageHeader &);
void read(Ogg::File *file, long pageOffset);
void read(Ogg::File *file, offset_t pageOffset);
ByteVector lacingValues() const;
class PageHeaderPrivate;

2
taglib/ogg/opus/opusproperties.cpp
View File

@@ -163,7 +163,7 @@ void Opus::Properties::read(File *file)
if(frameCount > 0) {
const double length = frameCount * 1000.0 / 48000.0;
long fileLengthWithoutOverhead = file->length();
offset_t fileLengthWithoutOverhead = file->length();
// Ignore the two mandatory header packets, see "3. Packet Organization"
// in https://tools.ietf.org/html/rfc7845.html
for (unsigned int i = 0; i < 2; ++i) {

2
taglib/ogg/speex/speexproperties.cpp
View File

@@ -182,7 +182,7 @@ void Speex::Properties::read(File *file)
if(frameCount > 0) {
const double length = frameCount * 1000.0 / d->sampleRate;
long fileLengthWithoutOverhead = file->length();
offset_t fileLengthWithoutOverhead = file->length();
// Ignore the two header packets, see "Ogg file format" in
// https://www.speex.org/docs/manual/speex-manual/node8.html
for (unsigned int i = 0; i < 2; ++i) {

2
taglib/ogg/vorbis/vorbisproperties.cpp
View File

@@ -186,7 +186,7 @@ void Vorbis::Properties::read(File *file)
if(frameCount > 0) {
const double length = frameCount * 1000.0 / d->sampleRate;
long fileLengthWithoutOverhead = file->length();
offset_t fileLengthWithoutOverhead = file->length();
// Ignore the three initial header packets, see "1.3.1. Decode Setup" in
// https://xiph.org/vorbis/doc/Vorbis_I_spec.html
for (unsigned int i = 0; i < 3; ++i) {

14
taglib/riff/rifffile.cpp
View File

@@ -38,7 +38,7 @@ using namespace TagLib;
struct Chunk
{
ByteVector name;
unsigned int offset;
offset_t offset;
unsigned int size;
unsigned int padding;
};
@@ -54,7 +54,7 @@ public:
const Endianness endianness;
unsigned int size;
long sizeOffset;
offset_t sizeOffset;
std::vector<Chunk> chunks;
};
@@ -108,7 +108,7 @@ unsigned int RIFF::File::chunkDataSize(unsigned int i) const
return d->chunks[i].size;
}
unsigned int RIFF::File::chunkOffset(unsigned int i) const
offset_t RIFF::File::chunkOffset(unsigned int i) const
{
if(i >= d->chunks.size()) {
debug("RIFF::File::chunkOffset() - Index out of range. Returning 0.");
@@ -212,7 +212,7 @@ void RIFF::File::setChunkData(const ByteVector &name, const ByteVector &data, bo
Chunk &last = d->chunks.back();
long offset = last.offset + last.size + last.padding;
offset_t offset = last.offset + last.size + last.padding;
if(offset & 1) {
if(last.padding == 1) {
last.padding = 0; // This should not happen unless the file is corrupted.
@@ -283,7 +283,7 @@ void RIFF::File::read()
{
const bool bigEndian = (d->endianness == BigEndian);
long offset = tell();
offset_t offset = tell();
offset += 4;
d->sizeOffset = offset;
@@ -345,7 +345,7 @@ void RIFF::File::read()
}
void RIFF::File::writeChunk(const ByteVector &name, const ByteVector &data,
unsigned long offset, unsigned long replace)
offset_t offset, unsigned long replace)
{
ByteVector combined;
@@ -363,7 +363,7 @@ void RIFF::File::updateGlobalSize()
{
const Chunk first = d->chunks.front();
const Chunk last = d->chunks.back();
d->size = last.offset + last.size + last.padding - first.offset + 12;
d->size = static_cast<unsigned int>(last.offset + last.size + last.padding - first.offset + 12);
const ByteVector data = ByteVector::fromUInt(d->size, d->endianness == BigEndian);
insert(data, d->sizeOffset, 4);

4
taglib/riff/rifffile.h
View File

@@ -71,7 +71,7 @@ namespace TagLib {
/*!
* \return The offset within the file for the selected chunk number.
*/
unsigned int chunkOffset(unsigned int i) const;
offset_t chunkOffset(unsigned int i) const;
/*!
* \return The size of the chunk data.
@@ -145,7 +145,7 @@ namespace TagLib {
void read();
void writeChunk(const ByteVector &name, const ByteVector &data,
unsigned long offset, unsigned long replace = 0);
offset_t offset, unsigned long replace = 0);
/*!
* Update the global RIFF size based on the current internal structure.

18
taglib/tagutils.cpp
View File

@@ -33,7 +33,7 @@
using namespace TagLib;
long Utils::findID3v1(File *file)
offset_t Utils::findID3v1(File *file)
{
if(!file->isValid())
return -1;
@@ -42,14 +42,14 @@ long Utils::findID3v1(File *file)
if (file->length() >= 131) {
file->seek(-131, File::End);
const long p = file->tell() + 3;
const offset_t p = file->tell() + 3;
const TagLib::ByteVector data = file->readBlock(8);
if(data.containsAt(ID3v1::Tag::fileIdentifier(), 3) && (data != APE::Tag::fileIdentifier()))
return p;
} else {
file->seek(-128, File::End);
const long p = file->tell();
const offset_t p = file->tell();
if(file->readBlock(3) == ID3v1::Tag::fileIdentifier())
return p;
@@ -58,7 +58,7 @@ long Utils::findID3v1(File *file)
return -1;
}
long Utils::findID3v2(File *file)
offset_t Utils::findID3v2(File *file)
{
if(!file->isValid())
return -1;
@@ -71,7 +71,7 @@ long Utils::findID3v2(File *file)
return -1;
}
long Utils::findAPE(File *file, long id3v1Location)
offset_t Utils::findAPE(File *file, offset_t id3v1Location)
{
if(!file->isValid())
return -1;
@@ -81,7 +81,7 @@ long Utils::findAPE(File *file, long id3v1Location)
else
file->seek(-32, File::End);
const long p = file->tell();
const offset_t p = file->tell();
if(file->readBlock(8) == APE::Tag::fileIdentifier())
return p;
@@ -90,13 +90,13 @@ long Utils::findAPE(File *file, long id3v1Location)
}
ByteVector TagLib::Utils::readHeader(IOStream *stream, unsigned int length,
bool skipID3v2, long *headerOffset)
bool skipID3v2, offset_t *headerOffset)
{
if(!stream || !stream->isOpen())
return ByteVector();
const long originalPosition = stream->tell();
long bufferOffset = 0;
const offset_t originalPosition = stream->tell();
offset_t bufferOffset = 0;
if(skipID3v2) {
stream->seek(0);

8
taglib/tagutils.h
View File

@@ -39,14 +39,14 @@ namespace TagLib {
namespace Utils {
long findID3v1(File *file);
offset_t findID3v1(File *file);
long findID3v2(File *file);
offset_t findID3v2(File *file);
long findAPE(File *file, long id3v1Location);
offset_t findAPE(File *file, offset_t id3v1Location);
ByteVector readHeader(IOStream *stream, unsigned int length, bool skipID3v2,
long *headerOffset = 0);
offset_t *headerOffset = 0);
} // namespace Utils
} // namespace TagLib

12
taglib/toolkit/taglib.h
View File

@@ -54,6 +54,10 @@
#define TAGLIB_DEPRECATED
#endif
#ifndef _WIN32
#include <sys/types.h>
#endif
#include <string>
//! A namespace for all TagLib related classes and functions
@@ -79,6 +83,14 @@ namespace TagLib {
typedef unsigned long ulong;
typedef unsigned long long ulonglong;
// Offset or length type for I/O streams.
// In Win32, always 64bit. Otherwise, equivalent to off_t.
#ifdef _WIN32
typedef long long offset_t;
#else
typedef off_t offset_t;
#endif
/*!
* Unfortunately std::wstring isn't defined on some systems, (i.e. GCC < 3)
* so I'm providing something here that should be constant.

35
taglib/toolkit/tbytevectorstream.cpp
View File

@@ -40,7 +40,7 @@ public:
ByteVectorStreamPrivate(const ByteVector &data);
ByteVector data;
long position;
offset_t position;
};
ByteVectorStream::ByteVectorStreamPrivate::ByteVectorStreamPrivate(const ByteVector &data) :
@@ -68,12 +68,13 @@ FileName ByteVectorStream::name() const
return ""; // XXX do we need a name?
}
ByteVector ByteVectorStream::readBlock(unsigned long length)
ByteVector ByteVectorStream::readBlock(size_t length)
{
if(length == 0)
return ByteVector();
ByteVector v = d->data.mid(d->position, length);
ByteVector v = d->data.mid(static_cast<unsigned int>(d->position),
static_cast<unsigned int>(length));
d->position += v.size();
return v;
}
@@ -88,28 +89,28 @@ void ByteVectorStream::writeBlock(const ByteVector &data)
d->position += size;
}
void ByteVectorStream::insert(const ByteVector &data, unsigned long start, unsigned long replace)
void ByteVectorStream::insert(const ByteVector &data, offset_t start, size_t replace)
{
long sizeDiff = data.size() - replace;
offset_t sizeDiff = data.size() - replace;
if(sizeDiff < 0) {
removeBlock(start + data.size(), -sizeDiff);
}
else if(sizeDiff > 0) {
truncate(length() + sizeDiff);
unsigned long readPosition = start + replace;
unsigned long writePosition = start + data.size();
offset_t readPosition = start + replace;
offset_t writePosition = start + data.size();
memmove(d->data.data() + writePosition, d->data.data() + readPosition, length() - sizeDiff - readPosition);
}
seek(start);
writeBlock(data);
}
void ByteVectorStream::removeBlock(unsigned long start, unsigned long length)
void ByteVectorStream::removeBlock(offset_t start, size_t length)
{
unsigned long readPosition = start + length;
unsigned long writePosition = start;
if(readPosition < static_cast<unsigned long>(ByteVectorStream::length())) {
unsigned long bytesToMove = ByteVectorStream::length() - readPosition;
offset_t readPosition = start + length;
offset_t writePosition = start;
if(readPosition < ByteVectorStream::length()) {
offset_t bytesToMove = ByteVectorStream::length() - readPosition;
memmove(d->data.data() + writePosition, d->data.data() + readPosition, bytesToMove);
writePosition += bytesToMove;
}
@@ -127,7 +128,7 @@ bool ByteVectorStream::isOpen() const
return true;
}
void ByteVectorStream::seek(long offset, Position p)
void ByteVectorStream::seek(offset_t offset, Position p)
{
switch(p) {
case Beginning:
@@ -146,19 +147,19 @@ void ByteVectorStream::clear()
{
}
long ByteVectorStream::tell() const
offset_t ByteVectorStream::tell() const
{
return d->position;
}
long ByteVectorStream::length()
offset_t ByteVectorStream::length()
{
return d->data.size();
}
void ByteVectorStream::truncate(long length)
void ByteVectorStream::truncate(offset_t length)
{
d->data.resize(length);
d->data.resize(static_cast<unsigned int>(length));
}
ByteVector *ByteVectorStream::data()

14
taglib/toolkit/tbytevectorstream.h
View File

@@ -61,7 +61,7 @@ namespace TagLib {
/*!
* Reads a block of size \a length at the current get pointer.
*/
ByteVector readBlock(unsigned long length);
ByteVector readBlock(size_t length);
/*!
* Attempts to write the block \a data at the current get pointer. If the
@@ -81,7 +81,7 @@ namespace TagLib {
* \note This method is slow since it requires rewriting all of the file
* after the insertion point.
*/
void insert(const ByteVector &data, unsigned long start = 0, unsigned long replace = 0);
void insert(const ByteVector &data, offset_t start = 0, size_t replace = 0);
/*!
* Removes a block of the file starting a \a start and continuing for
@@ -90,7 +90,7 @@ namespace TagLib {
* \note This method is slow since it involves rewriting all of the file
* after the removed portion.
*/
void removeBlock(unsigned long start = 0, unsigned long length = 0);
void removeBlock(offset_t start = 0, size_t length = 0);
/*!
* Returns true if the file is read only (or if the file can not be opened).
@@ -109,7 +109,7 @@ namespace TagLib {
*
* \see Position
*/
void seek(long offset, Position p = Beginning);
void seek(offset_t offset, Position p = Beginning);
/*!
* Reset the end-of-file and error flags on the file.
@@ -119,17 +119,17 @@ namespace TagLib {
/*!
* Returns the current offset within the file.
*/
long tell() const;
offset_t tell() const;
/*!
* Returns the length of the file.
*/
long length();
offset_t length();
/*!
* Truncates the file to a \a length.
*/
void truncate(long length);
void truncate(offset_t length);
ByteVector *data();

29
taglib/toolkit/tfile.cpp
View File

@@ -221,7 +221,7 @@ PropertyMap File::setProperties(const PropertyMap &properties)
return tag()->setProperties(properties);
}
ByteVector File::readBlock(unsigned long length)
ByteVector File::readBlock(size_t length)
{
return d->stream->readBlock(length);
}
@@ -231,14 +231,14 @@ void File::writeBlock(const ByteVector &data)
d->stream->writeBlock(data);
}
long File::find(const ByteVector &pattern, long fromOffset, const ByteVector &before)
offset_t File::find(const ByteVector &pattern, offset_t fromOffset, const ByteVector &before)
{
if(!d->stream || pattern.size() > bufferSize())
return -1;
// The position in the file that the current buffer starts at.
long bufferOffset = fromOffset;
offset_t bufferOffset = fromOffset;
ByteVector buffer;
// These variables are used to keep track of a partial match that happens at
@@ -250,7 +250,7 @@ long File::find(const ByteVector &pattern, long fromOffset, const ByteVector &be
// Save the location of the current read pointer. We will restore the
// position using seek() before all returns.
long originalPosition = tell();
offset_t originalPosition = tell();
// Start the search at the offset.
@@ -327,7 +327,7 @@ long File::find(const ByteVector &pattern, long fromOffset, const ByteVector &be
}
long File::rfind(const ByteVector &pattern, long fromOffset, const ByteVector &before)
offset_t File::rfind(const ByteVector &pattern, offset_t fromOffset, const ByteVector &before)
{
if(!d->stream || pattern.size() > bufferSize())
return -1;
@@ -347,15 +347,15 @@ long File::rfind(const ByteVector &pattern, long fromOffset, const ByteVector &b
// Save the location of the current read pointer. We will restore the
// position using seek() before all returns.
long originalPosition = tell();
offset_t originalPosition = tell();
// Start the search at the offset.
if(fromOffset == 0)
fromOffset = length();
long bufferLength = bufferSize();
long bufferOffset = fromOffset + pattern.size();
offset_t bufferLength = bufferSize();
offset_t bufferOffset = fromOffset + pattern.size();
// See the notes in find() for an explanation of this algorithm.
@@ -401,12 +401,12 @@ long File::rfind(const ByteVector &pattern, long fromOffset, const ByteVector &b
return -1;
}
void File::insert(const ByteVector &data, unsigned long start, unsigned long replace)
void File::insert(const ByteVector &data, offset_t start, size_t replace)
{
d->stream->insert(data, start, replace);
}
void File::removeBlock(unsigned long start, unsigned long length)
void File::removeBlock(offset_t start, size_t length)
{
d->stream->removeBlock(start, length);
}
@@ -426,12 +426,12 @@ bool File::isValid() const
return isOpen() && d->valid;
}
void File::seek(long offset, Position p)
void File::seek(offset_t offset, Position p)
{
d->stream->seek(offset, static_cast<IOStream::Position>(p));
}
void File::truncate(long length)
void File::truncate(offset_t length)
{
d->stream->truncate(length);
}
@@ -441,12 +441,12 @@ void File::clear()
d->stream->clear();
}
long File::tell() const
offset_t File::tell() const
{
return d->stream->tell();
}
long File::length()
offset_t File::length()
{
return d->stream->length();
}
@@ -494,4 +494,3 @@ void File::setValid(bool valid)
{
d->valid = valid;
}

22
taglib/toolkit/tfile.h
View File

@@ -155,7 +155,7 @@ namespace TagLib {
/*!
* Reads a block of size \a length at the current get pointer.
*/
ByteVector readBlock(unsigned long length);
ByteVector readBlock(size_t length);
/*!
* Attempts to write the block \a data at the current get pointer. If the
@@ -180,8 +180,8 @@ namespace TagLib {
* \note This has the practical limitation that \a pattern can not be longer
* than the buffer size used by readBlock(). Currently this is 1024 bytes.
*/
long find(const ByteVector &pattern,
long fromOffset = 0,
offset_t find(const ByteVector &pattern,
offset_t fromOffset = 0,
const ByteVector &before = ByteVector());
/*!
@@ -196,8 +196,8 @@ namespace TagLib {
* \note This has the practical limitation that \a pattern can not be longer
* than the buffer size used by readBlock(). Currently this is 1024 bytes.
*/
long rfind(const ByteVector &pattern,
long fromOffset = 0,
offset_t rfind(const ByteVector &pattern,
offset_t fromOffset = 0,
const ByteVector &before = ByteVector());
/*!
@@ -207,7 +207,7 @@ namespace TagLib {
* \note This method is slow since it requires rewriting all of the file
* after the insertion point.
*/
void insert(const ByteVector &data, unsigned long start = 0, unsigned long replace = 0);
void insert(const ByteVector &data, offset_t start = 0, size_t replace = 0);
/*!
* Removes a block of the file starting a \a start and continuing for
@@ -216,7 +216,7 @@ namespace TagLib {
* \note This method is slow since it involves rewriting all of the file
* after the removed portion.
*/
void removeBlock(unsigned long start = 0, unsigned long length = 0);
void removeBlock(offset_t start = 0, size_t length = 0);
/*!
* Returns true if the file is read only (or if the file can not be opened).
@@ -240,7 +240,7 @@ namespace TagLib {
*
* \see Position
*/
void seek(long offset, Position p = Beginning);
void seek(offset_t offset, Position p = Beginning);
/*!
* Reset the end-of-file and error flags on the file.
@@ -250,12 +250,12 @@ namespace TagLib {
/*!
* Returns the current offset within the file.
*/
long tell() const;
offset_t tell() const;
/*!
* Returns the length of the file.
*/
long length();
offset_t length();
/*!
* Returns true if \a file can be opened for reading. If the file does not
@@ -303,7 +303,7 @@ namespace TagLib {
/*!
* Truncates the file to a \a length.
*/
void truncate(long length);
void truncate(offset_t length);
/*!
* Returns the buffer size that is used for internal buffering.

45
taglib/toolkit/tfilestream.cpp
View File

@@ -196,7 +196,7 @@ FileName FileStream::name() const
return d->name;
}
ByteVector FileStream::readBlock(unsigned long length)
ByteVector FileStream::readBlock(size_t length)
{
if(!isOpen()) {
debug("FileStream::readBlock() -- invalid file.");
@@ -207,7 +207,7 @@ ByteVector FileStream::readBlock(unsigned long length)
return ByteVector();
if(length > bufferSize()) {
const unsigned long streamLength = static_cast<unsigned long>(FileStream::length());
const size_t streamLength = static_cast<size_t>(FileStream::length());
if(length > streamLength) {
length = streamLength;
}
@@ -236,7 +236,7 @@ void FileStream::writeBlock(const ByteVector &data)
writeFile(d->file, data);
}
void FileStream::insert(const ByteVector &data, unsigned long start, unsigned long replace)
void FileStream::insert(const ByteVector &data, offset_t start, size_t replace)
{
if(!isOpen()) {
debug("FileStream::insert() -- invalid file.");
@@ -270,15 +270,15 @@ void FileStream::insert(const ByteVector &data, unsigned long start, unsigned lo
// the *difference* in the tag sizes. We want to avoid overwriting parts
// that aren't yet in memory, so this is necessary.
unsigned long bufferLength = bufferSize();
size_t bufferLength = bufferSize();
while(data.size() - replace > bufferLength)
bufferLength += bufferSize();
// Set where to start the reading and writing.
long readPosition = start + replace;
long writePosition = start;
offset_t readPosition = start + replace;
offset_t writePosition = start;
ByteVector buffer = data;
ByteVector aboutToOverwrite(static_cast<unsigned int>(bufferLength));
@@ -317,19 +317,19 @@ void FileStream::insert(const ByteVector &data, unsigned long start, unsigned lo
}
}
void FileStream::removeBlock(unsigned long start, unsigned long length)
void FileStream::removeBlock(offset_t start, size_t length)
{
if(!isOpen()) {
debug("FileStream::removeBlock() -- invalid file.");
return;
}
unsigned long bufferLength = bufferSize();
unsigned int bufferLength = bufferSize();
long readPosition = start + length;
long writePosition = start;
offset_t readPosition = start + length;
offset_t writePosition = start;
ByteVector buffer(static_cast<unsigned int>(bufferLength));
ByteVector buffer(bufferLength);
for(unsigned int bytesRead = -1; bytesRead != 0;) {
seek(readPosition);
@@ -363,7 +363,7 @@ bool FileStream::isOpen() const
return (d->file != InvalidFileHandle);
}
void FileStream::seek(long offset, Position p)
void FileStream::seek(offset_t offset, Position p)
{
if(!isOpen()) {
debug("FileStream::seek() -- invalid file.");
@@ -420,16 +420,15 @@ void FileStream::clear()
#endif
}
long FileStream::tell() const
offset_t FileStream::tell() const
{
#ifdef _WIN32
const LARGE_INTEGER zero = {};
LARGE_INTEGER position;
if(SetFilePointerEx(d->file, zero, &position, FILE_CURRENT) &&
position.QuadPart <= LONG_MAX) {
return static_cast<long>(position.QuadPart);
if(SetFilePointerEx(d->file, zero, &position, FILE_CURRENT)) {
return position.QuadPart;
}
else {
debug("FileStream::tell() -- Failed to get the file pointer.");
@@ -443,7 +442,7 @@ long FileStream::tell() const
#endif
}
long FileStream::length()
offset_t FileStream::length()
{
if(!isOpen()) {
debug("FileStream::length() -- invalid file.");
@@ -454,8 +453,8 @@ long FileStream::length()
LARGE_INTEGER fileSize;
if(GetFileSizeEx(d->file, &fileSize) && fileSize.QuadPart <= LONG_MAX) {
return static_cast<long>(fileSize.QuadPart);
if(GetFileSizeEx(d->file, &fileSize)) {
return fileSize.QuadPart;
}
else {
debug("FileStream::length() -- Failed to get the file size.");
@@ -464,10 +463,10 @@ long FileStream::length()
#else
const long curpos = tell();
const offset_t curpos = tell();
seek(0, End);
const long endpos = tell();
const offset_t endpos = tell();
seek(curpos, Beginning);
@@ -480,11 +479,11 @@ long FileStream::length()
// protected members
////////////////////////////////////////////////////////////////////////////////
void FileStream::truncate(long length)
void FileStream::truncate(offset_t length)
{
#ifdef _WIN32
const long currentPos = tell();
const offset_t currentPos = tell();
seek(length);

14
taglib/toolkit/tfilestream.h
View File

@@ -72,7 +72,7 @@ namespace TagLib {
/*!
* Reads a block of size \a length at the current get pointer.
*/
ByteVector readBlock(unsigned long length);
ByteVector readBlock(size_t length);
/*!
* Attempts to write the block \a data at the current get pointer. If the
@@ -92,7 +92,7 @@ namespace TagLib {
* \note This method is slow since it requires rewriting all of the file
* after the insertion point.
*/
void insert(const ByteVector &data, unsigned long start = 0, unsigned long replace = 0);
void insert(const ByteVector &data, offset_t start = 0, size_t replace = 0);
/*!
* Removes a block of the file starting a \a start and continuing for
@@ -101,7 +101,7 @@ namespace TagLib {
* \note This method is slow since it involves rewriting all of the file
* after the removed portion.
*/
void removeBlock(unsigned long start = 0, unsigned long length = 0);
void removeBlock(offset_t start = 0, size_t length = 0);
/*!
* Returns true if the file is read only (or if the file can not be opened).
@@ -120,7 +120,7 @@ namespace TagLib {
*
* \see Position
*/
void seek(long offset, Position p = Beginning);
void seek(offset_t offset, Position p = Beginning);
/*!
* Reset the end-of-file and error flags on the file.
@@ -130,17 +130,17 @@ namespace TagLib {
/*!
* Returns the current offset within the file.
*/
long tell() const;
offset_t tell() const;
/*!
* Returns the length of the file.
*/
long length();
offset_t length();
/*!
* Truncates the file to a \a length.
*/
void truncate(long length);
void truncate(offset_t length);
protected:

14
taglib/toolkit/tiostream.h
View File

@@ -89,7 +89,7 @@ namespace TagLib {
/*!
* Reads a block of size \a length at the current get pointer.
*/
virtual ByteVector readBlock(unsigned long length) = 0;
virtual ByteVector readBlock(size_t length) = 0;
/*!
* Attempts to write the block \a data at the current get pointer. If the
@@ -110,7 +110,7 @@ namespace TagLib {
* after the insertion point.
*/
virtual void insert(const ByteVector &data,
unsigned long start = 0, unsigned long replace = 0) = 0;
offset_t start = 0, size_t replace = 0) = 0;
/*!
* Removes a block of the file starting a \a start and continuing for
@@ -119,7 +119,7 @@ namespace TagLib {
* \note This method is slow since it involves rewriting all of the file
* after the removed portion.
*/
virtual void removeBlock(unsigned long start = 0, unsigned long length = 0) = 0;
virtual void removeBlock(offset_t start = 0, size_t length = 0) = 0;
/*!
* Returns true if the file is read only (or if the file can not be opened).
@@ -138,7 +138,7 @@ namespace TagLib {
*
* \see Position
*/
virtual void seek(long offset, Position p = Beginning) = 0;
virtual void seek(offset_t offset, Position p = Beginning) = 0;
/*!
* Reset the end-of-stream and error flags on the stream.
@@ -148,17 +148,17 @@ namespace TagLib {
/*!
* Returns the current offset within the stream.
*/
virtual long tell() const = 0;
virtual offset_t tell() const = 0;
/*!
* Returns the length of the stream.
*/
virtual long length() = 0;
virtual offset_t length() = 0;
/*!
* Truncates the stream to a \a length.
*/
virtual void truncate(long length) = 0;
virtual void truncate(offset_t length) = 0;
private:
IOStream(const IOStream &);

6
taglib/trueaudio/trueaudiofile.cpp
View File

@@ -63,10 +63,10 @@ public:
}
const ID3v2::FrameFactory *ID3v2FrameFactory;
long ID3v2Location;
offset_t ID3v2Location;
long ID3v2OriginalSize;
long ID3v1Location;
offset_t ID3v1Location;
TagUnion tag;
@@ -290,7 +290,7 @@ void TrueAudio::File::read(bool readProperties)
if(readProperties) {
long streamLength;
offset_t streamLength;
if(d->ID3v1Location >= 0)
streamLength = d->ID3v1Location;

4
taglib/trueaudio/trueaudioproperties.cpp
View File

@@ -61,7 +61,7 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
TrueAudio::Properties::Properties(const ByteVector &data, long streamLength, ReadStyle style) :
TrueAudio::Properties::Properties(const ByteVector &data, offset_t streamLength, ReadStyle style) :
AudioProperties(style),
d(new PropertiesPrivate())
{
@@ -122,7 +122,7 @@ int TrueAudio::Properties::ttaVersion() const
// private members
////////////////////////////////////////////////////////////////////////////////
void TrueAudio::Properties::read(const ByteVector &data, long streamLength)
void TrueAudio::Properties::read(const ByteVector &data, offset_t streamLength)
{
if(data.size() < 4) {
debug("TrueAudio::Properties::read() -- data is too short.");

5
taglib/trueaudio/trueaudioproperties.h
View File

@@ -30,6 +30,7 @@
#ifndef TAGLIB_TRUEAUDIOPROPERTIES_H
#define TAGLIB_TRUEAUDIOPROPERTIES_H
#include "tbytevector.h"
#include "audioproperties.h"
namespace TagLib {
@@ -52,7 +53,7 @@ namespace TagLib {
* Create an instance of TrueAudio::Properties with the data read from the
* ByteVector \a data.
*/
Properties(const ByteVector &data, long streamLength, ReadStyle style = Average);
Properties(const ByteVector &data, offset_t streamLength, ReadStyle style = Average);
/*!
* Destroys this TrueAudio::Properties instance.
@@ -120,7 +121,7 @@ namespace TagLib {
Properties(const Properties &);
Properties &operator=(const Properties &);
void read(const ByteVector &data, long streamLength);
void read(const ByteVector &data, offset_t streamLength);
class PropertiesPrivate;
PropertiesPrivate *d;

6
taglib/wavpack/wavpackfile.cpp
View File

@@ -61,10 +61,10 @@ public:
delete properties;
}
long APELocation;
offset_t APELocation;
long APESize;
long ID3v1Location;
offset_t ID3v1Location;
TagUnion tag;
@@ -270,7 +270,7 @@ void WavPack::File::read(bool readProperties)
if(readProperties) {
long streamLength;
offset_t streamLength;
if(d->APELocation >= 0)
streamLength = d->APELocation;

12
taglib/wavpack/wavpackproperties.cpp
View File

@@ -66,14 +66,14 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
WavPack::Properties::Properties(const ByteVector &, long, ReadStyle style) :
WavPack::Properties::Properties(const ByteVector &, offset_t, ReadStyle style) :
AudioProperties(style),
d(new PropertiesPrivate())
{
debug("WavPack::Properties::Properties() -- This constructor is no longer used.");
}
WavPack::Properties::Properties(File *file, long streamLength, ReadStyle style) :
WavPack::Properties::Properties(File *file, offset_t streamLength, ReadStyle style) :
AudioProperties(style),
d(new PropertiesPrivate())
{
@@ -257,9 +257,9 @@ namespace
} // namespace
void WavPack::Properties::read(File *file, long streamLength)
void WavPack::Properties::read(File *file, offset_t streamLength)
{
long offset = 0;
offset_t offset = 0;
while(true) {
file->seek(offset);
@@ -339,9 +339,9 @@ void WavPack::Properties::read(File *file, long streamLength)
}
}
unsigned int WavPack::Properties::seekFinalIndex(File *file, long streamLength)
unsigned int WavPack::Properties::seekFinalIndex(File *file, offset_t streamLength)
{
long offset = streamLength;
offset_t offset = streamLength;
while (offset >= 32) {
offset = file->rfind("wvpk", offset - 4);

9
taglib/wavpack/wavpackproperties.h
View File

@@ -30,6 +30,7 @@
#ifndef TAGLIB_WVPROPERTIES_H
#define TAGLIB_WVPROPERTIES_H
#include "tbytevector.h"
#include "taglib_export.h"
#include "audioproperties.h"
@@ -58,13 +59,13 @@ namespace TagLib {
* \deprecated This constructor will be dropped in favor of the one below
* in a future version.
*/
TAGLIB_DEPRECATED Properties(const ByteVector &data, long streamLength,
TAGLIB_DEPRECATED Properties(const ByteVector &data, offset_t streamLength,
ReadStyle style = Average);
/*!
* Create an instance of WavPack::Properties.
*/
Properties(File *file, long streamLength, ReadStyle style = Average);
Properties(File *file, offset_t streamLength, ReadStyle style = Average);
/*!
* Destroys this WavPack::Properties instance.
@@ -137,8 +138,8 @@ namespace TagLib {
Properties(const Properties &);
Properties &operator=(const Properties &);
void read(File *file, long streamLength);
unsigned int seekFinalIndex(File *file, long streamLength);
void read(File *file, offset_t streamLength);
unsigned int seekFinalIndex(File *file, offset_t streamLength);
class PropertiesPrivate;
PropertiesPrivate *d;

2
taglib/xm/xmfile.cpp
View File

@@ -591,7 +591,7 @@ void XM::File::read(bool)
unsigned int count = 4 + instrument.read(*this, instrumentHeaderSize - 4U);
READ_ASSERT(count == std::min(instrumentHeaderSize, (unsigned long)instrument.size() + 4));
long offset = 0;
offset_t offset = 0;
if(sampleCount > 0) {
unsigned long sampleHeaderSize = 0;
sumSampleCount += sampleCount;

2
tests/plainfile.h
View File

@@ -41,7 +41,7 @@ public:
ByteVector readAll() {
seek(0, End);
long end = tell();
offset_t end = tell();
seek(0);
return readBlock(end);
}

4
tests/test_aiff.cpp
View File

@@ -141,8 +141,8 @@ public:
CPPUNIT_ASSERT_EQUAL(String("Title1"), f.tag()->title());
f.save();
CPPUNIT_ASSERT_EQUAL(7030L, f.length());
CPPUNIT_ASSERT_EQUAL(-1L, f.find("Title2"));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(7030), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(-1), f.find("Title2"));
}
void testFuzzedFile1()

4
tests/test_asf.cpp
View File

@@ -389,10 +389,10 @@ public:
ASF::File f(copy.fileName().c_str());
f.tag()->setTitle(longText(128 * 1024));
f.save();
CPPUNIT_ASSERT_EQUAL(297578L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(297578), f.length());
f.tag()->setTitle(longText(16 * 1024));
f.save();
CPPUNIT_ASSERT_EQUAL(68202L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(68202), f.length());
}
}

2
tests/test_bytevectorstream.cpp
View File

@@ -117,7 +117,7 @@ public:
{
ByteVector v("abcdefghijklmnopqrstuvwxyz");
ByteVectorStream stream(v);
CPPUNIT_ASSERT_EQUAL(26L, stream.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(26), stream.length());
stream.seek(-4, IOStream::End);
CPPUNIT_ASSERT_EQUAL(ByteVector("w"), stream.readBlock(1));

51
tests/test_file.cpp
View File

@@ -53,19 +53,19 @@ public:
}
{
PlainFile file(name.c_str());
CPPUNIT_ASSERT_EQUAL(10l, file.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(10), file.length());
CPPUNIT_ASSERT_EQUAL(2l, file.find(ByteVector("23", 2)));
CPPUNIT_ASSERT_EQUAL(2l, file.find(ByteVector("23", 2), 2));
CPPUNIT_ASSERT_EQUAL(7l, file.find(ByteVector("23", 2), 3));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(2), file.find(ByteVector("23", 2)));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(2), file.find(ByteVector("23", 2), 2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(7), file.find(ByteVector("23", 2), 3));
file.seek(0);
const ByteVector v = file.readBlock(file.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)10, v.size());
CPPUNIT_ASSERT_EQUAL((long)v.find("23"), file.find("23"));
CPPUNIT_ASSERT_EQUAL((long)v.find("23", 2), file.find("23", 2));
CPPUNIT_ASSERT_EQUAL((long)v.find("23", 3), file.find("23", 3));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(v.find("23")), file.find("23"));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(v.find("23", 2)), file.find("23", 2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(v.find("23", 3)), file.find("23", 3));
}
}
@@ -81,19 +81,19 @@ public:
}
{
PlainFile file(name.c_str());
CPPUNIT_ASSERT_EQUAL(10l, file.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(10), file.length());
CPPUNIT_ASSERT_EQUAL(7l, file.rfind(ByteVector("23", 2)));
CPPUNIT_ASSERT_EQUAL(7l, file.rfind(ByteVector("23", 2), 7));
CPPUNIT_ASSERT_EQUAL(2l, file.rfind(ByteVector("23", 2), 6));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(7), file.rfind(ByteVector("23", 2)));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(7), file.rfind(ByteVector("23", 2), 7));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(2), file.rfind(ByteVector("23", 2), 6));
file.seek(0);
const ByteVector v = file.readBlock(file.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)10, v.size());
CPPUNIT_ASSERT_EQUAL((long)v.rfind("23"), file.rfind("23"));
CPPUNIT_ASSERT_EQUAL((long)v.rfind("23", 7), file.rfind("23", 7));
CPPUNIT_ASSERT_EQUAL((long)v.rfind("23", 6), file.rfind("23", 6));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(v.rfind("23")), file.rfind("23"));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(v.rfind("23", 7)), file.rfind("23", 7));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(v.rfind("23", 6)), file.rfind("23", 6));
}
}
@@ -103,22 +103,22 @@ public:
std::string name = copy.fileName();
PlainFile f(name.c_str());
CPPUNIT_ASSERT_EQUAL((long)0, f.tell());
CPPUNIT_ASSERT_EQUAL((long)4328, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0), f.tell());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4328), f.length());
f.seek(100, File::Beginning);
CPPUNIT_ASSERT_EQUAL((long)100, f.tell());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(100), f.tell());
f.seek(100, File::Current);
CPPUNIT_ASSERT_EQUAL((long)200, f.tell());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(200), f.tell());
f.seek(-300, File::Current);
CPPUNIT_ASSERT_EQUAL((long)200, f.tell());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(200), f.tell());
f.seek(-100, File::End);
CPPUNIT_ASSERT_EQUAL((long)4228, f.tell());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4228), f.tell());
f.seek(-100, File::Current);
CPPUNIT_ASSERT_EQUAL((long)4128, f.tell());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4128), f.tell());
f.seek(300, File::Current);
CPPUNIT_ASSERT_EQUAL((long)4428, f.tell());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4428), f.tell());
}
void testTruncate()
@@ -128,18 +128,17 @@ public:
{
PlainFile f(name.c_str());
CPPUNIT_ASSERT_EQUAL(4328L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4328), f.length());
f.truncate(2000);
CPPUNIT_ASSERT_EQUAL(2000L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(2000), f.length());
}
{
PlainFile f(name.c_str());
CPPUNIT_ASSERT_EQUAL(2000L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(2000), f.length());
}
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestFile);

16
tests/test_flac.cpp
View File

@@ -91,8 +91,8 @@ public:
{
FLAC::File f(newname.c_str());
CPPUNIT_ASSERT_EQUAL(String("The Artist"), f.tag()->artist());
CPPUNIT_ASSERT_EQUAL(69L, f.find("Artist"));
CPPUNIT_ASSERT_EQUAL(-1L, f.find("Artist", 70));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(69), f.find("Artist"));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(-1), f.find("Artist", 70));
}
}
@@ -253,9 +253,9 @@ public:
FLAC::File f(copy.fileName().c_str());
f.ID3v2Tag(true)->setTitle("0123456789");
f.save();
CPPUNIT_ASSERT_EQUAL(5735L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(5735), f.length());
f.save();
CPPUNIT_ASSERT_EQUAL(5735L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(5735), f.length());
CPPUNIT_ASSERT(f.find("fLaC") >= 0);
}
@@ -266,9 +266,9 @@ public:
FLAC::File f(copy.fileName().c_str());
f.xiphComment()->setTitle(longText(8 * 1024));
f.save();
CPPUNIT_ASSERT_EQUAL(12862L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(12862), f.length());
f.save();
CPPUNIT_ASSERT_EQUAL(12862L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(12862), f.length());
}
void testSaveMultipleValues()
@@ -449,7 +449,7 @@ public:
{
FLAC::File f(copy.fileName().c_str());
CPPUNIT_ASSERT(!f.hasID3v1Tag());
CPPUNIT_ASSERT_EQUAL((long)4692, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4692), f.length());
f.seek(0x0100);
audioStream = f.readBlock(4436);
@@ -457,7 +457,7 @@ public:
f.ID3v1Tag(true)->setTitle("01234 56789 ABCDE FGHIJ");
f.save();
CPPUNIT_ASSERT(f.hasID3v1Tag());
CPPUNIT_ASSERT_EQUAL((long)4820, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4820), f.length());
f.seek(0x0100);
CPPUNIT_ASSERT_EQUAL(audioStream, f.readBlock(4436));

7
tests/test_id3v2.cpp
View File

@@ -1553,14 +1553,14 @@ public:
{
MPEG::File f(newname.c_str());
CPPUNIT_ASSERT(f.hasID3v2Tag());
CPPUNIT_ASSERT_EQUAL(74789L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(74789), f.length());
f.ID3v2Tag()->setTitle("ABCDEFGHIJ");
f.save(MPEG::File::ID3v2, File::StripOthers);
}
{
MPEG::File f(newname.c_str());
CPPUNIT_ASSERT(f.hasID3v2Tag());
CPPUNIT_ASSERT_EQUAL(9263L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(9263), f.length());
}
}
@@ -1618,7 +1618,7 @@ public:
{
MPEG::File f(copy.fileName().c_str());
CPPUNIT_ASSERT(f.hasID3v2Tag());
CPPUNIT_ASSERT_EQUAL((long)3594, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(3594), f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)1505, f.ID3v2Tag()->header()->completeTagSize());
CPPUNIT_ASSERT_EQUAL(String("Artist A"), f.ID3v2Tag()->artist());
CPPUNIT_ASSERT_EQUAL(44100, f.audioProperties()->sampleRate());
@@ -1689,4 +1689,3 @@ public:
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestID3v2);

8
tests/test_mp4.cpp
View File

@@ -298,7 +298,7 @@ public:
MP4::Atoms atoms(&f);
MP4::Atom *moov = atoms.atoms[0];
CPPUNIT_ASSERT_EQUAL(long(77), moov->length);
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(77), moov->length);
f.tag()->setItem("pgap", true);
f.save();
@@ -311,7 +311,7 @@ public:
MP4::Atoms atoms(&f);
MP4::Atom *moov = atoms.atoms[0];
// original size + 'pgap' size + padding
CPPUNIT_ASSERT_EQUAL(long(77 + 25 + 974), moov->length);
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(77 + 25 + 974), moov->length);
}
}
@@ -589,8 +589,8 @@ public:
f.tag()->setTitle("0123456789");
f.save();
f.save();
CPPUNIT_ASSERT_EQUAL(2862L, f.find("0123456789"));
CPPUNIT_ASSERT_EQUAL(-1L, f.find("0123456789", 2863));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(2862), f.find("0123456789"));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(-1), f.find("0123456789", 2863));
}
void testWithZeroLengthAtom()

24
tests/test_mpeg.cpp
View File

@@ -119,10 +119,10 @@ public:
CPPUNIT_ASSERT_EQUAL(44100, f.audioProperties()->sampleRate());
CPPUNIT_ASSERT(!f.audioProperties()->xingHeader());
const long last = f.lastFrameOffset();
const offset_t last = f.lastFrameOffset();
const MPEG::Header lastHeader(&f, last, false);
CPPUNIT_ASSERT_EQUAL(28213L, last);
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(28213), last);
CPPUNIT_ASSERT_EQUAL(209, lastHeader.frameLength());
}
@@ -258,20 +258,20 @@ public:
{
MPEG::File f(TEST_FILE_PATH_C("ape.mp3"));
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((long)0x0000, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL((long)0x1FD6, f.lastFrameOffset());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x0000), f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x1FD6), f.lastFrameOffset());
}
{
MPEG::File f(TEST_FILE_PATH_C("ape-id3v1.mp3"));
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((long)0x0000, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL((long)0x1FD6, f.lastFrameOffset());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x0000), f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x1FD6), f.lastFrameOffset());
}
{
MPEG::File f(TEST_FILE_PATH_C("ape-id3v2.mp3"));
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((long)0x041A, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL((long)0x23F0, f.lastFrameOffset());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x041A), f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x23F0), f.lastFrameOffset());
}
}
@@ -418,7 +418,7 @@ public:
f.save();
f.ID3v2Tag(true)->setTitle(std::string(4096, 'X').c_str());
f.save();
CPPUNIT_ASSERT_EQUAL(5141L, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(5141), f.firstFrameOffset());
}
}
@@ -430,7 +430,7 @@ public:
f.ID3v2Tag(true)->setTitle("0123456789");
f.save();
f.save();
CPPUNIT_ASSERT_EQUAL(-1L, f.find("ID3", 3));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(-1), f.find("ID3", 3));
}
void testRepeatedSave3()
@@ -524,8 +524,8 @@ public:
MPEG::File f(copy.fileName().c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT(f.hasID3v2Tag());
CPPUNIT_ASSERT_EQUAL(2255L, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL(6015L, f.lastFrameOffset());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(2255), f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(6015), f.lastFrameOffset());
CPPUNIT_ASSERT_EQUAL(String("Title A"), f.ID3v2Tag()->title());
f.ID3v2Tag()->setTitle("Title B");
f.save();

4
tests/test_ogg.cpp
View File

@@ -84,7 +84,7 @@ public:
{
Vorbis::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL(136383L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(136383), f.length());
CPPUNIT_ASSERT_EQUAL(19, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL(30U, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL(131127U, f.packet(1).size());
@@ -100,7 +100,7 @@ public:
{
Vorbis::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL(4370L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4370), f.length());
CPPUNIT_ASSERT_EQUAL(3, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL(30U, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL(60U, f.packet(1).size());

6
tests/test_oggflac.cpp
View File

@@ -62,7 +62,7 @@ public:
CPPUNIT_ASSERT_EQUAL(String("The Artist"), f.tag()->artist());
f.seek(0, File::End);
CPPUNIT_ASSERT_EQUAL(9134L, f.tell());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(9134), f.tell());
}
}
@@ -87,7 +87,7 @@ public:
{
Ogg::FLAC::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL(141141L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(141141), f.length());
CPPUNIT_ASSERT_EQUAL(21, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL(51U, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL(131126U, f.packet(1).size());
@@ -104,7 +104,7 @@ public:
{
Ogg::FLAC::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL(9128L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(9128), f.length());
CPPUNIT_ASSERT_EQUAL(5, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL(51U, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL(59U, f.packet(1).size());

4
tests/test_opus.cpp
View File

@@ -102,7 +102,7 @@ public:
{
Ogg::Opus::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL(167534L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(167534), f.length());
CPPUNIT_ASSERT_EQUAL(27, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL(19U, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL(131380U, f.packet(1).size());
@@ -119,7 +119,7 @@ public:
{
Ogg::Opus::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL(35521L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(35521), f.length());
CPPUNIT_ASSERT_EQUAL(11, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL(19U, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL(313U, f.packet(1).size());

83
tests/test_riff.cpp
View File

@@ -40,7 +40,7 @@ public:
PublicRIFF(FileName file) : RIFF::File(file, BigEndian) {};
unsigned int riffSize() { return RIFF::File::riffSize(); };
unsigned int chunkCount() { return RIFF::File::chunkCount(); };
unsigned int chunkOffset(unsigned int i) { return RIFF::File::chunkOffset(i); };
offset_t chunkOffset(unsigned int i) { return RIFF::File::chunkOffset(i); };
unsigned int chunkPadding(unsigned int i) { return RIFF::File::chunkPadding(i); };
unsigned int chunkDataSize(unsigned int i) { return RIFF::File::chunkDataSize(i); };
ByteVector chunkName(unsigned int i) { return RIFF::File::chunkName(i); };
@@ -78,7 +78,7 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x1728 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x1728 + 8), f.chunkOffset(2));
f.setChunkData("TEST", "foo");
}
@@ -87,7 +87,7 @@ public:
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("foo"), f.chunkData(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(3), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x1728 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x1728 + 8), f.chunkOffset(2));
f.setChunkData("SSND", "abcd");
@@ -120,18 +120,18 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(long(4400), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4400), f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abcd");
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(3));
@@ -139,15 +139,15 @@ public:
}
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(long(4412), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4412), f.length());
}
}
@@ -158,18 +158,18 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(long(4399), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4399), f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abcd");
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(3));
@@ -177,15 +177,15 @@ public:
}
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(long(4412), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4412), f.length());
}
}
@@ -196,18 +196,18 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(long(4399), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4399), f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abc");
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(3), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(3));
@@ -215,15 +215,15 @@ public:
}
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(3), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(long(4412), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(4412), f.length());
}
}
@@ -235,21 +235,21 @@ public:
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(5928U, f.riffSize());
CPPUNIT_ASSERT_EQUAL(5936L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(5936), f.length());
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.chunkName(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(1));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x1728 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x1728 + 8), f.chunkOffset(2));
const ByteVector data(0x400, ' ');
f.setChunkData("SSND", data);
CPPUNIT_ASSERT_EQUAL(1070U, f.riffSize());
CPPUNIT_ASSERT_EQUAL(1078L, f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x042E + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(1078), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x042E + 8), f.chunkOffset(2));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.readBlock(4));
@@ -260,10 +260,10 @@ public:
f.setChunkData(0, data);
CPPUNIT_ASSERT_EQUAL(2076U, f.riffSize());
CPPUNIT_ASSERT_EQUAL(2084L, f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x0414 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x081C + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(2084), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x0414 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x081C + 8), f.chunkOffset(2));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.readBlock(4));
@@ -274,9 +274,9 @@ public:
f.removeChunk("SSND");
CPPUNIT_ASSERT_EQUAL(1044U, f.riffSize());
CPPUNIT_ASSERT_EQUAL(1052L, f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x0414 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(1052), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x0414 + 8), f.chunkOffset(1));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.readBlock(4));
@@ -285,8 +285,8 @@ public:
f.removeChunk(0);
CPPUNIT_ASSERT_EQUAL(12U, f.riffSize());
CPPUNIT_ASSERT_EQUAL(20L, f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(20), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(0x000C + 8), f.chunkOffset(0));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.readBlock(4));
@@ -295,4 +295,3 @@ public:
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestRIFF);

4
tests/test_speex.cpp
View File

@@ -67,7 +67,7 @@ public:
{
Ogg::Speex::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL(156330L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(156330), f.length());
CPPUNIT_ASSERT_EQUAL(23, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL(80U, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL(131116U, f.packet(1).size());
@@ -84,7 +84,7 @@ public:
{
Ogg::Speex::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL(24317L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(24317), f.length());
CPPUNIT_ASSERT_EQUAL(7, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL(80U, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL(49U, f.packet(1).size());

6
tests/test_wav.cpp
View File

@@ -268,7 +268,7 @@ public:
ScopedFileCopy copy("duplicate_tags", ".wav");
RIFF::WAV::File f(copy.fileName().c_str());
CPPUNIT_ASSERT_EQUAL(17052L, f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(17052), f.length());
// duplicate_tags.wav has duplicate ID3v2/INFO tags.
// title() returns "Title2" if can't skip the second tag.
@@ -280,8 +280,8 @@ public:
CPPUNIT_ASSERT_EQUAL(String("Title1"), f.InfoTag()->title());
f.save();
CPPUNIT_ASSERT_EQUAL(15898L, f.length());
CPPUNIT_ASSERT_EQUAL(-1L, f.find("Title2"));
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(15898), f.length());
CPPUNIT_ASSERT_EQUAL(static_cast<offset_t>(-1), f.find("Title2"));
}
void testFuzzedFile1()