Merge remote-tracking branch 'bbc/upstream/set-next-from-here' into nrk/test/set-next-from-here

Author: nytamin

packages/job-worker/src/playout/lookahead/findForLayer.ts

@@ -115,7 +115,7 @@ function generatePartInstanceLookaheads(
 ): { objs: LookaheadTimelineObject[]; partInfo: PartAndPieces } {
 	const partInfo: PartAndPieces = {
 		part: partInstanceInfo.part.part,
-		usesInTransition: partInstanceInfo.calculatedTimings?.inTransitionStart ? true : false,
+		usesInTransition: partInstanceInfo.calculatedTimings?.inTransitionStart !== null ? true : false,
 		pieces: sortPieceInstancesByStart(partInstanceInfo.allPieces, partInstanceInfo.nowInPart),
 	}
 	if (nextTimeOffset) {

packages/job-worker/src/playout/lookahead/findObjects.ts

@@ -105,7 +105,8 @@ export function findLookaheadObjectsForPart(
 	for (const rawPiece of partInfo.pieces) {
 		if (shouldIgnorePiece(partInfo, rawPiece)) continue
 
-		const obj = getObjectMapForPiece(rawPiece).get(layer)
+		const rawObj = getObjectMapForPiece(rawPiece).get(layer)
+		const obj = rawObj ? structuredClone(rawObj) : undefined
 
 		// we only consider lookahead objects for lookahead and calculate the lookaheadOffset for each object.
 		const computedLookaheadObj = computeLookaheadObject(obj, rawPiece, partInfo, partInstanceId, nextTimeOffset)
@@ -131,7 +132,14 @@ export function findLookaheadObjectsForPart(
 	if (allObjs.length === 1) {
 		// Only one, just return it
 		const obj = allObjs[0]
-		const patchedContent = tryActivateKeyframesForObject(obj, !!transitionPiece, classesFromPreviousPart)
+		const patchedContent = tryActivateKeyframesForObject(
+			{
+				...obj,
+				content: structuredClone(obj.content),
+			},
+			!!transitionPiece,
+			classesFromPreviousPart
+		)
 
 		return [
 			{
@@ -144,7 +152,7 @@ export function findLookaheadObjectsForPart(
 
 		const res: Array<LookaheadTimelineObject> = []
 		allObjs.map((obj) => {
-			const piece = partInfo.pieces.find((piece) => unprotectString(piece._id) === obj.pieceInstanceId)
+			const piece = partInfo.pieces.find((piece) => unprotectString(piece._id) === getBestPieceInstanceId(piece))
 			if (!piece) return
 
 			// If there is a transition and this piece is abs0, it is assumed to be the primary piece and so does not need lookahead
@@ -158,7 +166,14 @@ export function findLookaheadObjectsForPart(
 			}
 
 			if (obj) {
-				const patchedContent = tryActivateKeyframesForObject(obj, !!transitionPiece, classesFromPreviousPart)
+				const patchedContent = tryActivateKeyframesForObject(
+					{
+						...obj,
+						content: structuredClone(obj.content),
+					},
+					!!transitionPiece,
+					classesFromPreviousPart
+				)
 
 				res.push(
 					literal<LookaheadTimelineObject>({