From: Carl Hetherington <cth@carlh.net>
Date: Tue, 2 Nov 2021 13:55:45 +0000 (+0100)
Subject: Fix errors when referencing trimmed DCPs (#2116).
X-Git-Tag: v2.15.172~9
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=6680847654010dfb233487fce0757a2372e79271

Fix errors when referencing trimmed DCPs (#2116).
---

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);
 			}