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

diff --git a/src/lib/image.h b/src/lib/image.h
index 8cf4a72f7..2d267f861 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -27,15 +27,13 @@
 #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
@@ -47,21 +45,21 @@ public:
 	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;