Fix nonfunctional send-problem-report.

[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 191d759db8d5453746a72b15691188992b9987e2..1d34e7f84e1a218ebc40b052e78a1b6b1cb1feb6 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -21,6 +21,11 @@
 #include "data.h"
 #include <dcp/util.h>
 
+namespace dcp {
+       class MonoPictureFrame;
+       class StereoPictureFrame;
+}
+
 class Data;
 
 class J2KImageProxy : public ImageProxy
@@ -35,7 +40,8 @@ public:
        void add_metadata (xmlpp::Node *) const;
        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 */
-       virtual bool same (boost::shared_ptr<const ImageProxy>) const;
+       bool same (boost::shared_ptr<const ImageProxy>) const;
+       AVPixelFormat pixel_format () const;
 
        Data j2k () const {
                return _data;
@@ -46,7 +52,14 @@ public:
        }
 
 private:
+       friend struct client_server_test_j2k;
+
+       /* For tests */
+       J2KImageProxy (Data data, dcp::Size size);
+       void ensure_j2k () const;
+
        Data _data;
        dcp::Size _size;
        boost::optional<dcp::Eye> _eye;
+       mutable boost::shared_ptr<dcp::OpenJPEGImage> _j2k;
 };