X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.cc;h=e56547e3dc2e7d265161bbf03abb2fbe1883acce;hb=8c852cbececaa94e7efbb0e8508484e073b06c67;hp=b710d61be559dace5de3a7aacd285f2b5dc50724;hpb=81312913ad26aaee12eeabd3f27a537806c97049;p=libdcp.git diff --git a/src/dcp.cc b/src/dcp.cc index b710d61b..e56547e3 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -1,20 +1,34 @@ /* Copyright (C) 2012-2015 Carl Hetherington - 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 . + + 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 @@ -24,6 +38,7 @@ #include "raw_convert.h" #include "dcp.h" #include "sound_asset.h" +#include "atmos_asset.h" #include "picture_asset.h" #include "interop_subtitle_asset.h" #include "smpte_subtitle_asset.h" @@ -34,29 +49,27 @@ #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; 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::exception; using boost::shared_ptr; @@ -64,16 +77,24 @@ using boost::dynamic_pointer_cast; 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"; + DCP::DCP (boost::filesystem::path directory) : _directory (directory) { if (!boost::filesystem::exists (directory)) { boost::filesystem::create_directories (directory); } - + _directory = boost::filesystem::canonical (_directory); } +/** Call this instead of throwing an exception if the error can be tolerated */ template void survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e) { @@ -87,10 +108,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"; @@ -101,7 +122,16 @@ DCP::read (bool keep_going, ReadErrors* errors) } cxml::Document asset_map ("AssetMap"); + asset_map.read_file (asset_map_file); + 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())); + } + list > asset_nodes = asset_map.node_child("AssetList")->node_children ("Asset"); map paths; BOOST_FOREACH (shared_ptr i, asset_nodes) { @@ -112,7 +142,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 +154,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,25 +162,37 @@ 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 { p->parse_file (path.string()); } catch (std::exception& e) { delete p; - continue; + throw DCPReadError(String::compose("XML error in %1", path.string()), e.what()); } - + string const root = p->get_document()->get_root_node()->get_name (); delete p; - + if (root == "CompositionPlaylist") { - _cpls.push_back (shared_ptr (new CPL (path))); + shared_ptr cpl (new CPL (path)); + if (_standard && cpl->standard() && cpl->standard().get() != _standard.get()) { + survivable_error (keep_going, errors, MismatchedStandardError ()); + } + _cpls.push_back (cpl); } else if (root == "DCSubtitle") { + if (_standard && _standard.get() == SMPTE) { + survivable_error (keep_going, errors, MismatchedStandardError ()); + } 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"); @@ -160,7 +202,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: @@ -172,8 +223,11 @@ DCP::read (bool keep_going, ReadErrors* errors) 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 ("Unknown MXF essence type"); + throw DCPReadError (String::compose ("Unknown MXF essence type %1 in %2", int(type), path.string())); } } else if (boost::filesystem::extension (path) == ".ttf") { other_assets.push_back (shared_ptr (new FontAsset (i->first, path))); @@ -181,7 +235,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 +252,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,48 +301,41 @@ DCP::add (DecryptedKDM const & kdm) BOOST_FOREACH (DecryptedKDMKey const & j, kdm.keys ()) { if (j.cpl_id() == i->id()) { i->add (kdm); - } + } } } } +/** @return full pathname of PKL file that was written */ boost::filesystem::path -DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr signer) const +DCP::write_pkl (string file, Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr signer) const { boost::filesystem::path p = _directory; - p /= String::compose ("pkl_%1.xml", pkl_uuid); + p /= file; xmlpp::Document doc; xmlpp::Element* pkl; if (standard == INTEROP) { - pkl = doc.create_root_node("PackingList", "http://www.digicine.com/PROTO-ASDCP-PKL-20040311#"); + pkl = doc.create_root_node("PackingList", pkl_interop_ns); } 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 = doc.create_root_node("PackingList", pkl_smpte_ns); } 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("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, 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 (); } @@ -308,24 +363,24 @@ 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"); } 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, XMLMetadata metadata) const { boost::filesystem::path p = _directory; - + switch (standard) { case INTEROP: p /= "ASSETMAP"; @@ -342,17 +397,17 @@ 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 (metadata.annotation_text); switch (standard) { case INTEROP: @@ -370,7 +425,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"); @@ -378,10 +433,10 @@ 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_" + pkl_uuid + ".xml"); + 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 (pkl_length)); + chunk->add_child("Length")->add_child_text (raw_convert (boost::filesystem::file_size (pkl_path))); BOOST_FOREACH (shared_ptr i, assets ()) { i->write_to_assetmap (asset_list, _directory); @@ -400,19 +455,23 @@ void DCP::write_xml ( Standard standard, XMLMetadata metadata, - shared_ptr signer + shared_ptr signer, + NameFormat name_format ) { BOOST_FOREACH (shared_ptr i, cpls ()) { - string const filename = "cpl_" + i->id() + ".xml"; - i->write_xml (_directory / filename, standard, signer); + 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); - + 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); + write_volindex (standard); - write_assetmap (standard, pkl_uuid, boost::filesystem::file_size (pkl_path), metadata); + write_assetmap (standard, pkl_uuid, pkl_path, metadata); } list > @@ -421,15 +480,21 @@ DCP::cpls () const return _cpls; } -/** @return All assest (including CPLs) */ +/** @param ignore_unresolved true to silently ignore unresolved assets, otherwise + * an exception is thrown if they are found. + * @return All assets (including CPLs). + */ list > -DCP::assets () const +DCP::assets (bool ignore_unresolved) 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 (); + if (ignore_unresolved && !j->asset_ref().resolved()) { + continue; + } + shared_ptr o = j->asset_ref().asset (); assets.push_back (o); /* More Interop special-casing */ shared_ptr sub = dynamic_pointer_cast (o); @@ -441,3 +506,16 @@ DCP::assets () const return assets; } + +/** Given a list of files that make up 1 or more DCPs, return the DCP directories */ +vector +DCP::directories_from_files (vector files) +{ + vector d; + BOOST_FOREACH (boost::filesystem::path i, files) { + if (i.filename() == "ASSETMAP" || i.filename() == "ASSETMAP.xml") { + d.push_back (i.parent_path ()); + } + } + return d; +}