diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-25 09:41:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-25 09:41:36 +0000 |
| commit | ee77b3cf5f59f775e75e628aa28e8f2f9f941530 (patch) | |
| tree | bbf9ab4ef1f0f633591889cbbd6b7b65de8f5a57 /src/lib/video_decoder.h | |
| parent | e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160 (diff) | |
It builds.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index c3228e88d..7c7ec35b9 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,15 +25,17 @@ #include "decoder.h" #include "video_content.h" #include "util.h" -#include "decoded.h" class VideoContent; class Image; +class ContentVideo; class VideoDecoder : public virtual Decoder { public: - VideoDecoder (boost::shared_ptr<const VideoContent>); + VideoDecoder (boost::shared_ptr<const VideoContent> c); + + boost::shared_ptr<ContentVideo> get_video (VideoFrame frame, bool accurate); boost::shared_ptr<const VideoContent> video_content () const { return _video_content; @@ -41,8 +43,12 @@ public: protected: - void video (boost::shared_ptr<const Image>, bool, ContentTime); + void seek (ContentTime time, bool accurate); + void video (boost::shared_ptr<const Image>, VideoFrame frame); + boost::shared_ptr<ContentVideo> decoded_video (VideoFrame frame); + boost::shared_ptr<const VideoContent> _video_content; + std::list<boost::shared_ptr<ContentVideo> > _decoded_video; }; #endif |