X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.cc;h=2011f04e52cdb515af362abc8939268d3c8d9fa1;hb=9d3e7f716accd67985f23048b4c36e7581348848;hp=875a2547dc6c3eca5fc3410b78f4996f7642b380;hpb=77b97edbd1a190a5d0da9dc760107772e7797c72;p=libdcp.git diff --git a/src/dcp.cc b/src/dcp.cc index 875a2547..2011f04e 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -56,6 +56,8 @@ #include "dcp_assert.h" #include "reel_asset.h" #include "font_asset.h" +#include "pkl.h" +#include "asset_factory.h" #include #include #include @@ -74,13 +76,12 @@ using std::cerr; using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::optional; using boost::algorithm::starts_with; using namespace dcp; static string const assetmap_interop_ns = "http://www.digicine.com/PROTO-ASDCP-AM-20040311#"; static string const assetmap_smpte_ns = "http://www.smpte-ra.org/schemas/429-9/2007/AM"; -static string const pkl_interop_ns = "http://www.digicine.com/PROTO-ASDCP-PKL-20040311#"; -static string const pkl_smpte_ns = "http://www.smpte-ra.org/schemas/429-8/2007/PKL"; static string const volindex_interop_ns = "http://www.digicine.com/PROTO-ASDCP-VL-20040311#"; static string const volindex_smpte_ns = "http://www.smpte-ra.org/schemas/429-9/2007/AM"; @@ -110,7 +111,7 @@ survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e) void DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mxf_type) { - /* Read the ASSETMAP */ + /* Read the ASSETMAP and PKL */ boost::filesystem::path asset_map_file; if (boost::filesystem::exists (_directory / "ASSETMAP")) { @@ -134,6 +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; + 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")); @@ -142,15 +144,43 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx if (starts_with (p, "file://")) { p = p.substr (7); } - paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); + switch (*_standard) { + case INTEROP: + if (i->optional_node_child("PackingList")) { + pkl_paths.push_back (p); + } else { + paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); + } + break; + case SMPTE: + { + optional pkl_bool = i->optional_string_child("PackingList"); + if (pkl_bool && *pkl_bool == "true") { + pkl_paths.push_back (p); + } else { + paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); + } + break; + } + } } - /* Read all the assets from the asset map */ - /* XXX: I think we should be looking at the PKL here to decide type, not - the extension of the file. - */ + if (pkl_paths.empty()) { + boost::throw_exception (XMLError ("No packing lists found in asset map")); + } - /* Make a list of non-CPL assets so that we can resolve the references + BOOST_FOREACH (boost::filesystem::path i, pkl_paths) { + _pkls.push_back (shared_ptr(new PKL(_directory / i))); + } + + /* Now we have: + paths - files in the DCP that are not PKLs. + _pkls - PKL objects for each PKL. + + Read all the assets from the asset map. + */ + + /* Make a list of non-CPL/PKL assets so that we can resolve the references from the CPLs. */ list > other_assets; @@ -158,12 +188,37 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx for (map::const_iterator i = paths.begin(); i != paths.end(); ++i) { boost::filesystem::path path = _directory / i->second; - if (!boost::filesystem::exists (path)) { + if (i->second.empty()) { + /* I can't see how this is valid, but it's + been seen in the wild with a DCP that + claims to come from ClipsterDCI 5.10.0.5. + */ + survivable_error (keep_going, errors, EmptyAssetPathError(i->first)); + continue; + } + + if (!boost::filesystem::exists(path)) { survivable_error (keep_going, errors, MissingAssetError (path)); continue; } - if (boost::filesystem::extension (path) == ".xml") { + /* Find the for this asset from the PKL that contains the asset */ + optional pkl_type; + BOOST_FOREACH (shared_ptr j, _pkls) { + pkl_type = j->type(i->first); + if (pkl_type) { + break; + } + } + + if (!pkl_type) { + /* This asset is in the ASSETMAP but not mentioned in any PKL so we don't + * need to worry about it. + */ + continue; + } + + 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()); @@ -187,50 +242,20 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx } other_assets.push_back (shared_ptr (new InteropSubtitleAsset (path))); } - } else if (boost::filesystem::extension (path) == ".mxf") { - - /* 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 (boost::filesystem::extension (path) == ".ttf") { + } 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) + ) { + + 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)); } } @@ -310,40 +335,6 @@ DCP::add (DecryptedKDM const & kdm) } } -/** @return full pathname of PKL file that was written */ -boost::filesystem::path -DCP::write_pkl (string file, Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr signer) const -{ - boost::filesystem::path p = _directory; - p /= file; - - xmlpp::Document doc; - xmlpp::Element* pkl; - if (standard == INTEROP) { - pkl = doc.create_root_node("PackingList", pkl_interop_ns); - } else { - pkl = doc.create_root_node("PackingList", pkl_smpte_ns); - } - - pkl->add_child("Id")->add_child_text ("urn:uuid:" + pkl_uuid); - pkl->add_child("AnnotationText")->add_child_text (metadata.annotation_text); - pkl->add_child("IssueDate")->add_child_text (metadata.issue_date); - pkl->add_child("Issuer")->add_child_text (metadata.issuer); - pkl->add_child("Creator")->add_child_text (metadata.creator); - - xmlpp::Element* asset_list = pkl->add_child("AssetList"); - BOOST_FOREACH (shared_ptr i, assets ()) { - i->write_to_pkl (asset_list, _directory, standard); - } - - if (signer) { - signer->sign (pkl, standard); - } - - doc.write_to_file (p.string (), "UTF-8"); - return p.string (); -} - /** Write the VOLINDEX file. * @param standard DCP standard to use (INTEROP or SMPTE) */ @@ -377,7 +368,7 @@ DCP::write_volindex (Standard standard) const } root->add_child("Index")->add_child_text ("1"); - doc.write_to_file (p.string (), "UTF-8"); + doc.write_to_file_formatted (p.string (), "UTF-8"); } void @@ -446,8 +437,7 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, boost::filesystem::path i->write_to_assetmap (asset_list, _directory); } - /* This must not be the _formatted version otherwise signature digests will be wrong */ - doc.write_to_file (p.string (), "UTF-8"); + doc.write_to_file_formatted (p.string (), "UTF-8"); } /** Write all the XML files for this DCP. @@ -469,13 +459,25 @@ DCP::write_xml ( i->write_xml (_directory / (name_format.get(values, "_" + i->id() + ".xml")), standard, signer); } - string const pkl_uuid = make_uuid (); + 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); + } + } else { + pkl = _pkls.front (); + } + NameFormat::Map values; values['t'] = "pkl"; - boost::filesystem::path const pkl_path = write_pkl (name_format.get(values, "_" + pkl_uuid + ".xml"), standard, pkl_uuid, metadata, 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_uuid, pkl_path, metadata); + write_assetmap (standard, pkl->id(), pkl_path, metadata); } list >