X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=dca8eef11482b8a473b800670f270adfc6f42000;hp=24ee7f4e5f1948bcbf6dd897fbb324570bd62199;hb=56caa542a558a3e261a3da4773c9ed3e66e262ab;hpb=2f51e117cbaf36b9e0ccb02c338b316fc8e26b9a

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 24ee7f4e5..dca8eef11 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 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/>.
 
 */
 
@@ -24,51 +25,49 @@
 #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 "decoder_part.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 
 class VideoContent;
 class ImageProxy;
 class Image;
+class Log;
+class FrameIntervalChecker;
 
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
  */
-class VideoDecoder : public virtual Decoder
+class VideoDecoder : public DecoderPart
 {
 public:
-	VideoDecoder (boost::shared_ptr<const VideoContent> c);
+	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c);
 
-	std::list<ContentVideo> get_video (VideoFrame frame, bool accurate);
+	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);
 
-	boost::shared_ptr<const VideoContent> video_content () const {
-		return _video_content;
+	boost::optional<dcpomatic::ContentTime> position (boost::shared_ptr<const Film>) const {
+		return _position;
 	}
 
-#ifdef DCPOMATIC_DEBUG
-	int test_gaps;
-#endif
+	void seek ();
+	void emit (boost::shared_ptr<const Film> film, boost::shared_ptr<const ImageProxy>, Frame frame);
 
-protected:
-	friend struct video_decoder_fill_test1;
-	friend struct video_decoder_fill_test2;
+	boost::signals2::signal<void (ContentVideo)> Data;
 
-	void seek (ContentTime time, bool accurate);
-	void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
-	std::list<ContentVideo> decoded_video (VideoFrame frame);
-	void fill_2d (VideoFrame from, VideoFrame to);
-	void fill_3d (VideoFrame from, VideoFrame to, Eyes);
-
-	boost::shared_ptr<const VideoContent> _video_content;
-	std::list<ContentVideo> _decoded_video;
-	bool _same;
-	boost::shared_ptr<Image> _black_image;
-	boost::optional<ContentTime> _last_seek_time;
-	bool _last_seek_accurate;
+private:
+	boost::shared_ptr<const Content> _content;
+	/** Frame of last thing to be emitted; only used for 3D */
+	boost::optional<Frame> _last_emitted_frame;
+	boost::optional<Eyes> _last_emitted_eyes;
+	boost::optional<dcpomatic::ContentTime> _position;
+	boost::scoped_ptr<FrameIntervalChecker> _frame_interval_checker;
 };
 
 #endif