X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=6b9ade99eefccb8b3d92e7c023300c14f9ac9601;hb=7f203e4df9ca94a44099c26158c6c81b5299567f;hp=13b92d72f11d0b48f98440932274ca9848eb6079;hpb=dedac27070ac5ad65265a0db1fa316b3e436cea7;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index 13b92d72f..6b9ade99e 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -32,6 +32,7 @@ extern "C" {
 #include <libavfilter/avfilter.h>
 }
 #include "util.h"
+#include "ffmpeg_compatibility.h"
 
 class Scaler;
 class RGBFrameImage;
@@ -65,13 +66,15 @@ public:
 	virtual int * stride () const = 0;
 
 	/** @return Size of the image, in pixels */
-	virtual Size size () const = 0;
+	virtual libdcp::Size size () const = 0;
+
+	virtual bool aligned () const = 0;
 
 	int components () const;
 	int lines (int) const;
 
-	boost::shared_ptr<Image> scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scaler, bool aligned) const;
-	boost::shared_ptr<Image> scale (Size, Scaler const *, bool aligned) const;
+	boost::shared_ptr<Image> scale_and_convert_to_rgb (libdcp::Size out_size, int padding, Scaler const * scaler, bool aligned) const;
+	boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, bool aligned) const;
 	boost::shared_ptr<Image> post_process (std::string, bool aligned) const;
 	void alpha_blend (boost::shared_ptr<const Image> image, Position pos);
 	boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
@@ -89,7 +92,10 @@ protected:
 	virtual void swap (Image &);
 	float bytes_per_pixel (int) const;
 
-private:	
+private:
+	void yuv_16_black (uint16_t);
+	static uint16_t swap_16 (uint16_t);
+	
 	AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
 };
 
@@ -105,7 +111,8 @@ public:
 	uint8_t ** data () const;
 	int * line_size () const;
 	int * stride () const;
-	Size size () const;
+	libdcp::Size size () const;
+	bool aligned () const;
 
 private:
 	/* Not allowed */
@@ -113,6 +120,7 @@ private:
 	FilterBufferImage& operator= (FilterBufferImage const &);
 	
 	AVFilterBufferRef* _buffer;
+	int* _line_size;
 };
 
 /** @class SimpleImage
@@ -121,23 +129,23 @@ private:
 class SimpleImage : public Image
 {
 public:
-	SimpleImage (AVPixelFormat, Size, bool);
+	SimpleImage (AVPixelFormat, libdcp::Size, bool);
 	SimpleImage (SimpleImage const &);
 	SimpleImage& operator= (SimpleImage const &);
-	SimpleImage (boost::shared_ptr<const Image>, bool aligned);
 	~SimpleImage ();
 
 	uint8_t ** data () const;
 	int * line_size () const;
 	int * stride () const;
-	Size size () const;
+	libdcp::Size size () const;
+	bool aligned () const;
 
 protected:
 	void allocate ();
 	void swap (SimpleImage &);
 	
 private:
-	Size _size; ///< size in pixels
+	libdcp::Size _size; ///< size in pixels
 	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)