X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fstereo_picture_frame.cc;h=72f59b36bbce6dd116ed3d783b9794c2875cd8da;hb=ada2065df461ae9e56165e93e02b901c67a8bea3;hp=293573bd84aff8cad562a8451c53eef07ead7c92;hpb=7c386ee3f400d80f043bc0b271a0184e35a08169;p=libdcp.git diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc index 293573bd..72f59b36 100644 --- a/src/stereo_picture_frame.cc +++ b/src/stereo_picture_frame.cc @@ -1,58 +1,70 @@ /* 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. */ #include "stereo_picture_frame.h" #include "exceptions.h" -#include "argb_frame.h" #include "util.h" -#include "gamma_lut.h" #include "rgb_xyz.h" -#include "AS_DCP.h" -#include "KM_fileio.h" -#include - -#define DCI_GAMMA 2.6 +#include "colour_conversion.h" +#include "compose.hpp" +#include "j2k.h" +#include "crypto_context.h" +#include +#include using std::string; using boost::shared_ptr; using namespace dcp; /** Make a picture frame from a 3D (stereoscopic) asset. - * @param mxf_path Path to the asset's MXF file. + * @param reader Reader for the MXF file. * @param n Frame within the asset, not taking EntryPoint into account. */ -StereoPictureFrame::StereoPictureFrame (boost::filesystem::path mxf_path, int n) +StereoPictureFrame::StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, shared_ptr c) { - ASDCP::JP2K::MXFSReader 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::SFrameBuffer (4 * Kumu::Megabyte); - if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer))) { - boost::throw_exception (DCPReadError ("could not read video frame")); + if (ASDCP_FAILURE (reader->ReadFrame (n, *_buffer, c->context(), c->hmac()))) { + boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1 of %2", n))); } } +StereoPictureFrame::StereoPictureFrame () +{ + _buffer = new ASDCP::JP2K::SFrameBuffer (4 * Kumu::Megabyte); +} + StereoPictureFrame::~StereoPictureFrame () { delete _buffer; @@ -62,29 +74,18 @@ StereoPictureFrame::~StereoPictureFrame () * @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 gamma to use when doing the - * output gamma correction (after conversion from XYZ to RGB). - * - * @return An ARGB representation of one of the eyes (left or right) - * 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 -StereoPictureFrame::argb_frame (Eye eye, int reduce, float srgb_gamma) const +shared_ptr +StereoPictureFrame::xyz_image (Eye eye, int reduce) const { - shared_ptr xyz_frame; switch (eye) { - case LEFT: - xyz_frame = decompress_j2k (const_cast (_buffer->Left.RoData()), _buffer->Left.Size(), reduce); - break; - case RIGHT: - xyz_frame = decompress_j2k (const_cast (_buffer->Right.RoData()), _buffer->Right.Size(), reduce); - break; + case EYE_LEFT: + return decompress_j2k (const_cast (_buffer->Left.RoData()), _buffer->Left.Size(), reduce); + case EYE_RIGHT: + return decompress_j2k (const_cast (_buffer->Right.RoData()), _buffer->Right.Size(), reduce); } - - return xyz_to_rgba (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA, false), GammaLUT::cache.get (12, 1 / srgb_gamma, false)); + + return shared_ptr (); } uint8_t const * @@ -93,6 +94,12 @@ StereoPictureFrame::left_j2k_data () const return _buffer->Left.RoData (); } +uint8_t* +StereoPictureFrame::left_j2k_data () +{ + return _buffer->Left.Data (); +} + int StereoPictureFrame::left_j2k_size () const { @@ -105,6 +112,12 @@ StereoPictureFrame::right_j2k_data () const return _buffer->Right.RoData (); } +uint8_t* +StereoPictureFrame::right_j2k_data () +{ + return _buffer->Right.Data (); +} + int StereoPictureFrame::right_j2k_size () const {