#include "mono_picture_frame.h"
#include "exceptions.h"
-#include "argb_frame.h"
-#include "gamma_lut.h"
#include "util.h"
#include "rgb_xyz.h"
+#include "colour_conversion.h"
#include "KM_fileio.h"
#include "AS_DCP.h"
#include <openjpeg.h>
using std::string;
using boost::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");
+ if (!f) {
+ boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno));
+ }
+
+ fread (j2k_data(), 1, size, f);
+ 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 n Frame within the asset, not taking EntryPoint into account.
}
}
+MonoPictureFrame::MonoPictureFrame ()
+{
+ _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
+}
+
/** MonoPictureFrame destructor */
MonoPictureFrame::~MonoPictureFrame ()
{
return _buffer->RoData ();
}
+/** @return Pointer to JPEG2000 data */
+uint8_t *
+MonoPictureFrame::j2k_data ()
+{
+ return _buffer->Data ();
+}
+
/** @return Size of JPEG2000 data in bytes */
int
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<ARGBFrame>
-MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const
+shared_ptr<XYZImage>
+MonoPictureFrame::xyz_image (int reduce) const
{
- return xyz_to_rgb (
- decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce),
- GammaLUT::cache.get (12, DCI_GAMMA, false), GammaLUT::cache.get (12, 1 / srgb_gamma, false)
- );
+ return decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce);
}