X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.h;h=08516e718bb4dbfe34ae5f07a81ef16abfe3265b;hp=f9a06d1b701c7c84b1979f52375cbb6c74769f4e;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=3e230d3785f19bc707fd7ea2b1f55321b93f536f

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index f9a06d1b7..08516e718 100644
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -60,25 +60,48 @@ class ImageProxy : public boost::noncopyable
 public:
 	virtual ~ImageProxy () {}
 
-	/** @param note Handler for any notes that occur.
+	struct Result {
+		Result (boost::shared_ptr<Image> image_, int log2_scaling_)
+			: image (image_)
+			, log2_scaling (log2_scaling_)
+			, error (false)
+		{}
+
+		Result (boost::shared_ptr<Image> image_, int log2_scaling_, bool error_)
+			: image (image_)
+			, log2_scaling (log2_scaling_)
+			, error (error_)
+		{}
+
+		/** Image (which will be aligned) */
+		boost::shared_ptr<Image> image;
+		/** log2 of any scaling down that has already been applied to the image;
+		 *  e.g. if the image is already half the size of the original, this value
+		 *  will be 1.
+		 */
+		int log2_scaling;
+		/** true if there was an error during image decoding, otherwise false */
+		bool error;
+	};
+
+	/** @param log Log to write to, or 0.
 	 *  @param size Size that the returned image will be scaled to, in case this
 	 *  can be used as an optimisation.
-	 *  @return Image (which must be aligned)
 	 */
-	virtual boost::shared_ptr<Image> image (
-		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+	virtual Result image (
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
 		) const = 0;
 
 	virtual void add_metadata (xmlpp::Node *) const = 0;
-	virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
+	virtual void write_to_socket (boost::shared_ptr<Socket>) const = 0;
 	/** @return true if our image is definitely the same as another, false if it is probably not */
 	virtual bool same (boost::shared_ptr<const ImageProxy>) const = 0;
 	/** Do any useful work that would speed up a subsequent call to ::image().
 	 *  This method may be called in a different thread to image().
+	 *  @return log2 of any scaling down that will be applied to the image.
 	 */
-	virtual void prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const {}
-	virtual AVPixelFormat pixel_format () const = 0;
+	virtual int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const { return 0; }
+	virtual size_t memory_used () const = 0;
 };
 
 boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);