* @brief DCP class.
*/
+#include "raw_convert.h"
#include "dcp.h"
#include "sound_mxf.h"
#include "picture_mxf.h"
-#include "subtitle_content.h"
+#include "interop_subtitle_content.h"
+#include "smpte_subtitle_content.h"
#include "mono_picture_mxf.h"
#include "stereo_picture_mxf.h"
#include "util.h"
#include "metadata.h"
#include "exceptions.h"
-#include "reel.h"
#include "cpl.h"
#include "signer.h"
#include "compose.hpp"
#include "AS_DCP.h"
#include "decrypted_kdm.h"
#include "decrypted_kdm_key.h"
+#include "dcp_assert.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 <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::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);
}
} else if (boost::filesystem::exists (_directory / "ASSETMAP.xml")) {
asset_map_file = _directory / "ASSETMAP.xml";
} else {
- boost::throw_exception (DCPReadError (String::compose ("could not find AssetMap file `%1'", asset_map_file.string())));
+ boost::throw_exception (DCPReadError (String::compose ("could not find AssetMap file in `%1'", _directory.string())));
}
cxml::Document asset_map ("AssetMap");
}
/* 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.
+ */
for (map<string, boost::filesystem::path>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
boost::filesystem::path path = _directory / i->second;
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, false)));
+ _assets.push_back (shared_ptr<InteropSubtitleContent> (new InteropSubtitleContent (path)));
}
} else if (boost::algorithm::ends_with (path.string(), ".mxf")) {
ASDCP::EssenceType_t type;
_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)));
+ _assets.push_back (shared_ptr<SMPTESubtitleContent> (new SMPTESubtitleContent (path)));
break;
default:
throw DCPReadError ("Unknown MXF essence type");
}
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, String::compose ("Asset counts differ: %1 vs %2", _assets.size(), other._assets.size()));
+ 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
{
DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr<const Signer> signer) const
{
boost::filesystem::path p = _directory;
- stringstream s;
- s << pkl_uuid << "_pkl.xml";
- p /= s.str();
+ p /= String::compose ("%1_pkl.xml", pkl_uuid);
xmlpp::Document doc;
xmlpp::Element* pkl;
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);
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");
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");
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