X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=86a9489b111338241dc5907cb7d8f9ad0e685229;hb=1eeba876ce09cedfa4c779bf3554372c01dc34c5;hp=6e4fd48c0019710a2632e921d35645efa119c239;hpb=f166fa19db164653e8229133a18f2e53dd722333;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 6e4fd48c0..86a9489b1 100644
--- 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,67 +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 "stream.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 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> c);
 
-	boost::shared_ptr<SubtitleStream> subtitle_stream () const {
-		return _subtitle_stream;
-	}
+	boost::optional<ContentVideo> get_video (VideoFrame frame, bool accurate);
 
-	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;
+	void seek (ContentTime time, bool accurate);
+	void video (boost::shared_ptr<const Image>, VideoFrame frame);
+	boost::optional<ContentVideo> decoded_video (VideoFrame frame);
 
-private:
-	int _video_frame;
-	double _last_source_time;
-	
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+	boost::shared_ptr<const VideoContent> _video_content;
+	std::list<ContentVideo> _decoded_video;
 };
 
 #endif