* @brief DCP class.
*/
+#include "raw_convert.h"
#include "dcp.h"
#include "sound_mxf.h"
#include "picture_mxf.h"
#include "reel.h"
#include "cpl.h"
#include "signer.h"
-#include "kdm.h"
#include "compose.hpp"
#include "AS_DCP.h"
+#include "decrypted_kdm.h"
+#include "decrypted_kdm_key.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>
using std::string;
using std::list;
+using std::cout;
using std::stringstream;
using std::ostream;
using std::make_pair;
using std::map;
+using std::cout;
+using std::exception;
using boost::shared_ptr;
-using boost::lexical_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 */
} 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 `%1'", asset_map_file.string())));
}
cxml::Document asset_map ("AssetMap");
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 */
-
for (map<string, boost::filesystem::path>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
boost::filesystem::path path = _directory / i->second;
+
+ if (!boost::filesystem::exists (path)) {
+ survivable_error (keep_going, errors, MissingAssetError (path));
+ continue;
+ }
+
if (boost::algorithm::ends_with (path.string(), ".xml")) {
xmlpp::DomParser* p = new xmlpp::DomParser;
try {
if (root == "CompositionPlaylist") {
_assets.push_back (shared_ptr<CPL> (new CPL (path)));
} else if (root == "DCSubtitle") {
- _assets.push_back (shared_ptr<SubtitleContent> (new SubtitleContent (path)));
+ _assets.push_back (shared_ptr<SubtitleContent> (new SubtitleContent (path, false)));
}
} else if (boost::algorithm::ends_with (path.string(), ".mxf")) {
ASDCP::EssenceType_t type;
case ASDCP::ESS_JPEG_2000_S:
_assets.push_back (shared_ptr<StereoPictureMXF> (new StereoPictureMXF (path)));
break;
+ case ASDCP::ESS_TIMED_TEXT:
+ _assets.push_back (shared_ptr<SubtitleContent> (new SubtitleContent (path, true)));
+ break;
default:
throw DCPReadError ("Unknown MXF essence type");
}
bool
DCP::equals (DCP const & other, EqualityOptions opt, boost::function<void (NoteType, string)> 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;
- while (a != _assets.end ()) {
- if (!(*a)->equals (*b, opt, note)) {
- return false;
+ for (list<shared_ptr<CPL> >::const_iterator i = a.begin(); i != a.end(); ++i) {
+ list<shared_ptr<CPL> >::const_iterator j = b.begin ();
+ while (j != b.end() && !(*j)->equals (*i, opt, note)) {
+ ++j;
+ }
+
+ if (j == b.end ()) {
+ r = false;
}
- ++a;
- ++b;
}
- return true;
+ return r;
}
void
_assets.push_back (asset);
}
-class AssetComparator
-{
-public:
- bool operator() (shared_ptr<const Content> a, shared_ptr<const Content> b) {
- return a->id() < b->id();
- }
-};
-
bool
DCP::encrypted () const
{
}
void
-DCP::add (KDM const & kdm)
+DCP::add (DecryptedKDM const & kdm)
{
- list<KDMKey> keys = kdm.keys ();
+ list<DecryptedKDMKey> 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) {
+ for (list<DecryptedKDMKey>::iterator j = keys.begin(); j != keys.end(); ++j) {
if (j->cpl_id() == (*i)->id()) {
(*i)->add (kdm);
}
chunk->add_child("Path")->add_child_text (pkl_uuid + "_pkl.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));
+ chunk->add_child("Length")->add_child_text (raw_convert<string> (pkl_length));
for (list<shared_ptr<Asset> >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) {
(*i)->write_to_assetmap (asset_list, _directory);
projects / libdcp.git / blobdiff