diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-12-11 01:06:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-12-11 01:06:37 +0000 |
| commit | 14c5566fe90b2584c7474c3250e6506d70e81510 (patch) | |
| tree | a219ac33ceb407eb384e0781b4f4e741f99a374d /src/lib/player.cc | |
| parent | f09e516b90f0b097c949926831ad1bc282ba41f7 (diff) | |
Fix various problems caused by non-integer-frame start trims,
and also by the inability of content_video_to_dcp to return
negative values. The latter is necessary for tests on "is this
content too early" to work.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index f91e3a7f2..0bc460465 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -346,8 +346,8 @@ DCPTime Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const { /* 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 ()); + DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime(piece->content->trim_start(), piece->frc); + return d + piece->content->position(); } Frame |