X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fcpl.cc;h=fe032f214defd9ac00047e8614624de61556b21e;hb=aeb2f36ede25d6e8ce583592c23bbb1dfb05041e;hp=0abf864af35570b18058c3ab43c2acc8eef22c4a;hpb=1eb9ba017214698de3fd41de5291604b4fe839c5;p=libdcp.git diff --git a/src/cpl.cc b/src/cpl.cc index 0abf864a..fe032f21 100644 --- a/src/cpl.cc +++ b/src/cpl.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of libdcp. @@ -40,6 +40,7 @@ #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" @@ -62,17 +63,17 @@ static string const cpl_interop_ns = "http://www.digicine.com/PROTO-ASDCP-CPL-20 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 ()) { + _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(); - _content_version_label_text = _content_version_id + LocalTime().as_string (); + 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 */ @@ -92,7 +93,7 @@ CPL::CPL (boost::filesystem::path file) } _id = remove_urn_uuid (f.string_child ("Id")); - _annotation_text = f.optional_string_child ("AnnotationText").get_value_or (""); + _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"); @@ -103,8 +104,16 @@ CPL::CPL (boost::filesystem::path file) _content_version_id = content_version->optional_string_child ("Id").get_value_or (""); _content_version_label_text = content_version->string_child ("LabelText"); content_version->done (); + } else if (_standard == SMPTE) { + /* ContentVersion is required in SMPTE */ + throw XMLError ("Missing ContentVersion tag in CPL"); + } + cxml::ConstNodePtr rating_list = f.node_child ("RatingList"); + if (rating_list) { + BOOST_FOREACH (cxml::ConstNodePtr i, rating_list->node_children("Rating")) { + _ratings.push_back (Rating(i)); + } } - f.ignore_child ("RatingList"); _reels = type_grand_children (f, "ReelList", "Reel"); f.ignore_child ("Issuer"); @@ -139,12 +148,8 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptrset_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("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); @@ -155,7 +160,10 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptradd_child ("Id")->add_child_text (_content_version_id); cv->add_child ("LabelText")->add_child_text (_content_version_label_text); } - root->add_child("RatingList"); + xmlpp::Element* rating_list = root->add_child("RatingList"); + BOOST_FOREACH (Rating i, _ratings) { + i.as_xml (rating_list->add_child("Rating")); + } xmlpp::Element* reel_list = root->add_child ("ReelList"); @@ -163,20 +171,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 ()) { @@ -188,6 +197,35 @@ 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()); } @@ -204,8 +242,8 @@ CPL::equals (shared_ptr other, EqualityOptions opt, NoteHandler not return false; } - if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) { - string const s = "CPL: annotation texts differ: " + _annotation_text + " vs " + other_cpl->_annotation_text + "\n"; + 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; } @@ -269,6 +307,12 @@ CPL::resolve_refs (list > assets) string CPL::pkl_type (Standard standard) const +{ + return static_pkl_type (standard); +} + +string +CPL::static_pkl_type (Standard standard) { switch (standard) { case INTEROP: