From 6680847654010dfb233487fce0757a2372e79271 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 2 Nov 2021 14:55:45 +0100 Subject: [PATCH] Fix errors when referencing trimmed DCPs (#2116). --- src/lib/player.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/player.cc b/src/lib/player.cc index df10ec146..5404dfac4 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -596,7 +596,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 = content->position() + DCPTime::from_frames(offset_from_start, ffr); + auto const from = max(DCPTime(), content->position() + DCPTime::from_frames(offset_from_start, ffr) - DCPTime::from_frames(trim_start, cfr)); if (dcp->reference_video()) { maybe_add_asset (reel_assets, reel->main_picture(), reel_trim_start, reel_trim_end, from, ffr); } -- 2.30.2