Merge pull request #1666 from nrkno/contribute/fix/sofie-4336/endRelativeToPart

Author: jstarpl

packages/job-worker/src/playout/__tests__/timeline.test.ts

@@ -1893,11 +1893,11 @@ describe('Timeline', () => {
 						currentInfinitePieces: {
 							piece002: {
 								// Should still be based on the time of previousPart
-								partGroup: { start: firstPartTakeTime },
 								pieceGroup: {
 									controlObj: { start: 500 },
 									childGroup: { preroll: 0, postroll: 0 },
 								},
+								partGroup: { start: firstPartTakeTime - 500 }, // this is Piece plannedStartedPlayback minus pieceGroup.controlObj.start
 							},
 						},
 						previousOutTransition: undefined,
@@ -1973,7 +1973,7 @@ describe('Timeline', () => {
 										},
 									},
 									partGroup: {
-										start: plannedStartedPlayback,
+										start: plannedStartedPlayback - 500, // this is plannedStartedPlayback minus pieceGroup.controlObj.start
 									},
 								},
 							},

packages/job-worker/src/playout/timeline/multi-gateway.ts

@@ -8,6 +8,7 @@ import { PlayoutModel } from '../model/PlayoutModel.js'
 import { RundownTimelineTimingContext, getInfinitePartGroupId } from './rundown.js'
 import { PlayoutPartInstanceModel } from '../model/PlayoutPartInstanceModel.js'
 import { PlayoutPieceInstanceModel } from '../model/PlayoutPieceInstanceModel.js'
+import { getPieceControlObjectId } from '@sofie-automation/corelib/dist/playout/ids'
 
 /**
  * We want it to be possible to generate a timeline without it containing any `start: 'now'`.
@@ -297,7 +298,7 @@ function setPlannedTimingsOnPieceInstance(
 
 		const userDurationEnd =
 			pieceInstance.pieceInstance.userDuration && 'endRelativeToPart' in pieceInstance.pieceInstance.userDuration
-				? pieceInstance.pieceInstance.userDuration.endRelativeToPart
+				? partPlannedStart + pieceInstance.pieceInstance.userDuration.endRelativeToPart
 				: null
 
 		let plannedEnd: number | undefined = userDurationEnd ?? undefined
@@ -334,14 +335,27 @@ function preserveOrTrackInfiniteTimings(
 	// Update the timeline group
 	const startedPlayback = plannedStartedPlayback ?? pieceInstance.pieceInstance.plannedStartedPlayback
 	if (startedPlayback) {
+		const pieceControlObjectId = getPieceControlObjectId(pieceInstance.pieceInstance)
+		const pieceControlObj = timelineObjsMap[pieceControlObjectId]
+
+		// this replicates what generateCurrentInfinitePieceObjects() does
+		let pieceEnableStartOffset = 0
+		if (
+			pieceControlObj &&
+			!Array.isArray(pieceControlObj.enable) &&
+			typeof pieceControlObj.enable?.start === 'number'
+		) {
+			pieceEnableStartOffset = pieceControlObj.enable.start
+		}
+
 		const infinitePartGroupId = getInfinitePartGroupId(pieceInstance.pieceInstance._id)
 		const infinitePartGroupObj = timelineObjsMap[infinitePartGroupId]
 		if (
 			infinitePartGroupObj &&
 			!Array.isArray(infinitePartGroupObj.enable) &&
 			typeof infinitePartGroupObj.enable.start === 'string'
 		) {
-			infinitePartGroupObj.enable.start = startedPlayback
+			infinitePartGroupObj.enable.start = startedPlayback - pieceEnableStartOffset
 		}
 	}
 }

packages/job-worker/src/playout/timeline/rundown.ts

@@ -282,6 +282,16 @@ function generateCurrentInfinitePieceObjects(
 		return []
 	}
 
+	/*
+	   Notes on the "Infinite Part Group":
+	   Infinite pieces are put into a parent "infinite Part Group" object instead of the usual Part Group,
+	   because their lifetime can be outside of their Part.
+	   
+	   The Infinite Part Group's start time is set to be the start time of the Piece, but this is then complicated by
+	   the Piece.enable.start assuming that it is relative to the PartGroup it is in. This is being factored in if an
+	   absolute start time is known for the piece.
+	*/
+
 	const { infiniteGroupEnable, pieceEnable, nowInParent } = calculateInfinitePieceEnable(
 		currentPartInfo,
 		timingContext,
@@ -350,7 +360,12 @@ function calculateInfinitePieceEnable(
 	)
 
 	let infiniteGroupEnable: PartEnable = {
-		start: `#${timingContext.currentPartGroup.id}.start`, // This gets overriden with a concrete time if the original piece is known to have already started
+		/*
+			This gets overridden with a concrete time if the original piece is known to have already started
+			but if not, allows the pieceEnable to be relative to the currentPartInstance's part group as normal
+			and `nowInParent` to be correct for the piece objects inside
+		*/
+		start: `#${timingContext.currentPartGroup.id}.start`,
 	}
 
 	let nowInParent = currentPartInfo.partTimes.nowInPart // Where is 'now' inside of the infiniteGroup?