/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
files in the program, then also delete it here.
*/
+
/** @file src/dcp.h
- * @brief DCP class.
+ * @brief DCP class
*/
+
#ifndef LIBDCP_DCP_H
#define LIBDCP_DCP_H
-#include "types.h"
-#include "util.h"
+
+#include "asset_map.h"
#include "certificate.h"
+#include "compose.hpp"
#include "metadata.h"
#include "name_format.h"
-#include <boost/shared_ptr.hpp>
+#include "types.h"
+#include "util.h"
+#include "verify.h"
+#include "version.h"
#include <boost/signals2.hpp>
+#include <memory>
#include <string>
#include <vector>
+
namespace xmlpp {
class Document;
class Element;
}
+
/** @brief Namespace for everything in libdcp */
namespace dcp
{
+
+class PKL;
class Content;
class Reel;
class CPL;
-class XMLMetadata;
class CertificateChain;
class DecryptedKDM;
class Asset;
-class DCPReadError;
+class ReadError;
+
/** @class DCP
- * @brief A class to create or read a DCP.
+ * @brief A class to create or read a DCP
*/
-
-class DCP : public boost::noncopyable
+class DCP
{
public:
/** Construct a DCP. You can pass an existing DCP's directory
*/
explicit DCP (boost::filesystem::path directory);
- typedef std::list<boost::shared_ptr<DCPReadError> > ReadErrors;
+ DCP (DCP const&) = delete;
+ DCP& operator= (DCP const&) = delete;
+
+ DCP (DCP &&);
+ DCP& operator= (DCP &&);
- /** Read the DCP's structure into this object.
- * @param keep_going true to try to keep going in the face of (some) errors.
- * @param errors List of errors that will be added to if keep_going is true.
+ /** Read a DCP. This method does not do any deep checking of the DCP's validity, but
+ * if it comes across any bad things it will do one of two things.
+ *
+ * Errors that are so serious that they prevent the method from working will result
+ * in an exception being thrown. For example, a missing ASSETMAP means that the DCP
+ * can't be read without a lot of guesswork, so this will throw.
+ *
+ * Errors that are not fatal will be added to notes, if it's non-null. For example,
+ * if the DCP contains a mixture of Interop and SMPTE elements this will result
+ * in a note being added to the vector.
+ *
+ * For more thorough checking of a DCP's contents, see dcp::verify().
+ *
+ * @param notes List of notes that will be added to if non-0.
* @param ignore_incorrect_picture_mxf_type true to try loading MXF files marked as monoscopic
* as stereoscopic if the monoscopic load fails; fixes problems some 3D DCPs that (I think)
* have an incorrect descriptor in their MXF.
*/
- void read (bool keep_going = false, ReadErrors* errors = 0, bool ignore_incorrect_picture_mxf_type = false);
+ void read (std::vector<VerificationNote>* notes = nullptr, bool ignore_incorrect_picture_mxf_type = false);
/** Compare this DCP with another, according to various options.
* @param other DCP to compare this one to.
*/
bool equals (DCP const & other, EqualityOptions options, NoteHandler note) const;
- void add (boost::shared_ptr<CPL> cpl);
+ void add (std::shared_ptr<CPL> cpl);
- std::list<boost::shared_ptr<CPL> > cpls () const;
- std::list<boost::shared_ptr<Asset> > assets () const;
+ std::vector<std::shared_ptr<CPL>> cpls () const;
- bool encrypted () const;
+ /** @param ignore_unresolved true to silently ignore unresolved assets, otherwise
+ * an exception is thrown if they are found.
+ * @return All assets (including CPLs).
+ */
+ std::vector<std::shared_ptr<Asset>> assets (bool ignore_unresolved = false) const;
+ bool any_encrypted () const;
+ bool all_encrypted () const;
+
+ /** Add a KDM to decrypt this DCP. This method must be called after DCP::read()
+ * or the KDM you specify will be ignored.
+ * @param kdm KDM to use.
+ */
void add (DecryptedKDM const &);
- void write_xml (
- Standard standard,
- XMLMetadata metadata = XMLMetadata (),
- boost::shared_ptr<const CertificateChain> signer = boost::shared_ptr<const CertificateChain> (),
+ void set_issuer(std::string issuer);
+ void set_creator(std::string creator);
+ void set_issue_date(std::string issue_date);
+ void set_annotation_text(std::string annotation_text);
+
+ /** Write all the XML files for this DCP.
+ * @param signer Signer to use
+ * @param include_mca_subdescriptors true to write MCA subdescriptors to CPLs.
+ * @param name_format Name format to use for the CPL and PKL filenames
+ */
+ void write_xml(
+ std::shared_ptr<const CertificateChain> signer = std::shared_ptr<const CertificateChain>(),
+ bool include_mca_subdescriptors = true,
NameFormat name_format = NameFormat("%t")
);
- void resolve_refs (std::list<boost::shared_ptr<Asset> > assets);
+ void resolve_refs (std::vector<std::shared_ptr<Asset>> assets);
/** @return Standard of a DCP that was read in */
boost::optional<Standard> standard () const {
- return _standard;
+ if (!_asset_map) {
+ return {};
+ }
+
+ return _asset_map->standard();
+ }
+
+ boost::filesystem::path directory () const {
+ return _directory;
+ }
+
+ /** @return PKLs if this DCP was read from an existing one, or if write_xml() has been called on it.
+ * If neither is true, this method returns an empty vector.
+ */
+ std::vector<std::shared_ptr<PKL>> pkls () const {
+ return _pkls;
+ }
+
+ boost::optional<boost::filesystem::path> asset_map_file() const {
+ if (!_asset_map) {
+ return {};
+ }
+
+ return _asset_map->file();
+ }
+
+ boost::optional<AssetMap> asset_map() const {
+ return _asset_map;
}
static std::vector<boost::filesystem::path> directories_from_files (std::vector<boost::filesystem::path> files);
private:
- /** Write the PKL file.
- * @param pkl_uuid UUID to use.
- */
- boost::filesystem::path write_pkl (
- std::string file,
- Standard standard,
- std::string pkl_uuid,
- XMLMetadata metadata,
- boost::shared_ptr<const CertificateChain> signer
- ) const;
-
void write_volindex (Standard standard) const;
- /** Write the ASSETMAP file.
- * @param pkl_uuid UUID of our PKL.
- * @param pkl_path Pathname of our PKL file.
- */
- void write_assetmap (Standard standard, std::string pkl_uuid, boost::filesystem::path pkl_path, XMLMetadata metadata) const;
-
- /** the directory that we are writing to */
+ /** The directory that we are writing to */
boost::filesystem::path _directory;
- /** the CPLs that make up this DCP */
- std::list<boost::shared_ptr<CPL> > _cpls;
-
- /** Standard of DCP that was read in */
- boost::optional<Standard> _standard;
+ /** The CPLs that make up this DCP */
+ std::vector<std::shared_ptr<CPL>> _cpls;
+ /** The PKLs that make up this DCP */
+ std::vector<std::shared_ptr<PKL>> _pkls;
+ boost::optional<AssetMap> _asset_map;
+
+ /* Metadata to use for newly created PKLs and AssetMaps */
+ boost::optional<std::string> _new_issuer;
+ boost::optional<std::string> _new_creator;
+ boost::optional<std::string> _new_issue_date;
+ boost::optional<std::string> _new_annotation_text;
};
+
}
+
#endif