Merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 74343e856a6761c2d029e677f1af0815ed3865ba..86a9489b111338241dc5907cb7d8f9ad0e685229 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,60 +17,38 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+#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"
+#include "content_video.h"
 
 class VideoContent;
+class Image;
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>);
+       VideoDecoder (boost::shared_ptr<const VideoContent> c);
 
-       /** @return video frames per second, or 0 if unknown */
-       virtual float frames_per_second () 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;
+       boost::optional<ContentVideo> get_video (VideoFrame frame, bool accurate);
 
-       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;
-       
-       int video_frame () const {
-               return _video_frame;
-       }
-
-       double last_source_time () const {
-               return _last_source_time;
+       boost::shared_ptr<const VideoContent> video_content () const {
+               return _video_content;
        }
 
 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 ();
-
-private:
-       void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
 
-       int _video_frame;
-       double _last_source_time;
-       
-       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+       void seek (ContentTime time, bool accurate);
+       void video (boost::shared_ptr<const Image>, VideoFrame frame);
+       boost::optional<ContentVideo> decoded_video (VideoFrame frame);
 
-       boost::shared_ptr<Image> _last_image;
-       boost::shared_ptr<Subtitle> _last_subtitle;
+       boost::shared_ptr<const VideoContent> _video_content;
+       std::list<ContentVideo> _decoded_video;
 };
 
 #endif