diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-14 12:40:01 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-14 16:20:45 +0200 |
| commit | 1ffc787c6318815592e8d81c4878488eb6183ca4 (patch) | |
| tree | fe3a3b9393e5db6b6f7a829a4834612a9e2c3d1f /src | |
| parent | 66566512275d363f68781b9a47ade6967d09e676 (diff) | |
Ignore parameters in PKL type strings when checking them.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dcp.cc | 21 |
1 files changed, 15 insertions, 6 deletions
@@ -221,7 +221,16 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m continue; } - if (*pkl_type == CPL::static_pkl_type(*_standard) || *pkl_type == InteropSubtitleAsset::static_pkl_type(*_standard)) { + auto remove_parameters = [](string const& n) { + return n.substr(0, n.find(";")); + }; + + /* Remove any optional parameters (after ;) */ + pkl_type = pkl_type->substr(0, pkl_type->find(";")); + + if ( + pkl_type == remove_parameters(CPL::static_pkl_type(*_standard)) || + pkl_type == remove_parameters(InteropSubtitleAsset::static_pkl_type(*_standard))) { auto p = new xmlpp::DomParser; try { p->parse_file (path.string()); @@ -246,14 +255,14 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m other_assets.push_back (make_shared<InteropSubtitleAsset>(path)); } } else if ( - *pkl_type == PictureAsset::static_pkl_type(*_standard) || - *pkl_type == SoundAsset::static_pkl_type(*_standard) || - *pkl_type == AtmosAsset::static_pkl_type(*_standard) || - *pkl_type == SMPTESubtitleAsset::static_pkl_type(*_standard) + *pkl_type == remove_parameters(PictureAsset::static_pkl_type(*_standard)) || + *pkl_type == remove_parameters(SoundAsset::static_pkl_type(*_standard)) || + *pkl_type == remove_parameters(AtmosAsset::static_pkl_type(*_standard)) || + *pkl_type == remove_parameters(SMPTESubtitleAsset::static_pkl_type(*_standard)) ) { other_assets.push_back (asset_factory(path, ignore_incorrect_picture_mxf_type)); - } else if (*pkl_type == FontAsset::static_pkl_type(*_standard)) { + } else if (*pkl_type == remove_parameters(FontAsset::static_pkl_type(*_standard))) { other_assets.push_back (make_shared<FontAsset>(i.first, path)); } else if (*pkl_type == "image/png") { /* It's an Interop PNG subtitle; let it go */ |