X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=237d2e3fe2858083d6a6d165dd0ac63999fee693;hb=10c9dbd18c11dc57629b5a0e0b8f33079f5d2d8f;hp=347d10667de69d97584a4dccb0ec9ddc1d194970;hpb=23aa3071850761144798112a5aaea61304de8586;p=dcpomatic.git diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 347d10667..237d2e3fe 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -23,11 +23,12 @@ #define DCPOMATIC_PLAYER_VIDEO_H -#include "types.h" -#include "position.h" -#include "dcpomatic_time.h" #include "colour_conversion.h" +#include "dcpomatic_time.h" +#include "image.h" +#include "position.h" #include "position_image.h" +#include "types.h" extern "C" { #include } @@ -74,9 +75,9 @@ public: return _text; } - void prepare (std::function pixel_format, VideoRange video_range, bool aligned, bool fast, bool proxy_only); - std::shared_ptr image (std::function pixel_format, VideoRange video_range, bool aligned, bool fast) const; - std::shared_ptr raw_image () const; + void prepare (std::function pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast, bool proxy_only); + std::shared_ptr image (std::function pixel_format, VideoRange video_range, bool fast) const; + std::shared_ptr raw_image () const; static AVPixelFormat force (AVPixelFormat, AVPixelFormat); static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat); @@ -126,7 +127,7 @@ public: } private: - void make_image (std::function pixel_format, VideoRange video_range, bool aligned, bool fast) const; + void make_image (std::function pixel_format, VideoRange video_range, bool fast) const; std::shared_ptr _in; Crop _crop;