X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=d8c362354ee02b2f9614b265c6159ee1b200bf7d;hb=ad10aea1d685e67e0e639f6303fc9c8f8f1f945c;hp=ea1899840a7252a6358c682a0a1e85167bb3c7bd;hpb=288e7e64e9be84b8dbe11f5acb490e64a29d9378;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index ea1899840..d8c362354 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,66 +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 VideoSource, public virtual Decoder
+class VideoContent;
+class Image;
+
+class VideoDecoder : public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
-
-	/** @return video frames per second, or 0 if unknown */
-	virtual float frames_per_second () const = 0;
-	/** @return native size in pixels */
-	virtual Size native_size () 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>);
+	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
 
-	void set_progress () const;
-	
-	SourceFrame video_frame () const {
-		return _video_frame;
-	}
-
-	boost::shared_ptr<SubtitleStream> subtitle_stream () const {
-		return _subtitle_stream;
-	}
-
-	std::vector<boost::shared_ptr<SubtitleStream> > subtitle_streams () const {
-		return _subtitle_streams;
+	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>);
-	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-	void repeat_last_video ();
-
-	/** 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:
-	void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-
-	SourceFrame _video_frame;
-
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
 
-	boost::shared_ptr<Image> _last_image;
-	boost::shared_ptr<Subtitle> _last_subtitle;
+	void video (boost::shared_ptr<const Image>, bool, ContentTime);
+	boost::shared_ptr<const VideoContent> _video_content;
 };
 
 #endif