diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-01 15:05:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-01 15:05:13 +0100 |
| commit | 6f071ce94bb7cff1106e2ef6d8eb4363694435f2 (patch) | |
| tree | 65fa1844ae470bc9011733ecff4f016ba5a4671e /src/lib/player.h | |
| parent | 15f23b356b757a9697bf1a9ec30c243ab8070404 (diff) | |
Remove FFmpegDecoder minimal_run and care on seeking, as the VideoDecoder/AudioDecoder has to cope with stuff per-stream anyway.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 04503c27a..3ee909f97 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -117,9 +117,10 @@ private: std::list<PositionImage> process_content_text_subtitles (std::list<boost::shared_ptr<ContentTextSubtitle> >) const; void update_subtitle_from_text (); VideoFrame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const; + DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, VideoFrame f) const; AudioFrame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const; ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const; - boost::shared_ptr<PlayerVideo> black_player_video_frame () const; + boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const; /** @return Pieces of content type C that overlap a specified time range in the DCP */ template<class C> |