🎥 Make videos programmatically with React
Fix floating-point errors in Studio timing edits
JonnyBurgerb60b56f304cf
diff --git a/packages/studio-codemods/src/sequence-props/video-config-numeric-expression.ts b/packages/studio-codemods/src/sequence-props/video-config-numeric-expression.tsindex 78d7aa87d3..8670a69db1 100644--- a/packages/studio-codemods/src/sequence-props/video-config-numeric-expression.ts+++ b/packages/studio-codemods/src/sequence-props/video-config-numeric-expression.ts@@ -178,7 +178,10 @@ export const updateVideoConfigNumericExpression = ({if (expression.type === 'video-config-subtraction') {const subtrahend = expression.minuend - value;- if (!Number.isFinite(subtrahend)) {+ if (+ !Number.isFinite(subtrahend) ||+ expression.minuend - subtrahend !== value+ ) {return numericExpression(value);}@@ -194,7 +197,12 @@ export const updateVideoConfigNumericExpression = ({}const multiplier = value / expression.multiplicand;- if (!Number.isFinite(multiplier) || multiplier === 0) {+ // Preserve the expression only if evaluating it reproduces the requested value.+ if (+ !Number.isFinite(multiplier) ||+ multiplier === 0 ||+ multiplier * expression.multiplicand !== value+ ) {return numericExpression(value);}diff --git a/packages/studio-codemods/src/split-jsx-sequence.ts b/packages/studio-codemods/src/split-jsx-sequence.tsindex fbb904dd3a..f43fee1ae3 100644--- a/packages/studio-codemods/src/split-jsx-sequence.ts+++ b/packages/studio-codemods/src/split-jsx-sequence.ts@@ -32,6 +32,11 @@ import {parseAst, parseAstForReadOnly} from './sequence-props/parse-ast';const {builders: b, namedTypes} = recast.types;+// Remove arithmetic noise without rounding fractional frames to whole frames.+const normalizeComputedTiming = (value: number): number => {+ return Number.isInteger(value) ? value : Number(value.toPrecision(15));+};+type SequenceTiming = {from: number;durationInFrames: number;@@ -435,10 +440,15 @@ export const splitJsxSequence = ({}const right = cloneJsxElement(jsxElement);- const leftDuration = splitFrame - timing.from;+ // Match Studio's numeric dragger precision while retaining fractional frames.+ const leftDuration = normalizeComputedTiming(splitFrame - timing.from);const rightDuration =- timing.durationInFrames === Infinity ? Infinity : finiteEnd - splitFrame;- const rightTrimBefore = timing.trimBefore + leftDuration;+ timing.durationInFrames === Infinity+ ? Infinity+ : normalizeComputedTiming(finiteEnd - splitFrame);+ const rightTrimBefore = normalizeComputedTiming(+ timing.trimBefore + leftDuration,+ );setNumericAttribute({element: jsxElement,diff --git a/packages/studio-codemods/src/test/split-jsx-sequence.test.ts b/packages/studio-codemods/src/test/split-jsx-sequence.test.tsnew file mode 100644index 0000000000..54ed9c0a9e--- /dev/null+++ b/packages/studio-codemods/src/test/split-jsx-sequence.test.ts@@ -0,0 +1,28 @@+import {expect, test} from 'bun:test';+import * as recast from 'recast';+import {getNodePathForRecastPath} from '../sequence-props';+import {parseAst} from '../sequence-props/parse-ast';+import {splitJsxSequence} from '../split-jsx-sequence';++test('splits fractional timing without persisting arithmetic noise', async () => {+ const input =+ 'export const Comp = () => <Sequence from={0.1} durationInFrames={1.2} trimBefore={0.2} />;';+ const ast = parseAst(input);+ let nodePath = null;+ recast.types.visit(ast, {+ visitJSXOpeningElement(path) {+ nodePath = getNodePathForRecastPath(path, ast);+ return false;+ },+ });+ if (!nodePath) throw new Error('Could not find Sequence');+ const {output} = await splitJsxSequence({+ input,+ nodePath,+ sequenceKeys: ['from', 'durationInFrames', 'trimBefore'],+ splitFrame: 1,+ });+ expect(output).toContain('durationInFrames={0.9}');+ expect(output).toContain('durationInFrames={0.3}');+ expect(output).toContain('trimBefore={1.1}');+});diff --git a/packages/studio-codemods/src/test/update-sequence-props.test.ts b/packages/studio-codemods/src/test/update-sequence-props.test.tsindex 63d8fd0885..4f3bd29cae 100644--- a/packages/studio-codemods/src/test/update-sequence-props.test.ts+++ b/packages/studio-codemods/src/test/update-sequence-props.test.ts@@ -95,3 +95,34 @@ export const ShortAudioLoop = () => {expect(output).toContain('from={-10 * fps}');});++test('saves exact values when preserving config arithmetic would change them', () => {+ for (const [expression, value] of [+ ['4 * fps', 123],+ ['fps * 4', 123],+ ['durationInFrames - 1', 0.1],+ ] as const) {+ const input = `import {Sequence} from "remotion"; const fps = 30; const durationInFrames = 10; export const Comp = () => <Sequence from={${expression}} />;`;+ const ast = parseAst(input);+ let nodePath = null;+ recast.types.visit(ast, {+ visitJSXOpeningElement(path) {+ nodePath = getNodePathForRecastPath(path, ast);+ return false;+ },+ });+ if (!nodePath) throw new Error('Could not find Sequence');+ const {output} = updateMultipleSequenceProps({+ input,+ changes: [+ {+ nodePath,+ updates: [{key: 'from', value, defaultValue: null}],+ schema: NoReactInternals.sequenceSchema,+ videoConfigValues: null,+ },+ ],+ });+ expect(output).toContain(`from={${value}}`);+ }+});diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsxindex bf1056ae4a..6f2ffb566c 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx@@ -536,7 +536,11 @@ export const getTimelineSequenceLeftEdgeDragValues = ({return {durationInFrames: initialDuration - clampedDeltaFrames,from: initialFrom + clampedDeltaFrames,- trimBefore: initialTrimBefore + clampedDeltaFrames * playbackRate,+ // Division and multiplication by playbackRate may not cancel exactly.+ trimBefore:+ clampedDeltaFrames === -initialTrimBefore / playbackRate+ ? 0+ : initialTrimBefore + clampedDeltaFrames * playbackRate,};};diff --git a/packages/studio/src/test/timeline-selection.test.ts b/packages/studio/src/test/timeline-selection.test.tsindex 291fce8bf8..d2e5206987 100644--- a/packages/studio/src/test/timeline-selection.test.ts+++ b/packages/studio/src/test/timeline-selection.test.ts@@ -2792,6 +2792,30 @@ test('Timeline left edge drag clamps scaled trimBefore at zero', () => {});});+test('Timeline left edge drag reaches exact zero with fractional playback rates', () => {+ for (const playbackRate of [0.7, 1.4, 1.55, 2.8]) {+ expect(+ getTimelineSequenceLeftEdgeDragValues({+ initialDuration: 300,+ initialFrom: 400,+ initialTrimBefore: 252,+ deltaFrames: -400,+ playbackRate,+ }).trimBefore,+ ).toBe(0);+ }++ expect(+ getTimelineSequenceLeftEdgeDragValues({+ initialDuration: 300,+ initialFrom: 400,+ initialTrimBefore: 252,+ deltaFrames: -1,+ playbackRate: 1.5,+ }).trimBefore,+ ).toBe(250.5);+});+test('Timeline left edge drag adjusts and clamps media trimBefore', () => {const schema = {} satisfies InteractivitySchema;const nodePathInfo = makeNodePathInfo(['body', 0], []);