More licence fixups.

[libdcp.git] / src / stereo_picture_frame.h

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index 40c2a44140d2e2a1a1e2aa25ee7c63f46276df43..e31bc01bf257a5a29614aec3960d9d06bf02bb5d 100644 (file)
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -1,52 +1,63 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 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/>.
 */
 
-#include <string>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
 #include "types.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/filesystem.hpp>
+#include <stdint.h>
+#include <string>
 
 namespace ASDCP {
        namespace JP2K {
-               class SFrameBuffer;
+               struct SFrameBuffer;
+               class MXFSReader;
        }
        class AESDecContext;
 }
 
 namespace dcp {
 
-class ARGBFrame;
+class OpenJPEGImage;
 
-/** A single frame of a 3D (stereoscopic) picture asset */     
-class StereoPictureFrame
+/** A single frame of a 3D (stereoscopic) picture asset */
+class StereoPictureFrame : public boost::noncopyable
 {
 public:
-       StereoPictureFrame (boost::filesystem::path mxf_path, int n);
+       StereoPictureFrame ();
        ~StereoPictureFrame ();
 
-       boost::shared_ptr<ARGBFrame> argb_frame (Eye eye, int reduce = 0, float srgb_gamma = 2.4) const;
+       boost::shared_ptr<OpenJPEGImage> xyz_image (Eye eye, int reduce = 0) const;
+
        uint8_t const * left_j2k_data () const;
+       uint8_t* left_j2k_data ();
        int left_j2k_size () const;
+
        uint8_t const * right_j2k_data () const;
+       uint8_t* right_j2k_data ();
        int right_j2k_size () const;
 
 private:
+       friend class StereoPictureAssetReader;
+
+       StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, ASDCP::AESDecContext *);
+
        ASDCP::JP2K::SFrameBuffer* _buffer;
 };