Merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index d24219d956cba2df1b92b8a58e2d3f5bc8d24d78..f5c3cd743ba43bf3df96d4a1706507a33a0e3a95 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -17,33 +17,50 @@
 
 */
 
+/** @file  src/lib/video_decoder.h
+ *  @brief VideoDecoder class.
+ */
+
 #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"
 
 class VideoContent;
+class ImageProxy;
 
+/** @class VideoDecoder
+ *  @brief Parent for classes which decode video.
+ */
 class VideoDecoder : public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>);
-
-       virtual void seek (VideoContent::Frame) = 0;
-       virtual void seek_back () = 0;
-
-       /** Emitted when a video frame is ready.
-        *  First parameter is the video image.
-        *  Second parameter is true if the image is the same as the last one that was emitted.
-        *  Third parameter is the frame within our source.
-        */
-       boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, VideoContent::Frame)> Video;
-       
+       VideoDecoder (boost::shared_ptr<const VideoContent> c);
+
+       std::list<ContentVideo> get_video (VideoFrame frame, bool accurate);
+
+       boost::shared_ptr<const VideoContent> video_content () const {
+               return _video_content;
+       }
+
+#ifdef DCPOMATIC_DEBUG
+       int test_gaps;
+#endif
+
 protected:
 
-       void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
-       VideoContent::Frame _video_position;
+       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;
 };
 
 #endif