Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

[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 96a776f2a5333bc6100a41629a4cf2919f24f7c6..71bcffb2c50754460736700310ad0af8f002cb3b 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,6 +21,7 @@
 #include "image_proxy.h"
 #include <dcp/util.h>
 #include <dcp/data.h>
+#include <boost/thread/mutex.hpp>
 
 namespace dcp {
        class MonoPictureFrame;
@@ -31,18 +32,33 @@ class J2KImageProxy : public ImageProxy
 {
 public:
        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<const dcp::MonoPictureFrame> frame,
+               dcp::Size,
+               AVPixelFormat pixel_format,
+               boost::optional<int> forced_reduction
+               );
+
+       J2KImageProxy (
+               boost::shared_ptr<const dcp::StereoPictureFrame> frame,
+               dcp::Size,
+               dcp::Eye,
+               AVPixelFormat pixel_format,
+               boost::optional<int> forced_reduction
+               );
+
        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;
+       Result image (
+               boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
+               ) const;
+
        void add_metadata (xmlpp::Node *) const;
-       void send_binary (boost::shared_ptr<Socket>) const;
+       void write_to_socket (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 {
-               return _pixel_format;
-       }
+       int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
 
        dcp::Data j2k () const {
                return _data;
@@ -52,16 +68,23 @@ public:
                return _size;
        }
 
+       size_t memory_used () const;
+
 private:
        friend struct client_server_test_j2k;
 
        /* For tests */
        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;
+       mutable boost::shared_ptr<Image> _image;
+       mutable boost::optional<dcp::Size> _target_size;
+       mutable boost::optional<int> _reduce;
        AVPixelFormat _pixel_format;
+       mutable boost::mutex _mutex;
+       boost::optional<int> _forced_reduction;
+       /** true if an error occurred while decoding the JPEG2000 data, false if not */
+       mutable bool _error;
 };