Add support for obtaining a frame as RGBA.

4 files changed, 114 insertions, 19 deletions

diff --git a/src/picture_frame.cc b/src/picture_frame.cc
index d2ef698f..844f0183 100644
--- a/src/picture_frame.cc
+++ b/src/picture_frame.cc
@@ -17,12 +17,16 @@
 
 */
 
+#include <openjpeg.h>
 #include "AS_DCP.h"
 #include "KM_fileio.h"
 #include "picture_frame.h"
 #include "exceptions.h"
+#include "rgba_frame.h"
+#include "lut.h"
 
 using namespace std;
+using namespace boost;
 using namespace libdcp;
 
 PictureFrame::PictureFrame (string mxf_path, int n)
@@ -56,3 +60,86 @@ PictureFrame::size () const
 {
 	return _buffer->Size ();
 }
+
+shared_ptr<RGBAFrame>
+PictureFrame::rgba_frame () const
+{
+	/* JPEG2000 -> decompressed XYZ */
+	
+	opj_dinfo_t* decoder = opj_create_decompress (CODEC_J2K);
+	opj_dparameters_t parameters;
+	opj_set_default_decoder_parameters (&parameters);
+	opj_setup_decoder (decoder, &parameters);
+	opj_cio_t* cio = opj_cio_open ((opj_common_ptr) decoder, const_cast<unsigned char *> (data()), size());
+	opj_image_t* xyz_frame = opj_decode (decoder, cio);
+	if (!xyz_frame) {
+		opj_destroy_decompress (decoder);
+		opj_cio_close (cio);
+		throw DCPReadError ("could not decode JPEG2000 codestream");
+	}
+	
+	assert (xyz_frame->numcomps == 3);
+	
+	/* XYZ -> RGB */
+	
+	struct {
+		double x, y, z;
+	} s;
+	
+	struct {
+		double r, g, b;
+	} d;
+	
+	int* xyz_x = xyz_frame->comps[0].data;
+	int* xyz_y = xyz_frame->comps[1].data;
+	int* xyz_z = xyz_frame->comps[2].data;
+
+	shared_ptr<RGBAFrame> rgba_frame (new RGBAFrame (xyz_frame->x1, xyz_frame->y1));
+	
+	uint8_t* rgba = rgba_frame->data ();
+	
+	for (int y = 0; y < xyz_frame->y1; ++y) {
+		uint8_t* rgba_line = rgba;
+		for (int x = 0; x < xyz_frame->x1; ++x) {
+			
+			assert (*xyz_x >= 0 && *xyz_y >= 0 && *xyz_z >= 0 && *xyz_x < 4096 && *xyz_x < 4096 && *xyz_z < 4096);
+			
+			/* In gamma LUT */
+			s.x = lut_in[*xyz_x++];
+			s.y = lut_in[*xyz_y++];
+			s.z = lut_in[*xyz_z++];
+			
+			/* DCI companding */
+			s.x /= DCI_COEFFICIENT;
+			s.y /= DCI_COEFFICIENT;
+			s.z /= DCI_COEFFICIENT;
+			
+			/* XYZ to RGB */
+			d.r = ((s.x * color_matrix[0][0]) + (s.y * color_matrix[0][1]) + (s.z * color_matrix[0][2]));
+			d.g = ((s.x * color_matrix[1][0]) + (s.y * color_matrix[1][1]) + (s.z * color_matrix[1][2]));
+			d.b = ((s.x * color_matrix[2][0]) + (s.y * color_matrix[2][1]) + (s.z * color_matrix[2][2]));
+			
+			d.r = min (d.r, 1.0);
+			d.r = max (d.r, 0.0);
+			
+			d.g = min (d.g, 1.0);
+			d.g = max (d.g, 0.0);
+			
+			d.b = min (d.b, 1.0);
+			d.b = max (d.b, 0.0);
+			
+			/* Out gamma LUT */
+			*rgba_line++ = lut_out[(int) (d.r * COLOR_DEPTH)];
+			*rgba_line++ = lut_out[(int) (d.g * COLOR_DEPTH)];
+			*rgba_line++ = lut_out[(int) (d.b * COLOR_DEPTH)];
+			*rgba_line++ = 0xff;
+		}
+		
+		rgba += rgba_frame->stride ();
+	}
+	
+	opj_cio_close (cio);
+	opj_image_destroy (xyz_frame);
+
+	return rgba_frame;
+}
diff --git a/src/picture_frame.h b/src/picture_frame.h
index b7eb5ff1..bb347294 100644
--- a/src/picture_frame.h
+++ b/src/picture_frame.h
@@ -19,6 +19,7 @@
 
 #include <string>
 #include <stdint.h>
