std::shared_ptr

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

diff --git a/src/lib/image.h b/src/lib/image.h
index dbcb38cc7a5c41123e7ff3aec60fcb04b0bea8bf..a5823656c85b1d676ed636ee9abbbaca0ff7b224 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -31,25 +31,26 @@
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
+#include <dcp/array_data.h>
 #include <dcp/colour_conversion.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 
 struct AVFrame;
 class Socket;
 
-class Image : public boost::enable_shared_from_this<Image>
+class Image : public std::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);
+       Image (std::shared_ptr<const Image>, bool);
        Image& operator= (Image const &);
        ~Image ();
 
        uint8_t * const * data () const;
+       /** @return array of sizes of the data in each line, in bytes (not including any alignment padding) */
        int const * line_size () const;
+       /** @return array of sizes of the data in each line, in bytes (including any alignment padding) */
        int const * stride () const;
        dcp::Size size () const;
        bool aligned () const;
@@ -60,20 +61,29 @@ public:
        dcp::Size sample_size (int) const;
        float bytes_per_pixel (int) const;
 
-       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
+       std::shared_ptr<Image> convert_pixel_format (dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const;
+       std::shared_ptr<Image> scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const;
+       std::shared_ptr<Image> crop_scale_window (
+               Crop crop,
+               dcp::Size inter_size,
+               dcp::Size out_size,
+               dcp::YUVToRGB yuv_to_rgb,
+               VideoRange video_range,
+               AVPixelFormat out_format,
+               VideoRange out_video_range,
+               bool aligned,
+               bool fast
                ) const;
 
        void make_black ();
        void make_transparent ();
-       void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
-       void copy (boost::shared_ptr<const Image> image, Position<int> pos);
+       void alpha_blend (std::shared_ptr<const Image> image, Position<int> pos);
+       void copy (std::shared_ptr<const Image> image, Position<int> pos);
        void fade (float);
+       void video_range_to_full_range ();
 
-       void read_from_socket (boost::shared_ptr<Socket>);
-       void write_to_socket (boost::shared_ptr<Socket>) const;
+       void read_from_socket (std::shared_ptr<Socket>);
+       void write_to_socket (std::shared_ptr<Socket>) const;
 
        AVPixelFormat pixel_format () const {
                return _pixel_format;
@@ -81,17 +91,18 @@ public:
 
        size_t memory_used () const;
 
-       dcp::Data as_png () const;
+       dcp::ArrayData as_png () const;
 
        void png_error (char const * message);
 
-       static boost::shared_ptr<const Image> ensure_aligned (boost::shared_ptr<const Image> image);
+       static std::shared_ptr<const Image> ensure_aligned (std::shared_ptr<const Image> image);
 
 private:
        friend struct pixel_formats_test;
 
        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);
 
@@ -101,7 +112,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);