X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmono_picture_frame.h;h=ea15f6a3268efae50ef18ab9bb71071c353bfef4;hb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;hp=57e890a8f39f81e7fe4db29b5bb0ec2f95b6e121;hpb=205fd96fc2592d5b50c91871fe0f2bd9d79783c5;p=libdcp.git

diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index 57e890a8..ea15f6a3 100644
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/mono_picture_frame.h
@@ -25,19 +39,21 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
 #include <string>
 #include <stdint.h>
 
 namespace ASDCP {
 	namespace JP2K {
 		class FrameBuffer;
+		class MXFReader;
 	}
 	class AESDecContext;
 }
 
 namespace dcp {
 
-class ARGBFrame;
+class OpenJPEGImage;
 
 /** @class MonoPictureFrame
  *  @brief A single frame of a 2D (monoscopic) picture asset.
@@ -45,15 +61,21 @@ class ARGBFrame;
 class MonoPictureFrame : public boost::noncopyable
 {
 public:
-	MonoPictureFrame (boost::filesystem::path mxf_path, int n, ASDCP::AESDecContext *);
+	explicit MonoPictureFrame (boost::filesystem::path path);
+	MonoPictureFrame (uint8_t const * data, int size);
 	~MonoPictureFrame ();
 
-	boost::shared_ptr<ARGBFrame> argb_frame (int reduce = 0, float srgb_gamma = 2.4) const;
-	void rgb_frame (uint8_t* buffer) const;
+	boost::shared_ptr<OpenJPEGImage> xyz_image (int reduce = 0) const;
+
 	uint8_t const * j2k_data () const;
+	uint8_t* j2k_data ();
 	int j2k_size () const;
 
 private:
+	friend class MonoPictureAssetReader;
+
+	MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, ASDCP::AESDecContext *);
+
 	ASDCP::JP2K::FrameBuffer* _buffer;
 };