Conversion of frame index to FFmpeg time must always use the original or detected...

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 26a11c805ceccb1ba82a669fc3d6e4473c82531b..42add42aacc547c3be5e2bced87882dfdacecd0b 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -27,12 +27,12 @@
 #include "util.h"
 
 class VideoContent;
-class Image;
+class ImageProxy;
 
 class VideoDecoder : public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>);
+       VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
 
        /** Seek so that the next pass() will yield (approximately) the requested frame.
         *  Pass accurate = true to try harder to get close to the request.
@@ -41,14 +41,20 @@ public:
 
        /** Emitted when a video frame is ready.
         *  First parameter is the video image.
-        *  Second parameter is true if the image is the same as the last one that was emitted.
-        *  Third parameter is the frame within our source.
+        *  Second parameter is the eye(s) which should see this image.
+        *  Third parameter is the part of this image that should be used.
+        *  Fourth parameter is true if the image is the same as the last one that was emitted for this Eyes value.
+        *  Fourth parameter is the frame within our source.
         */
-       boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, VideoContent::Frame)> Video;
+       boost::signals2::signal<void (boost::shared_ptr<const ImageProxy>, Eyes, Part, bool, VideoContent::Frame)> Video;
        
 protected:
 
-       void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
+       void video (boost::shared_ptr<const ImageProxy>, bool, VideoContent::Frame);
+       boost::shared_ptr<const VideoContent> _video_content;
+       /** This is in frames without taking 3D into account (e.g. if we are doing 3D alternate,
+        *  this would equal 2 on the left-eye second frame (not 1)).
+        */
        VideoContent::Frame _video_position;
 };