Get Signer to take a PEM string rather than a filename.

[libdcp.git] / src / mono_picture_frame.cc

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index c2f8abb712f6950703c8c417f40397cc20d68ff1..a06634a54f706cb640d876772a7b051cf68c6201 100644 (file)
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -58,6 +58,11 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path mxf_path, int n, ASD
        }
 }
 
+MonoPictureFrame::MonoPictureFrame ()
+{
+       _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
+}
+
 /** MonoPictureFrame destructor */
 MonoPictureFrame::~MonoPictureFrame ()
 {
@@ -71,6 +76,13 @@ MonoPictureFrame::j2k_data () const
        return _buffer->RoData ();
 }
 
+/** @return Pointer to JPEG2000 data */
+uint8_t *
+MonoPictureFrame::j2k_data ()
+{
+       return _buffer->Data ();
+}
+
 /** @return Size of JPEG2000 data in bytes */
 int
 MonoPictureFrame::j2k_size () const
@@ -91,8 +103,18 @@ MonoPictureFrame::j2k_size () const
 shared_ptr<ARGBFrame>
 MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const
 {
-       return xyz_to_rgb (
+       return xyz_to_rgba (
                decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce),
                GammaLUT::cache.get (12, DCI_GAMMA, false), GammaLUT::cache.get (12, 1 / srgb_gamma, false)
                );
 }
+
+void
+MonoPictureFrame::rgb_frame (uint8_t* buffer) const
+{
+       xyz_to_rgb (
+               decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), 0),
+               GammaLUT::cache.get (12, DCI_GAMMA, false), GammaLUT::cache.get (12, 1 / 2.4, false),
+               buffer
+               );
+}