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 23817c05536f4c568cef8cdc7a8358ec3991c074..42add42aacc547c3be5e2bced87882dfdacecd0b 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -20,57 +20,42 @@
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
-#include "video_source.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 #include "decoder.h"
+#include "video_content.h"
+#include "util.h"
 
 class VideoContent;
+class ImageProxy;
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>);
-
-       /** @return video frame rate second, or 0 if unknown */
-       virtual float video_frame_rate () const = 0;
-       /** @return native size in pixels */
-       virtual libdcp::Size native_size () const = 0;
-       /** @return length according to our content's header */
-       virtual ContentVideoFrame video_length () const = 0;
-
-       virtual int time_base_numerator () const = 0;
-       virtual int time_base_denominator () const = 0;
-       virtual int sample_aspect_ratio_numerator () const = 0;
-       virtual int sample_aspect_ratio_denominator () const = 0;
-
-       void set_progress (Job *) const;
+       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.
+        */
+       virtual void seek (VideoContent::Frame frame, bool accurate) = 0;
+
+       /** Emitted when a video frame is ready.
+        *  First parameter is the video image.
+        *  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 ImageProxy>, Eyes, Part, bool, VideoContent::Frame)> Video;
        
-       int video_frame () const {
-               return _video_frame;
-       }
-
-       double last_content_time () const {
-               return _last_content_time;
-       }
-
 protected:
-       
-       virtual PixelFormat pixel_format () const = 0;
-
-       void emit_video (boost::shared_ptr<Image>, double);
-       void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-       bool have_last_video () const;
-       void repeat_last_video (double);
-
-private:
-       void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
-
-       int _video_frame;
-       double _last_content_time;
-       
-       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
 
-       boost::shared_ptr<Image> _last_image;
-       boost::shared_ptr<Subtitle> _last_subtitle;
+       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;
 };
 
 #endif