X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=5053d32ebfe3a23aa60126e2ddee303dcd43a50c;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=255a038a9073f75be2a1c268e11aaf709642072b;hpb=04ef57589ebb7c0de3377172a03b24698fd2364a;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 255a038a9..5053d32eb 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,60 +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 <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
 #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 Log;
 
-class VideoDecoder : public virtual Decoder
+/** @class VideoDecoder
+ *  @brief Parent for classes which decode video.
+ */
+class VideoDecoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log);
 
-	/** Seek so that the next pass() will yield (approximately) the requested frame.
-	 *  Pass accurate = true to try harder to get close to the request.
-	 */
-	virtual void seek (VideoContent::Frame frame, bool accurate) = 0;
+	std::list<ContentVideo> get (Frame frame, bool accurate);
 
-	/** Emitted when a video frame is ready.
-	 *  First parameter is the video image.
-	 *  Second parameter is the eye(s) which should see this image.
-	 *  Third parameter is true if the image is the same as the last one that was emitted for this Eyes value.
-	 *  Fourth parameter is the frame within our source.
-	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame)> Video;
-	
-protected:
-
-	void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
-	boost::shared_ptr<const VideoContent> _video_content;
-	/** This is in frames without taking 3D into account (e.g. if we are doing 3D alternate,
-	 *  this would equal 2 on the left-eye second frame (not 1)).
+	void set_ignore ();
+	bool ignore () const {
+		return _ignore;
+	}
+
+#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 seek (ContentTime time, bool accurate);
+	void give (boost::shared_ptr<const ImageProxy>, Frame frame);
+
+private:
+
+	std::list<ContentVideo> decoded (Frame frame);
+	void fill_one_eye (Frame from, Frame to, Eyes);
+	void fill_both_eyes (Frame from, Frame to, Eyes);
+
+	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.
 	 */
-	VideoContent::Frame _video_position;
+	boost::optional<Frame> _no_data_frame;
 };
 
 #endif