projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to add basic decryption support to dcpdiff.
[libdcp.git]
/
src
/
cpl.cc
diff --git
a/src/cpl.cc
b/src/cpl.cc
index 96afc0887dadabf2aaaced479ec4493f171c5d3f..b0fc8d77bd8ef3a7f0bebf8a7221caf14928b55b 100644
(file)
--- a/
src/cpl.cc
+++ b/
src/cpl.cc
@@
-19,19
+19,16
@@
#include "cpl.h"
#include "util.h"
#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 "reel.h"
#include "metadata.h"
#include "signer.h"
-#include "exceptions.h"
#include "xml.h"
#include "xml.h"
-#include "compose.hpp"
#include "reel_picture_asset.h"
#include "reel_sound_asset.h"
#include "reel_subtitle_asset.h"
#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 <libxml/parser.h>
using std::string;
#include <libxml/parser.h>
using std::string;
@@
-40,16
+37,24
@@
using std::ostream;
using std::list;
using std::pair;
using std::make_pair;
using std::list;
using std::pair;
using std::make_pair;
+using std::cout;
using boost::shared_ptr;
using boost::shared_ptr;
-using boost::lexical_cast;
using boost::optional;
using boost::optional;
+using boost::dynamic_pointer_cast;
using namespace dcp;
CPL::CPL (string annotation_text, ContentKind content_kind)
: _annotation_text (annotation_text)
using namespace dcp;
CPL::CPL (string annotation_text, ContentKind content_kind)
: _annotation_text (annotation_text)
+ /* default _content_title_text to _annotation_text */
+ , _content_title_text (annotation_text)
, _content_kind (content_kind)
, _content_kind (content_kind)
+ , _content_version_id ("urn:uuid:" + make_uuid ())
{
{
-
+ /* default _content_version_id to 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;
}
/** Construct a CPL object from a XML file */
}
/** Construct a CPL object from a XML file */
@@
-65,8
+70,9
@@
CPL::CPL (boost::filesystem::path file)
_id = _id.substr (9);
}
_annotation_text = f.optional_string_child ("AnnotationText").get_value_or ("");
_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<cxml::Node> content_version = f.optional_node_child ("ContentVersion");
_content_title_text = f.string_child ("ContentTitleText");
_content_kind = content_kind_from_string (f.string_child ("ContentKind"));
shared_ptr<cxml::Node> content_version = f.optional_node_child ("ContentVersion");
@@
-94,8
+100,13
@@
CPL::add (boost::shared_ptr<Reel> reel)
_reels.push_back (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
void
-CPL::write_xml (boost::filesystem::path file, Standard standard,
XMLMetadata metadata,
shared_ptr<const Signer> signer) const
+CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<const Signer> signer) const
{
xmlpp::Document doc;
xmlpp::Element* root;
{
xmlpp::Document doc;
xmlpp::Element* root;
@@
-111,10
+122,10
@@
CPL::write_xml (boost::filesystem::path file, Standard standard, XMLMetadata met
root->add_child("Id")->add_child_text ("urn:uuid:" + _id);
root->add_child("AnnotationText")->add_child_text (_annotation_text);
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("ContentTitleText")->add_child_text (_content_
version_label
_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("ContentTitleText")->add_child_text (_content_
title
_text);
root->add_child("ContentKind")->add_child_text (content_kind_to_string (_content_kind));
{
xmlpp::Node* cv = root->add_child ("ContentVersion");
root->add_child("ContentKind")->add_child_text (content_kind_to_string (_content_kind));
{
xmlpp::Node* cv = root->add_child ("ContentVersion");
@@
-139,47
+150,53
@@
CPL::write_xml (boost::filesystem::path file, Standard standard, XMLMetadata met
set_file (file);
}
set_file (file);
}
-list<shared_ptr<const
Conten
t> >
-CPL::assets () const
+list<shared_ptr<const
ReelAsse
t> >
+CPL::
reel_
assets () const
{
{
- list<shared_ptr<const Content> > a;
+ list<shared_ptr<const ReelAsset> > c;
+
for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
if ((*i)->main_picture ()) {
for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
if ((*i)->main_picture ()) {
-
a.push_back ((*i)->main_picture()->mxf
());
+
c.push_back ((*i)->main_picture
());
}
if ((*i)->main_sound ()) {
}
if ((*i)->main_sound ()) {
-
a.push_back ((*i)->main_sound()->mxf
());
+
c.push_back ((*i)->main_sound
());
}
if ((*i)->main_subtitle ()) {
}
if ((*i)->main_subtitle ()) {
-
a.push_back ((*i)->main_subtitle()->subtitle_content
());
+
c.push_back ((*i)->main_subtitle
());
}
}
}
}
- return
a
;
+ return
c
;
}
bool
}
bool
-CPL::equals (
CPL const & other, EqualityOptions opt, boost::function<void (NoteType, string)>
note) const
+CPL::equals (
shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler
note) const
{
{
- if (_annotation_text != other._annotation_text && !opt.cpl_annotation_texts_can_differ) {
+ shared_ptr<const CPL> other_cpl = dynamic_pointer_cast<const CPL> (other);
+ if (!other_cpl) {
+ return false;
+ }
+
+ if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) {
stringstream s;
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;
}
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;
}
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<shared_ptr<Reel> >::const_iterator a = _reels.begin ();
return false;
}
list<shared_ptr<Reel> >::const_iterator a = _reels.begin ();
- list<shared_ptr<Reel> >::const_iterator b = other
.
_reels.begin ();
+ list<shared_ptr<Reel> >::const_iterator b = other
_cpl->
_reels.begin ();
while (a != _reels.end ()) {
if (!(*a)->equals (*b, opt, note)) {
while (a != _reels.end ()) {
if (!(*a)->equals (*b, opt, note)) {
@@
-205,30
+222,36
@@
CPL::encrypted () const
return false;
}
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
void
-CPL::add (KDM const & kdm)
+CPL::add (
Decrypted
KDM const & kdm)
{
for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
(*i)->add (kdm);
}
}
{
for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
(*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
void
-CPL::
set_mxf_keys (Key key
)
+CPL::
resolve_refs (list<shared_ptr<Object> > objects
)
{
for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
{
for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
- (*i)->
set_mxf_keys (key
);
+ (*i)->
resolve_refs (objects
);
}
}
}
}
-void
-CPL::
resolve_refs (list<shared_ptr<Object> > objects)
+string
+CPL::
pkl_type (Standard standard) const
{
{
- for (list<shared_ptr<Reel> >::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);
}
}
}
}
+