std::shared_ptr

[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 c20d89340318b2040bf3fc60a6c26b8d95e70845..91c90dba71bad6cd95cdfe6e095a1ebab1439804 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -19,8 +19,8 @@
 */
 
 #include "image_proxy.h"
+#include <dcp/array_data.h>
 #include <dcp/util.h>
-#include <dcp/data.h>
 #include <boost/thread/mutex.hpp>
 
 namespace dcp {
@@ -34,37 +34,33 @@ public:
        J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
 
        J2KImageProxy (
-               boost::shared_ptr<const dcp::MonoPictureFrame> frame,
+               std::shared_ptr<const dcp::MonoPictureFrame> frame,
                dcp::Size,
                AVPixelFormat pixel_format,
                boost::optional<int> forced_reduction
                );
 
        J2KImageProxy (
-               boost::shared_ptr<const dcp::StereoPictureFrame> frame,
+               std::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);
+       J2KImageProxy (std::shared_ptr<cxml::Node> xml, std::shared_ptr<Socket> socket);
 
-       boost::shared_ptr<Image> image (
-               boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+       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 (std::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;
-       void prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
-       AVPixelFormat pixel_format () const {
-               return _pixel_format;
-       }
+       bool same (std::shared_ptr<const ImageProxy>) const;
+       int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
 
-       dcp::Data j2k () const {
+       std::shared_ptr<const dcp::Data> j2k () const {
                return _data;
        }
 
@@ -72,18 +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);
+       J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format);
 
-       dcp::Data _data;
+       std::shared_ptr<const dcp::Data> _data;
        dcp::Size _size;
        boost::optional<dcp::Eye> _eye;
-       mutable boost::shared_ptr<dcp::OpenJPEGImage> _decompressed;
+       mutable std::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;
 };