Use an enum class for Marker.
[libdcp.git] / src / dcp.cc
index dd360edd5f22f21d5095fa3cf30b88cea753368f..ca7313a535cee7784d923a39b5d4099010de9daf 100644 (file)
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/dcp.cc
 
 #include "raw_convert.h"
 #include "dcp.h"
-#include "sound_mxf.h"
-#include "picture_mxf.h"
-#include "interop_subtitle_content.h"
-#include "smpte_subtitle_content.h"
-#include "mono_picture_mxf.h"
-#include "stereo_picture_mxf.h"
+#include "sound_asset.h"
+#include "atmos_asset.h"
+#include "picture_asset.h"
+#include "interop_subtitle_asset.h"
+#include "smpte_subtitle_asset.h"
+#include "mono_picture_asset.h"
+#include "stereo_picture_asset.h"
+#include "reel_subtitle_asset.h"
 #include "util.h"
 #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"
 #include "decrypted_kdm_key.h"
 #include "dcp_assert.h"
+#include "reel_asset.h"
+#include "font_asset.h"
+#include "pkl.h"
+#include "asset_factory.h"
+#include "verify.h"
+#include <asdcp/AS_DCP.h>
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/app.h>
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <iostream>
 
 using std::string;
 using std::list;
+using std::vector;
 using std::cout;
-using std::ostream;
 using std::make_pair;
 using std::map;
-using std::cout;
+using std::cerr;
+using std::make_shared;
 using std::exception;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::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 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";
+
 DCP::DCP (boost::filesystem::path directory)
        : _directory (directory)
 {
        if (!boost::filesystem::exists (directory)) {
                boost::filesystem::create_directories (directory);
        }
-       
-       _directory = boost::filesystem::canonical (_directory);
-}
 
-template<class T> void
-survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e)
-{
-       if (keep_going) {
-               if (errors) {
-                       errors->push_back (shared_ptr<T> (new T (e)));
-               }
-       } else {
-               throw e;
-       }
+       _directory = boost::filesystem::canonical (_directory);
 }
 
+/** Read a DCP.  This method does not do any deep checking of the DCP's validity, but
+ *  if it comes across any bad things it will do one of two things.
+ *
+ *  Errors that are so serious that they prevent the method from working will result
+ *  in an exception being thrown.  For example, a missing ASSETMAP means that the DCP
+ *  can't be read without a lot of guesswork, so this will throw.
+ *
+ *  Errors that are not fatal will be added to notes, if it's non-0.  For example,
+ *  if the DCP contains a mixture of Interop and SMPTE elements this will result
+ *  in a note being added to the vector.
+ */
 void
