fix: ensure pieces don't claim to have durations when their end has n…

…ot yet been decided
nrkno · Sep 23, 2024 · 250b5d7 · 250b5d7
1 parent f4e61fa
commit 250b5d7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/packages/job-worker/src/playout/resolvedPieces.ts b/packages/job-worker/src/playout/resolvedPieces.ts
@@ -47,13 +47,14 @@ export function getResolvedPiecesForPartInstancesOnTimeline(
 
 	const currentPartStarted = partInstancesInfo.current.partStarted ?? now
 	const nextPartStarted =
+		partInstancesInfo.current.partInstance.part.autoNext &&
 		partInstancesInfo.current.partInstance.part.expectedDuration !== undefined
 			? currentPartStarted + partInstancesInfo.current.partInstance.part.expectedDuration
 			: null
 
 	// Calculate the next part if needed
 	let nextResolvedPieces: ResolvedPieceInstance[] = []
-	if (partInstancesInfo.next && partInstancesInfo.current.partInstance.part.autoNext && nextPartStarted != null) {
+	if (partInstancesInfo.next && nextPartStarted != null) {
 		const nowInPart = partInstancesInfo.next.nowInPart
 		nextResolvedPieces = partInstancesInfo.next.pieceInstances.map((instance) =>
 			resolvePrunedPieceInstance(nowInPart, instance)

diff --git a/packages/job-worker/src/playout/timeline/part.ts b/packages/job-worker/src/playout/timeline/part.ts
@@ -61,7 +61,12 @@ export function transformPartIntoTimeline(
 				}
 				break
 			case IBlueprintPieceType.Normal:
-				pieceEnable = getPieceEnableInsidePart(pieceInstance, partTimings, parentGroup.id)
+				pieceEnable = getPieceEnableInsidePart(
+					pieceInstance,
+					partTimings,
+					parentGroup.id,
+					parentGroup.enable.duration !== undefined || parentGroup.enable.end !== undefined
+				)
 				break
 			default:
 				assertNever(pieceInstance.piece.pieceType)

diff --git a/packages/job-worker/src/playout/timeline/piece.ts b/packages/job-worker/src/playout/timeline/piece.ts
@@ -90,7 +90,8 @@ export function transformPieceGroupAndObjects(
 export function getPieceEnableInsidePart(
 	pieceInstance: ReadonlyDeep<PieceInstanceWithTimings>,
 	partTimings: PartCalculatedTimings,
-	partGroupId: string
+	partGroupId: string,
+	partHasEndTime: boolean
 ): TSR.Timeline.TimelineEnable {
 	const pieceEnable: TSR.Timeline.TimelineEnable = { ...pieceInstance.piece.enable }
 	if (typeof pieceEnable.start === 'number') {
@@ -103,7 +104,8 @@ export function getPieceEnableInsidePart(
 		}
 	}
 
-	if (partTimings.toPartPostroll) {
+	// If the part has an end time, we can consider post-roll
+	if (partHasEndTime && partTimings.toPartPostroll) {
 		if (!pieceEnable.duration) {
 			// make sure that the control object is shortened correctly
 			pieceEnable.duration = `#${partGroupId} - ${partTimings.toPartPostroll}`

diff --git a/packages/job-worker/src/playout/timeline/rundown.ts b/packages/job-worker/src/playout/timeline/rundown.ts
@@ -266,7 +266,9 @@ function generateCurrentInfinitePieceObjects(
 	const pieceEnable = getPieceEnableInsidePart(
 		pieceInstance,
 		currentPartInstanceTimings,
-		timingContext.currentPartGroup.id
+		timingContext.currentPartGroup.id,
+		timingContext.currentPartGroup.enable.end !== undefined ||
+			timingContext.currentPartGroup.enable.duration !== undefined
 	)
 
 	let nowInParent = currentPartInfo.nowInPart // Where is 'now' inside of the infiniteGroup?