Fix incorrect free and leak.

[libdcp.git] / src / picture_frame.cc

diff --git a/src/picture_frame.cc b/src/picture_frame.cc
index 5898d0ea0eb24acbc2b54235270f6046fb641f1a..b4d72f6f45713bd07d4878da5227989a45cac9e5 100644 (file)
--- a/src/picture_frame.cc
+++ b/src/picture_frame.cc
@@ -25,6 +25,9 @@
 #include "argb_frame.h"
 #include "lut.h"
 #include "util.h"
+#include "gamma_lut.h"
+
+#define DCI_GAMMA 2.6
 
 using std::string;
 using boost::shared_ptr;
@@ -34,7 +37,7 @@ using namespace libdcp;
  *  @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)
+MonoPictureFrame::MonoPictureFrame (string mxf_path, int n, ASDCP::AESDecContext* c)
 {
        ASDCP::JP2K::MXFReader reader;
        if (ASDCP_FAILURE (reader.OpenRead (mxf_path.c_str()))) {
@@ -44,7 +47,7 @@ MonoPictureFrame::MonoPictureFrame (string mxf_path, int n)
        /* XXX: unfortunate guesswork on this buffer size */
        _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
 
-       if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer))) {
+       if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer, c))) {
                boost::throw_exception (DCPReadError ("could not read video frame"));
        }
 }
@@ -76,11 +79,11 @@ MonoPictureFrame::j2k_size () const
  *
  */
 shared_ptr<ARGBFrame>
-MonoPictureFrame::argb_frame (int reduce) 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(), reduce);
        assert (xyz_frame->numcomps == 3);
-       shared_ptr<ARGBFrame> f = xyz_to_rgb (xyz_frame);
+       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;
 }
@@ -122,7 +125,7 @@ StereoPictureFrame::~StereoPictureFrame ()
  *
  */
 shared_ptr<ARGBFrame>
-StereoPictureFrame::argb_frame (Eye eye, int reduce) const
+StereoPictureFrame::argb_frame (Eye eye, int reduce, float srgb_gamma) const
 {
        opj_image_t* xyz_frame = 0;
        switch (eye) {
@@ -135,7 +138,7 @@ StereoPictureFrame::argb_frame (Eye eye, int reduce) const
        }
        
        assert (xyz_frame->numcomps == 3);
-       shared_ptr<ARGBFrame> f = xyz_to_rgb (xyz_frame);
+       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;
 }