-DCP::read (bool keep_going, ReadErrors* errors)
+DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_mxf_type)
 {
-       /* Read the ASSETMAP */
-       
-       boost::filesystem::path asset_map_file;
+       /* Read the ASSETMAP and PKL */
+
        if (boost::filesystem::exists (_directory / "ASSETMAP")) {
-               asset_map_file = _directory / "ASSETMAP";
+               _asset_map = _directory / "ASSETMAP";
        } else if (boost::filesystem::exists (_directory / "ASSETMAP.xml")) {
-               asset_map_file = _directory / "ASSETMAP.xml";
+               _asset_map = _directory / "ASSETMAP.xml";
        } else {
-               boost::throw_exception (DCPReadError (String::compose ("could not find AssetMap file in `%1'", _directory.string())));
+               boost::throw_exception (ReadError(String::compose("Could not find ASSETMAP nor ASSETMAP.xml in '%1'", _directory.string())));
        }
 
        cxml::Document asset_map ("AssetMap");
-       asset_map.read_file (asset_map_file);
-       list<shared_ptr<cxml::Node> > asset_nodes = asset_map.node_child("AssetList")->node_children ("Asset");
+
+       asset_map.read_file (_asset_map.get());
+       if (asset_map.namespace_uri() == assetmap_interop_ns) {
+               _standard = INTEROP;
+       } else if (asset_map.namespace_uri() == assetmap_smpte_ns) {
+               _standard = SMPTE;
+       } else {
+               boost::throw_exception (XMLError ("Unrecognised Assetmap namespace " + asset_map.namespace_uri()));
+       }
+
+       auto asset_nodes = asset_map.node_child("AssetList")->node_children ("Asset");
        map<string, boost::filesystem::path> paths;
-       for (list<shared_ptr<cxml::Node> >::const_iterator i = asset_nodes.begin(); i != asset_nodes.end(); ++i) {
-               if ((*i)->node_child("ChunkList")->node_children("Chunk").size() != 1) {
+       vector<boost::filesystem::path> pkl_paths;
+       for (auto i: asset_nodes) {
+               if (i->node_child("ChunkList")->node_children("Chunk").size() != 1) {
                        boost::throw_exception (XMLError ("unsupported asset chunk count"));
                }
-               string p = (*i)->node_child("ChunkList")->node_child("Chunk")->string_child ("Path");
+               auto p = i->node_child("ChunkList")->node_child("Chunk")->string_child ("Path");
                if (starts_with (p, "file://")) {
                        p = p.substr (7);
                }
-               paths.insert (make_pair ((*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:
+               {
+                       auto 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;
+               }
+               }
+       }
+
+       if (pkl_paths.empty()) {
+               boost::throw_exception (XMLError ("No packing lists found in asset map"));
        }
 
-       /* 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.
+       for (auto i: pkl_paths) {
+               _pkls.push_back (make_shared<PKL>(_directory / i));
+       }
+
+       /* Now we have:
+            paths - map of files in the DCP that are not PKLs; key is ID, value is path.
+            _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.
        */
-       for (map<string, boost::filesystem::path>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
-               boost::filesystem::path path = _directory / i->second;
+       vector<shared_ptr<Asset>> other_assets;
+
+       for (auto i: paths) {
+               auto path = _directory / i.second;
+
+               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.
+                       */
+                       if (notes) {
+                               notes->push_back (VerificationNote(VerificationNote::VERIFY_WARNING, VerificationNote::EMPTY_ASSET_PATH));
+                       }
+                       continue;
+               }
 
-               if (!boost::filesystem::exists (path)) {
-                       survivable_error (keep_going, errors, MissingAssetError (path));
+               if (!boost::filesystem::exists(path)) {
+                       if (notes) {
+                               notes->push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISSING_ASSET, path));
+                       }
                        continue;
                }
-               
-               if (boost::algorithm::ends_with (path.string(), ".xml")) {
-                       xmlpp::DomParser* p = new xmlpp::DomParser;
+
+               /* Find the <Type> for this asset from the PKL that contains the asset */
+               optional<string> pkl_type;
+               for (auto 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)) {
+                       auto p = new xmlpp::DomParser;
                        try {
                                p->parse_file (path.string());
                        } catch (std::exception& e) {
                                delete p;
-                               continue;
+                               throw ReadError(String::compose("XML error in %1", path.string()), e.what());
                        }
-                       
-                       string const root = p->get_document()->get_root_node()->get_name ();
+
+                       auto const root = p->get_document()->get_root_node()->get_name ();
                        delete p;
-                       
+
                        if (root == "CompositionPlaylist") {
-                               _assets.push_back (shared_ptr<CPL> (new CPL (path)));
+                               auto cpl = make_shared<CPL>(path);
+                               if (_standard && cpl->standard() && cpl->standard().get() != _standard.get() && notes) {
+                                       notes->push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_STANDARD));
+                               }
+                               _cpls.push_back (cpl);
                        } else if (root == "DCSubtitle") {
-                               _assets.push_back (shared_ptr<InteropSubtitleContent> (new InteropSubtitleContent (path)));
-                       }
-               } else if (boost::algorithm::ends_with (path.string(), ".mxf")) {
-                       ASDCP::EssenceType_t type;
-                       if (ASDCP::EssenceType (path.string().c_str(), type) != ASDCP::RESULT_OK) {
-                               throw DCPReadError ("Could not find essence type");
+                               if (_standard && _standard.get() == SMPTE && notes) {
+                                       notes->push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_STANDARD));
+                               }
+                               other_assets.push_back (make_shared<InteropSubtitleAsset>(path));
                        }
-                       switch (type) {
-                               case ASDCP::ESS_UNKNOWN:
-                               case ASDCP::ESS_MPEG2_VES:
-                                       throw DCPReadError ("MPEG2 video essences are not supported");
-                               case ASDCP::ESS_JPEG_2000:
-                                       _assets.push_back (shared_ptr<MonoPictureMXF> (new MonoPictureMXF (path)));
-                                       break;
-                               case ASDCP::ESS_PCM_24b_48k:
-                               case ASDCP::ESS_PCM_24b_96k:
-                                       _assets.push_back (shared_ptr<SoundMXF> (new SoundMXF (path)));
-                                       break;
-                               case ASDCP::ESS_JPEG_2000_S:
-                                       _assets.push_back (shared_ptr<StereoPictureMXF> (new StereoPictureMXF (path)));
-                                       break;
-                               case ASDCP::ESS_TIMED_TEXT:
-                                       _assets.push_back (shared_ptr<SMPTESubtitleContent> (new SMPTESubtitleContent (path)));
-                                       break;
-                               default:
-                                       throw DCPReadError ("Unknown MXF essence type");
+               } 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 (make_shared<FontAsset>(i.first, path));
+               } else if (*pkl_type == "image/png") {
+                       /* It's an Interop PNG subtitle; let it go */
+               } else {
+                       throw ReadError (String::compose("Unknown asset type %1 in PKL", *pkl_type));
+               }
+       }
+
+       resolve_refs (other_assets);
+
+       /* While we've got the ASSETMAP lets look and see if this DCP refers to things that are not in its ASSETMAP */
+       if (notes) {
+               for (auto i: cpls()) {
+                       for (auto j: i->reel_mxfs()) {
+                               if (!j->asset_ref().resolved() && paths.find(j->asset_ref().id()) == paths.end()) {
+                                       notes->push_back (VerificationNote(VerificationNote::VERIFY_WARNING, VerificationNote::EXTERNAL_ASSET, j->asset_ref().id()));
                                }
+                       }
                }
        }
