X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.h;h=d925bef864fe9129fc59dd8246b4b305325ea55e;hb=0330b684fe616b465e65b67f7d995e659fa83fca;hp=437a563ebb770a85e1627c576a3cd261b694fe09;hpb=5ea111a09d386676004a6078cf16aa0b937fbcf1;p=dcpomatic.git diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h index 437a563eb..d925bef86 100644 --- a/src/lib/j2k_image_proxy.h +++ b/src/lib/j2k_image_proxy.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,16 +18,19 @@ */ + #include "image_proxy.h" #include #include #include + namespace dcp { class MonoPictureFrame; class StereoPictureFrame; } + class J2KImageProxy : public ImageProxy { public: @@ -54,6 +57,7 @@ public: J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format); Result image ( + Image::Alignment alignment, boost::optional size = boost::optional () ) const; @@ -61,7 +65,7 @@ public: void write_to_socket (std::shared_ptr) const; /** @return true if our image is definitely the same as another, false if it is probably not */ bool same (std::shared_ptr) const; - int prepare (boost::optional = boost::optional()) const; + int prepare (Image::Alignment alignment, boost::optional = boost::optional()) const; std::shared_ptr j2k () const { return _data;