X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fcpl.cc;h=6fc52be536d4499ec372f56c806c7e63ee43eb30;hb=83358c16fcfdad24e8e415df13d6cf8e9bb43556;hp=d70bee25a45dfa6476b2cd0dd16aff32041e2065;hpb=781982ea9a78f88fef130dc08cd028b7e5f47937;p=libdcp.git diff --git a/src/cpl.cc b/src/cpl.cc index d70bee25..6fc52be5 100644 --- a/src/cpl.cc +++ b/src/cpl.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2014 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 @@ -17,24 +17,24 @@ */ -#include #include #include "cpl.h" #include "parse/cpl.h" #include "util.h" -#include "picture_asset.h" +#include "mono_picture_asset.h" +#include "stereo_picture_asset.h" #include "sound_asset.h" #include "subtitle_asset.h" #include "parse/asset_map.h" #include "reel.h" #include "metadata.h" -#include "encryption.h" +#include "signer.h" #include "exceptions.h" #include "compose.hpp" +#include "raw_convert.h" using std::string; using std::stringstream; -using std::ofstream; using std::ostream; using std::list; using std::pair; @@ -44,7 +44,7 @@ using boost::lexical_cast; using boost::optional; using namespace libdcp; -CPL::CPL (string directory, string name, ContentKind content_kind, int length, int frames_per_second) +CPL::CPL (boost::filesystem::path directory, string name, ContentKind content_kind, int length, int frames_per_second) : _directory (directory) , _name (name) , _content_kind (content_kind) @@ -60,7 +60,7 @@ CPL::CPL (string directory, string name, ContentKind content_kind, int length, i * @param asset_maps AssetMaps to look for assets in. * @param require_mxfs true to throw an exception if a required MXF file does not exist. */ -CPL::CPL (string directory, string file, list asset_maps, bool require_mxfs) +CPL::CPL (boost::filesystem::path directory, string file, list asset_maps, bool require_mxfs) : _directory (directory) , _content_kind (FEATURE) , _length (0) @@ -71,7 +71,7 @@ CPL::CPL (string directory, string file, list asset_maps, bool req try { cpl.reset (new parse::CPL (file)); } catch (FileError& e) { - boost::throw_exception (FileError ("could not load CPL file", file)); + boost::throw_exception (FileError ("could not load CPL file", file, e.number ())); } /* Now cherry-pick the required bits into our own data structure */ @@ -107,15 +107,13 @@ CPL::CPL (string directory, string file, list asset_maps, bool req if (!(*i)->asset_list->main_stereoscopic_picture && p->edit_rate == p->frame_rate) { - pair > asset = asset_from_id (asset_maps, p->id); - try { - picture.reset (new MonoPictureAsset ( - asset.first, - asset.second->chunks.front()->path - ) - ); + pair > asset = asset_from_id (asset_maps, p->id); + picture.reset (new MonoPictureAsset (asset.first, asset.second->chunks.front()->path)); + + picture->read (); + picture->set_edit_rate (_fps); picture->set_entry_point (p->entry_point); picture->set_duration (p->duration); if (p->key_id.length() > 9) { @@ -132,14 +130,10 @@ CPL::CPL (string directory, string file, list asset_maps, bool req try { pair > asset = asset_from_id (asset_maps, p->id); - picture.reset (new StereoPictureAsset ( - asset.first, - asset.second->chunks.front()->path, - _fps, - p->duration - ) - ); + picture.reset (new StereoPictureAsset (asset.first, asset.second->chunks.front()->path)); + picture->read (); + picture->set_edit_rate (_fps); picture->set_entry_point (p->entry_point); picture->set_duration (p->duration); if (p->key_id.length() > 9) { @@ -160,14 +154,10 @@ CPL::CPL (string directory, string file, list asset_maps, bool req try { pair > asset = asset_from_id (asset_maps, (*i)->asset_list->main_sound->id); - sound.reset (new SoundAsset ( - asset.first, - asset.second->chunks.front()->path - ) - ); - + sound.reset (new SoundAsset (asset.first, asset.second->chunks.front()->path)); shared_ptr s = (*i)->asset_list->main_sound; + sound->read (); sound->set_entry_point (s->entry_point); sound->set_duration (s->duration); if (s->key_id.length() > 9) { @@ -185,13 +175,10 @@ CPL::CPL (string directory, string file, list asset_maps, bool req pair > asset = asset_from_id (asset_maps, (*i)->asset_list->main_subtitle->id); - subtitle.reset (new SubtitleAsset ( - asset.first, - asset.second->chunks.front()->path - ) - ); + subtitle.reset (new SubtitleAsset (asset.first, asset.second->chunks.front()->path)); subtitle->set_entry_point ((*i)->asset_list->main_subtitle->entry_point); + subtitle->set_edit_rate (_fps); subtitle->set_duration ((*i)->asset_list->main_subtitle->duration); } @@ -205,14 +192,16 @@ CPL::add_reel (shared_ptr reel) _reels.push_back (reel); } +boost::filesystem::path +CPL::filename () const +{ + return _directory / String::compose ("%1_cpl.xml", _id); +} + void -CPL::write_xml (bool interop, XMLMetadata const & metadata, shared_ptr crypt) const +CPL::write_xml (bool interop, XMLMetadata const & metadata, shared_ptr signer) const { - boost::filesystem::path p; - p /= _directory; - stringstream s; - s << _id << "_cpl.xml"; - p /= s.str(); + boost::filesystem::path p = filename (); xmlpp::Document doc; xmlpp::Element* root; @@ -222,7 +211,7 @@ CPL::write_xml (bool interop, XMLMetadata const & metadata, shared_ptrset_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig"); } @@ -243,27 +232,32 @@ CPL::write_xml (bool interop, XMLMetadata const & metadata, shared_ptradd_child ("ReelList"); for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { - (*i)->write_to_cpl (reel_list, interop); + (*i)->write_to_cpl (reel_list); } - if (crypt) { - sign (root, crypt->certificates, crypt->signer_key, interop); + if (signer) { + signer->sign (root, interop); } - doc.write_to_file_formatted (p.string (), "UTF-8"); + /* This must not be the _formatted version otherwise signature digests will be wrong */ + doc.write_to_file (p.string (), "UTF-8"); _digest = make_digest (p.string (), 0); _length = boost::filesystem::file_size (p.string ()); } void -CPL::write_to_pkl (xmlpp::Node* node) const +CPL::write_to_pkl (xmlpp::Node* node, bool interop) const { xmlpp::Node* asset = node->add_child ("Asset"); 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 (_length)); - asset->add_child("Type")->add_child_text ("text/xml"); + asset->add_child("Size")->add_child_text (raw_convert (_length)); + if (interop) { + asset->add_child("Type")->add_child_text ("text/xml;asdcpKind=CPL"); + } else { + asset->add_child("Type")->add_child_text ("text/xml"); + } } list > @@ -295,7 +289,7 @@ CPL::write_to_assetmap (xmlpp::Node* node) const 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 (_length)); + chunk->add_child("Length")->add_child_text (raw_convert (_length)); } @@ -344,162 +338,6 @@ CPL::equals (CPL const & other, EqualityOptions opt, boost::function -CPL::make_kdm ( - CertificateChain const & certificates, - boost::filesystem::path signer_key, - shared_ptr recipient_cert, - boost::posix_time::ptime from, - boost::posix_time::ptime until, - bool interop, - MXFMetadata const & mxf_metadata, - XMLMetadata const & xml_metadata - ) const -{ - assert (recipient_cert); - - shared_ptr doc (new xmlpp::Document); - xmlpp::Element* root = doc->create_root_node ("DCinemaSecurityMessage"); - root->set_namespace_declaration ("http://www.smpte-ra.org/schemas/430-3/2006/ETM", ""); - root->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "ds"); - root->set_namespace_declaration ("http://www.w3.org/2001/04/xmlenc#", "enc"); - - { - xmlpp::Element* authenticated_public = root->add_child("AuthenticatedPublic"); - 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()); - /* XXX: this should probably be different if interop == true */ - 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 (certificates.leaf()->issuer()); - signer->add_child("X509SerialNumber", "ds")->add_child_text (certificates.leaf()->serial()); - } - - { - xmlpp::Element* required_extensions = authenticated_public->add_child("RequiredExtensions"); - - { - xmlpp::Element* kdm_required_extensions = required_extensions->add_child("KDMRequiredExtensions"); - kdm_required_extensions->set_namespace_declaration ("http://www.smpte-ra.org/schemas/430-1/2006/KDM"); - { - 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 (recipient_cert->issuer()); - serial_element->add_child("X509SerialNumber", "ds")->add_child_text (recipient_cert->serial()); - } - - recipient->add_child("X509SubjectName")->add_child_text (recipient_cert->subject()); - } - - 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(ptime_to_string (from)); - kdm_required_extensions->add_child("ContentKeysNotValidAfter")->add_child_text(ptime_to_string (until)); - - { - xmlpp::Element* authorized_device_info = kdm_required_extensions->add_child("AuthorizedDeviceInfo"); - authorized_device_info->add_child("DeviceListIdentifier")->add_child_text("urn:uuid:" + make_uuid()); - authorized_device_info->add_child("DeviceListDescription")->add_child_text(recipient_cert->subject()); - { - xmlpp::Element* device_list = authorized_device_info->add_child("DeviceList"); - device_list->add_child("CertificateThumbprint")->add_child_text(recipient_cert->thumbprint()); - } - } - - { - xmlpp::Element* key_id_list = kdm_required_extensions->add_child("KeyIdList"); - list > a = assets(); - for (list >::iterator i = a.begin(); i != a.end(); ++i) { - /* XXX: non-MXF assets? */ - shared_ptr mxf = boost::dynamic_pointer_cast (*i); - if (mxf) { - mxf->add_typed_key_id (key_id_list); - } - } - } - - { - xmlpp::Element* forensic_mark_flag_list = kdm_required_extensions->add_child("ForensicMarkFlagList"); - forensic_mark_flag_list->add_child("ForensicMarkFlag")->add_child_text ( - "http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-picture-disable" - ); - forensic_mark_flag_list->add_child("ForensicMarkFlag")->add_child_text ( - "http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-audio-disable" - ); - } - } - } - - authenticated_public->add_child("NonCriticalExtensions"); - } - - { - xmlpp::Element* authenticated_private = root->add_child("AuthenticatedPrivate"); - authenticated_private->set_attribute ("Id", "ID_AuthenticatedPrivate"); - xmlAddID (0, doc->cobj(), (const xmlChar *) "ID_AuthenticatedPrivate", authenticated_private->get_attribute("Id")->cobj()); - { - xmlpp::Element* encrypted_key = authenticated_private->add_child ("EncryptedKey", "enc"); - { - xmlpp::Element* encryption_method = encrypted_key->add_child ("EncryptionMethod", "enc"); - encryption_method->set_attribute ("Algorithm", "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"); - encryption_method->add_child("DigestMethod", "ds")->set_attribute("Algorithm", "http://www.w3.org/2000/09/xmldsig#sha1"); - } - - xmlpp::Element* cipher_data = authenticated_private->add_child ("CipherData", "enc"); - cipher_data->add_child("CipherValue", "enc")->add_child_text("XXX"); - } - } - - /* XXX: x2 one for each mxf? */ - - { - xmlpp::Element* signature = root->add_child("Signature", "ds"); - - { - xmlpp::Element* signed_info = signature->add_child("SignedInfo", "ds"); - signed_info->add_child("CanonicalizationMethod", "ds")->set_attribute( - "Algorithm", "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments" - ); - - if (interop) { - signed_info->add_child("SignatureMethod", "ds")->set_attribute( - "Algorithm", "http://www.w3.org/2000/09/xmldsig#rsa-sha1" - ); - } else { - signed_info->add_child("SignatureMethod", "ds")->set_attribute( - "Algorithm", "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" - ); - } - - { - xmlpp::Element* reference = signed_info->add_child("Reference", "ds"); - reference->set_attribute("URI", "#ID_AuthenticatedPublic"); - reference->add_child("DigestMethod", "ds")->set_attribute("Algorithm", "http://www.w3.org/2001/04/xmlenc#sha256"); - reference->add_child("DigestValue", "ds"); - } - - { - xmlpp::Element* reference = signed_info->add_child("Reference", "ds"); - reference->set_attribute("URI", "#ID_AuthenticatedPrivate"); - reference->add_child("DigestMethod", "ds")->set_attribute("Algorithm", "http://www.w3.org/2001/04/xmlenc#sha256"); - reference->add_child("DigestValue", "ds"); - } - } - - add_signature_value (signature, certificates, signer_key, "ds"); - } - - return doc; -} - /** @return true if we have any encrypted content */ bool CPL::encrypted () const @@ -533,3 +371,11 @@ CPL::asset_from_id (list asset_maps, string id) const return make_pair ("", shared_ptr ()); } + +void +CPL::set_mxf_keys (Key key) +{ + for (list >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) { + (*i)->set_mxf_keys (key); + } +}