Fix incorrect container size when loading a VF/OV combination into the player.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 5017d0e3c8f8bc8a1358d4fcf1d8e75055fd06bf..f4bf2a47165be5dbc58b35a3f95e752db7e81ab6 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -30,6 +30,7 @@ extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 class Image;
 class ImageProxy;
@@ -50,13 +51,18 @@ public:
                dcp::Size,
                Eyes,
                Part,
-               boost::optional<ColourConversion>
+               boost::optional<ColourConversion>,
+               boost::weak_ptr<Content>,
+               boost::optional<Frame>
                );
 
        PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
 
+       boost::shared_ptr<PlayerVideo> shallow_copy () const;
+
        void set_subtitle (PositionImage);
 
+       void prepare ();
        boost::shared_ptr<Image> image (dcp::NoteHandler note, boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
 
        static AVPixelFormat always_rgb (AVPixelFormat);
@@ -65,6 +71,8 @@ public:
        void add_metadata (xmlpp::Node* node) const;
        void send_binary (boost::shared_ptr<Socket> socket) const;
 
+       bool reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size);
+
        bool has_j2k () const;
        dcp::Data j2k () const;
 
@@ -90,6 +98,8 @@ public:
 
        bool same (boost::shared_ptr<const PlayerVideo> other) const;
 
+       size_t memory_used () const;
+
 private:
        boost::shared_ptr<const ImageProxy> _in;
        Crop _crop;
@@ -100,6 +110,10 @@ private:
        Part _part;
        boost::optional<ColourConversion> _colour_conversion;
        boost::optional<PositionImage> _subtitle;
+       /** Content that we came from.  This is so that reset_metadata() can work */
+       boost::weak_ptr<Content> _content;
+       /** Video frame that we came from.  Again, this is for reset_metadata() */
+       boost::optional<Frame> _video_frame;
 };
 
 #endif