X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=46633df679d00b9f6eceee34be126711c0fd5d85;hb=4230f0381715f8f6f9e85374ea0e74fb3104a18d;hp=fd5adb0762ea9071ce1cd831f7aba49c3bef0aab;hpb=0f664dab81a835feebd5db92942413f91747481f;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index fd5adb076..46633df67 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 p, dcp::Size s, bool aligned, int extra_pixels = 0);
-	Image (AVFrame *);
-	Image (Image const &);
+	Image (AVPixelFormat p, dcp::Size s, bool aligned);
+	explicit Image (AVFrame *);
+	explicit Image (Image const &);
 	Image (boost::shared_ptr<const Image>, bool);
 	Image& operator= (Image const &);
 	~Image ();
@@ -59,9 +60,10 @@ public:
 	dcp::Size sample_size (int) const;
 	float bytes_per_pixel (int) 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 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 ();
@@ -77,11 +79,20 @@ 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 &);
+	void make_part_black (int x, int w);
 	void yuv_16_black (uint16_t, bool);
 	static uint16_t swap_16 (uint16_t);
 
@@ -91,7 +102,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);