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

APE: Use the audio stream length in calculating the bit rate.

Browse Source
This commit is contained in:
Tsuda Kageyu 2015-05-26 10:12:29 +09:00
parent 9a8e41b9d6
commit 125d887b85
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
taglib/ape/apeproperties.cpp
View File

@ -33,6 +33,8 @@
#include "id3v2tag.h"
#include "apeproperties.h"
#include "apefile.h"
#include "apetag.h"
#include "apefooter.h"
using namespace TagLib;
@ -149,10 +151,18 @@ void APE::Properties::read(File *file)
else
analyzeOld(file);
long streamLength = file->length() - offset;
if(file->hasID3v1Tag())
streamLength -= 128;
if(file->hasAPETag())
streamLength -= file->APETag()->footer()->completeTagSize();
if(d->sampleFrames > 0 && d->sampleRate > 0) {
const double length = d->sampleFrames * 1000.0 / d->sampleRate;
d->length = static_cast<int>(length + 0.5);
d->bitrate = static_cast<int>(file->length() * 8.0 / length + 0.5);
d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
}
}

BIN
tests/data/mac-399-tagged.ape Normal file
View File

Binary file not shown.

16
tests/test_ape.cpp
View File

@ -14,6 +14,7 @@ class TestAPE : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(TestAPE);
CPPUNIT_TEST(testProperties399);
CPPUNIT_TEST(testProperties399Tagged);
CPPUNIT_TEST(testProperties396);
CPPUNIT_TEST(testProperties390);
CPPUNIT_TEST(testFuzzedFile1);
@ -37,6 +38,21 @@ public:
CPPUNIT_ASSERT_EQUAL(3990, f.audioProperties()->version());
}
void testProperties399Tagged()
{
APE::File f(TEST_FILE_PATH_C("mac-399-tagged.ape"));
CPPUNIT_ASSERT(f.audioProperties());
CPPUNIT_ASSERT_EQUAL(3, f.audioProperties()->length());
CPPUNIT_ASSERT_EQUAL(3, f.audioProperties()->lengthInSeconds());
CPPUNIT_ASSERT_EQUAL(3550, f.audioProperties()->lengthInMilliseconds());
CPPUNIT_ASSERT_EQUAL(192, f.audioProperties()->bitrate());
CPPUNIT_ASSERT_EQUAL(2, f.audioProperties()->channels());
CPPUNIT_ASSERT_EQUAL(44100, f.audioProperties()->sampleRate());
CPPUNIT_ASSERT_EQUAL(16, f.audioProperties()->bitsPerSample());
CPPUNIT_ASSERT_EQUAL(156556U, f.audioProperties()->sampleFrames());
CPPUNIT_ASSERT_EQUAL(3990, f.audioProperties()->version());
}
void testProperties396()
{
APE::File f(TEST_FILE_PATH_C("mac-396.ape"));