From 922dc3605c29bd742a18b02fbe1faae5739b70df Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Jun 2022 01:01:15 +0200 Subject: Believed fix for error when calculating the position in the output DCP of a referenced asset. --- src/lib/player.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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); } -- cgit v1.2.3