Merge branch 'master' of /home/carl/git/libdcp

[libdcp.git] / src / picture_frame.h

diff --git a/src/picture_frame.h b/src/picture_frame.h
index 07519455f608419efd5abf7a63e53c52d5c013a8..42c5d629c688820896ff695579307d86b0896f38 100644 (file)
--- a/src/picture_frame.h
+++ b/src/picture_frame.h
@@ -40,7 +40,9 @@ public:
        MonoPictureFrame (std::string mxf_path, int n);
        ~MonoPictureFrame ();
 
-       boost::shared_ptr<ARGBFrame> argb_frame (int reduce = 0) const;
+       boost::shared_ptr<ARGBFrame> argb_frame (int reduce = 0, float srgb_gamma = 2.4) const;
+       uint8_t const * j2k_data () const;
+       int j2k_size () const;
 
 private:
        ASDCP::JP2K::FrameBuffer* _buffer;
@@ -53,7 +55,11 @@ public:
        StereoPictureFrame (std::string mxf_path, int n);
        ~StereoPictureFrame ();
 
-       boost::shared_ptr<ARGBFrame> argb_frame (Eye eye, int reduce = 0) const;
+       boost::shared_ptr<ARGBFrame> argb_frame (Eye eye, int reduce = 0, float srgb_gamma = 2.4) const;
+       uint8_t const * left_j2k_data () const;
+       int left_j2k_size () const;
+       uint8_t const * right_j2k_data () const;
+       int right_j2k_size () const;
 
 private:
        ASDCP::JP2K::SFrameBuffer* _buffer;