fix: Segment and Part timing are being out of sync

bbc · Oct 2, 2024 · cf68683 · cf68683
1 parent 38f5690
commit cf68683
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/packages/webui/src/client/lib/rundownTiming.ts b/packages/webui/src/client/lib/rundownTiming.ts
@@ -134,6 +134,7 @@ export class RundownTimingCalculator {
 
 		let lastSegmentId: SegmentId | undefined = undefined
 		let nextRundownAnchor: number | undefined = undefined
+		let remainingTimeOnCurrentSegment = 0
 
 		if (playlist) {
 			const breakProps = currentRundown ? this.getRundownsBeforeNextBreak(rundowns, currentRundown) : undefined
@@ -281,6 +282,12 @@ export class RundownTimingCalculator {
 						defaultDuration
 					partDisplayDuration = Math.max(partDisplayDurationNoPlayback, now - lastStartedPlayback)
 					this.partPlayed[partInstanceOrPartId] = now - lastStartedPlayback
+					if (liveSegmentId === partInstance.segmentId) {
+						// Workaround:
+						// The offset of 650 microseconds is to compensate for part and segment being in separate
+						// clocks windows in the UI
+						remainingTimeOnCurrentSegment += now - lastStartedPlayback - 650
+					}
 					const segmentStartedPlayback =
 						playlist.segmentsStartedPlayback?.[unprotectString(partInstance.segmentId)] ??
 						lastStartedPlayback
@@ -632,6 +639,7 @@ export class RundownTimingCalculator {
 			segmentStartedPlayback: this.segmentStartedPlayback,
 			currentTime: now,
 			remainingTimeOnCurrentPart,
+			remainingTimeOnCurrentSegment,
 			remainingBudgetOnCurrentSegment,
 			currentPartWillAutoNext,
 			rundownsBeforeNextBreak,
@@ -726,6 +734,8 @@ export interface RundownTimingContext {
 	segmentStartedPlayback?: Record<string, number>
 	/** Remaining time on current part */
 	remainingTimeOnCurrentPart?: number
+	/** Remaining time on current segment */
+	remainingTimeOnCurrentSegment?: number
 	/** Remaining budget on current segment, if its countdownType === CountdownType.SEGMENT_BUDGET_DURATION */
 	remainingBudgetOnCurrentSegment?: number
 	/** Current part will autoNext */

diff --git a/packages/webui/src/client/ui/RundownView/RundownTiming/SegmentDuration.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/SegmentDuration.tsx
@@ -4,7 +4,6 @@ import { withTiming, WithTiming } from './withTiming'
 import { RundownUtils } from '../../../lib/rundown'
 import { PartUi } from '../../SegmentTimeline/SegmentTimelineContainer'
 import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
-import { getPartInstanceTimingId } from '../../../lib/rundownTiming'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 
 interface ISegmentDurationProps {
@@ -29,15 +28,14 @@ export const SegmentDuration = withTiming<ISegmentDurationProps, {}>()(function
 ) {
 	let duration: number | undefined = undefined
 	let budget = 0
-	let playedOut = 0
+	const playedOut = props.timingDurations.remainingTimeOnCurrentSegment || 0
 
 	const segmentBudgetDuration = props.segment.segmentTiming?.budgetDuration
 
 	if (segmentBudgetDuration !== undefined) {
 		budget = segmentBudgetDuration
 	}
 	if (props.parts && props.timingDurations.partPlayed) {
-		const { partPlayed } = props.timingDurations
 		if (segmentBudgetDuration === undefined) {
 			props.parts.forEach((part) => {
 				budget +=
@@ -46,9 +44,6 @@ export const SegmentDuration = withTiming<ISegmentDurationProps, {}>()(function
 						: calculatePartInstanceExpectedDurationWithTransition(part.instance) || 0
 			})
 		}
-		props.parts.forEach((part) => {
-			playedOut += (!part.instance.part.untimed ? partPlayed[getPartInstanceTimingId(part.instance)] : 0) || 0
-		})
 	}
 
 	duration = budget - playedOut