X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=416ee3a8d8fd25b0f5cca0176a9e53af48af7085;hb=1a1d4b22589d5832dd594a65054d9261f9f496cf;hp=8cf4a72f71e62f432e020a9f65e273787997becf;hpb=b683333b66b0c37bac09d492c65a880d73daf9a9;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index 8cf4a72f7..416ee3a8d 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -27,41 +27,39 @@
 #include "position.h"
 #include "position_image.h"
 #include "types.h"
-#include <dcp/colour_conversion.h>
 extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavfilter/avfilter.h>
+#include <libavutil/pixfmt.h>
 }
+#include <dcp/colour_conversion.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-#include <string>
 
+struct AVFrame;
 class Socket;
 
 class Image
 {
 public:
-	Image (AVPixelFormat, dcp::Size, bool);
+	Image (AVPixelFormat, dcp::Size, bool, int extra_pixels = 0);
 	Image (AVFrame *);
 	Image (Image const &);
 	Image (boost::shared_ptr<const Image>, bool);
 	Image& operator= (Image const &);
 	~Image ();
-	
+
 	uint8_t * const * data () const;
-	int * line_size () const;
+	int const * line_size () const;
 	int const * stride () const;
 	dcp::Size size () const;
 	bool aligned () const;
 
+	int planes () const;
 	int components () const;
 	int line_factor (int) const;
-	int lines (int) const;
+	dcp::Size sample_size (int) const;
 
 	boost::shared_ptr<Image> scale (dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
-	boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
 	boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
-	
+
 	void make_black ();
 	void make_transparent ();
 	void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
@@ -70,14 +68,14 @@ public:
 
 	void read_from_socket (boost::shared_ptr<Socket>);
 	void write_to_socket (boost::shared_ptr<Socket>) const;
-	
+
 	AVPixelFormat pixel_format () const {
 		return _pixel_format;
 	}
 
 private:
 	friend struct pixel_formats_test;
-	
+
 	void allocate ();
 	void swap (Image &);
 	float bytes_per_pixel (int) const;
@@ -90,6 +88,7 @@ private:
 	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;
 };
 
 extern PositionImage merge (std::list<PositionImage> images);