X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=128b546b5cc7ac2a511e592fe98ae388d36556dd;hb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;hp=a5823656c85b1d676ed636ee9abbbaca0ff7b224;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index a5823656c..128b546b5 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -40,10 +40,15 @@ class Socket;
 class Image : public std::enable_shared_from_this<Image>
 {
 public:
-	Image (AVPixelFormat p, dcp::Size s, bool aligned);
-	explicit Image (AVFrame *);
+	enum class Alignment {
+		COMPACT,
+		PADDED
+	};
+
+	Image (AVPixelFormat p, dcp::Size s, Alignment alignment);
+	explicit Image (AVFrame const *, Alignment alignment);
 	explicit Image (Image const &);
-	Image (std::shared_ptr<const Image>, bool);
+	Image (std::shared_ptr<const Image>, Alignment alignment);
 	Image& operator= (Image const &);
 	~Image ();
 
@@ -53,7 +58,7 @@ public:
 	/** @return array of sizes of the data in each line, in bytes (including any alignment padding) */
 	int const * stride () const;
 	dcp::Size size () const;
-	bool aligned () const;
+	Alignment alignment () const;
 
 	int planes () const;
 	int vertical_factor (int) const;
@@ -61,8 +66,8 @@ public:
 	dcp::Size sample_size (int) const;
 	float bytes_per_pixel (int) const;
 
-	std::shared_ptr<Image> convert_pixel_format (dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const;
-	std::shared_ptr<Image> scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const;
+	std::shared_ptr<Image> convert_pixel_format (dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, Alignment alignment, bool fast) const;
+	std::shared_ptr<Image> scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, Alignment alignment, bool fast) const;
 	std::shared_ptr<Image> crop_scale_window (
 		Crop crop,
 		dcp::Size inter_size,
@@ -71,7 +76,7 @@ public:
 		VideoRange video_range,
 		AVPixelFormat out_format,
 		VideoRange out_video_range,
-		bool aligned,
+		Alignment alignment,
 		bool fast
 		) const;
 
@@ -80,7 +85,6 @@ public:
 	void alpha_blend (std::shared_ptr<const Image> image, Position<int> pos);
 	void copy (std::shared_ptr<const Image> image, Position<int> pos);
 	void fade (float);
-	void video_range_to_full_range ();
 
 	void read_from_socket (std::shared_ptr<Socket>);
 	void write_to_socket (std::shared_ptr<Socket>) const;
@@ -95,26 +99,28 @@ public:
 
 	void png_error (char const * message);
 
-	static std::shared_ptr<const Image> ensure_aligned (std::shared_ptr<const Image> image);
+	static std::shared_ptr<const Image> ensure_alignment (std::shared_ptr<const Image> image, Alignment alignment);
 
 private:
 	friend struct pixel_formats_test;
+	friend struct make_part_black_test;
 
 	void allocate ();
 	void swap (Image &);
 	void make_part_black (int x, int w);
 	void yuv_16_black (uint16_t, bool);
 	static uint16_t swap_16 (uint16_t);
+	void video_range_to_full_range ();
 
 	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 bytes (without any alignment padding bytes)
 	int* _stride; ///< array of strides for each line, in bytes (including any alignment padding bytes)
-	bool _aligned;
+	Alignment _alignment;
 };
 
-extern PositionImage merge (std::list<PositionImage> images);
+extern PositionImage merge (std::list<PositionImage> images, Image::Alignment alignment);
 extern bool operator== (Image const & a, Image const & b);
 
 #endif