/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
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
* @brief DCP class.
*/
+#include "raw_convert.h"
#include "dcp.h"
-#include "sound_mxf.h"
-#include "picture_mxf.h"
-#include "subtitle_content.h"
-#include "mono_picture_mxf.h"
-#include "stereo_picture_mxf.h"
+#include "sound_asset.h"
+#include "picture_asset.h"
+#include "interop_subtitle_asset.h"
+#include "smpte_subtitle_asset.h"
+#include "mono_picture_asset.h"
+#include "stereo_picture_asset.h"
+#include "reel_subtitle_asset.h"
#include "util.h"
#include "metadata.h"
#include "exceptions.h"
-#include "reel.h"
#include "cpl.h"
-#include "signer.h"
-#include "kdm.h"
+#include "certificate_chain.h"
#include "compose.hpp"
#include "AS_DCP.h"
+#include "decrypted_kdm.h"
+#include "decrypted_kdm_key.h"
+#include "dcp_assert.h"
+#include "reel_asset.h"
+#include "font_asset.h"
#include <xmlsec/xmldsig.h>
#include <xmlsec/app.h>
#include <libxml++/libxml++.h>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-#include <sstream>
-#include <iomanip>
-#include <cassert>
+#include <boost/foreach.hpp>
#include <iostream>
using std::string;
using std::list;
-using std::stringstream;
+using std::cout;
using std::ostream;
using std::make_pair;
using std::map;
+using std::cout;
+using std::cerr;
+using std::exception;
using boost::shared_ptr;
-using boost::lexical_cast;
+using boost::dynamic_pointer_cast;
+using boost::algorithm::starts_with;
using namespace dcp;
DCP::DCP (boost::filesystem::path directory)
: _directory (directory)
{
- boost::filesystem::create_directories (directory);
+ if (!boost::filesystem::exists (directory)) {
+ boost::filesystem::create_directories (directory);
+ }
+
_directory = boost::filesystem::canonical (_directory);
}
+template<class T> void
+survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e)
+{
+ if (keep_going) {
+ if (errors) {
+ errors->push_back (shared_ptr<T> (new T (e)));
+ }
+ } else {
+ throw e;
+ }
+}
+
void
-DCP::read ()
+DCP::read (bool keep_going, ReadErrors* errors)
{
/* Read the ASSETMAP */
-
+
boost::filesystem::path asset_map_file;
if (boost::filesystem::exists (_directory / "ASSETMAP")) {
asset_map_file = _directory / "ASSETMAP";
} else if (boost::filesystem::exists (_directory / "ASSETMAP.xml")) {
asset_map_file = _directory / "ASSETMAP.xml";
} else {
- boost::throw_exception (DCPReadError ("could not find AssetMap file"));
+ boost::throw_exception (DCPReadError (String::compose ("could not find AssetMap file in `%1'", _directory.string())));
}
cxml::Document asset_map ("AssetMap");
asset_map.read_file (asset_map_file);
list<shared_ptr<cxml::Node> > asset_nodes = asset_map.node_child("AssetList")->node_children ("Asset");
map<string, boost::filesystem::path> paths;
- for (list<shared_ptr<cxml::Node> >::const_iterator i = asset_nodes.begin(); i != asset_nodes.end(); ++i) {
- if ((*i)->node_child("ChunkList")->node_children("Chunk").size() != 1) {
+ BOOST_FOREACH (shared_ptr<cxml::Node> i, asset_nodes) {
+ if (i->node_child("ChunkList")->node_children("Chunk").size() != 1) {
boost::throw_exception (XMLError ("unsupported asset chunk count"));
}
- paths.insert (make_pair (
- (*i)->string_child ("Id"),
- (*i)->node_child("ChunkList")->node_child("Chunk")->string_child ("Path")
- ));
+ string p = i->node_child("ChunkList")->node_child("Chunk")->string_child ("Path");
+ if (starts_with (p, "file://")) {
+ p = p.substr (7);
+ }
+ paths.insert (make_pair (i->string_child ("Id"), p));
}
/* Read all the assets from the asset map */
-
+ /* XXX: I think we should be looking at the PKL here to decide type, not
+ the extension of the file.
+ */
+
+ /* Make a list of non-CPL assets so that we can resolve the references
+ from the CPLs.
+ */
+ list<shared_ptr<Asset> > other_assets;
+
for (map<string, boost::filesystem::path>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
boost::filesystem::path path = _directory / i->second;
- if (boost::algorithm::ends_with (path.string(), ".xml")) {
+
+ if (!boost::filesystem::exists (path)) {
+ survivable_error (keep_going, errors, MissingAssetError (path));
+ continue;
+ }
+
+ if (boost::filesystem::extension (path) == ".xml") {
xmlpp::DomParser* p = new xmlpp::DomParser;
try {
p->parse_file (path.string());
delete p;
continue;
}
-
+
string const root = p->get_document()->get_root_node()->get_name ();
delete p;
-
+
if (root == "CompositionPlaylist") {
- _assets.push_back (shared_ptr<CPL> (new CPL (path)));
+ _cpls.push_back (shared_ptr<CPL> (new CPL (path)));
} else if (root == "DCSubtitle") {
- _assets.push_back (shared_ptr<SubtitleContent> (new SubtitleContent (path)));
+ other_assets.push_back (shared_ptr<InteropSubtitleAsset> (new InteropSubtitleAsset (path)));
}
- } else if (boost::algorithm::ends_with (path.string(), ".mxf")) {
+ } else if (boost::filesystem::extension (path) == ".mxf") {
ASDCP::EssenceType_t type;
if (ASDCP::EssenceType (path.string().c_str(), type) != ASDCP::RESULT_OK) {
throw DCPReadError ("Could not find essence type");
case ASDCP::ESS_MPEG2_VES:
throw DCPReadError ("MPEG2 video essences are not supported");
case ASDCP::ESS_JPEG_2000:
- _assets.push_back (shared_ptr<MonoPictureMXF> (new MonoPictureMXF (path)));
+ other_assets.push_back (shared_ptr<MonoPictureAsset> (new MonoPictureAsset (path)));
break;
case ASDCP::ESS_PCM_24b_48k:
case ASDCP::ESS_PCM_24b_96k:
- _assets.push_back (shared_ptr<SoundMXF> (new SoundMXF (path)));
+ other_assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (path)));
break;
case ASDCP::ESS_JPEG_2000_S:
- _assets.push_back (shared_ptr<StereoPictureMXF> (new StereoPictureMXF (path)));
+ other_assets.push_back (shared_ptr<StereoPictureAsset> (new StereoPictureAsset (path)));
+ break;
+ case ASDCP::ESS_TIMED_TEXT:
+ other_assets.push_back (shared_ptr<SMPTESubtitleAsset> (new SMPTESubtitleAsset (path)));
break;
default:
throw DCPReadError ("Unknown MXF essence type");
- }
+ }
+ } else if (boost::filesystem::extension (path) == ".ttf") {
+ other_assets.push_back (shared_ptr<FontAsset> (new FontAsset (i->first, path)));
}
}
- list<shared_ptr<CPL> > cpl = cpls ();
- for (list<shared_ptr<CPL> >::const_iterator i = cpl.begin(); i != cpl.end(); ++i) {
- (*i)->resolve_refs (list_of_type<Asset, Object> (assets ()));
+ BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+ i->resolve_refs (list_of_type<Asset, Object> (other_assets));
}
}
bool
-DCP::equals (DCP const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const
{
- if (_assets.size() != other._assets.size()) {
- note (ERROR, "Asset counts differ");
+ list<shared_ptr<CPL> > a = cpls ();
+ list<shared_ptr<CPL> > b = other.cpls ();
+
+ if (a.size() != b.size()) {
+ note (DCP_ERROR, String::compose ("CPL counts differ: %1 vs %2", a.size(), b.size()));
return false;
}
- list<shared_ptr<Asset> >::const_iterator a = _assets.begin ();
- list<shared_ptr<Asset> >::const_iterator b = other._assets.begin ();
+ bool r = true;
+
+ BOOST_FOREACH (shared_ptr<CPL> i, a) {
+ list<shared_ptr<CPL> >::const_iterator j = b.begin ();
+ while (j != b.end() && !(*j)->equals (i, opt, note)) {
+ ++j;
+ }
- while (a != _assets.end ()) {
- if (!(*a)->equals (*b, opt, note)) {
- return false;
+ if (j == b.end ()) {
+ r = false;
}
- ++a;
- ++b;
}
- return true;
+ return r;
}
void
-DCP::add (boost::shared_ptr<Asset> asset)
+DCP::add (boost::shared_ptr<CPL> cpl)
{
- _assets.push_back (asset);
+ _cpls.push_back (cpl);
}
-class AssetComparator
-{
-public:
- bool operator() (shared_ptr<const Content> a, shared_ptr<const Content> b) {
- return a->id() < b->id();
- }
-};
-
bool
DCP::encrypted () const
{
- list<shared_ptr<CPL> > cpl = cpls ();
- for (list<shared_ptr<CPL> >::const_iterator i = cpl.begin(); i != cpl.end(); ++i) {
- if ((*i)->encrypted ()) {
+ BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+ if (i->encrypted ()) {
return true;
}
}
}
void
-DCP::add (KDM const & kdm)
+DCP::add (DecryptedKDM const & kdm)
{
- list<KDMKey> keys = kdm.keys ();
- list<shared_ptr<CPL> > cpl = cpls ();
-
- for (list<shared_ptr<CPL> >::iterator i = cpl.begin(); i != cpl.end(); ++i) {
- for (list<KDMKey>::iterator j = keys.begin(); j != keys.end(); ++j) {
- if (j->cpl_id() == (*i)->id()) {
- (*i)->add (kdm);
- }
+ list<DecryptedKDMKey> keys = kdm.keys ();
+
+ BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+ BOOST_FOREACH (DecryptedKDMKey const & j, kdm.keys ()) {
+ if (j.cpl_id() == i->id()) {
+ i->add (kdm);
+ }
}
}
}
boost::filesystem::path
-DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr<const Signer> signer) const
+DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr<const CertificateChain> signer) const
{
boost::filesystem::path p = _directory;
- stringstream s;
- s << pkl_uuid << "_pkl.xml";
- p /= s.str();
+ p /= String::compose ("pkl_%1.xml", pkl_uuid);
xmlpp::Document doc;
xmlpp::Element* pkl;
} else {
pkl = doc.create_root_node("PackingList", "http://www.smpte-ra.org/schemas/429-8/2007/PKL");
}
-
+
if (signer) {
pkl->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig");
}
pkl->add_child("Id")->add_child_text ("urn:uuid:" + pkl_uuid);
/* XXX: this is a bit of a hack */
- assert (cpls().size() > 0);
+ DCP_ASSERT (cpls().size() > 0);
pkl->add_child("AnnotationText")->add_child_text (cpls().front()->annotation_text ());
-
+
pkl->add_child("IssueDate")->add_child_text (metadata.issue_date);
pkl->add_child("Issuer")->add_child_text (metadata.issuer);
pkl->add_child("Creator")->add_child_text (metadata.creator);
xmlpp::Element* asset_list = pkl->add_child("AssetList");
- for (list<shared_ptr<Asset> >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) {
- (*i)->write_to_pkl (asset_list, standard);
+ BOOST_FOREACH (shared_ptr<Asset> i, assets ()) {
+ i->write_to_pkl (asset_list, _directory, standard);
}
if (signer) {
signer->sign (pkl, standard);
}
-
+
doc.write_to_file (p.string (), "UTF-8");
return p.string ();
}
p /= "VOLINDEX.xml";
break;
default:
- assert (false);
+ DCP_ASSERT (false);
}
xmlpp::Document doc;
root = doc.create_root_node ("VolumeIndex", "http://www.smpte-ra.org/schemas/429-9/2007/AM");
break;
default:
- assert (false);
+ DCP_ASSERT (false);
}
-
+
root->add_child("Index")->add_child_text ("1");
doc.write_to_file (p.string (), "UTF-8");
}
DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMetadata metadata) const
{
boost::filesystem::path p = _directory;
-
+
switch (standard) {
case INTEROP:
p /= "ASSETMAP";
p /= "ASSETMAP.xml";
break;
default:
- assert (false);
+ DCP_ASSERT (false);
}
xmlpp::Document doc;
root = doc.create_root_node ("AssetMap", "http://www.smpte-ra.org/schemas/429-9/2007/AM");
break;
default:
- assert (false);
+ DCP_ASSERT (false);
}
root->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
root->add_child("Issuer")->add_child_text (metadata.issuer);
break;
default:
- assert (false);
+ DCP_ASSERT (false);
}
-
+
xmlpp::Node* asset_list = root->add_child ("AssetList");
xmlpp::Node* asset = asset_list->add_child ("Asset");
asset->add_child("PackingList")->add_child_text ("true");
xmlpp::Node* chunk_list = asset->add_child ("ChunkList");
xmlpp::Node* chunk = chunk_list->add_child ("Chunk");
- chunk->add_child("Path")->add_child_text (pkl_uuid + "_pkl.xml");
+ chunk->add_child("Path")->add_child_text ("pkl_" + pkl_uuid + ".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> (pkl_length));
-
- for (list<shared_ptr<Asset> >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) {
- (*i)->write_to_assetmap (asset_list, _directory);
+ chunk->add_child("Length")->add_child_text (raw_convert<string> (pkl_length));
+
+ BOOST_FOREACH (shared_ptr<Asset> i, assets ()) {
+ i->write_to_assetmap (asset_list, _directory);
}
/* This must not be the _formatted version otherwise signature digests will be wrong */
DCP::write_xml (
Standard standard,
XMLMetadata metadata,
- shared_ptr<const Signer> signer
+ shared_ptr<const CertificateChain> signer
)
{
- list<shared_ptr<CPL> > cpl = cpls ();
- for (list<shared_ptr<CPL> >::const_iterator i = cpl.begin(); i != cpl.end(); ++i) {
- string const filename = (*i)->id() + "_cpl.xml";
- (*i)->write_xml (_directory / filename, standard, signer);
+ BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+ string const filename = "cpl_" + i->id() + ".xml";
+ i->write_xml (_directory / filename, standard, signer);
}
string const pkl_uuid = make_uuid ();
boost::filesystem::path const pkl_path = write_pkl (standard, pkl_uuid, metadata, signer);
-
+
write_volindex (standard);
write_assetmap (standard, pkl_uuid, boost::filesystem::file_size (pkl_path), metadata);
}
list<shared_ptr<CPL> >
DCP::cpls () const
{
- return list_of_type<Asset, CPL> (_assets);
+ return _cpls;
+}
+
+/** @return All assets (including CPLs) */
+list<shared_ptr<Asset> >
+DCP::assets () const
+{
+ list<shared_ptr<Asset> > assets;
+ BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+ assets.push_back (i);
+ BOOST_FOREACH (shared_ptr<const ReelAsset> j, i->reel_assets ()) {
+ shared_ptr<Asset> o = j->asset_ref().object ();
+ assets.push_back (o);
+ /* More Interop special-casing */
+ shared_ptr<InteropSubtitleAsset> sub = dynamic_pointer_cast<InteropSubtitleAsset> (o);
+ if (sub) {
+ sub->add_font_assets (assets);
+ }
+ }
+ }
+
+ return assets;
}
projects / libdcp.git / blobdiff