Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr.metadata: fix mp4 parsing

Browse source
This commit is contained in:
Alexander Capehart 2024-12-23 12:52:33 -05:00
parent e56e290451
commit 6ccae5f0d2
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
musikr/src/main/cpp/JVMMetadataBuilder.cpp
View file

@ -18,9 +18,13 @@
#include "JVMMetadataBuilder.h" #include "JVMMetadataBuilder.h"
#include "log.h"
#include <taglib/mp4tag.h> #include <taglib/mp4tag.h>
#include <taglib/textidentificationframe.h> #include <taglib/textidentificationframe.h>
#include <taglib/tpropertymap.h>
JVMMetadataBuilder::JVMMetadataBuilder(JNIEnv *env) : env(env), id3v2(env), xiph( JVMMetadataBuilder::JVMMetadataBuilder(JNIEnv *env) : env(env), id3v2(env), xiph(
env), mp4(env), cover(), properties(nullptr) { env), mp4(env), cover(), properties(nullptr) {
} }
@ -60,19 +64,17 @@ void JVMMetadataBuilder::setXiph(const TagLib::Ogg::XiphComment &tag) {
} }
void JVMMetadataBuilder::setMp4(const TagLib::MP4::Tag &tag) { void JVMMetadataBuilder::setMp4(const TagLib::MP4::Tag &tag) {
for (auto item : tag.itemMap()) { auto map = tag.itemMap();
auto itemName = TagLib::String(item.first); for (auto item : map) {
auto itemName = item.first;
auto itemValue = item.second; auto itemValue = item.second;
auto type = itemValue.type(); auto type = itemValue.type();
// TODO: Handle internal atoms
// Only read out the atoms for the reasonable tags we are expecting. // Only read out the atoms for the reasonable tags we are expecting.
// None of the crazy binary atoms. // None of the crazy binary atoms.
if (type == TagLib::MP4::Item::Type::StringList) { if (type == TagLib::MP4::Item::Type::StringList) {
auto value = itemValue.toStringList(); auto value = itemValue.toStringList();
mp4.add(itemName, value); mp4.add(itemName, value);
return; continue;
} }
// Assume that taggers will be unhinged and store track numbers // Assume that taggers will be unhinged and store track numbers
@ -80,17 +82,17 @@ void JVMMetadataBuilder::setMp4(const TagLib::MP4::Tag &tag) {
if (type == TagLib::MP4::Item::Type::Int) { if (type == TagLib::MP4::Item::Type::Int) {
auto value = std::to_string(itemValue.toInt()); auto value = std::to_string(itemValue.toInt());
id3v2.add(itemName, value); id3v2.add(itemName, value);
return; continue;
} }
if (type == TagLib::MP4::Item::Type::UInt) { if (type == TagLib::MP4::Item::Type::UInt) {
auto value = std::to_string(itemValue.toUInt()); auto value = std::to_string(itemValue.toUInt());
id3v2.add(itemName, value); id3v2.add(itemName, value);
return; continue;
} }
if (type == TagLib::MP4::Item::Type::LongLong) { if (type == TagLib::MP4::Item::Type::LongLong) {
auto value = std::to_string(itemValue.toLongLong()); auto value = std::to_string(itemValue.toLongLong());
id3v2.add(itemName, value); id3v2.add(itemName, value);
return; continue;
} }
if (type == TagLib::MP4::Item::Type::IntPair) { if (type == TagLib::MP4::Item::Type::IntPair) {
// It's inefficient going from the integer representation back into // It's inefficient going from the integer representation back into
@ -99,9 +101,8 @@ void JVMMetadataBuilder::setMp4(const TagLib::MP4::Tag &tag) {
auto value = std::to_string(itemValue.toIntPair().first) + "/" auto value = std::to_string(itemValue.toIntPair().first) + "/"
+ std::to_string(itemValue.toIntPair().second); + std::to_string(itemValue.toIntPair().second);
id3v2.add(itemName, value); id3v2.add(itemName, value);
return; continue;
} }
// Nothing else makes sense to handle as far as I can tell.
} }
} }