X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fcpl.cc;h=0bf1582490155786f9727acc45e3c199a62acf79;hb=9eba1ff84fd89e2ff04181799f2185c8575de16d;hp=766b91c315660d858880dac57aa57414b5d4aa95;hpb=9e523d8a4062ad52330dff6c2ba50e54184c9bb2;p=libdcp.git diff --git a/src/cpl.cc b/src/cpl.cc index 766b91c3..0bf15824 100644 --- a/src/cpl.cc +++ b/src/cpl.cc @@ -1,40 +1,55 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2016 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. */ #include "cpl.h" #include "util.h" #include "reel.h" #include "metadata.h" -#include "signer.h" +#include "certificate_chain.h" #include "xml.h" #include "reel_picture_asset.h" #include "reel_sound_asset.h" #include "reel_subtitle_asset.h" +#include "reel_closed_caption_asset.h" +#include "reel_atmos_asset.h" #include "local_time.h" #include "dcp_assert.h" #include "compose.hpp" #include +#include #include using std::string; -using std::stringstream; -using std::ostream; using std::list; using std::pair; using std::make_pair; @@ -44,18 +59,21 @@ using boost::optional; using boost::dynamic_pointer_cast; using namespace dcp; +static string const cpl_interop_ns = "http://www.digicine.com/PROTO-ASDCP-CPL-20040511#"; +static string const cpl_smpte_ns = "http://www.smpte-ra.org/schemas/429-7/2006/CPL"; + CPL::CPL (string annotation_text, ContentKind content_kind) - : _annotation_text (annotation_text) - /* default _content_title_text to _annotation_text */ - , _content_title_text (annotation_text) + /* default _content_title_text to annotation_text */ + : _content_title_text (annotation_text) , _content_kind (content_kind) - , _content_version_id ("urn:uuid:" + make_uuid ()) { - /* default _content_version_id to and _content_version_label to + _metadata.annotation_text = annotation_text; + /* default _content_version_id to a random ID and _content_version_label to a random ID and the current time. */ - _content_version_id = "urn:uuid:" + make_uuid() + LocalTime().as_string (); - _content_version_label_text = _content_version_id; + string const uuid = make_uuid(); + _content_version_id = "urn:uuid:" + uuid; + _content_version_label_text = uuid + LocalTime().as_string (); } /** Construct a CPL object from a XML file */ @@ -66,11 +84,16 @@ CPL::CPL (boost::filesystem::path file) cxml::Document f ("CompositionPlaylist"); f.read_file (file); - _id = f.string_child ("Id"); - if (_id.length() > 9) { - _id = _id.substr (9); + if (f.namespace_uri() == cpl_interop_ns) { + _standard = INTEROP; + } else if (f.namespace_uri() == cpl_smpte_ns) { + _standard = SMPTE; + } else { + boost::throw_exception (XMLError ("Unrecognised CPL namespace " + f.namespace_uri())); } - _annotation_text = f.optional_string_child ("AnnotationText").get_value_or (""); + + _id = remove_urn_uuid (f.string_child ("Id")); + _metadata.annotation_text = f.optional_string_child ("AnnotationText").get_value_or (""); _metadata.issuer = f.optional_string_child ("Issuer").get_value_or (""); _metadata.creator = f.optional_string_child ("Creator").get_value_or (""); _metadata.issue_date = f.string_child ("IssueDate"); @@ -107,14 +130,14 @@ CPL::add (boost::shared_ptr reel) * @param signer Signer to sign the CPL, or 0 to add no signature. */ void -CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr signer) const +CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr signer) const { xmlpp::Document doc; xmlpp::Element* root; if (standard == INTEROP) { - root = doc.create_root_node ("CompositionPlaylist", "http://www.digicine.com/PROTO-ASDCP-CPL-20040511#"); + root = doc.create_root_node ("CompositionPlaylist", cpl_interop_ns); } else { - root = doc.create_root_node ("CompositionPlaylist", "http://www.smpte-ra.org/schemas/429-7/2006/CPL"); + root = doc.create_root_node ("CompositionPlaylist", cpl_smpte_ns); } if (signer) { @@ -122,7 +145,7 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptradd_child("Id")->add_child_text ("urn:uuid:" + _id); - root->add_child("AnnotationText")->add_child_text (_annotation_text); + root->add_child("AnnotationText")->add_child_text (_metadata.annotation_text); 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); @@ -141,20 +164,21 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptrwrite_to_cpl (reel_list, standard); } + indent (root, 0); + if (signer) { signer->sign (root, standard); } - /* This must not be the _formatted version otherwise signature digests will be wrong */ - doc.write_to_file (file.string (), "UTF-8"); + doc.write_to_file_formatted (file.string(), "UTF-8"); set_file (file); } -list > -CPL::reel_assets () const +list > +CPL::reel_mxfs () { - list > c; + list > c; BOOST_FOREACH (shared_ptr i, _reels) { if (i->main_picture ()) { @@ -166,6 +190,38 @@ CPL::reel_assets () const if (i->main_subtitle ()) { c.push_back (i->main_subtitle()); } + BOOST_FOREACH (shared_ptr j, i->closed_captions()) { + c.push_back (j); + } + if (i->atmos ()) { + c.push_back (i->atmos()); + } + } + + return c; +} + +list > +CPL::reel_mxfs () const +{ + list > c; + + BOOST_FOREACH (shared_ptr i, _reels) { + if (i->main_picture ()) { + c.push_back (i->main_picture()); + } + if (i->main_sound ()) { + c.push_back (i->main_sound()); + } + if (i->main_subtitle ()) { + c.push_back (i->main_subtitle()); + } + BOOST_FOREACH (shared_ptr j, i->closed_captions()) { + c.push_back (j); + } + if (i->atmos ()) { + c.push_back (i->atmos()); + } } return c; @@ -179,10 +235,9 @@ CPL::equals (shared_ptr other, EqualityOptions opt, NoteHandler not return false; } - if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) { - stringstream s; - s << "CPL: annotation texts differ: " << _annotation_text << " vs " << other_cpl->_annotation_text << "\n"; - note (DCP_ERROR, s.str ()); + if (_metadata.annotation_text != other_cpl->_metadata.annotation_text && !opt.cpl_annotation_texts_can_differ) { + string const s = "CPL: annotation texts differ: " + _metadata.annotation_text + " vs " + other_cpl->_metadata.annotation_text + "\n"; + note (DCP_ERROR, s); return false; } @@ -236,15 +291,21 @@ CPL::add (DecryptedKDM const & kdm) } void -CPL::resolve_refs (list > objects) +CPL::resolve_refs (list > assets) { BOOST_FOREACH (shared_ptr i, _reels) { - i->resolve_refs (objects); + i->resolve_refs (assets); } } string CPL::pkl_type (Standard standard) const +{ + return static_pkl_type (standard); +} + +string +CPL::static_pkl_type (Standard standard) { switch (standard) { case INTEROP: @@ -256,3 +317,12 @@ CPL::pkl_type (Standard standard) const } } +int64_t +CPL::duration () const +{ + int64_t d = 0; + BOOST_FOREACH (shared_ptr i, _reels) { + d += i->duration (); + } + return d; +}