X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.cc;h=7ec7577f8b722f70739e1c19d78cca3a2338924f;hb=f0a6d7b5b8d16b8b47917cd30b340917f5c62fc5;hp=b710d61be559dace5de3a7aacd285f2b5dc50724;hpb=81312913ad26aaee12eeabd3f27a537806c97049;p=libdcp.git diff --git a/src/dcp.cc b/src/dcp.cc index b710d61b..7ec7577f 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -34,7 +34,7 @@ #include "metadata.h" #include "exceptions.h" #include "cpl.h" -#include "signer.h" +#include "certificate_chain.h" #include "compose.hpp" #include "AS_DCP.h" #include "decrypted_kdm.h" @@ -70,7 +70,7 @@ DCP::DCP (boost::filesystem::path directory) if (!boost::filesystem::exists (directory)) { boost::filesystem::create_directories (directory); } - + _directory = boost::filesystem::canonical (_directory); } @@ -87,10 +87,10 @@ survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e) } void -DCP::read (bool keep_going, ReadErrors* errors) +DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mxf_type) { /* Read the ASSETMAP */ - + boost::filesystem::path asset_map_file; if (boost::filesystem::exists (_directory / "ASSETMAP")) { asset_map_file = _directory / "ASSETMAP"; @@ -112,7 +112,7 @@ DCP::read (bool keep_going, ReadErrors* errors) if (starts_with (p, "file://")) { p = p.substr (7); } - paths.insert (make_pair (i->string_child ("Id"), p)); + paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); } /* Read all the assets from the asset map */ @@ -124,7 +124,7 @@ DCP::read (bool keep_going, ReadErrors* errors) from the CPLs. */ list > other_assets; - + for (map::const_iterator i = paths.begin(); i != paths.end(); ++i) { boost::filesystem::path path = _directory / i->second; @@ -132,7 +132,7 @@ DCP::read (bool keep_going, ReadErrors* errors) survivable_error (keep_going, errors, MissingAssetError (path)); continue; } - + if (boost::filesystem::extension (path) == ".xml") { xmlpp::DomParser* p = new xmlpp::DomParser; try { @@ -141,10 +141,10 @@ DCP::read (bool keep_going, ReadErrors* errors) delete p; continue; } - + string const root = p->get_document()->get_root_node()->get_name (); delete p; - + if (root == "CompositionPlaylist") { _cpls.push_back (shared_ptr (new CPL (path))); } else if (root == "DCSubtitle") { @@ -160,7 +160,16 @@ DCP::read (bool keep_going, ReadErrors* errors) case ASDCP::ESS_MPEG2_VES: throw DCPReadError ("MPEG2 video essences are not supported"); case ASDCP::ESS_JPEG_2000: - other_assets.push_back (shared_ptr (new MonoPictureAsset (path))); + 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: @@ -181,7 +190,15 @@ DCP::read (bool keep_going, ReadErrors* errors) } BOOST_FOREACH (shared_ptr i, cpls ()) { - i->resolve_refs (list_of_type (other_assets)); + i->resolve_refs (other_assets); + } +} + +void +DCP::resolve_refs (list > assets) +{ + BOOST_FOREACH (shared_ptr i, cpls ()) { + i->resolve_refs (assets); } } @@ -190,7 +207,7 @@ DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const { list > a = cpls (); list > b = other.cpls (); - + if (a.size() != b.size()) { note (DCP_ERROR, String::compose ("CPL counts differ: %1 vs %2", a.size(), b.size())); return false; @@ -239,13 +256,13 @@ DCP::add (DecryptedKDM const & kdm) BOOST_FOREACH (DecryptedKDMKey const & j, kdm.keys ()) { if (j.cpl_id() == i->id()) { i->add (kdm); - } + } } } } boost::filesystem::path -DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr signer) const +DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr signer) const { boost::filesystem::path p = _directory; p /= String::compose ("pkl_%1.xml", pkl_uuid); @@ -257,7 +274,7 @@ DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared } else { pkl = doc.create_root_node("PackingList", "http://www.smpte-ra.org/schemas/429-8/2007/PKL"); } - + if (signer) { pkl->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig"); } @@ -267,20 +284,20 @@ DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared /* XXX: this is a bit of a hack */ DCP_ASSERT (cpls().size() > 0); pkl->add_child("AnnotationText")->add_child_text (cpls().front()->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, standard); + 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 (); } @@ -316,7 +333,7 @@ DCP::write_volindex (Standard standard) const default: DCP_ASSERT (false); } - + root->add_child("Index")->add_child_text ("1"); doc.write_to_file (p.string (), "UTF-8"); } @@ -325,7 +342,7 @@ void DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMetadata metadata) const { boost::filesystem::path p = _directory; - + switch (standard) { case INTEROP: p /= "ASSETMAP"; @@ -370,7 +387,7 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta default: DCP_ASSERT (false); } - + xmlpp::Node* asset_list = root->add_child ("AssetList"); xmlpp::Node* asset = asset_list->add_child ("Asset"); @@ -400,7 +417,7 @@ void DCP::write_xml ( Standard standard, XMLMetadata metadata, - shared_ptr signer + shared_ptr signer ) { BOOST_FOREACH (shared_ptr i, cpls ()) { @@ -410,7 +427,7 @@ DCP::write_xml ( string const pkl_uuid = make_uuid (); boost::filesystem::path const pkl_path = write_pkl (standard, pkl_uuid, metadata, signer); - + write_volindex (standard); write_assetmap (standard, pkl_uuid, boost::filesystem::file_size (pkl_path), metadata); } @@ -421,7 +438,7 @@ DCP::cpls () const return _cpls; } -/** @return All assest (including CPLs) */ +/** @return All assets (including CPLs) */ list > DCP::assets () const { @@ -429,7 +446,7 @@ DCP::assets () const BOOST_FOREACH (shared_ptr i, cpls ()) { assets.push_back (i); BOOST_FOREACH (shared_ptr j, i->reel_assets ()) { - shared_ptr o = j->asset_ref().object (); + shared_ptr o = j->asset_ref().asset (); assets.push_back (o); /* More Interop special-casing */ shared_ptr sub = dynamic_pointer_cast (o);