diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-26 01:24:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-02-26 01:24:26 +0100 |
| commit | cbb8260e395058da76b3de518ebc535a114c54b1 (patch) | |
| tree | a993610525747e5e77955013451a3b296236d2d1 /src/lib/video_decoder.h | |
| parent | 5ea111a09d386676004a6078cf16aa0b937fbcf1 (diff) | |
Fix a set of mistakes related to 3D content.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 5d9a6b8a0..9d69f743a 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,13 +18,16 @@ */ + /** @file src/lib/video_decoder.h * @brief VideoDecoder class. */ + #ifndef DCPOMATIC_VIDEO_DECODER_H #define DCPOMATIC_VIDEO_DECODER_H + #include "decoder.h" #include "video_content.h" #include "util.h" @@ -32,12 +35,14 @@ #include "decoder_part.h" #include <boost/signals2.hpp> + class VideoContent; class ImageProxy; class Image; class Log; class FrameIntervalChecker; + /** @class VideoDecoder * @brief Parent for classes which decode video. */ @@ -62,11 +67,11 @@ public: private: std::shared_ptr<const Content> _content; - /** Frame of last thing to be emitted; only used for 3D */ - boost::optional<Frame> _last_emitted_frame; + /** Eyes of last thing to be emitted; only used for THREE_D_ALTERNATE */ boost::optional<Eyes> _last_emitted_eyes; boost::optional<dcpomatic::ContentTime> _position; boost::scoped_ptr<FrameIntervalChecker> _frame_interval_checker; }; + #endif |
