X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=cb8f11ffc27d0eab3ab4ba86d4646b4498bc7b7a;hp=dde42f1bc2add86b228e7d0847a42d50830c0956;hb=4e2ff7851127cd85c3e7d78b42eb884d0cda0ac3;hpb=f1d209319f90adc50e0f3d2a853216052f290bd5

diff --git a/src/lib/image.h b/src/lib/image.h
index dde42f1bc..cb8f11ffc 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -31,24 +31,26 @@
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
+#include <dcp/array_data.h>
 #include <dcp/colour_conversion.h>
-#include <boost/shared_ptr.hpp>
 
 struct AVFrame;
 class Socket;
 
-class Image
+class Image : public std::enable_shared_from_this<Image>
 {
 public:
-	Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
-	Image (AVFrame *);
-	Image (Image const &);
-	Image (boost::shared_ptr<const Image>, bool);
+	Image (AVPixelFormat p, dcp::Size s, bool aligned);
+	explicit Image (AVFrame const *);
+	explicit Image (Image const &);
+	Image (std::shared_ptr<const Image>, bool);
 	Image& operator= (Image const &);
 	~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;
@@ -57,33 +59,53 @@ public:
 	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 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
+	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> crop_scale_window (
+		Crop crop,
+		dcp::Size inter_size,
+		dcp::Size out_size,
+		dcp::YUVToRGB yuv_to_rgb,
+		VideoRange video_range,
+		AVPixelFormat out_format,
+		VideoRange out_video_range,
+		bool aligned,
+		bool fast
 		) const;
 
 	void make_black ();
 	void make_transparent ();
-	void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
-	void copy (boost::shared_ptr<const Image> image, Position<int> pos);
+	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 read_from_socket (boost::shared_ptr<Socket>);
-	void write_to_socket (boost::shared_ptr<Socket>) const;
+	void read_from_socket (std::shared_ptr<Socket>);
+	void write_to_socket (std::shared_ptr<Socket>) const;
 
 	AVPixelFormat pixel_format () const {
 		return _pixel_format;
 	}
 
+	size_t memory_used () const;
+
+	dcp::ArrayData as_png () const;
+
+	void png_error (char const * message);
+
+	static std::shared_ptr<const Image> ensure_aligned (std::shared_ptr<const Image> image);
+
 private:
 	friend struct pixel_formats_test;
+	friend struct make_part_black_test;
 
 	void allocate ();
 	void swap (Image &);
-	float bytes_per_pixel (int) const;
+	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
@@ -91,7 +113,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);