diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-21 01:47:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-21 01:50:07 +0100 |
| commit | c5f67166138c3849cc49f1223742343ce4b11b9f (patch) | |
| tree | 6137a1b0cf653b0e3e8677e7e960fcb2e84f9979 /src/lib/video_decoder.h | |
| parent | c3cccfcf0f3942a55f1c0df5ba623fcfa360533e (diff) | |
Give an error if 2D content is set to 3D (#1565). Also run
3D tests with more parallel jobs to speed them up.
Backported from 11c07c6fd98620c859c7d3dcf6a4bbf6a05e567e in v2.15.x.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 0fc7ca5a4..ed56feea0 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -62,9 +62,10 @@ public: boost::signals2::signal<void (ContentVideo)> Data; private: - /** Time of last thing to be emitted */ boost::shared_ptr<const Content> _content; - boost::optional<Frame> _last_emitted; + /** Frame of last thing to be emitted */ + boost::optional<Frame> _last_emitted_frame; + boost::optional<Eyes> _last_emitted_eyes; ContentTime _position; }; |