projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix problems with FFmpeg files that have all-zero stream IDs.
[dcpomatic.git]
/
src
/
lib
/
video_decoder.h
diff --git
a/src/lib/video_decoder.h
b/src/lib/video_decoder.h
index d24219d956cba2df1b92b8a58e2d3f5bc8d24d78..142320a049c8e7a23bf7aff2d618149d6259941d 100644
(file)
--- a/
src/lib/video_decoder.h
+++ b/
src/lib/video_decoder.h
@@
-20,29
+20,37
@@
#ifndef DCPOMATIC_VIDEO_DECODER_H
#define DCPOMATIC_VIDEO_DECODER_H
#ifndef DCPOMATIC_VIDEO_DECODER_H
#define DCPOMATIC_VIDEO_DECODER_H
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
#include "decoder.h"
#include "decoder.h"
+#include "video_content.h"
#include "util.h"
class VideoContent;
#include "util.h"
class VideoContent;
+class Image;
class VideoDecoder : public virtual Decoder
{
public:
class VideoDecoder : public virtual Decoder
{
public:
- VideoDecoder (boost::shared_ptr<const Film>);
+ VideoDecoder (boost::shared_ptr<const Film>
, boost::shared_ptr<const VideoContent>
);
- virtual void seek (VideoContent::Frame) = 0;
- virtual void seek_back () = 0;
+ /** Seek so that the next pass() will yield (approximately) the requested frame.
+ * Pass accurate = true to try harder to get close to the request.
+ */
+ virtual void seek (VideoContent::Frame frame, bool accurate) = 0;
/** Emitted when a video frame is ready.
* First parameter is the video image.
/** 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.
+ * Second parameter is the eye(s) which should see this image.
+ * Third parameter is true if the image is the same as the last one that was emitted for this Eyes value.
+ * Fourth parameter is the frame within our source.
*/
*/
- boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, VideoContent::Frame)> Video;
+ boost::signals2::signal<void (boost::shared_ptr<const Image>,
Eyes,
bool, VideoContent::Frame)> Video;
protected:
void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
protected:
void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
+ boost::shared_ptr<const VideoContent> _video_content;
VideoContent::Frame _video_position;
};
VideoContent::Frame _video_position;
};