X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=42cfc49063de396fa5043f193430ccffc6279eb0;hb=67705b5665715abebfdd33e9f36797f040bc3e79;hp=685138a58c761d05307a71adb5b5dfdb74fc9889;hpb=92a16acdd9a91977e154d09120160fa427adf3f7;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 685138a58..42cfc4906 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-2015 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,68 +17,62 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+/** @file  src/lib/video_decoder.h
+ *  @brief VideoDecoder class.
+ */
 
-#include "video_source.h"
-#include "stream.h"
-#include "decoder.h"
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+#include "decoder.h"
+#include "video_content.h"
+#include "util.h"
+#include "content_video.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
+
+class VideoContent;
+class ImageProxy;
+class Image;
+
+/** @class VideoDecoder
+ *  @brief Parent for classes which decode video.
+ */
+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;
-	/** @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 () const;
-	
-	SourceFrame video_frame () const {
-		return _video_frame;
-	}
+	VideoDecoder (boost::shared_ptr<const VideoContent> c);
 
-	boost::shared_ptr<SubtitleStream> subtitle_stream () const {
-		return _subtitle_stream;
-	}
+	std::list<ContentVideo> get_video (Frame frame, bool accurate);
 
-	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 ();
+	void set_ignore_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;
+#ifdef DCPOMATIC_DEBUG
+	int test_gaps;
+#endif
 
-	boost::shared_ptr<Image> _last_image;
-	boost::shared_ptr<Subtitle> _last_subtitle;
+protected:
+	friend struct video_decoder_fill_test1;
+	friend struct video_decoder_fill_test2;
+
+	void seek (ContentTime time, bool accurate);
+	void video (boost::shared_ptr<const ImageProxy>, Frame frame);
+	std::list<ContentVideo> decoded_video (Frame frame);
+	void fill_one_eye (Frame from, Frame to, Eyes);
+	void fill_both_eyes (Frame from, Frame to, Eyes);
+
+	boost::shared_ptr<const VideoContent> _video_content;
+	std::list<ContentVideo> _decoded_video;
+	boost::shared_ptr<Image> _black_image;
+	boost::optional<ContentTime> _last_seek_time;
+	bool _last_seek_accurate;
+
+	/** true if this decoder should ignore all video; i.e. never produce any */
+	bool _ignore_video;
 };
 
 #endif