X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.cc;h=53d5dd39843f27fd0b91a97b6bedcb0a2f118f74;hb=c4db5b5396c6401c63d80777a812e8adc642ce02;hp=b1443e1ada0cc03c5c5b5f5326d20e8b44e99cfe;hpb=861117816d557cd048d56b26f8903ac26a94b395;p=libdcp.git diff --git a/src/dcp.cc b/src/dcp.cc index b1443e1a..53d5dd39 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,27 +23,31 @@ #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 "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 #include #include #include #include -#include +#include #include using std::string; @@ -53,8 +57,10 @@ using std::ostream; using std::make_pair; using std::map; using std::cout; +using std::cerr; using std::exception; using boost::shared_ptr; +using boost::dynamic_pointer_cast; using boost::algorithm::starts_with; using namespace dcp; @@ -64,7 +70,7 @@ DCP::DCP (boost::filesystem::path directory) if (!boost::filesystem::exists (directory)) { boost::filesystem::create_directories (directory); } - + _directory = boost::filesystem::canonical (_directory); } @@ -84,7 +90,7 @@ void DCP::read (bool keep_going, ReadErrors* errors) { /* Read the ASSETMAP */ - + boost::filesystem::path asset_map_file; if (boost::filesystem::exists (_directory / "ASSETMAP")) { asset_map_file = _directory / "ASSETMAP"; @@ -98,18 +104,27 @@ DCP::read (bool keep_going, ReadErrors* errors) asset_map.read_file (asset_map_file); list > asset_nodes = asset_map.node_child("AssetList")->node_children ("Asset"); map paths; - for (list >::const_iterator i = asset_nodes.begin(); i != asset_nodes.end(); ++i) { - if ((*i)->node_child("ChunkList")->node_children("Chunk").size() != 1) { + 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")); } - string p = (*i)->node_child("ChunkList")->node_child("Chunk")->string_child ("Path"); + string 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)); + paths.insert (make_pair (i->string_child ("Id"), p)); } /* 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. + */ + + /* Make a list of non-CPL assets so that we can resolve the references + from the CPLs. + */ + list > other_assets; + for (map::const_iterator i = paths.begin(); i != paths.end(); ++i) { boost::filesystem::path path = _directory / i->second; @@ -117,8 +132,8 @@ DCP::read (bool keep_going, ReadErrors* errors) survivable_error (keep_going, errors, MissingAssetError (path)); continue; } - - if (boost::algorithm::ends_with (path.string(), ".xml")) { + + if (boost::filesystem::extension (path) == ".xml") { xmlpp::DomParser* p = new xmlpp::DomParser; try { p->parse_file (path.string()); @@ -126,16 +141,16 @@ 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") { - _assets.push_back (shared_ptr (new CPL (path))); + _cpls.push_back (shared_ptr (new CPL (path))); } else if (root == "DCSubtitle") { - _assets.push_back (shared_ptr (new InteropSubtitleContent (path))); + other_assets.push_back (shared_ptr (new InteropSubtitleAsset (path))); } - } else if (boost::algorithm::ends_with (path.string(), ".mxf")) { + } else if (boost::filesystem::extension (path) == ".mxf") { ASDCP::EssenceType_t type; if (ASDCP::EssenceType (path.string().c_str(), type) != ASDCP::RESULT_OK) { throw DCPReadError ("Could not find essence type"); @@ -145,36 +160,37 @@ 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: - _assets.push_back (shared_ptr (new MonoPictureMXF (path))); + other_assets.push_back (shared_ptr (new MonoPictureAsset (path))); break; case ASDCP::ESS_PCM_24b_48k: case ASDCP::ESS_PCM_24b_96k: - _assets.push_back (shared_ptr (new SoundMXF (path))); + other_assets.push_back (shared_ptr (new SoundAsset (path))); break; case ASDCP::ESS_JPEG_2000_S: - _assets.push_back (shared_ptr (new StereoPictureMXF (path))); + other_assets.push_back (shared_ptr (new StereoPictureAsset (path))); break; case ASDCP::ESS_TIMED_TEXT: - _assets.push_back (shared_ptr (new SMPTESubtitleContent (path))); + other_assets.push_back (shared_ptr (new SMPTESubtitleAsset (path))); break; default: throw DCPReadError ("Unknown MXF essence type"); - } + } + } else if (boost::filesystem::extension (path) == ".ttf") { + other_assets.push_back (shared_ptr (new FontAsset (i->first, path))); } } - list > cpl = cpls (); - for (list >::const_iterator i = cpl.begin(); i != cpl.end(); ++i) { - (*i)->resolve_refs (list_of_type (assets ())); + BOOST_FOREACH (shared_ptr i, cpls ()) { + i->resolve_refs (list_of_type (other_assets)); } } bool -DCP::equals (DCP const & other, EqualityOptions opt, boost::function note) const +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; @@ -182,9 +198,9 @@ DCP::equals (DCP const & other, EqualityOptions opt, boost::function >::const_iterator i = a.begin(); i != a.end(); ++i) { + BOOST_FOREACH (shared_ptr i, a) { list >::const_iterator j = b.begin (); - while (j != b.end() && !(*j)->equals (*i, opt, note)) { + while (j != b.end() && !(*j)->equals (i, opt, note)) { ++j; } @@ -197,17 +213,16 @@ DCP::equals (DCP const & other, EqualityOptions opt, boost::function asset) +DCP::add (boost::shared_ptr cpl) { - _assets.push_back (asset); + _cpls.push_back (cpl); } bool DCP::encrypted () const { - list > cpl = cpls (); - for (list >::const_iterator i = cpl.begin(); i != cpl.end(); ++i) { - if ((*i)->encrypted ()) { + BOOST_FOREACH (shared_ptr i, cpls ()) { + if (i->encrypted ()) { return true; } } @@ -219,22 +234,21 @@ void DCP::add (DecryptedKDM const & kdm) { list keys = kdm.keys (); - list > cpl = cpls (); - - for (list >::iterator i = cpl.begin(); i != cpl.end(); ++i) { - for (list::iterator j = keys.begin(); j != keys.end(); ++j) { - if (j->cpl_id() == (*i)->id()) { - (*i)->add (kdm); - } + + BOOST_FOREACH (shared_ptr i, cpls ()) { + 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 ("%1_pkl.xml", pkl_uuid); + p /= String::compose ("pkl_%1.xml", pkl_uuid); xmlpp::Document doc; xmlpp::Element* pkl; @@ -243,7 +257,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"); } @@ -251,22 +265,22 @@ DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared pkl->add_child("Id")->add_child_text ("urn:uuid:" + pkl_uuid); /* XXX: this is a bit of a hack */ - assert (cpls().size() > 0); + 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 >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) { - (*i)->write_to_pkl (asset_list, standard); + 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 (); } @@ -286,7 +300,7 @@ DCP::write_volindex (Standard standard) const p /= "VOLINDEX.xml"; break; default: - assert (false); + DCP_ASSERT (false); } xmlpp::Document doc; @@ -300,9 +314,9 @@ DCP::write_volindex (Standard standard) const root = doc.create_root_node ("VolumeIndex", "http://www.smpte-ra.org/schemas/429-9/2007/AM"); break; default: - assert (false); + DCP_ASSERT (false); } - + root->add_child("Index")->add_child_text ("1"); doc.write_to_file (p.string (), "UTF-8"); } @@ -311,7 +325,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"; @@ -320,7 +334,7 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta p /= "ASSETMAP.xml"; break; default: - assert (false); + DCP_ASSERT (false); } xmlpp::Document doc; @@ -334,7 +348,7 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta root = doc.create_root_node ("AssetMap", "http://www.smpte-ra.org/schemas/429-9/2007/AM"); break; default: - assert (false); + DCP_ASSERT (false); } root->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid()); @@ -354,9 +368,9 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta root->add_child("Issuer")->add_child_text (metadata.issuer); break; default: - assert (false); + DCP_ASSERT (false); } - + xmlpp::Node* asset_list = root->add_child ("AssetList"); xmlpp::Node* asset = asset_list->add_child ("Asset"); @@ -364,13 +378,13 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta 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"); + chunk->add_child("Path")->add_child_text ("pkl_" + pkl_uuid + ".xml"); 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 (pkl_length)); - - for (list >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) { - (*i)->write_to_assetmap (asset_list, _directory); + + BOOST_FOREACH (shared_ptr i, assets ()) { + i->write_to_assetmap (asset_list, _directory); } /* This must not be the _formatted version otherwise signature digests will be wrong */ @@ -386,18 +400,17 @@ void DCP::write_xml ( Standard standard, XMLMetadata metadata, - shared_ptr signer + shared_ptr signer ) { - list > cpl = cpls (); - for (list >::const_iterator i = cpl.begin(); i != cpl.end(); ++i) { - string const filename = (*i)->id() + "_cpl.xml"; - (*i)->write_xml (_directory / filename, standard, signer); + BOOST_FOREACH (shared_ptr i, cpls ()) { + string const filename = "cpl_" + i->id() + ".xml"; + i->write_xml (_directory / filename, standard, signer); } 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); } @@ -405,5 +418,26 @@ DCP::write_xml ( list > DCP::cpls () const { - return list_of_type (_assets); + return _cpls; +} + +/** @return All assets (including CPLs) */ +list > +DCP::assets () const +{ + list > assets; + 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 (); + assets.push_back (o); + /* More Interop special-casing */ + shared_ptr sub = dynamic_pointer_cast (o); + if (sub) { + sub->add_font_assets (assets); + } + } + } + + return assets; }