X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=69270244430d1a29fc4778026eab51fa57417580;hb=4b7b0edb359ae68f2dbcab90c7c10382f507fa5b;hp=0b05b2f7143690237754d810d8557d8e80cb9d77;hpb=47f25009bcbc765e397bcb471dd361a511c99daf;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 0b05b2f71..692702444 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,69 +1,88 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+/** @file  src/lib/video_decoder.h
+ *  @brief VideoDecoder class.
+ */
+
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
-#include "video_source.h"
 #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 VideoDecoder : public TimedVideoSource, public virtual Decoder
+class ImageProxy;
+class Image;
+class Log;
+
+/** @class VideoDecoder
+ *  @brief Parent for classes which decode video.
+ */
+class VideoDecoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>);
-
-	/** @return video frame rate second, or 0 if unknown */
-	virtual float video_frame_rate () 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;
-
-	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;
-	}
+	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log);
 
-	double last_content_time () const {
-		return _last_content_time;
+	std::list<ContentVideo> get (Frame frame, bool accurate);
+
+	void set_ignore ();
+	bool ignore () const {
+		return _ignore;
 	}
 
-protected:
-	
-	virtual PixelFormat pixel_format () const = 0;
+#ifdef DCPOMATIC_DEBUG
+	int test_gaps;
+#endif
+
+	friend struct video_decoder_fill_test1;
+	friend struct video_decoder_fill_test2;
+	friend struct ffmpeg_pts_offset_test;
+	friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
 
-	void emit_video (boost::shared_ptr<Image>, bool, double);
-	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
+	void seek (ContentTime time, bool accurate);
+	void give (boost::shared_ptr<const ImageProxy>, Frame frame);
 
 private:
-	int _video_frame;
-	double _last_content_time;
-	
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+
+	std::list<ContentVideo> decoded (Frame frame);
+	void fill_one_eye (Frame from, Frame to, Eyes);
+	void fill_both_eyes (VideoFrame from, VideoFrame to);
+
+	Decoder* _parent;
+	boost::shared_ptr<const Content> _content;
+	boost::shared_ptr<Log> _log;
+	std::list<ContentVideo> _decoded;
+	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;
+	/** if set, this is a frame for which we got no data because the Decoder said
+	 *  it has no more to give.
+	 */
+	boost::optional<Frame> _no_data_frame;
 };
 
 #endif