Check CPL hash in the PKL on verify.

[libdcp.git] / src / cpl.cc

diff --git a/src/cpl.cc b/src/cpl.cc
index 0abf864af35570b18058c3ab43c2acc8eef22c4a..cc7237ea59498a3c2f0926778f7d9641616bb5ee 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -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,12 +63,12 @@ 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.
        */
@@ -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");
@@ -139,12 +140,8 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
                root = doc.create_root_node ("CompositionPlaylist", cpl_smpte_ns);
        }
 
-       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("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);
@@ -173,6 +170,32 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
        set_file (file);
 }
 
+list<shared_ptr<ReelAsset> >
+CPL::reel_assets ()
+{
+       list<shared_ptr<ReelAsset> > c;
+
+       BOOST_FOREACH (shared_ptr<Reel> 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<ReelClosedCaptionAsset> j, i->closed_captions()) {
+                       c.push_back (j);
+               }
+               if (i->atmos ()) {
+                       c.push_back (i->atmos());
+               }
+       }
+
+       return c;
+}
+
 list<shared_ptr<const ReelAsset> >
 CPL::reel_assets () const
 {
@@ -188,6 +211,9 @@ CPL::reel_assets () const
                if (i->main_subtitle ()) {
                        c.push_back (i->main_subtitle());
                }
+               BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> j, i->closed_captions()) {
+                       c.push_back (j);
+               }
                if (i->atmos ()) {
                        c.push_back (i->atmos());
                }
@@ -204,8 +230,8 @@ CPL::equals (shared_ptr<const Asset> 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 +295,12 @@ CPL::resolve_refs (list<shared_ptr<Asset> > assets)
 
 string
 CPL::pkl_type (Standard standard) const
+{
+       return static_pkl_type (standard);
+}
+
+string
+CPL::static_pkl_type (Standard standard)
 {
        switch (standard) {
        case INTEROP: