X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmono_picture_frame.cc;h=2abd57e453248d68bb916ea513163fa3f559e85e;hb=dfc34502469e9c975bf78011b0efc365c11e9779;hp=1237fd904754e53fdec6a371baca33d82e8cb6d1;hpb=fe99eae4b95c5fcf2f3730efad4a18d0cb5c29bc;p=libdcp.git diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc index 1237fd90..2abd57e4 100644 --- a/src/mono_picture_frame.cc +++ b/src/mono_picture_frame.cc @@ -1,119 +1,130 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2021 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. */ + /** @file src/mono_picture_frame.cc - * @brief MonoPictureFrame class. + * @brief MonoPictureFrame class */ -#include "mono_picture_frame.h" + +#include "colour_conversion.h" +#include "compose.hpp" +#include "crypto_context.h" #include "exceptions.h" -#include "util.h" +#include "file.h" +#include "filesystem.h" +#include "j2k_transcode.h" +#include "mono_picture_frame.h" #include "rgb_xyz.h" -#include "colour_conversion.h" -#include "KM_fileio.h" -#include "AS_DCP.h" -#include +#include "util.h" +#include +#include -#define DCI_GAMMA 2.6 +using std::make_shared; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcp; -/** Make a picture frame from a JPEG2000 file. - * @param path Path to JPEG2000 file. - */ + MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path) { - boost::uintmax_t const size = boost::filesystem::file_size (path); - _buffer = new ASDCP::JP2K::FrameBuffer (size); - FILE* f = fopen_boost (path, "r"); + auto const size = filesystem::file_size(path); + _buffer.reset(new ASDCP::JP2K::FrameBuffer(size)); + File f(path, "rb"); if (!f) { - boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno)); + boost::throw_exception (FileError("could not open JPEG2000 file", path, errno)); } - fread (j2k_data(), 1, size, f); - fclose (f); + if (f.read(data(), 1, size) != size) { + boost::throw_exception (FileError("could not read from JPEG2000 file", path, errno)); + } _buffer->Size (size); } + /** Make a picture frame from a 2D (monoscopic) asset. - * @param path Path to the asset's MXF file. + * @param reader Reader for the asset's MXF file. * @param n Frame within the asset, not taking EntryPoint into account. * @param c Context for decryption, or 0. + * @param check_hmac true to check the HMAC and give an error if it is not as expected. */ -MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path, int n, ASDCP::AESDecContext* c) +MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, shared_ptr c, bool check_hmac) { - ASDCP::JP2K::MXFReader reader; - Kumu::Result_t r = reader.OpenRead (path.string().c_str()); - if (ASDCP_FAILURE (r)) { - boost::throw_exception (FileError ("could not open MXF file for reading", path, r)); - } - /* XXX: unfortunate guesswork on this buffer size */ - _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte); + _buffer = make_shared(4 * Kumu::Megabyte); - if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer, c))) { - boost::throw_exception (DCPReadError ("could not read video frame")); + auto const r = reader->ReadFrame (n, *_buffer, c->context(), check_hmac ? c->hmac() : nullptr); + + if (ASDCP_FAILURE(r)) { + boost::throw_exception (ReadError(String::compose ("could not read video frame %1 (%2)", n, static_cast(r)))); } } -MonoPictureFrame::MonoPictureFrame () -{ - _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte); -} -/** MonoPictureFrame destructor */ -MonoPictureFrame::~MonoPictureFrame () +MonoPictureFrame::MonoPictureFrame (uint8_t const * data, int size) { - delete _buffer; + _buffer = make_shared(size); + _buffer->Size (size); + memcpy (_buffer->Data(), data, size); } -/** @return Pointer to JPEG2000 data */ + uint8_t const * -MonoPictureFrame::j2k_data () const +MonoPictureFrame::data () const { return _buffer->RoData (); } -/** @return Pointer to JPEG2000 data */ + uint8_t * -MonoPictureFrame::j2k_data () +MonoPictureFrame::data () { return _buffer->Data (); } -/** @return Size of JPEG2000 data in bytes */ + int -MonoPictureFrame::j2k_size () const +MonoPictureFrame::size () const { return _buffer->Size (); } -/** @param reduce a factor by which to reduce the resolution - * of the image, expressed as a power of two (pass 0 for no - * reduction). - */ -shared_ptr + +shared_ptr MonoPictureFrame::xyz_image (int reduce) const { - return decompress_j2k (const_cast (_buffer->RoData()), _buffer->Size(), reduce); + return decompress_j2k (const_cast(_buffer->RoData()), _buffer->Size(), reduce); }