X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.h;h=5235d8e42522d02c42dd7566ec18bc6c8301853c;hp=9fc96a54336beb6069a0137b9bef818ad3fa9021;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=6c19b21e12f73ce63edd406ea617ff25bcc9bfea

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 9fc96a543..5235d8e42 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -1,47 +1,72 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #include "image_proxy.h"
+#include <dcp/array_data.h>
 #include <dcp/util.h>
+#include <boost/thread/mutex.hpp>
+
 
 namespace dcp {
 	class MonoPictureFrame;
 	class StereoPictureFrame;
-	class Data;
 }
 
+
 class J2KImageProxy : public ImageProxy
 {
 public:
-	J2KImageProxy (boost::filesystem::path path, dcp::Size);
-	J2KImageProxy (boost::shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size);
-	J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye);
-	J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
+	J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
+
+	J2KImageProxy (
+		std::shared_ptr<const dcp::MonoPictureFrame> frame,
+		dcp::Size,
+		AVPixelFormat pixel_format,
+		boost::optional<int> forced_reduction
+		);
+
+	J2KImageProxy (
+		std::shared_ptr<const dcp::StereoPictureFrame> frame,
+		dcp::Size,
+		dcp::Eye,
+		AVPixelFormat pixel_format,
+		boost::optional<int> forced_reduction
+		);
+
+	J2KImageProxy (std::shared_ptr<cxml::Node> xml, std::shared_ptr<Socket> socket);
+
+	/* For tests */
+	J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format);
+
+	Result image (
+		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
+		) const;
 
-	boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const;
 	void add_metadata (xmlpp::Node *) const;
-	void send_binary (boost::shared_ptr<Socket>) const;
+	void write_to_socket (std::shared_ptr<Socket>) const;
 	/** @return true if our image is definitely the same as another, false if it is probably not */
-	bool same (boost::shared_ptr<const ImageProxy>) const;
-	AVPixelFormat pixel_format () const;
+	bool same (std::shared_ptr<const ImageProxy>) const;
+	int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
 
-	dcp::Data j2k () const {
+	std::shared_ptr<const dcp::Data> j2k () const {
 		return _data;
 	}
 
@@ -49,15 +74,22 @@ public:
 		return _size;
 	}
 
-private:
-	friend struct client_server_test_j2k;
+	boost::optional<dcp::Eye> eye () const {
+		return _eye;
+	}
 
-	/* For tests */
-	J2KImageProxy (dcp::Data data, dcp::Size size);
-	void ensure_j2k () const;
+	size_t memory_used () const;
 
-	dcp::Data _data;
+private:
+	std::shared_ptr<const dcp::Data> _data;
 	dcp::Size _size;
 	boost::optional<dcp::Eye> _eye;
-	mutable boost::shared_ptr<dcp::OpenJPEGImage> _j2k;
+	mutable std::shared_ptr<Image> _image;
+	mutable boost::optional<dcp::Size> _target_size;
+	mutable boost::optional<int> _reduce;
+	AVPixelFormat _pixel_format;
+	mutable boost::mutex _mutex;
+	boost::optional<int> _forced_reduction;
+	/** true if an error occurred while decoding the JPEG2000 data, false if not */
+	mutable bool _error;
 };