Set up seek position correctly when a seek skips over a reel in

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

diff --git a/src/lib/image.h b/src/lib/image.h
index cdad28c20214ff38f71dcce743d19126ac2c36fa..8de0a2c69e53c5576a28baf62a8b9b4873667125 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -54,9 +54,12 @@ 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> 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
@@ -75,12 +78,15 @@ public:
                return _pixel_format;
        }
 
+       size_t memory_used () const;
+
+       static boost::shared_ptr<Image> ensure_aligned (boost::shared_ptr<Image> image);
+
 private:
        friend struct pixel_formats_test;
 
        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);