mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-19 21:44:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'official/master'

Browse Source
This commit is contained in:
Michael Helmling
2012-02-25 18:51:30 +01:00
parent b8d5246f88 cdfb447042
commit 9fd22023cd
7 changed files with 62 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
taglib/trueaudio/trueaudioproperties.cpp
View File

@ -48,7 +48,8 @@ public:
bitrate(0),
sampleRate(0),
channels(0),
bitsPerSample(0) {}
bitsPerSample(0),
sampleFrames(0) {}
ByteVector data;
long streamLength;
@ -59,6 +60,7 @@ public:
int sampleRate;
int channels;
int bitsPerSample;
uint sampleFrames;
};
////////////////////////////////////////////////////////////////////////////////
@ -101,6 +103,11 @@ int TrueAudio::Properties::channels() const
return d->channels;
}
uint TrueAudio::Properties::sampleFrames() const
{
return d->sampleFrames;
}
int TrueAudio::Properties::ttaVersion() const
{
return d->version;
@ -118,19 +125,26 @@ void TrueAudio::Properties::read()
int pos = 3;
d->version = d->data[pos] - '0';
pos += 1 + 2;
pos += 1;
d->channels = d->data.mid(pos, 2).toShort(false);
pos += 2;
// According to http://en.true-audio.com/TTA_Lossless_Audio_Codec_-_Format_Description
// TTA2 headers are in development, and have a different format
if(1 == d->version) {
// Skip the audio format
pos += 2;
d->bitsPerSample = d->data.mid(pos, 2).toShort(false);
pos += 2;
d->channels = d->data.mid(pos, 2).toShort(false);
pos += 2;
d->sampleRate = d->data.mid(pos, 4).toUInt(false);
pos += 4;
d->bitsPerSample = d->data.mid(pos, 2).toShort(false);
pos += 2;
unsigned long samples = d->data.mid(pos, 4).toUInt(false);
d->length = samples / d->sampleRate;
d->sampleRate = d->data.mid(pos, 4).toUInt(false);
pos += 4;
d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
d->sampleFrames = d->data.mid(pos, 4).toUInt(false);
d->length = d->sampleFrames / d->sampleRate;
d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
}
}

5
taglib/trueaudio/trueaudioproperties.h
View File

@ -73,6 +73,11 @@ namespace TagLib {
*/
int bitsPerSample() const;
/*!
* Returns the total number of sample frames
*/
uint sampleFrames() const;
/*!
* Returns the major version number.
*/