X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=c3228e88dac3fb2fcb633c32b752f8e7a8676f61;hp=8de76c10f7a2653b2d79702b9a10301bfce5b221;hb=ddf8e31d94c4f6eb7b336ee7168a6a6499ded515;hpb=f1bf21a9c2581591ab80bfc997a22b93046f8c56

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 8de76c10f..62757e3a9 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,56 +1,73 @@
 /*
-    Copyright (C) 2012 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/>.
 
 */
 
+/** @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 "decoder_part.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 
 class VideoContent;
+class ImageProxy;
+class Image;
+class Log;
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+/** @class VideoDecoder
+ *  @brief Parent for classes which decode video.
+ */
+class VideoDecoder : public DecoderPart
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c);
+
+	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);
 
-	virtual void seek (Time);
-	virtual void seek_back ();
-	virtual void seek_forward ();
-	
-	void set_video_container_size (libdcp::Size);
+	boost::optional<dcpomatic::ContentTime> position (boost::shared_ptr<const Film>) const {
+		return _position;
+	}
 
-protected:
-	
-	void video (boost::shared_ptr<Image>, bool, Time);
-	void subtitle (boost::shared_ptr<TimedSubtitle>);
-	bool video_done () const;
+	void seek ();
+	void emit (boost::shared_ptr<const Film> film, boost::shared_ptr<const ImageProxy>, Frame frame);
 
-	Time _next_video;
-	boost::shared_ptr<const VideoContent> _video_content;
+	/** @return true if the emitted data was accepted, false if not */
+	boost::signals2::signal<void (ContentVideo)> Data;
 
 private:
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-	FrameRateConversion _frame_rate_conversion;
-	bool _odd;
-	boost::optional<libdcp::Size> _video_container_size;
+	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;
+	std::vector<Frame> _last_threed_frames;
 };
 
 #endif