X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=f5c3cd743ba43bf3df96d4a1706507a33a0e3a95;hb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;hp=8715b9714cfefadcbc37c1a53016202153fb51af;hpb=7f2e74604a51b984e4c8cbb5d5f4bb642677ec00;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 8715b9714..f5c3cd743 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/lib/video_decoder.h
+ *  @brief VideoDecoder class.
+ */
+
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
@@ -28,14 +32,17 @@
 #include "content_video.h"
 
 class VideoContent;
-class Image;
+class ImageProxy;
 
+/** @class VideoDecoder
+ *  @brief Parent for classes which decode video.
+ */
 class VideoDecoder : public virtual Decoder
 {
 public:
 	VideoDecoder (boost::shared_ptr<const VideoContent> c);
 
-	boost::optional<ContentVideo> get_video (VideoFrame frame, bool accurate);
+	std::list<ContentVideo> get_video (VideoFrame frame, bool accurate);
 
 	boost::shared_ptr<const VideoContent> video_content () const {
 		return _video_content;
@@ -48,11 +55,12 @@ public:
 protected:
 
 	void seek (ContentTime time, bool accurate);
-	void video (boost::shared_ptr<const Image>, VideoFrame frame);
-	boost::optional<ContentVideo> decoded_video (VideoFrame frame);
+	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