Make a parent for SMPTELoadFont and InteropLoadFont.

[libdcp.git] / src / stereo_picture_frame.cc

diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index 9d9bef7d65460b96368d97fc4404a84a20461841..3e872e2bf45812039027c209c3ce445554e80b68 100644 (file)
--- a/src/stereo_picture_frame.cc
+++ b/src/stereo_picture_frame.cc
@@ -21,8 +21,8 @@
 #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 <openjpeg.h>
@@ -53,6 +53,11 @@ StereoPictureFrame::StereoPictureFrame (boost::filesystem::path mxf_path, int n)
        }
 }
 
+StereoPictureFrame::StereoPictureFrame ()
+{
+       _buffer = new ASDCP::JP2K::SFrameBuffer (4 * Kumu::Megabyte);
+}
+
 StereoPictureFrame::~StereoPictureFrame ()
 {
        delete _buffer;
@@ -84,11 +89,11 @@ StereoPictureFrame::argb_frame (Eye eye, int reduce, float srgb_gamma) const
                break;
        }
        
-       return xyz_to_rgba (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA, false), GammaLUT::cache.get (12, 1 / srgb_gamma, false));
+       return xyz_to_rgba (xyz_frame, ColourConversion::xyz_to_srgb);
 }
 
 void
-StereoPictureFrame::rgb_frame (Eye eye, uint8_t* buffer) const
+StereoPictureFrame::rgb_frame (Eye eye, uint16_t* buffer) const
 {
        shared_ptr<XYZFrame> xyz_frame;
        switch (eye) {
@@ -100,7 +105,7 @@ StereoPictureFrame::rgb_frame (Eye eye, uint8_t* buffer) const
                break;
        }
        
-       return xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA, false), GammaLUT::cache.get (12, 1 / 2.4, false), buffer);
+       return xyz_to_rgb (xyz_frame, ColourConversion::xyz_to_srgb, buffer);
 }
 
 uint8_t const *
@@ -109,6 +114,12 @@ StereoPictureFrame::left_j2k_data () const
        return _buffer->Left.RoData ();
 }
 
+uint8_t*
+StereoPictureFrame::left_j2k_data ()
+{
+       return _buffer->Left.Data ();
+}
+
 int
 StereoPictureFrame::left_j2k_size () const
 {
@@ -121,6 +132,12 @@ StereoPictureFrame::right_j2k_data () const
        return _buffer->Right.RoData ();
 }
 
+uint8_t*
+StereoPictureFrame::right_j2k_data ()
+{
+       return _buffer->Right.Data ();
+}
+
 int
 StereoPictureFrame::right_j2k_size () const
 {