🎥 Make videos programmatically with React
Batch HtmlInCanvas backend assertions in shared renders
Jonny Burger181b2d4fc2e9
diff --git a/packages/web-renderer/src/test/Root.tsx b/packages/web-renderer/src/test/Root.tsxindex d81a6d8aa7..a2977bef20 100644--- a/packages/web-renderer/src/test/Root.tsx+++ b/packages/web-renderer/src/test/Root.tsx@@ -33,6 +33,7 @@ import {flexPositionedScaled} from './fixtures/flex-positioned-scaled';import {gradientTransparentKeyword} from './fixtures/gradient-transparent-keyword';import {htmlInCanvasBlur} from './fixtures/html-in-canvas-blur';import {+ htmlInCanvasFrameMatrix,htmlInCanvasFrames,htmlInCanvasNestedFrames,} from './fixtures/html-in-canvas-frames';@@ -144,6 +145,7 @@ export const Root: React.FC = () => {<Composition {...hugeImageTransform} /><Composition {...htmlInCanvasBlur} /><Composition {...htmlInCanvasFrames} />+ <Composition {...htmlInCanvasFrameMatrix} /><Composition {...htmlInCanvasNestedFrames} /><Composition {...objectFit} /><Composition {...nestedTranslateScale} />diff --git a/packages/web-renderer/src/test/fixtures/html-in-canvas-frames.tsx b/packages/web-renderer/src/test/fixtures/html-in-canvas-frames.tsxindex 60ecff6887..8fb65eb0cd 100644--- a/packages/web-renderer/src/test/fixtures/html-in-canvas-frames.tsx+++ b/packages/web-renderer/src/test/fixtures/html-in-canvas-frames.tsx@@ -181,6 +181,48 @@ export const htmlInCanvasFrames = {},} as const;+export const htmlInCanvasBackends = [+ {backend: '2d', preserveDrawingBuffer: false},+ {backend: 'init-only', preserveDrawingBuffer: false},+ {backend: 'incremental', preserveDrawingBuffer: false},+ {backend: 'webgl', preserveDrawingBuffer: false},+ {backend: 'webgl', preserveDrawingBuffer: true},+ {backend: 'webgl2', preserveDrawingBuffer: false},+ {backend: 'webgl2', preserveDrawingBuffer: true},+ {backend: 'webgpu', preserveDrawingBuffer: false},+] as const;++const FrameMatrix: React.FC<+ Pick<HtmlInCanvasFramesProps, 'mountAt' | 'pixelDensity'>+> = (props) => {+ return (+ <AbsoluteFill>+ {htmlInCanvasBackends.map((backend, index) => (+ <div+ key={`${backend.backend}-${backend.preserveDrawingBuffer}`}+ style={{+ position: 'absolute',+ // Native nested capture drops pixels with nonzero layout offsets.+ transform: `translateX(${index * 100}px)`,+ width: 100,+ height: 100,+ }}+ >+ <Component {...props} {...backend} />+ </div>+ ))}+ </AbsoluteFill>+ );+};++export const htmlInCanvasFrameMatrix = {+ ...htmlInCanvasFrames,+ id: 'html-in-canvas-frame-matrix',+ component: FrameMatrix,+ width: htmlInCanvasBackends.length * 100,+ defaultProps: {mountAt: 0, pixelDensity: 2},+} as const;+const paint: HtmlInCanvasOnPaint = ({canvas, elementImage}) => {const ctx = canvas.getContext('2d')!;ctx.reset();diff --git a/packages/web-renderer/src/test/html-in-canvas.test.tsx b/packages/web-renderer/src/test/html-in-canvas.test.tsxindex 05751ca43d..d64fc7640f 100644--- a/packages/web-renderer/src/test/html-in-canvas.test.tsx+++ b/packages/web-renderer/src/test/html-in-canvas.test.tsx@@ -12,7 +12,8 @@ import {createLayer, type HtmlInCanvasLayerOutcome} from '../take-screenshot';import {backgroundColor} from './fixtures/background-color';import {htmlInCanvasBlur} from './fixtures/html-in-canvas-blur';import {- htmlInCanvasFrames,+ htmlInCanvasBackends,+ htmlInCanvasFrameMatrix,htmlInCanvasNestedFrames,} from './fixtures/html-in-canvas-frames';@@ -99,85 +100,74 @@ for (const allowHtmlInCanvas of [false, true]) {},);- for (const backend of [- '2d',- 'init-only',- 'incremental',- 'webgl',- 'webgl2',- 'webgpu',- ] as const) {- for (const preserveDrawingBuffer of backend === 'webgl' ||- backend === 'webgl2'- ? [false, true]- : [false]) {- for (const mountAt of [0, 50]) {- test(- `captures current custom ${backend} pixels at mount ${mountAt}, preserve=${preserveDrawingBuffer}, native=${allowHtmlInCanvas} (#12074)`,- {timeout: 60_000},- async (t) => {- if (!supportsNativeHtmlInCanvas()) {- t.skip();- return;- }+ for (const mountAt of [0, 50]) {+ test(+ `captures all custom backends at mount ${mountAt}, native=${allowHtmlInCanvas} (#12074)`,+ {timeout: 60_000},+ async (t) => {+ if (!supportsNativeHtmlInCanvas()) {+ t.skip();+ return;+ }- const start = Math.max(0, mountAt - 2);- let captured = start;- await renderMediaOnWeb({- composition: htmlInCanvasFrames,- inputProps: {- backend,- preserveDrawingBuffer,- mountAt,- pixelDensity: 2,- },- allowHtmlInCanvas,- licenseKey: 'free-license',- logLevel: 'error',- frameRange: [start, mountAt + 5],- container: 'webm',- videoCodec: 'vp9',- hardwareAcceleration: 'prefer-software',- muted: true,- onFrame: (frame) => {- const pixels = readPixels(frame, 100, 100);- const color =- captured < mountAt- ? [255, 255, 255, 255]- : [(captured * 37 + 17) % 255, 0, 0, 255];- const index = (10 * 100 + 10) * 4;+ const start = Math.max(0, mountAt - 2);+ const {width, height} = htmlInCanvasFrameMatrix;+ let captured = start;+ await renderMediaOnWeb({+ composition: htmlInCanvasFrameMatrix,+ inputProps: {mountAt, pixelDensity: 2},+ allowHtmlInCanvas,+ licenseKey: 'free-license',+ logLevel: 'error',+ frameRange: [start, mountAt + 5],+ container: 'webm',+ videoCodec: 'vp9',+ hardwareAcceleration: 'prefer-software',+ muted: true,+ onFrame: (frame) => {+ const pixels = readPixels(frame, width, height);+ const color =+ captured < mountAt+ ? [255, 255, 255, 255]+ : [(captured * 37 + 17) % 255, 0, 0, 255];+ for (const [+ column,+ {backend, preserveDrawingBuffer},+ ] of htmlInCanvasBackends.entries()) {+ const label = `${backend}, preserve=${preserveDrawingBuffer}, frame ${captured}`;+ const left = column * 100;+ const index = (10 * width + left + 10) * 4;+ expect(Array.from(pixels.slice(index, index + 4)), label).toEqual(+ color,+ );+ if (backend === 'incremental' && captured >= mountAt) {+ const retained = (10 * width + left + 50) * 4;expect(- Array.from(pixels.slice(index, index + 4)),- `frame ${captured}`,- ).toEqual(color);- if (backend === 'incremental' && captured >= mountAt) {- const retained = (10 * 100 + 50) * 4;- expect(- Array.from(pixels.slice(retained, retained + 4)),- `retained pixels ${captured}`,- ).toEqual([0, 0, 255, 255]);- }+ Array.from(pixels.slice(retained, retained + 4)),+ `retained pixels: ${label}`,+ ).toEqual([0, 0, 255, 255]);+ }- const right = (10 * 100 + 70) * 4;- expect(- Array.from(pixels.slice(right, right + 4)),- `resized frame ${captured}`,- ).toEqual(- captured >= mountAt && (captured === 1 || captured === 51)- ? backend === 'incremental'- ? [0, 0, 255, 255]- : color- : [255, 255, 255, 255],- );- captured++;- return frame;- },- });- expect(captured).toBe(mountAt + 6);+ const right = (10 * width + left + 70) * 4;+ expect(+ Array.from(pixels.slice(right, right + 4)),+ `resized frame: ${label}`,+ ).toEqual(+ captured >= mountAt && (captured === 1 || captured === 51)+ ? backend === 'incremental'+ ? [0, 0, 255, 255]+ : color+ : [255, 255, 255, 255],+ );+ }++ captured++;+ return frame;},- );- }- }+ });+ expect(captured).toBe(mountAt + 6);+ },+ );}for (const offset of [false, true]) {