🎥 Make videos programmatically with React
@remotion/web-renderer: Render with adjusted dimensions
JonnyBurgerf434af05878a
diff --git a/packages/docs/docs/web-renderer/render-media-on-web.mdx b/packages/docs/docs/web-renderer/render-media-on-web.mdxindex 60e06a6d96..b884e8dff7 100644--- a/packages/docs/docs/web-renderer/render-media-on-web.mdx+++ b/packages/docs/docs/web-renderer/render-media-on-web.mdx@@ -94,7 +94,7 @@ For H.264, H.265, and AV1, the scaled output dimensions are automatically adjustThis uses the same scale-aware calculation as server-side rendering.For example, a `1200 × 675` composition at `scale: 1` produces a `1200 × 674` video.-The resize happens after `onFrame`, so the callback still receives and returns frames at the original scaled dimensions.+The composition is rendered at the adjusted dimensions. In the example above, [`useVideoConfig()`](/docs/use-video-config) returns a height of `674`, and `onFrame` receives a `1200 × 674` frame.Pass the same `scale` to [`canRenderMediaOnWeb()`](/docs/web-renderer/can-render-media-on-web) when checking support.### `onProgress?`diff --git a/packages/web-renderer/src/drawing/draw-background.ts b/packages/web-renderer/src/drawing/draw-background.tsindex c66aef6e86..f288f48df9 100644--- a/packages/web-renderer/src/drawing/draw-background.ts+++ b/packages/web-renderer/src/drawing/draw-background.ts@@ -81,6 +81,7 @@ export const drawBackground = async ({scale,onlyBackgroundClipText: true,waitForPageResponsiveness: null,+ outputSize: null,});onlyBackgroundClipText.setTransform(new DOMMatrix().scale(scale, scale));element.style.backgroundClip = originalBackgroundClip;diff --git a/packages/web-renderer/src/drawing/process-node.ts b/packages/web-renderer/src/drawing/process-node.tsindex a06fc37a74..654da65a92 100644--- a/packages/web-renderer/src/drawing/process-node.ts+++ b/packages/web-renderer/src/drawing/process-node.ts@@ -140,6 +140,7 @@ export const processNode = async ({scale,onlyBackgroundClipText: false,waitForPageResponsiveness,+ outputSize: null,});if (waitForPageResponsiveness !== null) {await waitForPageResponsiveness();diff --git a/packages/web-renderer/src/render-media-on-web.tsx b/packages/web-renderer/src/render-media-on-web.tsxindex 5556a14c8f..d286bf36b7 100644--- a/packages/web-renderer/src/render-media-on-web.tsx+++ b/packages/web-renderer/src/render-media-on-web.tsx@@ -316,19 +316,12 @@ const internalRenderMediaOnWeb = async <compositionWidth: composition.width ?? null,});- const encodedDimensions = getEncodedDimensions({+ const dimensions = getEncodedDimensions({width: resolved.width,height: resolved.height,scale,codec: videoEnabled ? codec : null,});- const sourceDimensions = {- width: Math.ceil(resolved.width * scale),- height: Math.ceil(resolved.height * scale),- };- const needsResize =- encodedDimensions.width !== sourceDimensions.width ||- encodedDimensions.height !== sourceDimensions.height;const realFrameRange = getRealFrameRange(resolved.durationInFrames,frameRange,@@ -339,8 +332,8 @@ const internalRenderMediaOnWeb = async <}using scaffold = createScaffold({- width: resolved.width,- height: resolved.height,+ width: dimensions.compositionWidth,+ height: dimensions.compositionHeight,fps: resolved.fps,durationInFrames: resolved.durationInFrames,Component: composition.component,@@ -476,8 +469,7 @@ const internalRenderMediaOnWeb = async <typeof videoBitrate === 'number'? videoBitrate: getQualityForWebRendererQuality(videoBitrate),- sizeChangeBehavior: needsResize ? 'fill' : 'deny',- ...(needsResize ? {transform: encodedDimensions} : {}),+ sizeChangeBehavior: 'deny',hardwareAcceleration,latencyMode: 'quality',keyFrameInterval: keyframeIntervalInSeconds,@@ -599,7 +591,13 @@ const internalRenderMediaOnWeb = async <logLevel,internalState,onlyBackgroundClipText: false,- cutout: new DOMRect(0, 0, resolved.width, resolved.height),+ cutout: new DOMRect(+ 0,+ 0,+ dimensions.compositionWidth,+ dimensions.compositionHeight,+ ),+ outputSize: dimensions,htmlInCanvasContext,onHtmlInCanvasLayerOutcome: htmlInCanvasContext? onHtmlInCanvasLayerOutcome@@ -629,8 +627,8 @@ const internalRenderMediaOnWeb = async <frameToEncode = validateVideoFrame({originalFrame: videoFrame,returnedFrame,- expectedWidth: sourceDimensions.width,- expectedHeight: sourceDimensions.height,+ expectedWidth: dimensions.width,+ expectedHeight: dimensions.height,expectedTimestamp: timestamp,});await waitForPageResponsiveness();diff --git a/packages/web-renderer/src/render-still-on-web.tsx b/packages/web-renderer/src/render-still-on-web.tsxindex 6e346ef3e3..854de2058b 100644--- a/packages/web-renderer/src/render-still-on-web.tsx+++ b/packages/web-renderer/src/render-still-on-web.tsx@@ -211,6 +211,7 @@ async function internalRenderStillOnWeb<? onHtmlInCanvasLayerOutcome: undefined,waitForPageResponsiveness: null,+ outputSize: null,});const {canvas} = capturedFrame;diff --git a/packages/web-renderer/src/take-screenshot.ts b/packages/web-renderer/src/take-screenshot.tsindex 0fd9389921..ba5d312705 100644--- a/packages/web-renderer/src/take-screenshot.ts+++ b/packages/web-renderer/src/take-screenshot.ts@@ -23,6 +23,7 @@ export const createLayer = async ({htmlInCanvasContext,onHtmlInCanvasLayerOutcome,waitForPageResponsiveness,+ outputSize,}: {element: HTMLElement | SVGElement;scale: number;@@ -33,9 +34,10 @@ export const createLayer = async ({htmlInCanvasContext?: HtmlInCanvasContext | null;onHtmlInCanvasLayerOutcome?: (outcome: HtmlInCanvasLayerOutcome) => void;waitForPageResponsiveness: (() => Promise<void>) | null;+ outputSize: {width: number; height: number} | null;}) => {- const scaledWidth = Math.ceil(cutout.width * scale);- const scaledHeight = Math.ceil(cutout.height * scale);+ const scaledWidth = outputSize?.width ?? Math.ceil(cutout.width * scale);+ const scaledHeight = outputSize?.height ?? Math.ceil(cutout.height * scale);if (!onlyBackgroundClipText &&diff --git a/packages/web-renderer/src/test/html-in-canvas.test.tsx b/packages/web-renderer/src/test/html-in-canvas.test.tsxindex 942f90e9ad..176774e5ea 100644--- a/packages/web-renderer/src/test/html-in-canvas.test.tsx+++ b/packages/web-renderer/src/test/html-in-canvas.test.tsx@@ -160,6 +160,7 @@ test('does not create a nested HTML-in-canvas capture', async () => {onlyBackgroundClipText: false,scale: 1,waitForPageResponsiveness: null,+ outputSize: null,});expect(drawElementImage).not.toHaveBeenCalled();diff --git a/packages/web-renderer/src/validate-dimensions.ts b/packages/web-renderer/src/validate-dimensions.tsindex 4959075afb..c688827666 100644--- a/packages/web-renderer/src/validate-dimensions.ts+++ b/packages/web-renderer/src/validate-dimensions.ts@@ -16,6 +16,8 @@ export const getEncodedDimensions = ({codec === 'h264' || codec === 'h265' || codec === 'av1';if (!shouldHaveEvenDimensions) {return {+ compositionWidth: width,+ compositionHeight: height,width: Math.ceil(width * scale),height: Math.ceil(height * scale),};@@ -34,6 +36,8 @@ export const getEncodedDimensions = ({}return {+ compositionWidth: widthWithEvenDimensions,+ compositionHeight: heightWithEvenDimensions,width: Math.round(widthWithEvenDimensions * scale),height: Math.round(heightWithEvenDimensions * scale),};