/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
#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 <openjpeg.h>
-
-#define DCI_GAMMA 2.6
+#include "compose.hpp"
+#include "j2k.h"
using std::string;
using boost::shared_ptr;
{
boost::uintmax_t const size = boost::filesystem::file_size (path);
_buffer = new ASDCP::JP2K::FrameBuffer (size);
- FILE* f = fopen_boost (path, "r");
+ FILE* f = fopen_boost (path, "rb");
if (!f) {
boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno));
}
}
/** 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, ASDCP::AESDecContext* 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);
- if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer, c))) {
- boost::throw_exception (DCPReadError ("could not read video frame"));
+ if (ASDCP_FAILURE (reader->ReadFrame (n, *_buffer, c))) {
+ boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1", n)));
}
}
-MonoPictureFrame::MonoPictureFrame ()
+MonoPictureFrame::MonoPictureFrame (uint8_t const * data, int size)
{
- _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
+ _buffer = new ASDCP::JP2K::FrameBuffer (size);
+ _buffer->Size (size);
+ memcpy (_buffer->Data(), data, size);
}
/** MonoPictureFrame destructor */
/** @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<ARGBFrame>
-MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const
-{
- return xyz_to_rgba (
- decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce),
- ColourConversion::xyz_to_srgb ()
- );
-}
-
-void
-MonoPictureFrame::rgb_frame (uint16_t* buffer, optional<NoteHandler> note) const
+shared_ptr<OpenJPEGImage>
+MonoPictureFrame::xyz_image (int reduce) const
{
- xyz_to_rgb (
- decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), 0),
- ColourConversion::xyz_to_srgb (),
- buffer,
- note
- );
+ return decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce);
}