Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions src/lib/ai-edition/timeline/timelineMap.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,40 @@ describe("projectRegionsToSource", () => {
const out = projectRegionsToSource([partial], [c], [c], () => "x");
expect(out).toEqual([{ ...partial, startMs: 3000, endMs: 5000, clipIndex: 0 }]);
});

// A piece at a cut is gated in f32 by the compositor (`continues_before` → `t < start`,
// `continues_after` → `t > end`), and a clip's first and last frames land on the clip's own
// bounds. A bound rounded to the ms past them left that frame out of the Full Camera piece:
// camera back in its PiP corner, motion blur trailing it there (issue #1300, cuts of the
// v2.1.0-rc.5 passes). The cuts that rounded the other way were clean: the controls.
const pieceAcross = (trimStartSec: number, trimEndSec: number) => {
const c = clip({
id: "c1",
assetId: "a",
sourceStartSec: 0,
sourceEndSec: 60,
timelineEndSec: 60,
});
const anchored = { ...region("r", 0, 60), clipId: "c1", sourceStartSec: 0, sourceEndSec: 60 };
const segments = resolvePlaybackSegments([c], [trim("a", trimStartSec, trimEndSec)]);
return projectRegionsToSource([anchored], segments, [c], () => "r2");
};

it.each([
10.292957, 18.361809, 46.34986635, 6.284394,
])("keeps the first frame after a cut at %s in the Full Camera piece", (cut) => {
const [, after] = pieceAcross(cut - 2, cut);
expect(after.continuesBefore).toBe(true);
expect(Math.fround(after.startMs / 1000)).toBe(Math.fround(cut));
});

it.each([
6.284394, 14.340314, 10.292957,
])("keeps the last frame before a cut at %s in the Full Camera piece", (cut) => {
const [before] = pieceAcross(cut, cut + 2);
expect(before.continuesAfter).toBe(true);
expect(Math.fround(before.endMs / 1000)).toBe(Math.fround(cut));
});
});

describe("resolveNativePosition", () => {
Expand Down
7 changes: 5 additions & 2 deletions src/lib/ai-edition/timeline/timelineMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,11 @@ export function projectRegionsToSource<
out.push({
...region,
id: emitted === 0 ? region.id : makeId(),
startMs: Math.round(srcStartSec * 1000),
endMs: Math.round(srcEndSec * 1000),
// A bound at a cut is not rounded to the ms: it must sit exactly on the segment's
// bound, where native puts the clip's first or last frame. Rounded past it, that
// frame fell out of the piece and Full Camera trailed to its PiP corner (#1300).
startMs: flags.continuesBefore ? srcStartSec * 1000 : Math.round(srcStartSec * 1000),
endMs: flags.continuesAfter ? srcEndSec * 1000 : Math.round(srcEndSec * 1000),
clipIndex,
// Omitted rather than sent as `false`: every payload without a trim under a
// modifier stays byte-for-byte what it was.
Expand Down
Loading