Tweak content properties layout (#895).

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

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 72815a0f6c57d8d3b1575c124816304e58b1d47d..96a776f2a5333bc6100a41629a4cf2919f24f7c6 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -30,9 +30,9 @@ namespace dcp {
 class J2KImageProxy : public ImageProxy
 {
 public:
-       J2KImageProxy (boost::filesystem::path path, dcp::Size);
-       J2KImageProxy (boost::shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size);
-       J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye);
+       J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
+       J2KImageProxy (boost::shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size, AVPixelFormat pixel_format);
+       J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye, AVPixelFormat pixel_format);
        J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
        boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const;
@@ -40,7 +40,9 @@ public:
        void send_binary (boost::shared_ptr<Socket>) const;
        /** @return true if our image is definitely the same as another, false if it is probably not */
        bool same (boost::shared_ptr<const ImageProxy>) const;
-       AVPixelFormat pixel_format () const;
+       AVPixelFormat pixel_format () const {
+               return _pixel_format;
+       }
 
        dcp::Data j2k () const {
                return _data;
@@ -54,11 +56,12 @@ private:
        friend struct client_server_test_j2k;
 
        /* For tests */
-       J2KImageProxy (dcp::Data data, dcp::Size size);
+       J2KImageProxy (dcp::Data data, dcp::Size size, AVPixelFormat pixel_format);
        void ensure_j2k () const;
 
        dcp::Data _data;
        dcp::Size _size;
        boost::optional<dcp::Eye> _eye;
        mutable boost::shared_ptr<dcp::OpenJPEGImage> _j2k;
+       AVPixelFormat _pixel_format;
 };