projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent crash if you forget to call FilterGraph::setup().
[dcpomatic.git]
/
src
/
lib
/
image_decoder.h
diff --git
a/src/lib/image_decoder.h
b/src/lib/image_decoder.h
index 9b8cf73bbba6461a5da786d312338b35c25144de..41924735c4635c07d0ad0e484954091c9f248dfa 100644
(file)
--- a/
src/lib/image_decoder.h
+++ b/
src/lib/image_decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,26
+18,31
@@
*/
*/
+
#include "decoder.h"
#include "decoder.h"
+#include "types.h"
+
class ImageContent;
class Log;
class ImageProxy;
class ImageContent;
class Log;
class ImageProxy;
+
class ImageDecoder : public Decoder
{
public:
class ImageDecoder : public Decoder
{
public:
- ImageDecoder (
boost::shared_ptr<const ImageContent> c, boost::shared_ptr<Log> log
);
+ ImageDecoder (
std::shared_ptr<const Film> film, std::shared_ptr<const ImageContent> c
);
-
boost
::shared_ptr<const ImageContent> content () {
+
std
::shared_ptr<const ImageContent> content () {
return _image_content;
}
return _image_content;
}
+ bool pass () override;
+ void seek (dcpomatic::ContentTime, bool) override;
+
private:
private:
- bool pass (Decoder::PassReason, bool);
- void seek (ContentTime, bool);
-
boost
::shared_ptr<const ImageContent> _image_content;
-
boost
::shared_ptr<ImageProxy> _image;
- Frame _
video_position
;
+
std
::shared_ptr<const ImageContent> _image_content;
+
std
::shared_ptr<ImageProxy> _image;
+ Frame _
frame_video_position = 0
;
};
};