Merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 7c7ec35b9031c25a01e5e5a6decd2c5b51c9ccaf..f5c3cd743ba43bf3df96d4a1706507a33a0e3a95 100644 (file)
--- 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
 
@@ -25,30 +29,38 @@
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
+#include "content_video.h"
 
 class VideoContent;
-class Image;
-class ContentVideo;
+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::shared_ptr<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;
        }
 
+#ifdef DCPOMATIC_DEBUG
+       int test_gaps;
+#endif
+
 protected:
 
        void seek (ContentTime time, bool accurate);
-       void video (boost::shared_ptr<const Image>, VideoFrame frame);
-       boost::shared_ptr<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<boost::shared_ptr<ContentVideo> > _decoded_video;
+       std::list<ContentVideo> _decoded_video;
+       bool _same;
 };
 
 #endif