X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fstereo_picture_frame.h;h=b0c0f0c8ef830883c0a077f528beca1a121460ce;hb=0d31c86d6dfad9f437f5613d41cace9cc5928474;hp=fe363da5b64131940fd50618d3d9554375d6d142;hpb=bfb33feb40c5b014e9eae3958b1ecb8161f1d090;p=libdcp.git

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index fe363da5..b0c0f0c8 100644
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -1,55 +1,116 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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.
 */
 
-#include "types.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/noncopyable.hpp>
+
+/** @file  src/stereo_picture_frame.h
+ *  @brief StereoPictureFrame class
+ */
+
+
+#ifndef LIBDCP_STEREO_PICTURE_FRAME_H
+#define LIBDCP_STEREO_PICTURE_FRAME_H
+
+
+#include "asset_reader.h"
+#include <memory>
 #include <boost/filesystem.hpp>
 #include <stdint.h>
 #include <string>
 
+
 namespace ASDCP {
 	namespace JP2K {
 		struct SFrameBuffer;
+		class MXFSReader;
 	}
 	class AESDecContext;
 }
 
+
 namespace dcp {
 
-class ARGBFrame;
 
-/** A single frame of a 3D (stereoscopic) picture asset */	
-class StereoPictureFrame : public boost::noncopyable
+class OpenJPEGImage;
+class StereoPictureFrame;
+
+
+/** @class StereoPictureFrame
+ *  @brief A single frame of a 3D (stereoscopic) picture asset
+ */
+class StereoPictureFrame
 {
 public:
-	StereoPictureFrame (boost::filesystem::path mxf_path, int n);
-	~StereoPictureFrame ();
+	StereoPictureFrame ();
+
+	StereoPictureFrame (StereoPictureFrame const &) = delete;
+	StereoPictureFrame& operator= (StereoPictureFrame const &) = delete;
 
-	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;
+	std::shared_ptr<OpenJPEGImage> xyz_image (Eye eye, int reduce = 0) const;
+
+	class Part : public Data
+	{
+	public:
+		Part (std::shared_ptr<ASDCP::JP2K::SFrameBuffer> buffer, Eye eye);
+
+		uint8_t const * data () const override;
+		uint8_t * data () override;
+		int size () const override;
+
+	private:
+		friend class StereoPictureFrame;
+
+		ASDCP::JP2K::FrameBuffer& mono () const;
+
+		std::shared_ptr<ASDCP::JP2K::SFrameBuffer> _buffer;
+		Eye _eye;
+	};
+
+	std::shared_ptr<Part> left () const;
+	std::shared_ptr<Part> right () const;
 
 private:
-	ASDCP::JP2K::SFrameBuffer* _buffer;
+	/* XXX: this is a bit of a shame, but I tried friend StereoPictureAssetReader and it's
+	   rejected by some (seemingly older) GCCs.
+	*/
+	friend class AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame>;
+
+	StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, std::shared_ptr<DecryptionContext>, bool check_hmac);
+
+	std::shared_ptr<ASDCP::JP2K::SFrameBuffer> _buffer;
 };
 
+
 }
+
+
+#endif