Skip to content

Commit b1b368d

Browse files
fix(studio): preserve media offsets when splitting clips (#3272)
1 parent 532caf7 commit b1b368d

3 files changed

Lines changed: 89 additions & 2 deletions

File tree

‎packages/studio-server/src/helpers/sourceMutation.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,14 +367,18 @@ export function splitElementInHtml(
367367
// Keep the "clip" class — the runtime uses it to control visibility
368368
// based on data-start/data-duration timing.
369369

370-
// Adjust media trim offset for the second half
370+
// A split creates two views over the same media source. Even an untrimmed
371+
// audio/video element needs an explicit zero in-point stamped on the first
372+
// half so the second half can advance from it instead of restarting at zero.
371373
const playbackStartAttr = el.hasAttribute("data-playback-start")
372374
? "data-playback-start"
373375
: el.hasAttribute("data-media-start")
374376
? "data-media-start"
375377
: fallbackTiming?.stampPlaybackStart
376378
? "data-playback-start"
377-
: null;
379+
: el.matches("audio, video")
380+
? "data-media-start"
381+
: null;
378382
if (playbackStartAttr) {
379383
const currentTrim =
380384
parseFloat(el.getAttribute(playbackStartAttr) ?? "") || fallbackTiming?.playbackStart || 0;

‎packages/studio-server/src/helpers/sourceMutationSplitAndGroup.test.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,36 @@ describe("splitElementInHtml", () => {
123123
expect(result.html).toMatch(/id="box-split"[^>]*data-playback-start="2"/);
124124
});
125125

126+
it.each(["audio", "video"])(
127+
"seeds the second %s half with a media in-point when the source starts at zero",
128+
(tag) => {
129+
const mediaSource = `<!DOCTYPE html><html><body><div data-composition-id="root"><${tag} id="media" class="clip" src="asset.mp4" data-start="1" data-duration="6"></${tag}></div></body></html>`;
130+
131+
const result = splitElementInHtml(mediaSource, { id: "media" }, 3, "media-split");
132+
const { document } = parseHTML(result.html);
133+
134+
expect(result.matched).toBe(true);
135+
expect(document.getElementById("media")?.getAttribute("data-media-start")).toBe("0");
136+
expect(document.getElementById("media-split")?.getAttribute("data-media-start")).toBe("2");
137+
},
138+
);
139+
140+
it("advances a zero-based media in-point by playback rate", () => {
141+
const mediaSource = `<!DOCTYPE html><html><body><div data-composition-id="root"><video id="media" class="clip" src="asset.mp4" data-start="1" data-duration="6" data-playback-rate="2"></video></div></body></html>`;
142+
143+
const result = splitElementInHtml(mediaSource, { id: "media" }, 3, "media-split");
144+
const { document } = parseHTML(result.html);
145+
146+
expect(document.getElementById("media-split")?.getAttribute("data-media-start")).toBe("4");
147+
});
148+
149+
it("does not add a media in-point to non-media elements", () => {
150+
const result = splitElementInHtml(source, { id: "box" }, 3, "box-split");
151+
152+
expect(result.html).not.toContain("data-media-start");
153+
expect(result.html).not.toContain("data-playback-start");
154+
});
155+
126156
it("stamps a legacy composition offset and advances the second half by playback rate", () => {
127157
const result = splitElementInHtml(source, { id: "box" }, 3, "box-split", {
128158
start: 1,

‎packages/studio-server/src/routes/files.test.ts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { afterEach, describe, expect, it, vi } from "vitest";
22
import { Hono } from "hono";
3+
import { parseHTML } from "linkedom";
34
import {
45
existsSync,
56
mkdirSync,
@@ -107,6 +108,9 @@ function postCutBatch(
107108
splitTime: number;
108109
elementStart: number;
109110
elementDuration: number;
111+
playbackStart?: number;
112+
playbackRate?: number;
113+
isComposition?: boolean;
110114
}>;
111115
}>,
112116
): Promise<Response> {
@@ -851,6 +855,55 @@ describe("registerFileRoutes", () => {
851855
});
852856
});
853857

858+
it("persists media in-points for audio and video in an atomic split-all cut", async () => {
859+
const projectDir = createProjectDir();
860+
const before =
861+
'<audio id="audio" src="voice.mp3" data-start="0" data-duration="6"></audio>' +
862+
'<video id="video" src="clip.mp4" data-start="0" data-duration="6" data-playback-rate="2"></video>';
863+
writeFileSync(join(projectDir, "index.html"), before);
864+
const app = new Hono();
865+
registerFileRoutes(app, createAdapter(projectDir));
866+
867+
const response = await postCutBatch(app, [
868+
{
869+
path: "index.html",
870+
expectedVersion: fileContentVersion(before),
871+
targets: [
872+
{
873+
target: { id: "audio" },
874+
originalId: "audio",
875+
splitTime: 2,
876+
elementStart: 0,
877+
elementDuration: 6,
878+
playbackStart: 0,
879+
playbackRate: 1,
880+
},
881+
{
882+
target: { id: "video" },
883+
originalId: "video",
884+
splitTime: 2,
885+
elementStart: 0,
886+
elementDuration: 6,
887+
playbackStart: 0,
888+
playbackRate: 2,
889+
},
890+
],
891+
},
892+
]);
893+
const payload = (await response.json()) as {
894+
files: Array<{ after: string; splitCount: number }>;
895+
};
896+
const { document } = parseHTML(payload.files[0].after);
897+
898+
expect(response.status).toBe(200);
899+
expect(payload.files[0].splitCount).toBe(2);
900+
expect(document.getElementById("audio")?.getAttribute("data-media-start")).toBe("0");
901+
expect(document.getElementById("audio-split")?.getAttribute("data-media-start")).toBe("2");
902+
expect(document.getElementById("video")?.getAttribute("data-media-start")).toBe("0");
903+
expect(document.getElementById("video-split")?.getAttribute("data-media-start")).toBe("4");
904+
expect(readFileSync(join(projectDir, "index.html"), "utf-8")).toBe(payload.files[0].after);
905+
});
906+
854907
it("cuts multiple id-less selector targets against their original indices", async () => {
855908
const projectDir = createProjectDir();
856909
const before =

0 commit comments

Comments
 (0)