Rename some methods.

[dcpomatic.git] / src / lib / video_decoder.h

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index f5c3cd743ba43bf3df96d4a1706507a33a0e3a95..712ea5060e5a01e6e64b9ccc2edfb0716accf959 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 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
     it under the terms of the GNU General Public License as published by
@@ -24,43 +24,64 @@
 #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
  *  @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 (VideoFrame 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;
        }
 
 #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>, VideoFrame frame);
-       std::list<ContentVideo> decoded_video (VideoFrame frame);
-
-       boost::shared_ptr<const VideoContent> _video_content;
-       std::list<ContentVideo> _decoded_video;
-       bool _same;
+       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.
+        */
+       boost::optional<Frame> _no_data_frame;
 };
 
 #endif