Merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index d8c362354ee02b2f9614b265c6159ee1b200bf7d..86a9489b111338241dc5907cb7d8f9ad0e685229 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
@@ -25,7 +25,7 @@
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
-#include "decoded.h"
+#include "content_video.h"
 
 class VideoContent;
 class Image;
@@ -33,7 +33,9 @@ class Image;
 class VideoDecoder : public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+       VideoDecoder (boost::shared_ptr<const VideoContent> c);
+
+       boost::optional<ContentVideo> get_video (VideoFrame frame, bool accurate);
 
        boost::shared_ptr<const VideoContent> video_content () const {
                return _video_content;
@@ -41,8 +43,12 @@ public:
 
 protected:
 
-       void video (boost::shared_ptr<const Image>, bool, ContentTime);
+       void seek (ContentTime time, bool accurate);
+       void video (boost::shared_ptr<const Image>, VideoFrame frame);
+       boost::optional<ContentVideo> decoded_video (VideoFrame frame);
+
        boost::shared_ptr<const VideoContent> _video_content;
+       std::list<ContentVideo> _decoded_video;
 };
 
 #endif