diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-23 12:47:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-23 12:47:16 +0000 |
| commit | 2f51e117cbaf36b9e0ccb02c338b316fc8e26b9a (patch) | |
| tree | a51cbf2bf0031f192742c126aa40ac3edc5fc68a /src/lib/video_decoder.h | |
| parent | b4e75d642c809fa38b45a4e54ea1ab7eca16e04f (diff) | |
Various fixes to seek since changing fill code.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 9e56546df..24ee7f4e5 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -60,13 +60,15 @@ protected: void seek (ContentTime time, bool accurate); void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame); std::list<ContentVideo> decoded_video (VideoFrame frame); - void fill_up_to_2d (VideoFrame); - void fill_up_to_3d (VideoFrame, Eyes); + void fill_2d (VideoFrame from, VideoFrame to); + void fill_3d (VideoFrame from, VideoFrame to, Eyes); boost::shared_ptr<const VideoContent> _video_content; std::list<ContentVideo> _decoded_video; bool _same; boost::shared_ptr<Image> _black_image; + boost::optional<ContentTime> _last_seek_time; + bool _last_seek_accurate; }; #endif |
