#include "argb_frame.h"
#include "lut.h"
#include "util.h"
+#include "gamma_lut.h"
+#include "rgb_xyz.h"
-using namespace std;
-using namespace boost;
+#define DCI_GAMMA 2.6
+
+using std::string;
+using boost::shared_ptr;
using namespace libdcp;
-MonoPictureFrame::MonoPictureFrame (string mxf_path, int n)
+/** 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 (string mxf_path, int n, ASDCP::AESDecContext* c)
{
ASDCP::JP2K::MXFReader reader;
if (ASDCP_FAILURE (reader.OpenRead (mxf_path.c_str()))) {
- throw FileError ("could not open MXF file for reading", mxf_path);
+ boost::throw_exception (FileError ("could not open MXF file for reading", mxf_path));
}
/* XXX: unfortunate guesswork on this buffer size */
_buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
- if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer))) {
- throw DCPReadError ("could not read video frame");
+ if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer, c))) {
+ boost::throw_exception (DCPReadError ("could not read video frame"));
}
}
delete _buffer;
}
-#if 0
uint8_t const *
-MonoPictureFrame::data () const
+MonoPictureFrame::j2k_data () const
{
- return _buffer->RoData();
+ return _buffer->RoData ();
}
int
-MonoPictureFrame::size () const
+MonoPictureFrame::j2k_size () const
{
return _buffer->Size ();
}
-#endif
-/** @return An ARGB representation of this frame. This is ARGB in the
+/** @param reduce a factor by which to reduce the resolution
+ * of the image, expressed as a power of two (pass 0 for no
+ * reduction).
+ *
+ * @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 () const
+MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const
{
- opj_image_t* xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size());
- assert (xyz_frame->numcomps == 3);
- shared_ptr<ARGBFrame> f = xyz_to_rgb (xyz_frame);
- opj_image_destroy (xyz_frame);
- return f;
+ return xyz_to_rgb (
+ decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce),
+ GammaLUT::cache.get (12, DCI_GAMMA), GammaLUT::cache.get (12, 1 / srgb_gamma)
+ );
}
-
+/** Make a picture frame from a 3D (stereoscopic) asset.
+ * @param mxf_path Path to the asset's MXF file.
+ * @param n Frame within the asset, not taking EntryPoint into account.
+ */
StereoPictureFrame::StereoPictureFrame (string mxf_path, int n)
{
ASDCP::JP2K::MXFSReader reader;
if (ASDCP_FAILURE (reader.OpenRead (mxf_path.c_str()))) {
- throw FileError ("could not open MXF file for reading", mxf_path);
+ boost::throw_exception (FileError ("could not open MXF file for reading", mxf_path));
}
/* XXX: unfortunate guesswork on this buffer size */
_buffer = new ASDCP::JP2K::SFrameBuffer (4 * Kumu::Megabyte);
if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer))) {
- throw DCPReadError ("could not read video frame");
+ boost::throw_exception (DCPReadError ("could not read video frame"));
}
}
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 eye Eye to return (EYE_LEFT or EYE_RIGHT).
+ *
+ * @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) const
+StereoPictureFrame::argb_frame (Eye eye, int reduce, float srgb_gamma) const
{
- opj_image_t* xyz_frame = 0;
+ shared_ptr<XYZFrame> xyz_frame;
switch (eye) {
case LEFT:
- xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size());
+ xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size(), reduce);
break;
case RIGHT:
- xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size());
+ xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size(), reduce);
break;
}
- assert (xyz_frame->numcomps == 3);
- shared_ptr<ARGBFrame> f = xyz_to_rgb (xyz_frame);
- opj_image_destroy (xyz_frame);
- return f;
+ return xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA), GammaLUT::cache.get (12, 1 / srgb_gamma));
+}
+
+uint8_t const *
+StereoPictureFrame::left_j2k_data () const
+{
+ return _buffer->Left.RoData ();
+}
+
+int
+StereoPictureFrame::left_j2k_size () const
+{
+ return _buffer->Left.Size ();
+}
+
+uint8_t const *
+StereoPictureFrame::right_j2k_data () const
+{
+ return _buffer->Right.RoData ();
+}
+
+int
+StereoPictureFrame::right_j2k_size () const
+{
+ return _buffer->Right.Size ();
}