Set up OV/VF in name according to whether DCP content has been referenced.

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 2e90a89e92ed9701b19c3c4a80c0e67e10687297..2d267f861e72a64cd337036bfe815943350a077a 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -28,13 +28,12 @@
 #include "position_image.h"
 #include "types.h"
 extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavfilter/avfilter.h>
+#include <libavutil/pixfmt.h>
 }
+#include <dcp/colour_conversion.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-#include <string>
 
+struct AVFrame;
 class Socket;
 
 class Image
@@ -46,22 +45,21 @@ public:
        Image (boost::shared_ptr<const Image>, bool);
        Image& operator= (Image const &);
        ~Image ();
-       
+
        uint8_t * const * data () const;
-       int * line_size () const;
+       int const * line_size () const;
        int const * stride () const;
        dcp::Size size () const;
        bool aligned () const;
 
+       int planes () const;
        int components () const;
        int line_factor (int) const;
-       int lines (int) const;
+       dcp::Size sample_size (int) const;
 
-       boost::shared_ptr<Image> scale (dcp::Size, AVPixelFormat, bool aligned) const;
-       boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
+       boost::shared_ptr<Image> scale (dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
+       boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
 
-       boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, AVPixelFormat, bool aligned) const;
-       
        void make_black ();
        void make_transparent ();
        void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
@@ -70,16 +68,14 @@ public:
 
        void read_from_socket (boost::shared_ptr<Socket>);
        void write_to_socket (boost::shared_ptr<Socket>) const;
-       
+
        AVPixelFormat pixel_format () const {
                return _pixel_format;
        }
 
-       std::string digest () const;
-
 private:
        friend struct pixel_formats_test;
-       
+
        void allocate ();
        void swap (Image &);
        float bytes_per_pixel (int) const;