#include "stereo_picture_frame.h"
#include "exceptions.h"
-#include "argb_frame.h"
#include "util.h"
-#include "gamma_lut.h"
#include "rgb_xyz.h"
+#include "colour_conversion.h"
#include "AS_DCP.h"
#include "KM_fileio.h"
+#include "compose.hpp"
+#include "j2k.h"
#include <openjpeg.h>
-#define DCI_GAMMA 2.6
-
using std::string;
using boost::shared_ptr;
using namespace dcp;
* @param mxf_path Path to the asset's MXF file.
* @param n Frame within the asset, not taking EntryPoint into account.
*/
-StereoPictureFrame::StereoPictureFrame (boost::filesystem::path mxf_path, int n)
+StereoPictureFrame::StereoPictureFrame (boost::filesystem::path path, int n)
{
ASDCP::JP2K::MXFSReader reader;
- Kumu::Result_t r = reader.OpenRead (mxf_path.string().c_str());
+ 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", mxf_path, 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::SFrameBuffer (4 * Kumu::Megabyte);
if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer))) {
- boost::throw_exception (DCPReadError ("could not read video frame"));
+ boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1 of %2", n, path.string())));
}
}
+StereoPictureFrame::StereoPictureFrame ()
+{
+ _buffer = new ASDCP::JP2K::SFrameBuffer (4 * Kumu::Megabyte);
+}
+
StereoPictureFrame::~StereoPictureFrame ()
{
delete _buffer;
* @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<ARGBFrame>
-StereoPictureFrame::argb_frame (Eye eye, int reduce, float srgb_gamma) const
+shared_ptr<OpenJPEGImage>
+StereoPictureFrame::xyz_image (Eye eye, int reduce) const
{
- shared_ptr<XYZFrame> xyz_frame;
switch (eye) {
case LEFT:
- xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size(), reduce);
- break;
+ return decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size(), reduce);
case RIGHT:
- xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size(), reduce);
- break;
+ return decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size(), reduce);
}
-
- return xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA), GammaLUT::cache.get (12, 1 / srgb_gamma));
+
+ return shared_ptr<OpenJPEGImage> ();
}
uint8_t const *
return _buffer->Left.RoData ();
}
+uint8_t*
+StereoPictureFrame::left_j2k_data ()
+{
+ return _buffer->Left.Data ();
+}
+
int
StereoPictureFrame::left_j2k_size () const
{
return _buffer->Right.RoData ();
}
+uint8_t*
+StereoPictureFrame::right_j2k_data ()
+{
+ return _buffer->Right.Data ();
+}
+
int
StereoPictureFrame::right_j2k_size () const
{