X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=4b059ff36fb8c7534d4559015409d282b5a50056;hb=1bfc60e40f533c6d931a915deabd97899719eb4b;hp=c5fc3dd2db47d11af362cd757c6b38a12d33efe6;hpb=09a0d2f170b17c1eef75d334f20e5f5c6d19b1c9;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index c5fc3dd2d..4b059ff36 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -33,16 +33,17 @@ extern "C" {
 }
 #include <dcp/colour_conversion.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
 
 struct AVFrame;
 class Socket;
 
-class Image
+class Image : public boost::enable_shared_from_this<Image>
 {
 public:
-	Image (AVPixelFormat, dcp::Size, bool, int extra_pixels = 0);
-	Image (AVFrame *);
-	Image (Image const &);
+	Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
+	explicit Image (AVFrame *);
+	explicit Image (Image const &);
 	Image (boost::shared_ptr<const Image>, bool);
 	Image& operator= (Image const &);
 	~Image ();
@@ -54,13 +55,16 @@ public:
 	bool aligned () const;
 
 	int planes () const;
-	int line_factor (int) const;
+	int vertical_factor (int) const;
+	int horizontal_factor (int) const;
 	dcp::Size sample_size (int) const;
+	float bytes_per_pixel (int) const;
 
-	boost::shared_ptr<Image> scale (dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned, bool fast) const;
+	boost::shared_ptr<Image> convert_pixel_format (dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const;
+	boost::shared_ptr<Image> scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const;
 	boost::shared_ptr<Image> crop_scale_window (
-		Crop c, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned, bool fast)
-		const;
+		Crop crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, VideoRange video_range, AVPixelFormat out_format, bool aligned, bool fast
+		) const;
 
 	void make_black ();
 	void make_transparent ();
@@ -75,20 +79,27 @@ public:
 		return _pixel_format;
 	}
 
+	size_t memory_used () const;
+
+	dcp::Data as_png () const;
+
+	void png_error (char const * message);
+
+	static boost::shared_ptr<const Image> ensure_aligned (boost::shared_ptr<const Image> image);
+
 private:
 	friend struct pixel_formats_test;
 
 	void allocate ();
 	void swap (Image &);
-	float bytes_per_pixel (int) const;
 	void yuv_16_black (uint16_t, bool);
 	static uint16_t swap_16 (uint16_t);
 
 	dcp::Size _size;
 	AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
 	uint8_t** _data; ///< array of pointers to components
-	int* _line_size; ///< array of sizes of the data in each line, in pixels (without any alignment padding bytes)
-	int* _stride; ///< array of strides for each line (including any alignment padding bytes)
+	int* _line_size; ///< array of sizes of the data in each line, in bytes (without any alignment padding bytes)
+	int* _stride; ///< array of strides for each line, in bytes (including any alignment padding bytes)
 	bool _aligned;
 	int _extra_pixels;
 };