Merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 6e4fd48c0019710a2632e921d35645efa119c239..c3228e88dac3fb2fcb633c32b752f8e7a8676f61 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,67 +17,32 @@
 
 */
 
-#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 "stream.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 #include "decoder.h"
+#include "video_content.h"
+#include "util.h"
+#include "decoded.h"
 
-class VideoDecoder : public TimedVideoSource, public virtual Decoder
+class VideoContent;
+class Image;
+
+class VideoDecoder : public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);
-
-       /** @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 (in source video frames), according to our content's header */
-       virtual SourceFrame 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;
-
-       virtual void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
-
-       void set_progress (Job *) const;
-       
-       int video_frame () const {
-               return _video_frame;
-       }
+       VideoDecoder (boost::shared_ptr<const VideoContent>);
 
-       boost::shared_ptr<SubtitleStream> subtitle_stream () const {
-               return _subtitle_stream;
-       }
-
-       std::vector<boost::shared_ptr<SubtitleStream> > subtitle_streams () const {
-               return _subtitle_streams;
-       }
-
-       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>, bool, double);
-       void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-
-       /** Subtitle stream to use when decoding */
-       boost::shared_ptr<SubtitleStream> _subtitle_stream;
-       /** Subtitle streams that this decoder's content has */
-       std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
 
-private:
-       int _video_frame;
-       double _last_source_time;
-       
-       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+       void video (boost::shared_ptr<const Image>, bool, ContentTime);
+       boost::shared_ptr<const VideoContent> _video_content;
 };
 
 #endif