X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.cc;h=8bf2f02fe97811d255361c28ffa5cc67008babf4;hb=d3598922d970bba6fcb468c331e1f0a33bef1a0f;hp=58d05651942cde1c688aadaccb3114e67b9e5016;hpb=f1f6fd9f2ac4894217800c8eca17937c14f648ae;p=libdcp.git diff --git a/src/dcp.cc b/src/dcp.cc index 58d05651..8bf2f02f 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -57,6 +57,7 @@ #include "reel_asset.h" #include "font_asset.h" #include "pkl.h" +#include "asset_factory.h" #include #include #include @@ -134,7 +135,7 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx list > asset_nodes = asset_map.node_child("AssetList")->node_children ("Asset"); map paths; - optional pkl_path; + list pkl_paths; BOOST_FOREACH (shared_ptr i, asset_nodes) { if (i->node_child("ChunkList")->node_children("Chunk").size() != 1) { boost::throw_exception (XMLError ("unsupported asset chunk count")); @@ -146,7 +147,7 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx switch (*_standard) { case INTEROP: if (i->optional_node_child("PackingList")) { - pkl_path = p; + pkl_paths.push_back (p); } else { paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); } @@ -155,21 +156,22 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx { optional pkl_bool = i->optional_string_child("PackingList"); if (pkl_bool && *pkl_bool == "true") { - pkl_path = p; + pkl_paths.push_back (p); } else { paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); } break; } } - } - if (!pkl_path) { - boost::throw_exception (XMLError ("No packing list found in asset map")); + if (pkl_paths.empty()) { + boost::throw_exception (XMLError ("No packing lists found in asset map")); } - _pkl.reset (new PKL (_directory / *pkl_path)); + BOOST_FOREACH (boost::filesystem::path i, pkl_paths) { + _pkls.push_back (shared_ptr(new PKL(_directory / i))); + } /* Read all the assets from the asset map */ @@ -186,9 +188,17 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx continue; } - string const pkl_type = _pkl->type(i->first); + optional pkl_type; + BOOST_FOREACH (shared_ptr j, _pkls) { + pkl_type = j->type(i->first); + if (pkl_type) { + break; + } + } + + DCP_ASSERT (pkl_type); - if (pkl_type == CPL::static_pkl_type(*_standard) || pkl_type == InteropSubtitleAsset::static_pkl_type(*_standard)) { + if (*pkl_type == CPL::static_pkl_type(*_standard) || *pkl_type == InteropSubtitleAsset::static_pkl_type(*_standard)) { xmlpp::DomParser* p = new xmlpp::DomParser; try { p->parse_file (path.string()); @@ -213,56 +223,19 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx other_assets.push_back (shared_ptr (new 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 == 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) ) { - /* XXX: asdcplib does not appear to support discovery of read MXFs standard - (Interop / SMPTE) - */ - - ASDCP::EssenceType_t type; - if (ASDCP::EssenceType (path.string().c_str(), type) != ASDCP::RESULT_OK) { - throw DCPReadError ("Could not find essence type"); - } - switch (type) { - case ASDCP::ESS_UNKNOWN: - case ASDCP::ESS_MPEG2_VES: - throw DCPReadError ("MPEG2 video essences are not supported"); - case ASDCP::ESS_JPEG_2000: - try { - other_assets.push_back (shared_ptr (new MonoPictureAsset (path))); - } catch (dcp::MXFFileError& e) { - if (ignore_incorrect_picture_mxf_type && e.number() == ASDCP::RESULT_SFORMAT) { - /* Tried to load it as mono but the error says it's stereo; try that instead */ - other_assets.push_back (shared_ptr (new StereoPictureAsset (path))); - } else { - throw; - } - } - break; - case ASDCP::ESS_PCM_24b_48k: - case ASDCP::ESS_PCM_24b_96k: - other_assets.push_back (shared_ptr (new SoundAsset (path))); - break; - case ASDCP::ESS_JPEG_2000_S: - other_assets.push_back (shared_ptr (new StereoPictureAsset (path))); - break; - case ASDCP::ESS_TIMED_TEXT: - other_assets.push_back (shared_ptr (new SMPTESubtitleAsset (path))); - break; - case ASDCP::ESS_DCDATA_DOLBY_ATMOS: - other_assets.push_back (shared_ptr (new AtmosAsset (path))); - break; - default: - throw DCPReadError (String::compose ("Unknown MXF essence type %1 in %2", int(type), path.string())); - } - } else if (pkl_type == FontAsset::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)) { other_assets.push_back (shared_ptr (new FontAsset (i->first, path))); + } else if (*pkl_type == "image/png") { + /* It's an Interop PNG subtitle; let it go */ } else { - throw DCPReadError (String::compose("Unknown asset type %1 in PKL", pkl_type)); + throw DCPReadError (String::compose("Unknown asset type %1 in PKL", *pkl_type)); } } @@ -467,20 +440,25 @@ DCP::write_xml ( i->write_xml (_directory / (name_format.get(values, "_" + i->id() + ".xml")), standard, signer); } - if (!_pkl) { - _pkl.reset (new PKL (standard, metadata.annotation_text, metadata.issue_date, metadata.issuer, metadata.creator)); + shared_ptr pkl; + + if (_pkls.empty()) { + pkl.reset (new PKL (standard, metadata.annotation_text, metadata.issue_date, metadata.issuer, metadata.creator)); + _pkls.push_back (pkl); BOOST_FOREACH (shared_ptr i, assets ()) { - i->add_to_pkl (_pkl, _directory); + i->add_to_pkl (pkl, _directory); } + } else { + pkl = _pkls.front (); } NameFormat::Map values; values['t'] = "pkl"; - boost::filesystem::path pkl_path = _directory / name_format.get(values, "_" + _pkl->id() + ".xml"); - _pkl->write (pkl_path, signer); + boost::filesystem::path pkl_path = _directory / name_format.get(values, "_" + pkl->id() + ".xml"); + pkl->write (pkl_path, signer); write_volindex (standard); - write_assetmap (standard, _pkl->id(), pkl_path, metadata); + write_assetmap (standard, pkl->id(), pkl_path, metadata); } list >