Basics of splitting up Decoder tree like Content.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c787faa0413e4181c8206aa35fad5123e6e54e16..c14a877f267e793ad2d4fd6ffc0728a7801c6184 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -39,34 +39,38 @@ 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, boost::shared_ptr<Log> log);
+       VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log);
 
        std::list<ContentVideo> get_video (Frame frame, bool accurate);
 
-       boost::shared_ptr<const VideoContent> video_content () const {
-               return _video_content;
-       }
-
        void set_ignore_video ();
+       bool ignore_video () const {
+               return _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);
+
+private:
+
        std::list<ContentVideo> decoded_video (Frame frame);
        void fill_one_eye (Frame from, Frame to, Eyes);
        void fill_both_eyes (Frame from, Frame to, Eyes);
 
-       boost::shared_ptr<const VideoContent> _video_content;
+       Decoder* _parent;
+       boost::shared_ptr<const Content> _video_content;
        boost::shared_ptr<Log> _log;
        std::list<ContentVideo> _decoded_video;
        boost::shared_ptr<Image> _black_image;