Tweak interop / SMPTE to pass dcp_inspect.

[libdcp.git] / src / picture_frame.cc

diff --git a/src/picture_frame.cc b/src/picture_frame.cc
index 7e6bc1f8f30dfaff8818dfe397b62035243a1f2b..07a2b074758d05880dbd59733b8f7e260b2dc147 100644 (file)
--- a/src/picture_frame.cc
+++ b/src/picture_frame.cc
@@ -26,6 +26,7 @@
 #include "lut.h"
 #include "util.h"
 #include "gamma_lut.h"
+#include "rgb_xyz.h"
 
 #define DCI_GAMMA 2.6
 
@@ -37,7 +38,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()))) {
@@ -47,7 +48,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"));
        }
 }
@@ -81,11 +82,10 @@ MonoPictureFrame::j2k_size () const
 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;
+       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.
@@ -127,7 +127,7 @@ StereoPictureFrame::~StereoPictureFrame ()
 shared_ptr<ARGBFrame>
 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(), reduce);
@@ -137,10 +137,7 @@ StereoPictureFrame::argb_frame (Eye eye, int reduce, float srgb_gamma) const
                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;
+       return xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA), GammaLUT::cache.get (12, 1 / srgb_gamma));
 }
 
 uint8_t const *