+#include <boost/shared_ptr.hpp>
 
 namespace ASDCP {
 	namespace JP2K {
@@ -28,6 +29,8 @@ namespace ASDCP {
 
 namespace libdcp {
 
+class RGBAFrame;	
+
 class PictureFrame
 {
 public:
@@ -37,6 +40,8 @@ public:
 	uint8_t const * data () const;
 	int size () const;
 
+	boost::shared_ptr<RGBAFrame> rgba_frame () const;
+
 private:
 	ASDCP::JP2K::FrameBuffer* _buffer;
 };
diff --git a/src/sound_asset.h b/src/sound_asset.h
index 06edfc33..84a941cd 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -21,7 +21,7 @@
 #define LIBDCP_SOUND_ASSET_H
 
 /** @file  src/sound_asset.h
- *  @brief An asset made up of WAV files
+ *  @brief An asset made up of PCM audio data files
  */
 
 #include "mxf_asset.h"
@@ -36,7 +36,7 @@ class SoundFrame;
 class SoundAsset : public MXFAsset
 {
 public:
-	/** Construct a SoundAsset, generating the MXF from the WAV files.
+	/** Construct a SoundAsset, generating the MXF from some WAV files.
 	 *  This may take some time; progress is indicated by emission of the Progress signal.
 	 *  @param files Pathnames of sound files, in the order Left, Right, Centre, Lfe (sub), Left surround, Right surround.
 	 *  @param directory Directory in which to create MXF file.
@@ -54,7 +54,7 @@ public:
 		int length
 		);
 
-	/** Construct a SoundAsset, generating the MXF from the WAV files.
+	/** Construct a SoundAsset, generating the MXF from some WAV files.
 	 *  This may take some time; progress is indicated by emission of the Progress signal.
 	 *  @param get_path Functor which returns a WAV file path for a given channel.
 	 *  @param directory Directory in which to create MXF file.
@@ -97,7 +97,7 @@ public:
 	int sampling_rate () const {
 		return _sampling_rate;
 	}
-	
+
 private:
 	void construct (sigc::slot<std::string, Channel> get_path);
 	std::string path_from_channel (Channel channel, std::vector<std::string> const & files);
diff --git a/src/wscript b/src/wscript
index 89823c57..fb62970a 100644
--- a/src/wscript
+++ b/src/wscript
@@ -11,37 +11,40 @@ def build(bld):
                  cpl.cc
                  dcp.cc        
                  dcp_time.cc
+                 lut.cc
+                 metadata.cc
                  mxf_asset.cc
-                 sound_asset.cc
-                 subtitle_asset.cc
                  picture_asset.cc
                  picture_frame.cc
                  pkl.cc
-                 util.cc
-                 metadata.cc
-                 version.cc
+                 rgba_frame.cc
+                 sound_asset.cc
+                 sound_frame.cc
+                 subtitle_asset.cc
                  test_mode.cc
                  types.cc
+                 util.cc
+                 version.cc
                  xml.cc
-                 sound_frame.cc
                  """
 
     headers = """
+              asset.h
               dcp.h
-              metadata.h
-              types.h
+              dcp_time.h
               exceptions.h
-              test_mode.h
-              version.h
+              metadata.h
+              mxf_asset.h
               picture_asset.h
+              picture_frame.h
+              rgba_frame.h
               sound_asset.h
+              sound_frame.h
               subtitle_asset.h
-              mxf_asset.h
+              test_mode.h
+              types.h
+              version.h
               xml.h
-              dcp_time.h
-              asset.h
-              picture_frame.h
-              sound_frame.h
               """
 
     bld.install_files('${PREFIX}/include/libdcp', headers)