Extract common code out into kdm_for_screen()

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 73f2313c1a03f297c22960d5ba290aa83d927fb9..46633df679d00b9f6eceee34be126711c0fd5d85 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -41,7 +41,7 @@ class Socket;
 class Image : public boost::enable_shared_from_this<Image>
 {
 public:
-       Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
+       Image (AVPixelFormat p, dcp::Size s, bool aligned);
        explicit Image (AVFrame *);
        explicit Image (Image const &);
        Image (boost::shared_ptr<const Image>, bool);
@@ -63,7 +63,7 @@ public:
        boost::shared_ptr<Image> convert_pixel_format (dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, 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 crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast
+               Crop crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, VideoRange video_range, AVPixelFormat out_format, bool aligned, bool fast
                ) const;
 
        void make_black ();
@@ -83,6 +83,8 @@ public:
 
        dcp::Data as_png () const;
 
+       void png_error (char const * message);
+
        static boost::shared_ptr<const Image> ensure_aligned (boost::shared_ptr<const Image> image);
 
 private:
@@ -90,6 +92,7 @@ private:
 
        void allocate ();
        void swap (Image &);
+       void make_part_black (int x, int w);
        void yuv_16_black (uint16_t, bool);
        static uint16_t swap_16 (uint16_t);
 
@@ -99,7 +102,6 @@ private:
        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;
 };
 
 extern PositionImage merge (std::list<PositionImage> images);