Hand-apply 80562fe5dce5fd625da583ca6f7c2833f9db8754 from master (remove default scale...

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 145baa40b0ca115acda97f8b33376d8712890193..9e56546df952e5a659904b5be064f259c4b62fa8 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -32,6 +32,7 @@
 #include "content_video.h"
 
 class VideoContent;
+class ImageProxy;
 class Image;
 
 /** @class VideoDecoder
@@ -53,13 +54,19 @@ public:
 #endif
 
 protected:
+       friend struct video_decoder_fill_test1;
+       friend struct video_decoder_fill_test2;
 
        void seek (ContentTime time, bool accurate);
-       void video (boost::shared_ptr<const Image>, VideoFrame frame);
+       void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
        std::list<ContentVideo> decoded_video (VideoFrame frame);
+       void fill_up_to_2d (VideoFrame);
+       void fill_up_to_3d (VideoFrame, Eyes);
 
        boost::shared_ptr<const VideoContent> _video_content;
        std::list<ContentVideo> _decoded_video;
+       bool _same;
+       boost::shared_ptr<Image> _black_image;
 };
 
 #endif