X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.h;h=cc1be9f0360cfb234d9e980339ff042b3ecdf8d8;hb=9d3e7f716accd67985f23048b4c36e7581348848;hp=da3eb7d00e9f5e7bfdb21bfc143e8c1833d86ea5;hpb=8fca5499789ae1deb2dbcad8d3501a8f42fb95f0;p=libdcp.git diff --git a/src/picture_asset.h b/src/picture_asset.h index da3eb7d0..cc1be9f0 100644 --- a/src/picture_asset.h +++ b/src/picture_asset.h @@ -1,136 +1,140 @@ /* - 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 files + * @brief PictureAsset class. */ -#include -#include "mxf_asset.h" +#include "mxf.h" +#include "util.h" +#include "metadata.h" + +namespace ASDCP { + namespace JP2K { + struct PictureDescriptor; + } +} -namespace libdcp +namespace dcp { -class MonoPictureFrame; -class StereoPictureFrame; +class MonoPictureFrame; +class StereoPictureFrame; +class PictureAssetWriter; -/** @brief An asset made up of JPEG2000 files */ -class PictureAsset : public MXFAsset +/** @class PictureAsset + * @brief An asset made up of JPEG2000 data. + */ +class PictureAsset : public Asset, public MXF { public: - PictureAsset (std::string directory, std::string mxf_name, sigc::signal1* progress, int fps, int entry_point, int length); - - /** Write details of this asset to a CPL stream. - * @param s Stream. - */ - void write_to_cpl (std::ostream& s) const; + explicit PictureAsset (boost::filesystem::path file); + explicit PictureAsset (Fraction edit_rate, Standard standard); + + virtual boost::shared_ptr start_write ( + boost::filesystem::path file, + bool overwrite + ) = 0; + + Size size () const { + return _size; + } + + void set_size (Size s) { + _size = s; + } + + 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; + } - bool equals (boost::shared_ptr other, EqualityOptions opt, std::list& notes) const; + void set_screen_aspect_ratio (Fraction r) { + _screen_aspect_ratio = r; + } - int width () const { - return _width; + Fraction edit_rate () const { + return _edit_rate; } - int height () const { - return _height; + int64_t intrinsic_duration () const { + return _intrinsic_duration; } -protected: + static std::string static_pkl_type (Standard standard); + +protected: + friend class MonoPictureAssetWriter; + friend class StereoPictureAssetWriter; bool frame_buffer_equals ( - int frame, EqualityOptions opt, std::list& notes, + 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; - - /** picture width in pixels */ - int _width; - /** picture height in pixels */ - int _height; -}; -/** A 2D (monoscopic) picture asset */ -class MonoPictureAsset : public PictureAsset -{ -public: - /** Construct a PictureAsset, generating the MXF from the JPEG2000 files. - * This may take some time; progress is indicated by emission of the Progress signal. - * @param files Pathnames of JPEG2000 files, in frame order. - * @param directory Directory in which to create MXF file. - * @param mxf_name Name of MXF file to create. - * @param progress Signal to inform of progress. - * @param fps Frames per second. - * @param length Length in frames. - * @param width Width of images in pixels. - * @param height Height of images in pixels. - */ - MonoPictureAsset ( - std::vector const & files, - std::string directory, - std::string mxf_name, - sigc::signal1* progress, - int fps, - int length, - int width, - int height - ); - - /** Construct a PictureAsset, generating the MXF from the JPEG2000 files. - * This may take some time; progress is indicated by emission of the Progress signal. - * @param get_path Functor which returns a JPEG2000 file path for a given frame (frames counted from 0). - * @param directory Directory in which to create MXF file. - * @param mxf_name Name of MXF file to create. - * @param progress Signal to inform of progress. - * @param fps Frames per second. - * @param length Length in frames. - * @param width Width of images in pixels. - * @param height Height of images in pixels. + bool descriptor_equals ( + 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. */ - MonoPictureAsset ( - sigc::slot get_path, - std::string directory, - std::string mxf_name, - sigc::signal1* progress, - int fps, - int length, - int width, - int height - ); - - MonoPictureAsset (std::string directory, std::string mxf_name, int fps, int entry_point, int length); - - boost::shared_ptr get_frame (int n) const; - bool equals (boost::shared_ptr other, EqualityOptions opt, std::list& notes) const; + int64_t _intrinsic_duration; + /** picture size in pixels */ + Size _size; + Fraction _frame_rate; + Fraction _screen_aspect_ratio; private: - std::string path_from_list (int f, std::vector const & files) const; - void construct (sigc::slot); + std::string pkl_type (Standard standard) const; }; -/** A 3D (stereoscopic) picture asset */ -class StereoPictureAsset : public PictureAsset -{ -public: - StereoPictureAsset (std::string directory, std::string mxf_name, int fps, int entry_point, int length); - - boost::shared_ptr get_frame (int n) const; - bool equals (boost::shared_ptr other, EqualityOptions opt, std::list& notes) const; -}; - } + +#endif