🎥 Make videos programmatically with React
`@remotion/studio`: Set video duration on Canvas Capture imports
Jonny Burgerb6f5c486dbfe
diff --git a/packages/browser-studio/src/test/browser-studio-operations.test.ts b/packages/browser-studio/src/test/browser-studio-operations.test.tsindex 9129620b4a..9ee376c377 100644--- a/packages/browser-studio/src/test/browser-studio-operations.test.ts+++ b/packages/browser-studio/src/test/browser-studio-operations.test.ts@@ -1451,6 +1451,7 @@ test('imports a Canvas Capture as an interactive composition', async () => {newFps: 60,newDurationInFrames: 180,canvasCapture: {+ videoDurationInSeconds: 3,videoFileName: 'capture.mp4',videoHeight: 720,videoWidth: 1280,diff --git a/packages/codemods/src/generate-canvas-capture-composition.ts b/packages/codemods/src/generate-canvas-capture-composition.tsindex e514da8cc6..bcccd9e427 100644--- a/packages/codemods/src/generate-canvas-capture-composition.ts+++ b/packages/codemods/src/generate-canvas-capture-composition.ts@@ -91,6 +91,7 @@ export const generateCanvasCaptureComposition = ({fps,height,keyframeFps,+ videoDurationInSeconds,videoFileName,videoHeight,videoWidth,@@ -103,6 +104,7 @@ export const generateCanvasCaptureComposition = ({readonly fps: number;readonly height: number;readonly keyframeFps: number;+ readonly videoDurationInSeconds: number;readonly videoFileName: string;readonly videoHeight: number;readonly videoWidth: number;@@ -252,6 +254,7 @@ export const ${previewComponentName} = () => {><Videosrc={staticFile(${serialize(videoFileName)})}+ durationInFrames={${Math.ceil(videoDurationInSeconds * fps)}}style={{position: 'absolute',}}@@ -297,6 +300,7 @@ export const makeNewCompositionComponentSource = (fps: codemod.newFps,height: codemod.newHeight,keyframeFps: codemod.canvasCapture.keyframeFps,+ videoDurationInSeconds: codemod.canvasCapture.videoDurationInSeconds,videoFileName: codemod.canvasCapture.videoFileName,videoHeight: codemod.canvasCapture.videoHeight,videoWidth: codemod.canvasCapture.videoWidth,diff --git a/packages/studio-server/src/test/apply-codemod.test.ts b/packages/studio-server/src/test/apply-codemod.test.tsindex ad04b98bf9..a8b79c9934 100644--- a/packages/studio-server/src/test/apply-codemod.test.ts+++ b/packages/studio-server/src/test/apply-codemod.test.ts@@ -919,6 +919,7 @@ test('applyCodemodHandler creates an interactive Canvas Capture composition', ascodemod: {type: 'new-composition',canvasCapture: {+ videoDurationInSeconds: 2.01,videoFileName: 'capture.mp4',videoHeight: 1080,videoWidth: 1920,@@ -984,7 +985,10 @@ test('applyCodemodHandler creates an interactive Canvas Capture composition', asexpect(componentContents).toContain('url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%2F%3E") 6 7, alias',);- expect(componentContents).toContain("src={staticFile('capture.mp4')}");+ expect(componentContents).toMatch(+ /<Video\s+src=\{staticFile\('capture\.mp4'\)\}\s+durationInFrames=\{61\}/,+ );+ expect(componentContents).toContain('durationInFrames={90}');expect(componentContents).toContain('width: 1920');expect(componentContents).toContain('height: 1080');expect(componentContents).toContain("id={'FreshCapture'}");diff --git a/packages/studio-server/src/test/fixtures/canvas-capture-composition.txt b/packages/studio-server/src/test/fixtures/canvas-capture-composition.txtindex 87f89ee84b..aa01c7590d 100644--- a/packages/studio-server/src/test/fixtures/canvas-capture-composition.txt+++ b/packages/studio-server/src/test/fixtures/canvas-capture-composition.txt@@ -21,6 +21,7 @@ export const CanvasCapturePreview = () => {><Videosrc={staticFile('remotion-capture-editor-starter.mp4')}+ durationInFrames={435}style={{position: 'absolute',}}diff --git a/packages/studio-server/src/test/generate-canvas-capture-composition.test.ts b/packages/studio-server/src/test/generate-canvas-capture-composition.test.tsindex 95c74e6f16..6ea3dcb7f0 100644--- a/packages/studio-server/src/test/generate-canvas-capture-composition.test.ts+++ b/packages/studio-server/src/test/generate-canvas-capture-composition.test.ts@@ -30,6 +30,7 @@ test('generates the ideal interactive Canvas Capture composition markup', asyncfps: 60,height: 1080,keyframeFps: 30,+ videoDurationInSeconds: 7.25,videoFileName: 'remotion-capture-editor-starter.mp4',videoHeight: 1386,videoWidth: 3026,diff --git a/packages/studio-shared/src/codemods.ts b/packages/studio-shared/src/codemods.tsindex 8688273d90..78914e93f5 100644--- a/packages/studio-shared/src/codemods.ts+++ b/packages/studio-shared/src/codemods.ts@@ -37,6 +37,7 @@ export type RecastCodemod =newFps: number;newDurationInFrames: number;canvasCapture: {+ readonly videoDurationInSeconds: number;readonly videoFileName: string;readonly videoHeight: number;readonly videoWidth: number;diff --git a/packages/studio/src/components/NewComposition/NewComposition.tsx b/packages/studio/src/components/NewComposition/NewComposition.tsxindex 9e3ac8fc39..259b6240ab 100644--- a/packages/studio/src/components/NewComposition/NewComposition.tsx+++ b/packages/studio/src/components/NewComposition/NewComposition.tsx@@ -501,6 +501,7 @@ const NewCompositionLoaded: React.FC<{? null: {data: canvasCapture.data,+ videoDurationInSeconds: canvasCapture.durationInSeconds,videoFileName: canvasCapture.file.name,videoHeight: canvasCapture.height,videoWidth: canvasCapture.width,diff --git a/packages/studio/src/helpers/use-create-composition.ts b/packages/studio/src/helpers/use-create-composition.tsindex a38e163e79..20a2fe925e 100644--- a/packages/studio/src/helpers/use-create-composition.ts+++ b/packages/studio/src/helpers/use-create-composition.ts@@ -69,6 +69,7 @@ export const useCreateComposition = ({};canvasCapture: {readonly data: CanvasCaptureData;+ readonly videoDurationInSeconds: number;readonly videoFileName: string;readonly videoHeight: number;readonly videoWidth: number;@@ -113,6 +114,7 @@ export const useCreateComposition = ({: {data: canvasCapture.data,keyframeFps: Number(selectedFrameRate),+ videoDurationInSeconds: canvasCapture.videoDurationInSeconds,videoFileName: canvasCapture.videoFileName,videoHeight: canvasCapture.videoHeight,videoWidth: canvasCapture.videoWidth,