diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-06-08 01:01:15 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-06-12 15:40:33 +0200 |
| commit | 922dc3605c29bd742a18b02fbe1faae5739b70df (patch) | |
| tree | dbed3527eaf2921a7811b254c0f338b1a587c9d8 /src/lib | |
| parent | 55e137bfa7a7a4c394cce9e396a89e81f16b388a (diff) | |
Believed fix for error when calculating the position in the output DCP of a referenced asset.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/player.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 77193cb1f..de9be2b71 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -614,7 +614,7 @@ Player::get_reel_assets () Frame const reel_trim_start = min(reel_duration, max(int64_t(0), trim_start - offset_from_start)); Frame const reel_trim_end = min(reel_duration, max(int64_t(0), reel_duration - (offset_from_end - trim_end))); - auto const from = max(DCPTime(), content->position() + DCPTime::from_frames(offset_from_start, frame_rate) - DCPTime::from_frames(trim_start, frame_rate)); + auto const from = content->position() + std::max(DCPTime(), DCPTime::from_frames(offset_from_start - trim_start, frame_rate)); if (dcp->reference_video()) { maybe_add_asset (reel_assets, reel->main_picture(), reel_trim_start, reel_trim_end, from, frame_rate); } |