X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=6b9ade99eefccb8b3d92e7c023300c14f9ac9601;hb=8eabffda9a95de36df560c1b6eadd1a7baa852c7;hp=3e16d43bfff220a4ceeb22a82b999976f35c054f;hpb=009a58293bf2e9727d544d1a2648422cc395d81e;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index 3e16d43bf..6b9ade99e 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -26,11 +26,13 @@
 
 #include <string>
 #include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
 #include "util.h"
+#include "ffmpeg_compatibility.h"
 
 class Scaler;
 class RGBFrameImage;
@@ -48,7 +50,7 @@ class SimpleImage;
 class Image
 {
 public:
-	Image (PixelFormat p)
+	Image (AVPixelFormat p)
 		: _pixel_format (p)
 	{}
 	
@@ -64,23 +66,37 @@ 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, int, Scaler const *) const;
-	boost::shared_ptr<Image> scale (Size, Scaler const *) const;
-	boost::shared_ptr<Image> post_process (std::string) const;
-	void alpha_blend (boost::shared_ptr<Image> image, Position pos);
+
+	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;
 	
 	void make_black ();
+
+	void read_from_socket (boost::shared_ptr<Socket>);
+	void write_to_socket (boost::shared_ptr<Socket>) const;
 	
-	PixelFormat pixel_format () const {
+	AVPixelFormat pixel_format () const {
 		return _pixel_format;
 	}
 
+protected:
+	virtual void swap (Image &);
+	float bytes_per_pixel (int) const;
+
 private:
-	PixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
+	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
 };
 
 /** @class FilterBufferImage
@@ -89,16 +105,22 @@ private:
 class FilterBufferImage : public Image
 {
 public:
-	FilterBufferImage (PixelFormat, AVFilterBufferRef *);
+	FilterBufferImage (AVPixelFormat, AVFilterBufferRef *);
 	~FilterBufferImage ();
 
 	uint8_t ** data () const;
 	int * line_size () const;
 	int * stride () const;
-	Size size () const;
+	libdcp::Size size () const;
+	bool aligned () const;
 
 private:
+	/* Not allowed */
+	FilterBufferImage (FilterBufferImage const &);
+	FilterBufferImage& operator= (FilterBufferImage const &);
+	
 	AVFilterBufferRef* _buffer;
+	int* _line_size;
 };
 
 /** @class SimpleImage
@@ -107,43 +129,41 @@ private:
 class SimpleImage : public Image
 {
 public:
-	SimpleImage (PixelFormat, Size);
+	SimpleImage (AVPixelFormat, libdcp::Size, bool);
+	SimpleImage (SimpleImage const &);
+	SimpleImage& operator= (SimpleImage const &);
 	~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)
-
+	bool _aligned;
 };
 
-/** @class RGBFrameImage
- *  @brief An RGB image that is held within an AVFrame.
- */
-class RGBFrameImage : public Image
+class RGBPlusAlphaImage : public SimpleImage
 {
 public:
-	RGBFrameImage (Size);
-	~RGBFrameImage ();
+	RGBPlusAlphaImage (boost::shared_ptr<const Image>);
+	~RGBPlusAlphaImage ();
 
-	uint8_t ** data () const;
-	int * line_size () const;
-	int * stride () const;
-	Size size () const;
-	AVFrame * frame () const {
-		return _frame;
+	uint8_t* alpha () const {
+		return _alpha;
 	}
-
+	
 private:
-	Size _size;
-	AVFrame* _frame;
-	uint8_t* _data;
+	uint8_t* _alpha;
 };
 
 #endif