Skip to content

🎥 Make videos programmatically with React

Reuse composition duration for Canvas Capture video

Jonny Burger9cc064d8ebc3
diff --git a/packages/browser-studio/src/test/browser-studio-operations.test.ts b/packages/browser-studio/src/test/browser-studio-operations.test.ts
index 9ee376c377..9129620b4a 100644
--- a/packages/browser-studio/src/test/browser-studio-operations.test.ts
+++ b/packages/browser-studio/src/test/browser-studio-operations.test.ts
@@ -1451,7 +1451,6 @@ 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.ts
index bcccd9e427..da70750c23 100644
--- a/packages/codemods/src/generate-canvas-capture-composition.ts
+++ b/packages/codemods/src/generate-canvas-capture-composition.ts
@@ -91,7 +91,6 @@ export const generateCanvasCaptureComposition = ({
fps,
height,
keyframeFps,
- videoDurationInSeconds,
videoFileName,
videoHeight,
videoWidth,
@@ -104,7 +103,6 @@ export const generateCanvasCaptureComposition = ({
readonly fps: number;
readonly height: number;
readonly keyframeFps: number;
- readonly videoDurationInSeconds: number;
readonly videoFileName: string;
readonly videoHeight: number;
readonly videoWidth: number;
@@ -254,7 +252,7 @@ export const ${previewComponentName} = () => {
>
<Video
src={staticFile(${serialize(videoFileName)})}
- durationInFrames={${Math.ceil(videoDurationInSeconds * fps)}}
+ durationInFrames={${durationInFrames}}
style={{
position: 'absolute',
}}
@@ -300,7 +298,6 @@ 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.ts
index a8b79c9934..6eb74cff9e 100644
--- a/packages/studio-server/src/test/apply-codemod.test.ts
+++ b/packages/studio-server/src/test/apply-codemod.test.ts
@@ -919,7 +919,6 @@ test('applyCodemodHandler creates an interactive Canvas Capture composition', as
codemod: {
type: 'new-composition',
canvasCapture: {
- videoDurationInSeconds: 2.01,
videoFileName: 'capture.mp4',
videoHeight: 1080,
videoWidth: 1920,
@@ -986,9 +985,8 @@ test('applyCodemodHandler creates an interactive Canvas Capture composition', as
'url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%2F%3E") 6 7, alias',
);
expect(componentContents).toMatch(
- /<Video\s+src=\{staticFile\('capture\.mp4'\)\}\s+durationInFrames=\{61\}/,
+ /<Video\s+src=\{staticFile\('capture\.mp4'\)\}\s+durationInFrames=\{90\}/,
);
- 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.txt
index aa01c7590d..ceeca7c0bf 100644
--- a/packages/studio-server/src/test/fixtures/canvas-capture-composition.txt
+++ b/packages/studio-server/src/test/fixtures/canvas-capture-composition.txt
@@ -21,7 +21,7 @@ export const CanvasCapturePreview = () => {
>
<Video
src={staticFile('remotion-capture-editor-starter.mp4')}
- durationInFrames={435}
+ durationInFrames={500}
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.ts
index 6ea3dcb7f0..95c74e6f16 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,7 +30,6 @@ test('generates the ideal interactive Canvas Capture composition markup', async
fps: 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.ts
index 78914e93f5..8688273d90 100644
--- a/packages/studio-shared/src/codemods.ts
+++ b/packages/studio-shared/src/codemods.ts
@@ -37,7 +37,6 @@ 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.tsx
index 259b6240ab..9e3ac8fc39 100644
--- a/packages/studio/src/components/NewComposition/NewComposition.tsx
+++ b/packages/studio/src/components/NewComposition/NewComposition.tsx
@@ -501,7 +501,6 @@ 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.ts
index 20a2fe925e..a38e163e79 100644
--- a/packages/studio/src/helpers/use-create-composition.ts
+++ b/packages/studio/src/helpers/use-create-composition.ts
@@ -69,7 +69,6 @@ export const useCreateComposition = ({
};
canvasCapture: {
readonly data: CanvasCaptureData;
- readonly videoDurationInSeconds: number;
readonly videoFileName: string;
readonly videoHeight: number;
readonly videoWidth: number;
@@ -114,7 +113,6 @@ export const useCreateComposition = ({
: {
data: canvasCapture.data,
keyframeFps: Number(selectedFrameRate),
- videoDurationInSeconds: canvasCapture.videoDurationInSeconds,
videoFileName: canvasCapture.videoFileName,
videoHeight: canvasCapture.videoHeight,
videoWidth: canvasCapture.videoWidth,