*/
#include <fstream>
+#include <libxml/parser.h>
#include "cpl.h"
#include "parse/cpl.h"
#include "util.h"
#include "reel.h"
#include "metadata.h"
#include "encryption.h"
+#include "exceptions.h"
+#include "compose.hpp"
using std::string;
using std::stringstream;
, _length (length)
, _fps (frames_per_second)
{
- _uuid = make_uuid ();
+ _id = make_uuid ();
}
/** Construct a CPL object from a XML file.
_name = cpl->annotation_text;
_content_kind = cpl->content_kind;
+ /* Trim urn:uuid: off the front */
+ _id = cpl->id.substr (9);
+
for (list<shared_ptr<libdcp::parse::Reel> >::iterator i = cpl->reels.begin(); i != cpl->reels.end(); ++i) {
shared_ptr<parse::Picture> p;
picture->set_entry_point (p->entry_point);
picture->set_duration (p->duration);
+ if (p->key_id.length() > 9) {
+ /* Trim urn:uuid: */
+ picture->set_key_id (p->key_id.substr (9));
+ }
} catch (MXFFileError) {
if (require_mxfs) {
throw;
picture->set_entry_point (p->entry_point);
picture->set_duration (p->duration);
+ if (p->key_id.length() > 9) {
+ /* Trim urn:uuid: */
+ picture->set_key_id (p->key_id.substr (9));
+ }
} catch (MXFFileError) {
if (require_mxfs) {
)
);
- sound->set_entry_point ((*i)->asset_list->main_sound->entry_point);
- sound->set_duration ((*i)->asset_list->main_sound->duration);
+ shared_ptr<parse::MainSound> s = (*i)->asset_list->main_sound;
+
+ sound->set_entry_point (s->entry_point);
+ sound->set_duration (s->duration);
+ if (s->key_id.length() > 9) {
+ /* Trim urn:uuid: */
+ sound->set_key_id (s->key_id.substr (9));
+ }
} catch (MXFFileError) {
if (require_mxfs) {
throw;
}
void
-CPL::add_reel (shared_ptr<const Reel> reel)
+CPL::add_reel (shared_ptr<Reel> reel)
{
_reels.push_back (reel);
}
void
-CPL::write_xml (shared_ptr<Encryption> crypt, XMLMetadata const & metadata) const
+CPL::write_xml (XMLMetadata const & metadata, shared_ptr<Encryption> crypt) const
{
boost::filesystem::path p;
p /= _directory;
stringstream s;
- s << _uuid << "_cpl.xml";
+ s << _id << "_cpl.xml";
p /= s.str();
xmlpp::Document doc;
root->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig");
}
- root->add_child("Id")->add_child_text ("urn:uuid:" + _uuid);
+ root->add_child("Id")->add_child_text ("urn:uuid:" + _id);
root->add_child("AnnotationText")->add_child_text (_name);
root->add_child("IssueDate")->add_child_text (metadata.issue_date);
root->add_child("Creator")->add_child_text (metadata.creator);
root->add_child("ContentKind")->add_child_text (content_kind_to_string (_content_kind));
{
xmlpp::Node* cv = root->add_child ("ContentVersion");
- cv->add_child ("Id")->add_child_text ("urn:uri:" + _uuid + "_" + metadata.issue_date);
- cv->add_child ("LabelText")->add_child_text (_uuid + "_" + metadata.issue_date);
+ cv->add_child ("Id")->add_child_text ("urn:uri:" + _id + "_" + metadata.issue_date);
+ cv->add_child ("LabelText")->add_child_text (_id + "_" + metadata.issue_date);
}
root->add_child("RatingList");
xmlpp::Node* reel_list = root->add_child ("ReelList");
- for (list<shared_ptr<const 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)->write_to_cpl (reel_list);
}
CPL::write_to_pkl (xmlpp::Node* node) const
{
xmlpp::Node* asset = node->add_child ("Asset");
- asset->add_child("Id")->add_child_text ("urn:uuid:" + _uuid);
+ asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
asset->add_child("Hash")->add_child_text (_digest);
asset->add_child("Size")->add_child_text (lexical_cast<string> (_length));
asset->add_child("Type")->add_child_text ("text/xml");
CPL::assets () const
{
list<shared_ptr<const Asset> > a;
- for (list<shared_ptr<const Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
+ for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
if ((*i)->main_picture ()) {
a.push_back ((*i)->main_picture ());
}
CPL::write_to_assetmap (xmlpp::Node* node) const
{
xmlpp::Node* asset = node->add_child ("Asset");
- asset->add_child("Id")->add_child_text ("urn:uuid:" + _uuid);
+ asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
xmlpp::Node* chunk_list = asset->add_child ("ChunkList");
xmlpp::Node* chunk = chunk_list->add_child ("Chunk");
- chunk->add_child("Path")->add_child_text (_uuid + "_cpl.xml");
+ chunk->add_child("Path")->add_child_text (_id + "_cpl.xml");
chunk->add_child("VolumeIndex")->add_child_text ("1");
chunk->add_child("Offset")->add_child_text("0");
chunk->add_child("Length")->add_child_text(lexical_cast<string> (_length));
}
if (_fps != other._fps) {
- note (ERROR, "frames per second differ");
+ note (ERROR, String::compose ("frames per second differ (%1 vs %2)", _fps, other._fps));
return false;
}
if (_length != other._length) {
- note (ERROR, "lengths differ");
+ stringstream s;
+ s << "lengths differ (" << _length << " cf " << other._length << ")";
+ note (ERROR, String::compose ("lengths differ (%1 vs %2)", _length, other._length));
return false;
}
if (_reels.size() != other._reels.size()) {
- note (ERROR, "reel counts differ");
+ note (ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size()));
return false;
}
- list<shared_ptr<const Reel> >::const_iterator a = _reels.begin ();
- list<shared_ptr<const Reel> >::const_iterator b = other._reels.begin ();
+ list<shared_ptr<Reel> >::const_iterator a = _reels.begin ();
+ list<shared_ptr<Reel> >::const_iterator b = other._reels.begin ();
while (a != _reels.end ()) {
if (!(*a)->equals (*b, opt, note)) {
string const & signer_key,
shared_ptr<const Certificate> recipient_cert,
boost::posix_time::ptime from,
- boost::posix_time::ptime until
+ boost::posix_time::ptime until,
+ MXFMetadata const & mxf_metadata,
+ XMLMetadata const & xml_metadata
) const
{
assert (recipient_cert);
authenticated_public->set_attribute("Id", "ID_AuthenticatedPublic");
xmlAddID (0, doc->cobj(), (const xmlChar *) "ID_AuthenticatedPublic", authenticated_public->get_attribute("Id")->cobj());
- authenticated_public->add_child("MessageId")->add_child_text("urn:uuid:" + make_uuid());
- authenticated_public->add_child("MessageType")->add_child_text("http://www.smpte-ra.org/430-1/2006/KDM#kdm-key-type");
- authenticated_public->add_child("AnnotationText")->add_child_text(Metadata::instance()->product_name);
- authenticated_public->add_child("IssueDate")->add_child_text(Metadata::instance()->issue_date);
+ authenticated_public->add_child("MessageId")->add_child_text ("urn:uuid:" + make_uuid());
+ authenticated_public->add_child("MessageType")->add_child_text ("http://www.smpte-ra.org/430-1/2006/KDM#kdm-key-type");
+ authenticated_public->add_child("AnnotationText")->add_child_text (mxf_metadata.product_name);
+ authenticated_public->add_child("IssueDate")->add_child_text (xml_metadata.issue_date);
{
xmlpp::Element* signer = authenticated_public->add_child("Signer");
- signer->add_child("X509IssuerName", "ds")->add_child_text (
- Certificate::name_for_xml (recipient_cert->issuer())
- );
- signer->add_child("X509SerialNumber", "ds")->add_child_text (
- recipient_cert->serial()
- );
+ signer->add_child("X509IssuerName", "ds")->add_child_text (recipient_cert->issuer());
+ signer->add_child("X509SerialNumber", "ds")->add_child_text (recipient_cert->serial());
}
{
xmlpp::Element* recipient = kdm_required_extensions->add_child("Recipient");
{
xmlpp::Element* serial_element = recipient->add_child("X509IssuerSerial");
- serial_element->add_child("X509IssuerName", "ds")->add_child_text (
- Certificate::name_for_xml (recipient_cert->issuer())
- );
- serial_element->add_child("X509SerialNumber", "ds")->add_child_text (
- recipient_cert->serial()
- );
+ serial_element->add_child("X509IssuerName", "ds")->add_child_text (recipient_cert->issuer());
+ serial_element->add_child("X509SerialNumber", "ds")->add_child_text (recipient_cert->serial());
}
- recipient->add_child("X509SubjectName")->add_child_text (Certificate::name_for_xml (recipient_cert->subject()));
+ recipient->add_child("X509SubjectName")->add_child_text (recipient_cert->subject());
}
- kdm_required_extensions->add_child("CompositionPlaylistId")->add_child_text("urn:uuid:" + _uuid);
+ kdm_required_extensions->add_child("CompositionPlaylistId")->add_child_text("urn:uuid:" + _id);
kdm_required_extensions->add_child("ContentTitleText")->add_child_text(_name);
kdm_required_extensions->add_child("ContentAuthenticator")->add_child_text(certificates.leaf()->thumbprint());
kdm_required_extensions->add_child("ContentKeysNotValidBefore")->add_child_text("XXX");
return doc;
}
+
+/** @return true if we have any encrypted content */
+bool
+CPL::encrypted () const
+{
+ for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
+ if ((*i)->encrypted ()) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+void
+CPL::add_kdm (KDM const & kdm)
+{
+ for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
+ (*i)->add_kdm (kdm);
+ }
+}
projects / libdcp.git / blobdiff