diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-09 19:58:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 19f94521139aac13ef8fb4eaa55855b2ada307b4 (patch) | |
| tree | 6e4b457c1fa46c674433fb1a5d2a9cd0f07c5a11 /src/lib/video_decoder.h | |
| parent | 0a2d40420813403a96352c6dc895d23fcd9994c0 (diff) | |
Move video frame rate ('prepared-for') into Content.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index c787faa04..669a5ef1e 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2016 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 @@ -42,14 +42,10 @@ class Log; class VideoDecoder : public virtual Decoder { public: - VideoDecoder (boost::shared_ptr<const VideoContent> c, boost::shared_ptr<Log> log); + VideoDecoder (boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log); std::list<ContentVideo> get_video (Frame frame, bool accurate); - boost::shared_ptr<const VideoContent> video_content () const { - return _video_content; - } - void set_ignore_video (); #ifdef DCPOMATIC_DEBUG @@ -59,6 +55,8 @@ public: protected: friend struct video_decoder_fill_test1; friend struct video_decoder_fill_test2; + friend struct ffmpeg_pts_offset_test; + friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length); void seek (ContentTime time, bool accurate); void video (boost::shared_ptr<const ImageProxy>, Frame frame); @@ -66,7 +64,7 @@ protected: void fill_one_eye (Frame from, Frame to, Eyes); void fill_both_eyes (Frame from, Frame to, Eyes); - boost::shared_ptr<const VideoContent> _video_content; + boost::shared_ptr<const Content> _video_content; boost::shared_ptr<Log> _log; std::list<ContentVideo> _decoded_video; boost::shared_ptr<Image> _black_image; |