More tests; fix blend for YUV420P10LE.

[dcpomatic.git] / src / lib / image.h

diff --git a/src/lib/image.h b/src/lib/image.h
index c5fc3dd2db47d11af362cd757c6b38a12d33efe6..fd5adb0762ea9071ce1cd831f7aba49c3bef0aab 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -40,7 +40,7 @@ class Socket;
 class Image
 {
 public:
-       Image (AVPixelFormat, dcp::Size, bool, int extra_pixels = 0);
+       Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
        Image (AVFrame *);
        Image (Image const &);
        Image (boost::shared_ptr<const Image>, bool);
@@ -54,13 +54,15 @@ public:
        bool aligned () const;
 
        int planes () 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> scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, 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;
+               Crop crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast
+               ) const;
 
        void make_black ();
        void make_transparent ();
@@ -80,15 +82,14 @@ private:
 
        void allocate ();
        void swap (Image &);
-       float bytes_per_pixel (int) const;
        void yuv_16_black (uint16_t, bool);
        static uint16_t swap_16 (uint16_t);
 
        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)
+       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)
        bool _aligned;
        int _extra_pixels;
 };