diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-08-31 18:56:25 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-08-31 18:56:25 +0100 |
| commit | dc9dc1a61c2670c6017948e84a092c8416973cd1 (patch) | |
| tree | 140cdbe1bbae160eda6ae55b200f12d1a533ca01 /src/lib | |
| parent | ada1c702da6a1d892286a8665d9e0e93dac4c166 (diff) | |
| parent | 760cc7d05f8b2a5c85f2535caa97ea8c95db357a (diff) | |
Merge branch '1.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_subtitle_stream.cc | 1 | ||||
| -rw-r--r-- | src/lib/player.cc | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc index 413477865..8b1baf724 100644 --- a/src/lib/ffmpeg_subtitle_stream.cc +++ b/src/lib/ffmpeg_subtitle_stream.cc @@ -25,6 +25,7 @@ using std::string; using std::map; using std::list; +using std::cout; /** Construct a SubtitleStream from a value returned from to_string(). * @param t String returned from to_string(). diff --git a/src/lib/player.cc b/src/lib/player.cc index d6e142c5e..caa2791b8 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -540,8 +540,9 @@ DCPTime Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const { shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (piece->content); - ContentTime const c = ContentTime::from_frames (f, vc->video_frame_rate ()) - piece->content->trim_start (); - return max (DCPTime (), DCPTime (c, piece->frc) + piece->content->position ()); + /* See comment in dcp_to_content_video */ + DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime (piece->content->trim_start (), piece->frc); + return max (DCPTime (), d + piece->content->position ()); } Frame |