X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fcpl.cc;h=5f3d0291482861d9d82886669f827d21853fec58;hb=d97e1600057d796c4163cecf28f9f04a6ea6402b;hp=fc1b878c68896caa868142a98578c773015155a7;hpb=4126980a15f4f6bb981d0793bd37483456c5bc79;p=libdcp.git diff --git a/src/cpl.cc b/src/cpl.cc index fc1b878c..5f3d0291 100644 --- a/src/cpl.cc +++ b/src/cpl.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 @@ -19,20 +19,18 @@ #include "cpl.h" #include "util.h" -#include "mono_picture_mxf.h" -#include "stereo_picture_mxf.h" -#include "sound_mxf.h" -#include "subtitle_content.h" #include "reel.h" #include "metadata.h" -#include "signer.h" -#include "exceptions.h" +#include "certificate_chain.h" #include "xml.h" -#include "compose.hpp" #include "reel_picture_asset.h" #include "reel_sound_asset.h" #include "reel_subtitle_asset.h" +#include "local_time.h" +#include "dcp_assert.h" +#include "compose.hpp" #include +#include using std::string; using std::stringstream; @@ -40,9 +38,10 @@ using std::ostream; using std::list; using std::pair; using std::make_pair; +using std::cout; using boost::shared_ptr; -using boost::lexical_cast; using boost::optional; +using boost::dynamic_pointer_cast; using namespace dcp; CPL::CPL (string annotation_text, ContentKind content_kind) @@ -52,13 +51,11 @@ CPL::CPL (string annotation_text, ContentKind content_kind) , _content_kind (content_kind) , _content_version_id ("urn:uuid:" + make_uuid ()) { - /* default _content_version_id to and _content_version_label to + /* default _content_version_id to a random ID and _content_version_label to a random ID and the current time. */ - time_t now = time (0); - struct tm* tm = localtime (&now); - _content_version_id = "urn:uuid:" + make_uuid() + tm_to_string (tm); - _content_version_label_text = _content_version_id; + _content_version_id = "urn:uuid:" + make_uuid(); + _content_version_label_text = _content_version_id + LocalTime().as_string (); } /** Construct a CPL object from a XML file */ @@ -74,8 +71,9 @@ CPL::CPL (boost::filesystem::path file) _id = _id.substr (9); } _annotation_text = f.optional_string_child ("AnnotationText").get_value_or (""); - _issue_date = f.string_child ("IssueDate"); - _creator = f.optional_string_child ("Creator").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"); _content_title_text = f.string_child ("ContentTitleText"); _content_kind = content_kind_from_string (f.string_child ("ContentKind")); shared_ptr content_version = f.optional_node_child ("ContentVersion"); @@ -103,8 +101,13 @@ CPL::add (boost::shared_ptr reel) _reels.push_back (reel); } +/** Write an CompositonPlaylist XML file. + * @param file Filename to write. + * @param standard INTEROP or SMPTE. + * @param signer Signer to sign the CPL, or 0 to add no signature. + */ void -CPL::write_xml (boost::filesystem::path file, Standard standard, XMLMetadata metadata, shared_ptr signer) const +CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr signer) const { xmlpp::Document doc; xmlpp::Element* root; @@ -117,12 +120,12 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, XMLMetadata met if (signer) { root->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig"); } - + root->add_child("Id")->add_child_text ("urn:uuid:" + _id); root->add_child("AnnotationText")->add_child_text (_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); + 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("ContentTitleText")->add_child_text (_content_title_text); root->add_child("ContentKind")->add_child_text (content_kind_to_string (_content_kind)); { @@ -133,9 +136,9 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, XMLMetadata met root->add_child("RatingList"); xmlpp::Element* reel_list = root->add_child ("ReelList"); - - for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { - (*i)->write_to_cpl (reel_list, standard); + + BOOST_FOREACH (shared_ptr i, _reels) { + i->write_to_cpl (reel_list, standard); } if (signer) { @@ -148,48 +151,54 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, XMLMetadata met set_file (file); } -list > -CPL::content () const +list > +CPL::reel_assets () const { - list > c; - for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { - if ((*i)->main_picture ()) { - c.push_back ((*i)->main_picture()->mxf ()); + 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()->mxf ()); + if (i->main_sound ()) { + c.push_back (i->main_sound()); } - if ((*i)->main_subtitle ()) { - c.push_back ((*i)->main_subtitle()->subtitle_content ()); + if (i->main_subtitle ()) { + c.push_back (i->main_subtitle()); } } return c; } - + bool -CPL::equals (CPL const & other, EqualityOptions opt, boost::function note) const +CPL::equals (shared_ptr other, EqualityOptions opt, NoteHandler note) const { - if (_annotation_text != other._annotation_text && !opt.cpl_annotation_texts_can_differ) { + shared_ptr other_cpl = dynamic_pointer_cast (other); + if (!other_cpl) { + return false; + } + + if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) { stringstream s; - s << "annotation texts differ: " << _annotation_text << " vs " << other._annotation_text << "\n"; - note (ERROR, s.str ()); + s << "CPL: annotation texts differ: " << _annotation_text << " vs " << other_cpl->_annotation_text << "\n"; + note (DCP_ERROR, s.str ()); return false; } - if (_content_kind != other._content_kind) { - note (ERROR, "content kinds differ"); + if (_content_kind != other_cpl->_content_kind) { + note (DCP_ERROR, "CPL: content kinds differ"); return false; } - if (_reels.size() != other._reels.size()) { - note (ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size())); + if (_reels.size() != other_cpl->_reels.size()) { + note (DCP_ERROR, String::compose ("CPL: reel counts differ (%1 vs %2)", _reels.size(), other_cpl->_reels.size())); return false; } - + list >::const_iterator a = _reels.begin (); - list >::const_iterator b = other._reels.begin (); - + list >::const_iterator b = other_cpl->_reels.begin (); + while (a != _reels.end ()) { if (!(*a)->equals (*b, opt, note)) { return false; @@ -205,8 +214,8 @@ CPL::equals (CPL const & other, EqualityOptions opt, boost::function >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { - if ((*i)->encrypted ()) { + BOOST_FOREACH (shared_ptr i, _reels) { + if (i->encrypted ()) { return true; } } @@ -214,30 +223,35 @@ CPL::encrypted () const return false; } +/** Add a KDM to this CPL. If the KDM is for any of this CPLs assets it will be used + * to decrypt those assets. + * @param kdm KDM. + */ void -CPL::add (KDM const & kdm) +CPL::add (DecryptedKDM const & kdm) { - for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { - (*i)->add (kdm); + BOOST_FOREACH (shared_ptr i, _reels) { + i->add (kdm); } } -/** Set a private key for every MXF referenced by this CPL. This will allow the data - * to be decrypted or encrypted. - * @param key Key to use. - */ void -CPL::set_mxf_keys (Key key) +CPL::resolve_refs (list > objects) { - for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { - (*i)->set_mxf_keys (key); + BOOST_FOREACH (shared_ptr i, _reels) { + i->resolve_refs (objects); } } -void -CPL::resolve_refs (list > objects) +string +CPL::pkl_type (Standard standard) const { - for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { - (*i)->resolve_refs (objects); + switch (standard) { + case INTEROP: + return "text/xml;asdcpKind=CPL"; + case SMPTE: + return "text/xml"; + default: + DCP_ASSERT (false); } }