X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmono_picture_frame.cc;h=7420193e47ec0f0701e48ac8d7207df5113b0c51;hb=f11ff8d4d961d92e994ef0f9beb456aa8ec7c4cb;hp=e7dc04abe46d48fb1e6bdcf6c6606f7bfd90f3c9;hpb=c2018e0dae9ed2503b6244a47524a7ce16eedb0b;p=libdcp.git diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc index e7dc04ab..7420193e 100644 --- a/src/mono_picture_frame.cc +++ b/src/mono_picture_frame.cc @@ -1,20 +1,34 @@ /* 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. */ /** @file src/mono_picture_frame.cc @@ -23,18 +37,18 @@ #include "mono_picture_frame.h" #include "exceptions.h" -#include "argb_frame.h" #include "util.h" #include "rgb_xyz.h" #include "colour_conversion.h" -#include "KM_fileio.h" -#include "AS_DCP.h" -#include - -#define DCI_GAMMA 2.6 +#include "compose.hpp" +#include "j2k.h" +#include "crypto_context.h" +#include +#include 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. @@ -43,67 +57,64 @@ using namespace dcp; 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"); + _buffer.reset(new ASDCP::JP2K::FrameBuffer(size)); + FILE* f = fopen_boost (path, "rb"); if (!f) { boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno)); } - fread (j2k_data(), 1, size, f); + size_t n = fread (data(), 1, size, f); + if (n != size) { + boost::throw_exception (FileError ("could not read from JPEG2000 file", path, errno)); + } + fclose (f); _buffer->Size (size); } /** Make a picture frame from a 2D (monoscopic) asset. - * @param mxf_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. */ -MonoPictureFrame::MonoPictureFrame (boost::filesystem::path mxf_path, int n, ASDCP::AESDecContext* c) +MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, shared_ptr c) { - ASDCP::JP2K::MXFReader reader; - Kumu::Result_t r = reader.OpenRead (mxf_path.string().c_str()); - if (ASDCP_FAILURE (r)) { - boost::throw_exception (FileError ("could not open MXF file for reading", mxf_path, r)); - } - /* XXX: unfortunate guesswork on this buffer size */ - _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte); + _buffer.reset(new ASDCP::JP2K::FrameBuffer(4 * Kumu::Megabyte)); - if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer, c))) { - boost::throw_exception (DCPReadError ("could not read video frame")); + ASDCP::Result_t const r = reader->ReadFrame (n, *_buffer, c->context(), c->hmac()); + + if (ASDCP_FAILURE (r)) { + boost::throw_exception (ReadError (String::compose ("could not read video frame %1 (%2)", n, static_cast(r)))); } } -MonoPictureFrame::MonoPictureFrame () +MonoPictureFrame::MonoPictureFrame (uint8_t const * data, int size) { - _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte); + _buffer.reset(new ASDCP::JP2K::FrameBuffer(size)); + _buffer->Size (size); + memcpy (_buffer->Data(), data, size); } -/** MonoPictureFrame destructor */ -MonoPictureFrame::~MonoPictureFrame () -{ - delete _buffer; -} /** @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 (); } @@ -111,28 +122,9 @@ MonoPictureFrame::j2k_size () const /** @param reduce a factor by which to reduce the resolution * of the image, expressed as a power of two (pass 0 for no * reduction). - * @param srgb_gamma Reciprocal of output gamma to use after - * the conversion from XYZ to RGB. - * - * @return An ARGB representation of this frame. This is ARGB in the - * Cairo sense, so that each pixel takes up 4 bytes; the first byte - * is blue, second green, third red and fourth alpha (always 255). */ -shared_ptr -MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const -{ - return xyz_to_rgba ( - decompress_j2k (const_cast (_buffer->RoData()), _buffer->Size(), reduce), - ColourConversion::xyz_to_srgb () - ); -} - -void -MonoPictureFrame::rgb_frame (uint16_t* buffer) const +shared_ptr +MonoPictureFrame::xyz_image (int reduce) const { - xyz_to_rgb ( - decompress_j2k (const_cast (_buffer->RoData()), _buffer->Size(), 0), - ColourConversion::xyz_to_srgb (), - buffer - ); + return decompress_j2k (const_cast (_buffer->RoData()), _buffer->Size(), reduce); }