+}
 
-       list<shared_ptr<CPL> > cpl = cpls ();
-       for (list<shared_ptr<CPL> >::const_iterator i = cpl.begin(); i != cpl.end(); ++i) {
-               (*i)->resolve_refs (list_of_type<Asset, Object> (assets ()));
+void
+DCP::resolve_refs (vector<shared_ptr<Asset>> assets)
+{
+       for (auto i: cpls()) {
+               i->resolve_refs (assets);
        }
 }
 
 bool
 DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const
 {
-       list<shared_ptr<CPL> > a = cpls ();
-       list<shared_ptr<CPL> > b = other.cpls ();
-       
+       auto a = cpls ();
+       auto 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;
@@ -185,9 +296,9 @@ DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const
 
        bool r = true;
 
-       for (list<shared_ptr<CPL> >::const_iterator i = a.begin(); i != a.end(); ++i) {
-               list<shared_ptr<CPL> >::const_iterator j = b.begin ();
-               while (j != b.end() && !(*j)->equals (*i, opt, note)) {
+       for (auto i: a) {
+               auto j = b.begin();
+               while (j != b.end() && !(*j)->equals (i, opt, note)) {
                        ++j;
                }
 
@@ -200,17 +311,16 @@ DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const
 }
 
 void
-DCP::add (boost::shared_ptr<Asset> asset)
+DCP::add (std::shared_ptr<CPL> cpl)
 {
-       _assets.push_back (asset);
+       _cpls.push_back (cpl);
 }
 
 bool
 DCP::encrypted () const
 {
-       list<shared_ptr<CPL> > cpl = cpls ();
-       for (list<shared_ptr<CPL> >::const_iterator i = cpl.begin(); i != cpl.end(); ++i) {
-               if ((*i)->encrypted ()) {
+       for (auto i: cpls()) {
+               if (i->encrypted()) {
                        return true;
                }
        }
@@ -218,60 +328,22 @@ DCP::encrypted () const
        return false;
 }
 
+/** Add a KDM to decrypt this DCP.  This method must be called after DCP::read()
+ *  or the KDM you specify will be ignored.
+ *  @param kdm KDM to use.
+ */
 void
 DCP::add (DecryptedKDM const & kdm)
 {
-       list<DecryptedKDMKey> keys = kdm.keys ();
-       list<shared_ptr<CPL> > cpl = cpls ();
-       
-       for (list<shared_ptr<CPL> >::iterator i = cpl.begin(); i != cpl.end(); ++i) {
-               for (list<DecryptedKDMKey>::iterator j = keys.begin(); j != keys.end(); ++j) {
-                       if (j->cpl_id() == (*i)->id()) {
-                               (*i)->add (kdm);
-                       }                               
-               }
-       }
-}
+       auto keys = kdm.keys ();
 
-boost::filesystem::path
-DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr<const Signer> signer) const
-{
-       boost::filesystem::path p = _directory;
-       p /= String::compose ("%1_pkl.xml", pkl_uuid);
-
-       xmlpp::Document doc;
-       xmlpp::Element* pkl;
-       if (standard == INTEROP) {
-               pkl = doc.create_root_node("PackingList", "http://www.digicine.com/PROTO-ASDCP-PKL-20040311#");
-       } 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");
-       }
-
-       pkl->add_child("Id")->add_child_text ("urn:uuid:" + pkl_uuid);
-
-       /* 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");
-       for (list<shared_ptr<Asset> >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) {
-               (*i)->write_to_pkl (asset_list, standard);
-       }
-
-       if (signer) {
-               signer->sign (pkl, standard);
+       for (auto i: cpls()) {
+               for (auto const& j: kdm.keys()) {
+                       if (j.cpl_id() == i->id()) {
+                               i->add (kdm);
+                       }
+               }
        }
-               
-       doc.write_to_file (p.string (), "UTF-8");
-       return p.string ();
 }
 
 /** Write the VOLINDEX file.
@@ -297,24 +369,27 @@ DCP::write_volindex (Standard standard) const
 
        switch (standard) {
        case INTEROP:
-               root = doc.create_root_node ("VolumeIndex", "http://www.digicine.com/PROTO-ASDCP-AM-20040311#");
+               root = doc.create_root_node ("VolumeIndex", volindex_interop_ns);
                break;
        case SMPTE:
-               root = doc.create_root_node ("VolumeIndex", "http://www.smpte-ra.org/schemas/429-9/2007/AM");
+               root = doc.create_root_node ("VolumeIndex", volindex_smpte_ns);
                break;
        default:
                DCP_ASSERT (false);
        }
-       
+
        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
-DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMetadata metadata) const
+DCP::write_assetmap (
+       Standard standard, string pkl_uuid, boost::filesystem::path pkl_path,
+       string issuer, string creator, string issue_date, string annotation_text
+       ) const
 {
-       boost::filesystem::path p = _directory;
-       
+       auto p = _directory;
+
        switch (standard) {
        case INTEROP:
                p /= "ASSETMAP";
@@ -331,53 +406,53 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta
 
        switch (standard) {
        case INTEROP:
-               root = doc.create_root_node ("AssetMap", "http://www.digicine.com/PROTO-ASDCP-AM-20040311#");
+               root = doc.create_root_node ("AssetMap", assetmap_interop_ns);
                break;
        case SMPTE:
-               root = doc.create_root_node ("AssetMap", "http://www.smpte-ra.org/schemas/429-9/2007/AM");
+               root = doc.create_root_node ("AssetMap", assetmap_smpte_ns);
                break;
        default:
                DCP_ASSERT (false);
        }
 
        root->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
-       root->add_child("AnnotationText")->add_child_text ("Created by " + metadata.creator);
+       root->add_child("AnnotationText")->add_child_text (annotation_text);
 
        switch (standard) {
        case INTEROP:
                root->add_child("VolumeCount")->add_child_text ("1");
-               root->add_child("IssueDate")->add_child_text (metadata.issue_date);
-               root->add_child("Issuer")->add_child_text (metadata.issuer);
-               root->add_child("Creator")->add_child_text (metadata.creator);
+               root->add_child("IssueDate")->add_child_text (issue_date);
+               root->add_child("Issuer")->add_child_text (issuer);
+               root->add_child("Creator")->add_child_text (creator);
                break;
        case SMPTE:
-               root->add_child("Creator")->add_child_text (metadata.creator);
+               root->add_child("Creator")->add_child_text (creator);
                root->add_child("VolumeCount")->add_child_text ("1");
-               root->add_child("IssueDate")->add_child_text (metadata.issue_date);
-               root->add_child("Issuer")->add_child_text (metadata.issuer);
+               root->add_child("IssueDate")->add_child_text (issue_date);
+               root->add_child("Issuer")->add_child_text (issuer);
                break;
        default:
                DCP_ASSERT (false);
        }
-               
-       xmlpp::Node* asset_list = root->add_child ("AssetList");
 
-       xmlpp::Node* asset = asset_list->add_child ("Asset");
+       auto asset_list = root->add_child ("AssetList");
+
+       auto asset = asset_list->add_child ("Asset");
        asset->add_child("Id")->add_child_text ("urn:uuid:" + pkl_uuid);
        asset->add_child("PackingList")->add_child_text ("true");
-       xmlpp::Node* chunk_list = asset->add_child ("ChunkList");
-       xmlpp::Node* chunk = chunk_list->add_child ("Chunk");
-       chunk->add_child("Path")->add_child_text (pkl_uuid + "_pkl.xml");
+       auto chunk_list = asset->add_child ("ChunkList");
+       auto chunk = chunk_list->add_child ("Chunk");
+       chunk->add_child("Path")->add_child_text (pkl_path.filename().string());
        chunk->add_child("VolumeIndex")->add_child_text ("1");
        chunk->add_child("Offset")->add_child_text ("0");
-       chunk->add_child("Length")->add_child_text (raw_convert<string> (pkl_length));
-       
-       for (list<shared_ptr<Asset> >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) {
-               (*i)->write_to_assetmap (asset_list, _directory);
+       chunk->add_child("Length")->add_child_text (raw_convert<string> (boost::filesystem::file_size (pkl_path)));
+
+       for (auto i: assets()) {
+               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");
+       _asset_map = p;
 }
 
 /** Write all the XML files for this DCP.
@@ -388,25 +463,94 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta
 void
 DCP::write_xml (
        Standard standard,
-       XMLMetadata metadata,
-       shared_ptr<const Signer> signer
+       string issuer,
+       string creator,
+       string issue_date,
+       string annotation_text,
+       shared_ptr<const CertificateChain> signer,
+       NameFormat name_format
        )
 {
-       list<shared_ptr<CPL> > cpl = cpls ();
-       for (list<shared_ptr<CPL> >::const_iterator i = cpl.begin(); i != cpl.end(); ++i) {
-               string const filename = (*i)->id() + "_cpl.xml";
-               (*i)->write_xml (_directory / filename, standard, signer);
+       for (auto i: cpls()) {
+               NameFormat::Map values;
+               values['t'] = "cpl";
+               i->write_xml (_directory / (name_format.get(values, "_" + i->id() + ".xml")), standard, signer);
        }
 
-       string const pkl_uuid = make_uuid ();
-       boost::filesystem::path const pkl_path = write_pkl (standard, pkl_uuid, metadata, signer);
-       
+       shared_ptr<PKL> pkl;
+
+       if (_pkls.empty()) {
+               pkl = make_shared<PKL>(standard, annotation_text, issue_date, issuer, creator);
+               _pkls.push_back (pkl);
+               for (auto i: assets()) {
+                       i->add_to_pkl (pkl, _directory);
+               }
+        } else {
+               pkl = _pkls.front ();
+       }
+
+       NameFormat::Map values;
+       values['t'] = "pkl";
+       auto pkl_path = _directory / name_format.get(values, "_" + pkl->id() + ".xml");
+       pkl->write (pkl_path, signer);
+
        write_volindex (standard);
-       write_assetmap (standard, pkl_uuid, boost::filesystem::file_size (pkl_path), metadata);
+       write_assetmap (standard, pkl->id(), pkl_path, issuer, creator, issue_date, annotation_text);
 }
 
-list<shared_ptr<CPL> >
+vector<shared_ptr<CPL>>
 DCP::cpls () const
 {
-       return list_of_type<Asset, CPL> (_assets);
+       return _cpls;
+}
+
+/** @param ignore_unresolved true to silently ignore unresolved assets, otherwise
+ *  an exception is thrown if they are found.
+ *  @return All assets (including CPLs).
+ */
+vector<shared_ptr<Asset>>
+DCP::assets (bool ignore_unresolved) const
+{
+       vector<shared_ptr<Asset>> assets;
+       for (auto i: cpls()) {
+               assets.push_back (i);
+               for (auto j: i->reel_mxfs()) {
+                       if (ignore_unresolved && !j->asset_ref().resolved()) {
+                               continue;
+                       }
+
+                       auto const id = j->asset_ref().id();
+                       auto already_got = false;
+                       for (auto k: assets) {
+                               if (k->id() == id) {
+                                       already_got = true;
+                               }
+                       }
+
+                       if (!already_got) {
+                               auto o = j->asset_ref().asset();
+                               assets.push_back (o);
+                               /* More Interop special-casing */
+                               auto sub = dynamic_pointer_cast<InteropSubtitleAsset>(o);
+                               if (sub) {
+                                       sub->add_font_assets (assets);
+                               }
+                       }
+               }
+       }
+
+       return assets;
+}
+
+/** Given a list of files that make up 1 or more DCPs, return the DCP directories */
+vector<boost::filesystem::path>
+DCP::directories_from_files (vector<boost::filesystem::path> files)
+{
+       vector<boost::filesystem::path> d;
+       for (auto i: files) {
+               if (i.filename() == "ASSETMAP" || i.filename() == "ASSETMAP.xml") {
+                       d.push_back (i.parent_path ());
+               }
+       }
+       return d;
 }