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

Fix parsing of ID3v2.2 frames (#1228)

Browse Source
This commit is contained in:
Urs Fleisch 2024-05-14 13:27:17 +02:00
parent ebf4c5bbb1
commit 3d4428726e
3 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -843,8 +843,10 @@ void ID3v2::Tag::parse(const ByteVector &origData)
break;
}
Frame *frame = d->factory->createFrame(data.mid(frameDataPosition),
&d->header);
const ByteVector origData = data.mid(frameDataPosition);
const Header *tagHeader = &d->header;
unsigned int headerVersion = tagHeader->majorVersion();
Frame *frame = d->factory->createFrame(origData, tagHeader);
if(!frame)
return;
@ -856,7 +858,15 @@ void ID3v2::Tag::parse(const ByteVector &origData)
return;
}
frameDataPosition += frame->size() + frame->headerSize();
if(frame->header()->version() == headerVersion) {
frameDataPosition += frame->size() + frame->headerSize();
} else {
// The frame was converted to another version, e.g. from 2.2 to 2.4.
// We must advance the frame data position according to the original
// frame, not the converted frame because its header size might differ.
Frame::Header origHeader(origData, headerVersion);
frameDataPosition += origHeader.frameSize() + origHeader.size();
}
addFrame(frame);
}

BIN
tests/data/itunes10.mp3 Normal file
View File

Binary file not shown.

51
tests/test_mpeg.cpp
View File

@ -71,6 +71,7 @@ class TestMPEG : public CppUnit::TestFixture
CPPUNIT_TEST(testIgnoreGarbage);
CPPUNIT_TEST(testExtendedHeader);
CPPUNIT_TEST(testReadStyleFast);
CPPUNIT_TEST(testID3v22Properties);
CPPUNIT_TEST_SUITE_END();
public:
@ -618,6 +619,56 @@ public:
}
}
void testID3v22Properties()
{
ScopedFileCopy copy("itunes10", ".mp3");
MPEG::File f(copy.fileName().c_str());
PropertyMap expectedProperties(SimplePropertyMap{
{"ALBUM", {"Album"}},
{"ALBUMARTIST", {"Album Artist"}},
{"ALBUMARTISTSORT", {"Sort Album Artist"}},
{"ALBUMSORT", {"Sort Album"}},
{"ARTIST", {"Artist"}},
{"ARTISTSORT", {"Sort Artist"}},
{"BPM", {"180"}},
{"COMMENT", {"Comments"}},
{"COMMENT:ITUNPGAP", {"1"}},
{"COMPILATION", {"1"}},
{"COMPOSER", {"Composer"}},
{"COMPOSERSORT", {"Sort Composer"}},
{"DATE", {"2011"}},
{"DISCNUMBER", {"1/2"}},
{"GENRE", {"Heavy Metal"}},
{"LYRICS", {"Lyrics"}},
{"SUBTITLE", {"Description"}},
{"TITLE", {"iTunes10MP3"}},
{"TITLESORT", {"Sort Name"}},
{"TRACKNUMBER", {"1/10"}},
{"WORK", {"Grouping"}}
});
expectedProperties.addUnsupportedData("APIC");
expectedProperties.addUnsupportedData("UNKNOWN/RVA");
PropertyMap properties = f.properties();
if (expectedProperties != properties) {
CPPUNIT_ASSERT_EQUAL(expectedProperties.toString(), properties.toString());
}
CPPUNIT_ASSERT(expectedProperties == properties);
const String PICTURE_KEY("PICTURE");
CPPUNIT_ASSERT_EQUAL(StringList(PICTURE_KEY), f.complexPropertyKeys());
auto pictures = f.complexProperties(PICTURE_KEY);
CPPUNIT_ASSERT_EQUAL(1U, pictures.size());
auto picture = pictures.front();
CPPUNIT_ASSERT_EQUAL(String("image/png"), picture.value("mimeType").toString());
CPPUNIT_ASSERT(picture.value("description").toString().isEmpty());
CPPUNIT_ASSERT_EQUAL(String("Other"), picture.value("pictureType").toString());
auto data = picture.value("data").toByteVector();
CPPUNIT_ASSERT(data.startsWith("\x89PNG\x0d\x0a\x1a\x0a"));
CPPUNIT_ASSERT_EQUAL(2315U, data.size());
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestMPEG);