X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=f71a47b0c7c9a1c3cf9f4e66105f817689a29fb9;hb=c6871fe8617b3de03662b7630355059393bf8043;hp=08fdceaa598ae546528ae7b00de2ddfed0bd834c;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index 08fdceaa5..f71a47b0c 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -40,9 +40,9 @@ class Socket;
 class 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,14 +54,16 @@ public:
 	bool aligned () const;
 
 	int planes () const;
-	int components () 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, AVPixelFormat out_format, bool aligned, bool fast
+		) const;
 
 	void make_black ();
 	void make_transparent ();
@@ -76,20 +78,23 @@ public:
 		return _pixel_format;
 	}
 
+	size_t memory_used () const;
+
+	static boost::shared_ptr<Image> ensure_aligned (boost::shared_ptr<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;
 };