X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.h;h=8fc9040d5a8eda0eccf621fbaeddcce1c1ded1f5;hb=d0a0a4839f0e1e8d37f9f9ad41784c4d18210a6b;hp=d7b5c83fc443d36e2c79b98b641067fea695c924;hpb=04eebe07e2f64bd15f6887a10ab51fb92c52901a;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index d7b5c83fc..8fc9040d5 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -1,46 +1,71 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015 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>
 
-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);
+	J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye, AVPixelFormat pixel_format);
+	J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
+
+	boost::shared_ptr<Image> image (
+		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+		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;
+	/** @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 {
+		return _pixel_format;
+	}
+
+	dcp::Data j2k () const {
+		return _data;
+	}
 
-	boost::shared_ptr<EncodedData> j2k () const;
 	dcp::Size size () const {
 		return _size;
 	}
-	
+
 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<dcp::OpenJPEGImage> _j2k;
+	mutable boost::optional<dcp::Size> _j2k_target_size;
+	AVPixelFormat _pixel_format;
 };