Supporters update.

[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 ec99e71a938c19c0b39d9af4c26d4a9baccf8f78..9666ea406784f9981780661e60ba39c7dcfb2c31 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,49 +18,56 @@
 
 */
 
+
 #include "image_proxy.h"
+#include <dcp/array_data.h>
 #include <dcp/util.h>
-#include <dcp/data.h>
 #include <boost/thread/mutex.hpp>
 
+
 namespace dcp {
        class MonoPictureFrame;
        class StereoPictureFrame;
 }
 
+
 class J2KImageProxy : public ImageProxy
 {
 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);
+
+       /* For tests */
+       J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format);
 
        Result image (
+               Image::Alignment alignment,
                boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
-               ) const;
+               ) const override;
 
-       void add_metadata (xmlpp::Node *) const;
-       void send_binary (boost::shared_ptr<Socket>) const;
+       void add_metadata (xmlpp::Node *) const override;
+       void write_to_socket (std::shared_ptr<Socket> override) const override;
        /** @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;
-       int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
+       bool same (std::shared_ptr<const ImageProxy>) const override;
+       int prepare (Image::Alignment alignment, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const override;
 
-       dcp::Data j2k () const {
+       std::shared_ptr<const dcp::Data> j2k () const {
                return _data;
        }
 
@@ -68,21 +75,22 @@ public:
                return _size;
        }
 
-       size_t memory_used () const;
+       boost::optional<dcp::Eye> eye () const {
+               return _eye;
+       }
 
-private:
-       friend struct client_server_test_j2k;
+       size_t memory_used () const override;
 
-       /* For tests */
-       J2KImageProxy (dcp::Data data, dcp::Size size, AVPixelFormat pixel_format);
-
-       dcp::Data _data;
+private:
+       std::shared_ptr<const dcp::Data> _data;
        dcp::Size _size;
        boost::optional<dcp::Eye> _eye;
-       mutable boost::shared_ptr<Image> _image;
+       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;
 };