X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=eab71c2b1db7aace54c4568ed02f3ab012e18dac;hb=22d8401d9eadb022e40380a324b5871f77a18158;hp=dbcb38cc7a5c41123e7ff3aec60fcb04b0bea8bf;hpb=45d19dde4861fe9a729ba90ab1d8c486ab956529;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index dbcb38cc7..eab71c2b1 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -41,7 +41,7 @@ class Socket;
 class Image : public boost::enable_shared_from_this<Image>
 {
 public:
-	Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
+	Image (AVPixelFormat p, dcp::Size s, bool aligned);
 	explicit Image (AVFrame *);
 	explicit Image (Image const &);
 	Image (boost::shared_ptr<const Image>, bool);
@@ -49,7 +49,9 @@ public:
 	~Image ();
 
 	uint8_t * const * data () const;
+	/** @return array of sizes of the data in each line, in bytes (not including any alignment padding) */
 	int const * line_size () const;
+	/** @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;
@@ -63,7 +65,7 @@ public:
 	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 crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast
+		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 ();
@@ -92,6 +94,7 @@ private:
 
 	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);
 
@@ -101,7 +104,6 @@ private:
 	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;
 };
 
 extern PositionImage merge (std::list<PositionImage> images);