X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=128b546b5cc7ac2a511e592fe98ae388d36556dd;hp=b8d48275a5fed39dc9a9515a4951b9ec85ff85b5;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=631f905234537d2b0a24e9b3ff40f08a17c0fd8b

diff --git a/src/lib/image.h b/src/lib/image.h
index b8d48275a..128b546b5 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -30,70 +31,96 @@
 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, dcp::Size, bool, int extra_pixels = 0);
-	Image (AVFrame *);
-	Image (Image const &);
-	Image (boost::shared_ptr<const Image>, bool);
+	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>, Alignment alignment);
 	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;
+	Alignment alignment () 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> crop_scale_window (
-		Crop c, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, 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,
+		dcp::Size out_size,
+		dcp::YUVToRGB yuv_to_rgb,
+		VideoRange video_range,
+		AVPixelFormat out_format,
+		VideoRange out_video_range,
+		Alignment alignment,
+		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_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 &);
-	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
 	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)
-	bool _aligned;
-	int _extra_pixels;
+	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)
+	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