X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdcp.h;h=3c81b152cf0eaaa0a233af69994aba4e515eba12;hb=5591a50b918d2dc784a9e15688dfe24eb2b6dfcc;hp=3817913cb6dcf40b066f2c5284b34e6597134037;hpb=bc09fbc79580f56c93e35de25230af18b30e0e1e;p=libdcp.git diff --git a/src/dcp.h b/src/dcp.h index 3817913c..3c81b152 100644 --- a/src/dcp.h +++ b/src/dcp.h @@ -1,162 +1,139 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + libdcp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . */ /** @file src/dcp.h - * @brief A class to create a DCP. + * @brief DCP class. */ #ifndef LIBDCP_DCP_H #define LIBDCP_DCP_H +#include "types.h" +#include "certificate.h" +#include "metadata.h" +#include +#include #include #include -#include -#include -#include "types.h" namespace xmlpp { - class Node; + class Document; + class Element; } /** @brief Namespace for everything in libdcp */ -namespace libdcp +namespace dcp { -class Asset; -class PictureAsset; -class SoundAsset; +class Content; +class Reel; +class CPL; +class XMLMetadata; +class CertificateChain; +class DecryptedKDM; +class Asset; +class DCPReadError; -/** @class DCP dcp.h libdcp/dcp.h +/** @class DCP * @brief A class to create or read a DCP. */ - -class DCP + +class DCP : public boost::noncopyable { public: - /** Construct a DCP. - * @param directory Directory to write files to. - * @param name Name. - * @param content_kind Content kind. - * @param fps Frames per second. - * @param length Length in frames. + /** Construct a DCP. You can pass an existing DCP's directory + * as the parameter; alternatively, directory will be created + * if it does not exist. Note that if you pass an existing DCP + * into this constructor it will not be read until you call ::read(). + * + * @param directory Directory containing the DCP's files. */ - DCP (std::string directory, std::string name, ContentKind content_kind, int fps, int length); + explicit DCP (boost::filesystem::path directory); - DCP (std::string directory); + typedef std::list > ReadErrors; - /** Add a sound asset. - * @param files Pathnames of WAV files to use in the order Left, Right, - * Centre, Lfe (sub), Left surround, Right surround; not all files need - * to be present. + /** 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. + * @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 add_sound_asset (std::vector const & files); + void read (bool keep_going = false, ReadErrors* errors = 0, bool ignore_incorrect_picture_mxf_type = false); - /** Add a sound asset. - * @param get_path Functor to get the path to the WAV for a given channel. - * @param channels Number of channels. + /** Compare this DCP with another, according to various options. + * @param other DCP to compare this one to. + * @param options Options to define what "equality" means. + * @param note Functor to handle notes made by the equality operation. + * @return true if the DCPs are equal according to EqualityOptions, otherwise false. */ - void add_sound_asset (sigc::slot get_path, int channels); + bool equals (DCP const & other, EqualityOptions options, NoteHandler note) const; - /** Add a picture asset. - * @param files Pathnames of JPEG2000 files, in frame order. - * @param width Width of images in pixels. - * @param height Height of images in pixels. - */ - void add_picture_asset (std::vector const & files, int width, int height); + void add (boost::shared_ptr cpl); - /** Add a picture asset. - * @param get_path Functor to get path to the JPEG2000 for a given frame. - * @param width Width of images in pixels. - * @param height Height of images in pixels. - */ - void add_picture_asset (sigc::slot get_path, int width, int height); + std::list > cpls () const; + std::list > assets () const; - /** Write the required XML files to the directory that was - * passed into the constructor. - */ - void write_xml () const; + bool encrypted () const; - std::string name () const { - return _name; - } + void add (DecryptedKDM const &); - ContentKind content_kind () const { - return _content_kind; - } + void write_xml ( + Standard standard, + XMLMetadata metadata = XMLMetadata (), + boost::shared_ptr signer = boost::shared_ptr () + ); - int frames_per_second () const { - return _fps; - } + void resolve_refs (std::list > assets); - int length () const { - return _length; + /** @return Standard of a DCP that was read in */ + boost::optional standard () const { + return _standard; } - boost::shared_ptr picture_asset () const; - boost::shared_ptr sound_asset () const; - - std::list equals (DCP const & other, EqualityOptions options) const; - - /** Emitted with a parameter between 0 and 1 to indicate progress - * for long jobs. - */ - sigc::signal1 Progress; - private: - /** Write the CPL file. - * @param cpl_uuid UUID to use. - * @return CPL pathname. - */ - std::string write_cpl (std::string cpl_uuid) const; - /** Write the PKL file. * @param pkl_uuid UUID to use. - * @param cpl_uuid UUID of the CPL file. - * @param cpl_digest SHA digest of the CPL file. - * @param cpl_length Length of the CPL file in bytes. */ - std::string write_pkl (std::string pkl_uuid, std::string cpl_uuid, std::string cpl_digest, int cpl_length) const; - - /** Write the VOLINDEX file */ - void write_volindex () const; + boost::filesystem::path write_pkl ( + Standard standard, + std::string pkl_uuid, + XMLMetadata metadata, + boost::shared_ptr signer + ) const; + + void write_volindex (Standard standard) const; /** Write the ASSETMAP file. - * @param cpl_uuid UUID of our CPL. - * @param cpl_length Length of our CPL in bytes. * @param pkl_uuid UUID of our PKL. * @param pkl_length Length of our PKL in bytes. */ - void write_assetmap (std::string cpl_uuid, int cpl_length, std::string pkl_uuid, int pkl_length) const; + void write_assetmap (Standard standard, std::string pkl_uuid, int pkl_length, XMLMetadata metadata) const; /** the directory that we are writing to */ - std::string _directory; - /** the name of the DCP */ - std::string _name; - /** the content kind of the DCP */ - ContentKind _content_kind; - /** frames per second */ - int _fps; - /** length in frames */ - int _length; - /** assets */ - std::list > _assets; + boost::filesystem::path _directory; + /** the CPLs that make up this DCP */ + std::list > _cpls; + + /** Standard of DCP that was read in */ + boost::optional _standard; }; }