X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.h;h=71bcffb2c50754460736700310ad0af8f002cb3b;hp=d7b5c83fc443d36e2c79b98b641067fea695c924;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=6de35d058821acc092d2aae75543024a97026b8a

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index d7b5c83fc..71bcffb2c 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -1,46 +1,90 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2017 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 <dcp/util.h>
 #include "image_proxy.h"
+#include <dcp/util.h>
+#include <dcp/data.h>
+#include <boost/thread/mutex.hpp>
 
-class EncodedData;
+namespace dcp {
+	class MonoPictureFrame;
+	class StereoPictureFrame;
+}
 
 class J2KImageProxy : public ImageProxy
 {
 public:
-	J2KImageProxy (boost::shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size, boost::shared_ptr<Log> log);
-	J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye, boost::shared_ptr<Log> log);
-	J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+	J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
+
+	J2KImageProxy (
+		boost::shared_ptr<const dcp::MonoPictureFrame> frame,
+		dcp::Size,
+		AVPixelFormat pixel_format,
+		boost::optional<int> forced_reduction
+		);
+
+	J2KImageProxy (
+		boost::shared_ptr<const dcp::StereoPictureFrame> frame,
+		dcp::Size,
+		dcp::Eye,
+		AVPixelFormat pixel_format,
+		boost::optional<int> forced_reduction
+		);
+
+	J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
+
+	Result image (
+		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
+		) const;
 
-	boost::shared_ptr<Image> image () const;
 	void add_metadata (xmlpp::Node *) const;
-	void send_binary (boost::shared_ptr<Socket>) const;
+	void write_to_socket (boost::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;
+	int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
+
+	dcp::Data j2k () const {
+		return _data;
+	}
 
-	boost::shared_ptr<EncodedData> j2k () const;
 	dcp::Size size () const {
 		return _size;
 	}
-	
+
+	size_t memory_used () const;
+
 private:
-	boost::shared_ptr<const dcp::MonoPictureFrame> _mono;
-	boost::shared_ptr<const dcp::StereoPictureFrame> _stereo;
+	friend struct client_server_test_j2k;
+
+	/* For tests */
+	J2KImageProxy (dcp::Data data, dcp::Size size, AVPixelFormat pixel_format);
+
+	dcp::Data _data;
 	dcp::Size _size;
-	dcp::Eye _eye;
+	boost::optional<dcp::Eye> _eye;
+	mutable boost::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;
 };