X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=69270244430d1a29fc4778026eab51fa57417580;hp=42cfc49063de396fa5043f193430ccffc6279eb0;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=d184945d41ea7d6e489621dc6492a93b5d91f7de

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 42cfc4906..692702444 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -34,45 +35,54 @@
 class VideoContent;
 class ImageProxy;
 class Image;
+class Log;
 
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
  */
-class VideoDecoder : public virtual Decoder
+class VideoDecoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const VideoContent> c);
+	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log);
 
-	std::list<ContentVideo> get_video (Frame frame, bool accurate);
+	std::list<ContentVideo> get (Frame frame, bool accurate);
 
-	boost::shared_ptr<const VideoContent> video_content () const {
-		return _video_content;
+	void set_ignore ();
+	bool ignore () const {
+		return _ignore;
 	}
 
-	void set_ignore_video ();
-
 #ifdef DCPOMATIC_DEBUG
 	int test_gaps;
 #endif
 
-protected:
 	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 video (boost::shared_ptr<const ImageProxy>, Frame frame);
-	std::list<ContentVideo> decoded_video (Frame frame);
+	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);
+	void fill_both_eyes (VideoFrame from, VideoFrame to);
 
-	boost::shared_ptr<const VideoContent> _video_content;
-	std::list<ContentVideo> _decoded_video;
+	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_video;
+	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