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

Ogg: Set granule position to -1 if no packets finish on page (#864)

Browse Source
This commit is contained in:
Urs Fleisch 2021-02-08 10:41:25 +01:00
parent 4c14571647
commit 83aa01c6af
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
taglib/ogg/oggpage.cpp
View File

@ -305,4 +305,10 @@ Ogg::Page::Page(const ByteVectorList &packets,
}
d->packets = packets;
d->header.setPacketSizes(packetSizes);
// https://xiph.org/ogg/doc/framing.html, absolute granule position:
// A special value of '-1' (in two's complement) indicates that no packets
// finish on this page.
if(!lastPacketCompleted && packets.size() <= 1)
d->header.setAbsoluteGranularPosition(-1);
}

28
tests/test_ogg.cpp
View File

@ -48,6 +48,7 @@ class TestOGG : public CppUnit::TestFixture
CPPUNIT_TEST(testDictInterface2);
CPPUNIT_TEST(testAudioProperties);
CPPUNIT_TEST(testPageChecksum);
CPPUNIT_TEST(testPageGranulePosition);
CPPUNIT_TEST_SUITE_END();
public:
@ -222,6 +223,33 @@ public:
}
void testPageGranulePosition()
{
ScopedFileCopy copy("empty", ".ogg");
{
Vorbis::File f(copy.fileName().c_str());
// Force the Vorbis comment packet to span more than one page and
// check if the granule position is -1 indicating that no packets
// finish on this page.
f.tag()->setComment(String(ByteVector(70000, 'A')));
f.save();
f.seek(0x3a);
CPPUNIT_ASSERT_EQUAL(ByteVector("OggS\0\0", 6), f.readBlock(6));
CPPUNIT_ASSERT_EQUAL(static_cast<long long>(-1), f.readBlock(8).toLongLong());
}
{
Vorbis::File f(copy.fileName().c_str());
// Use a small Vorbis comment package which ends on the seconds page and
// check if the granule position is zero.
f.tag()->setComment("A small comment");
f.save();
f.seek(0x3a);
CPPUNIT_ASSERT_EQUAL(ByteVector("OggS\0\0", 6), f.readBlock(6));
CPPUNIT_ASSERT_EQUAL(static_cast<long long>(0), f.readBlock(8).toLongLong());
}
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestOGG);