Add workaround for 3D DCPs whose picture MXFs are labelled (within the MXF) as mono.

[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 34b1490b3858fb0a2eee07f693d8573a25ced4e6..efb744c0a1b53f68d4cbcc29fce340ac88535008 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -18,10 +18,13 @@
 */
 
 #include "image_proxy.h"
-#include "data.h"
 #include <dcp/util.h>
+#include <dcp/data.h>
 
-class Data;
+namespace dcp {
+       class MonoPictureFrame;
+       class StereoPictureFrame;
+}
 
 class J2KImageProxy : public ImageProxy
 {
@@ -34,17 +37,27 @@ public:
        boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const;
        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 */
+       bool same (boost::shared_ptr<const ImageProxy>) const;
+       AVPixelFormat pixel_format () const;
 
-       Data j2k () const {
+       dcp::Data j2k () const {
                return _data;
        }
-       
+
        dcp::Size size () const {
                return _size;
        }
-       
+
 private:
-       Data _data;
+       friend struct client_server_test_j2k;
+
+       /* For tests */
+       J2KImageProxy (dcp::Data data, dcp::Size size);
+       void ensure_j2k () const;
+
+       dcp::Data _data;
        dcp::Size _size;
        boost::optional<dcp::Eye> _eye;
+       mutable boost::shared_ptr<dcp::OpenJPEGImage> _j2k;
 };