Work around deadlock when destroying J2KEncoder with a full writer queue (#2784).

[dcpomatic.git] / src / lib / ffmpeg_image_proxy.h

diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h
index 21109c9d6f2dccf9baf64f11ebbc3b2ac24618bc..b567fadee0825e2c6506746c6d44739c999132ea 100644 (file)
--- a/src/lib/ffmpeg_image_proxy.h
+++ b/src/lib/ffmpeg_image_proxy.h
@@ -19,7 +19,6 @@
 */
 
 #include "image_proxy.h"
-#include "types.h"
 #include <dcp/array_data.h>
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem.hpp>
@@ -32,13 +31,14 @@ public:
        FFmpegImageProxy (std::shared_ptr<Socket> socket);
 
        Result image (
+               Image::Alignment alignment,
                boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
-               ) const;
+               ) const override;
 
-       void add_metadata (xmlpp::Node *) const;
-       void write_to_socket (std::shared_ptr<Socket>) const;
-       bool same (std::shared_ptr<const ImageProxy> other) const;
-       size_t memory_used () const;
+       void add_metadata (xmlpp::Node *) const override;
+       void write_to_socket (std::shared_ptr<Socket>) const override;
+       bool same (std::shared_ptr<const ImageProxy> other) const override;
+       size_t memory_used () const override;
 
        int avio_read (uint8_t* buffer, int const amount);
        int64_t avio_seek (int64_t const pos, int whence);
@@ -50,6 +50,6 @@ private:
            failed-decode errors can give more detail.
        */
        boost::optional<boost::filesystem::path> _path;
-       mutable std::shared_ptr<Image> _image;
+       mutable std::shared_ptr<const Image> _image;
        mutable boost::mutex _mutex;
 };