X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.h;h=a03b85d2f974f992779d7ba732c449900289c07a;hb=06f0ba166ff4b811ff0c635434d06dc8abfaa5ab;hp=b8dab05205e1f17542e934dbde8d25dfdebfbfc7;hpb=bf59c288798851808359575662f202d390032aa7;p=libdcp.git diff --git a/src/picture_asset.h b/src/picture_asset.h index b8dab052..a03b85d2 100644 --- a/src/picture_asset.h +++ b/src/picture_asset.h @@ -1,73 +1,75 @@ /* - 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 . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ #ifndef LIBDCP_PICTURE_ASSET_H #define LIBDCP_PICTURE_ASSET_H /** @file src/picture_asset.h - * @brief An asset made up of JPEG2000 data + * @brief PictureAsset class. */ -#include -#include "mxf_asset.h" +#include "mxf.h" #include "util.h" #include "metadata.h" namespace ASDCP { namespace JP2K { - class PictureDescriptor; + struct PictureDescriptor; } } -namespace libdcp +namespace dcp { -class MonoPictureFrame; +class MonoPictureFrame; class StereoPictureFrame; class PictureAssetWriter; -/** @brief An asset made up of JPEG2000 data */ -class PictureAsset : public MXFAsset +/** @class PictureAsset + * @brief An asset made up of JPEG2000 data. + */ +class PictureAsset : public Asset, public MXF { public: - /** Construct a PictureAsset. - * - * @param directory Directory where MXF file is. - * @param mxf_name Name of MXF file. - */ - PictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name); - - /** Start a progressive write to this asset. - * The following parameters must be set up (if required) before calling this: - * Interop mode (set_interop) - * Edit rate (set_edit_rate) - * MXF Metadata (set_metadata) - * - * @param overwrite true to overwrite an existing MXF file; in this mode, writing can be resumed to a partially-written MXF; false if the - * MXF file does not exist. - */ - virtual boost::shared_ptr start_write (bool overwrite) = 0; + explicit PictureAsset (boost::filesystem::path file); + explicit PictureAsset (Fraction edit_rate); + + virtual boost::shared_ptr start_write ( + boost::filesystem::path file, + Standard standard, + bool overwrite + ) = 0; - virtual void read () = 0; - virtual void create (std::vector const &) {} - virtual void create (boost::function) {} - Size size () const { return _size; } @@ -76,27 +78,61 @@ public: _size = s; } - void write_to_cpl (xmlpp::Element *) const; + Fraction frame_rate () const { + return _frame_rate; + } + + void set_frame_rate (Fraction r) { + _frame_rate = r; + } + + Fraction screen_aspect_ratio () const { + return _screen_aspect_ratio; + } + + void set_screen_aspect_ratio (Fraction r) { + _screen_aspect_ratio = r; + } + + Fraction edit_rate () const { + return _edit_rate; + } -protected: + int64_t intrinsic_duration () const { + return _intrinsic_duration; + } + +protected: + friend class MonoPictureAssetWriter; + friend class StereoPictureAssetWriter; bool frame_buffer_equals ( - int frame, EqualityOptions opt, boost::function note, + int frame, EqualityOptions opt, NoteHandler note, uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B ) const; bool descriptor_equals ( - ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function + ASDCP::JP2K::PictureDescriptor const & a, + ASDCP::JP2K::PictureDescriptor const & b, + NoteHandler note ) const; + void read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const &); + + Fraction _edit_rate; + /** The total length of this content in video frames. The amount of + * content presented may be less than this. + */ + int64_t _intrinsic_duration; /** picture size in pixels */ Size _size; + Fraction _frame_rate; + Fraction _screen_aspect_ratio; private: - std::string key_type () const; - virtual int edit_rate_factor () const = 0; + std::string pkl_type (Standard standard) const; }; - + }