X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_frame.cc;h=b4d72f6f45713bd07d4878da5227989a45cac9e5;hb=8a95b38aeadeddd52badd6aa6b0466da2f4ca25e;hp=d2ef698fcf04d373387840c5919fe39cbb5c863e;hpb=f6ee90107839e0d750d8678b67c9d6d1d596d739;p=libdcp.git

diff --git a/src/picture_frame.cc b/src/picture_frame.cc
index d2ef698f..b4d72f6f 100644
--- a/src/picture_frame.cc
+++ b/src/picture_frame.cc
@@ -17,42 +17,152 @@
 
 */
 
+#include <openjpeg.h>
 #include "AS_DCP.h"
 #include "KM_fileio.h"
 #include "picture_frame.h"
 #include "exceptions.h"
+#include "argb_frame.h"
+#include "lut.h"
+#include "util.h"
+#include "gamma_lut.h"
 
-using namespace std;
+#define DCI_GAMMA 2.6
+
+using std::string;
+using boost::shared_ptr;
 using namespace libdcp;
 
-PictureFrame::PictureFrame (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"));
 	}
 }
 
-PictureFrame::~PictureFrame ()
+MonoPictureFrame::~MonoPictureFrame ()
 {
 	delete _buffer;
 }
 
 uint8_t const *
-PictureFrame::data () const
+MonoPictureFrame::j2k_data () const
 {
-	return _buffer->RoData();
+	return _buffer->RoData ();
 }
 
 int
-PictureFrame::size () const
+MonoPictureFrame::j2k_size () const
 {
 	return _buffer->Size ();
 }
+
+/** @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 (int reduce, float srgb_gamma) const
+{
+	opj_image_t* xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce);
+	assert (xyz_frame->numcomps == 3);
+	shared_ptr<ARGBFrame> f = xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA), GammaLUT::cache.get (12, 1 / srgb_gamma));
+	opj_image_destroy (xyz_frame);
+	return f;
+}
+
+/** 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()))) {
+		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))) {
+		boost::throw_exception (DCPReadError ("could not read video frame"));
+	}
+}
+
+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 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, int reduce, float srgb_gamma) const
+{
+	opj_image_t* xyz_frame = 0;
+	switch (eye) {
+	case LEFT:
+		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(), reduce);
+		break;
+	}
+	
+	assert (xyz_frame->numcomps == 3);
+	shared_ptr<ARGBFrame> f = xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA), GammaLUT::cache.get (12, 1 / srgb_gamma));
+	opj_image_destroy (xyz_frame);
+	return f;
+}
+
+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 ();
+}