@remotion/web-renderer 4.0.390 → 4.0.392

package/dist/esm/index.mjs

@@ -8345,10 +8345,14 @@ var handleArtifacts = () => {
 var TARGET_NUMBER_OF_CHANNELS = 2;
 var TARGET_SAMPLE_RATE = 48000;
 function mixAudio(waves, length) {
-  if (waves.length === 1) {
+  if (waves.length === 1 && waves[0].length === length) {
     return waves[0];
   }
   const mixed = new Int16Array(length);
+  if (waves.length === 1) {
+    mixed.set(waves[0].subarray(0, length));
+    return mixed;
+  }
   for (let i = 0;i < length; i++) {
     const sum = waves.reduce((acc, wave2) => {
       return acc + (wave2[i] ?? 0);
@@ -8480,7 +8484,8 @@ async function createScaffold({
     remotion_renderReady: true,
     remotion_delayRenderTimeouts: {},
     remotion_puppeteerTimeout: delayRenderTimeoutInMilliseconds,
-    remotion_attempt: 0
+    remotion_attempt: 0,
+    remotion_delayRenderHandles: []
   };
   const timeUpdater = createRef();
   const collectAssets = createRef();
@@ -8659,6 +8664,110 @@ var getQualityForWebRendererQuality = (quality) => {
   }
 };
 
+// src/drawing/parse-transform-origin.ts
+var parseTransformOrigin = (transformOrigin) => {
+  if (transformOrigin.trim() === "") {
+    return null;
+  }
+  const [x, y] = transformOrigin.split(" ");
+  return { x: parseFloat(x), y: parseFloat(y) };
+};
+
+// src/drawing/calculate-transforms.ts
+var getInternalTransformOrigin = (transform) => {
+  const centerX = transform.boundingClientRect.width / 2;
+  const centerY = transform.boundingClientRect.height / 2;
+  const origin = parseTransformOrigin(transform.transformOrigin) ?? {
+    x: centerX,
+    y: centerY
+  };
+  return origin;
+};
+var getGlobalTransformOrigin = (transform) => {
+  const { x: originX, y: originY } = getInternalTransformOrigin(transform);
+  return {
+    x: originX + transform.boundingClientRect.left,
+    y: originY + transform.boundingClientRect.top
+  };
+};
+var calculateTransforms = (element) => {
+  let parent = element;
+  const transforms = [];
+  const toReset = [];
+  let opacity = 1;
+  let elementComputedStyle = null;
+  while (parent) {
+    const computedStyle = getComputedStyle(parent);
+    const parentOpacity = computedStyle.opacity;
+    if (parentOpacity && parentOpacity !== "") {
+      opacity *= parseFloat(parentOpacity);
+    }
+    if (parent === element) {
+      elementComputedStyle = computedStyle;
+    }
+    if (computedStyle.transform && computedStyle.transform !== "none" || parent === element) {
+      const toParse = computedStyle.transform === "none" || computedStyle.transform === "" ? undefined : computedStyle.transform;
+      const matrix = new DOMMatrix(toParse);
+      const { transform, scale, rotate } = parent.style;
+      const additionalMatrices = [];
+      if (rotate !== "") {
+        additionalMatrices.push(new DOMMatrix(`rotate(${rotate})`));
+      }
+      if (scale !== "") {
+        additionalMatrices.push(new DOMMatrix(`scale(${scale})`));
+      }
+      additionalMatrices.push(matrix);
+      parent.style.transform = "none";
+      parent.style.scale = "none";
+      parent.style.rotate = "none";
+      transforms.push({
+        rect: parent,
+        transformOrigin: computedStyle.transformOrigin,
+        boundingClientRect: null,
+        matrices: additionalMatrices
+      });
+      const parentRef = parent;
+      toReset.push(() => {
+        parentRef.style.transform = transform;
+        parentRef.style.scale = scale;
+        parentRef.style.rotate = rotate;
+      });
+    }
+    parent = parent.parentElement;
+  }
+  for (const transform of transforms) {
+    transform.boundingClientRect = transform.rect.getBoundingClientRect();
+  }
+  const dimensions = transforms[0].boundingClientRect;
+  const nativeTransformOrigin = getInternalTransformOrigin(transforms[0]);
+  const totalMatrix = new DOMMatrix;
+  for (const transform of transforms.slice().reverse()) {
+    if (!transform.boundingClientRect) {
+      throw new Error("Bounding client rect not found");
+    }
+    for (const matrix of transform.matrices) {
+      const globalTransformOrigin = getGlobalTransformOrigin(transform);
+      const transformMatrix = new DOMMatrix().translate(globalTransformOrigin.x, globalTransformOrigin.y).multiply(matrix).translate(-globalTransformOrigin.x, -globalTransformOrigin.y);
+      totalMatrix.multiplySelf(transformMatrix);
+    }
+  }
+  if (!elementComputedStyle) {
+    throw new Error("Element computed style not found");
+  }
+  return {
+    dimensions,
+    totalMatrix,
+    reset: () => {
+      for (const reset of toReset) {
+        reset();
+      }
+    },
+    nativeTransformOrigin,
+    opacity,
+    computedStyle: elementComputedStyle
+  };
+};
+
 // src/drawing/border-radius.ts
 function parseValue({
   value,
@@ -8795,96 +8904,6 @@ function setBorderRadius({
   };
 }
 
-// src/drawing/parse-transform-origin.ts
-var parseTransformOrigin = (transformOrigin) => {
-  if (transformOrigin.trim() === "") {
-    return null;
-  }
-  const [x, y] = transformOrigin.split(" ");
-  return { x: parseFloat(x), y: parseFloat(y) };
-};
-
-// src/drawing/calculate-transforms.ts
-var getInternalTransformOrigin = (transform) => {
-  const centerX = transform.boundingClientRect.width / 2;
-  const centerY = transform.boundingClientRect.height / 2;
-  const origin = parseTransformOrigin(transform.transformOrigin) ?? {
-    x: centerX,
-    y: centerY
-  };
-  return origin;
-};
-var getGlobalTransformOrigin = (transform) => {
-  const { x: originX, y: originY } = getInternalTransformOrigin(transform);
-  return {
-    x: originX + transform.boundingClientRect.left,
-    y: originY + transform.boundingClientRect.top
-  };
-};
-var calculateTransforms = (element) => {
-  let parent = element;
-  const transforms = [];
-  const toReset = [];
-  let opacity = 1;
-  let elementComputedStyle = null;
-  while (parent) {
-    const computedStyle = getComputedStyle(parent);
-    const parentOpacity = computedStyle.opacity;
-    if (parentOpacity && parentOpacity !== "") {
-      opacity *= parseFloat(parentOpacity);
-    }
-    if (parent === element) {
-      elementComputedStyle = computedStyle;
-    }
-    if (computedStyle.transform && computedStyle.transform !== "none" || parent === element) {
-      const toParse = computedStyle.transform === "none" || computedStyle.transform === "" ? undefined : computedStyle.transform;
-      const matrix = new DOMMatrix(toParse);
-      const { transform } = parent.style;
-      parent.style.transform = "none";
-      transforms.push({
-        matrix,
-        rect: parent,
-        transformOrigin: computedStyle.transformOrigin,
-        boundingClientRect: null
-      });
-      const parentRef = parent;
-      toReset.push(() => {
-        parentRef.style.transform = transform;
-      });
-    }
-    parent = parent.parentElement;
-  }
-  for (const transform of transforms) {
-    transform.boundingClientRect = transform.rect.getBoundingClientRect();
-  }
-  const dimensions = transforms[0].boundingClientRect;
-  const nativeTransformOrigin = getInternalTransformOrigin(transforms[0]);
-  const totalMatrix = new DOMMatrix;
-  for (const transform of transforms.slice().reverse()) {
-    if (!transform.boundingClientRect) {
-      throw new Error("Bounding client rect not found");
-    }
-    const globalTransformOrigin = getGlobalTransformOrigin(transform);
-    const transformMatrix = new DOMMatrix().translate(globalTransformOrigin.x, globalTransformOrigin.y).multiply(transform.matrix).translate(-globalTransformOrigin.x, -globalTransformOrigin.y);
-    totalMatrix.multiplySelf(transformMatrix);
-  }
-  if (!elementComputedStyle) {
-    throw new Error("Element computed style not found");
-  }
-  return {
-    dimensions,
-    totalMatrix,
-    reset: () => {
-      for (const reset of toReset) {
-        reset();
-      }
-    },
-    nativeTransformOrigin,
-    opacity,
-    computedStyle: elementComputedStyle
-  };
-};
-
 // src/drawing/draw-border.ts
 var drawBorder = ({
   ctx,
@@ -8995,21 +9014,15 @@ var setTransform = ({
   };
 };
 
-// src/drawing/draw-element-to-canvas.ts
-var drawElementToCanvas = async ({
-  element,
+// src/drawing/draw-element.ts
+var drawElement = async ({
+  dimensions,
+  computedStyle,
   context,
-  draw
+  draw,
+  opacity,
+  totalMatrix
 }) => {
-  const { totalMatrix, reset, dimensions, opacity, computedStyle } = calculateTransforms(element);
-  if (opacity === 0) {
-    reset();
-    return;
-  }
-  if (dimensions.width <= 0 || dimensions.height <= 0) {
-    reset();
-    return;
-  }
   const background = computedStyle.backgroundColor;
   const borderRadius = parseBorderRadius({
     borderRadius: computedStyle.borderRadius,
@@ -9051,6 +9064,196 @@ var drawElementToCanvas = async ({
   finishOpacity();
   finishBorderRadius();
   finishTransform();
+};
+
+// src/drawing/transform-in-3d.ts
+function compileShader(shaderGl, source, type) {
+  const shader = shaderGl.createShader(type);
+  if (!shader) {
+    throw new Error("Could not create shader");
+  }
+  shaderGl.shaderSource(shader, source);
+  shaderGl.compileShader(shader);
+  if (!shaderGl.getShaderParameter(shader, shaderGl.COMPILE_STATUS)) {
+    const log = shaderGl.getShaderInfoLog(shader);
+    shaderGl.deleteShader(shader);
+    throw new Error("Shader compile error: " + log);
+  }
+  return shader;
+}
+var transformIn3d = ({
+  canvasWidth,
+  canvasHeight,
+  matrix,
+  sourceCanvas,
+  offsetLeft,
+  offsetTop
+}) => {
+  const canvas = new OffscreenCanvas(canvasWidth, canvasHeight);
+  const gl = canvas.getContext("webgl");
+  if (!gl) {
+    throw new Error("WebGL not supported");
+  }
+  const vsSource = `
+        attribute vec2 aPosition;
+        attribute vec2 aTexCoord;
+        uniform mat4 uTransform;
+        uniform mat4 uProjection;
+        varying vec2 vTexCoord;
+
+        void main() {
+            gl_Position = uProjection * uTransform * vec4(aPosition, 0.0, 1.0);
+            vTexCoord = aTexCoord;
+        }
+    `;
+  const fsSource = `
+        precision mediump float;
+        uniform sampler2D uTexture;
+        varying vec2 vTexCoord;
+
+        void main() {
+            gl_FragColor = texture2D(uTexture, vTexCoord);
+        }
+    `;
+  const vertexShader = compileShader(gl, vsSource, gl.VERTEX_SHADER);
+  const fragmentShader = compileShader(gl, fsSource, gl.FRAGMENT_SHADER);
+  const program = gl.createProgram();
+  gl.attachShader(program, vertexShader);
+  gl.attachShader(program, fragmentShader);
+  gl.linkProgram(program);
+  if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+    throw new Error("Program link error: " + gl.getProgramInfoLog(program));
+  }
+  gl.useProgram(program);
+  const vertices = new Float32Array([
+    offsetLeft,
+    offsetTop,
+    0,
+    0,
+    canvasWidth + offsetLeft,
+    offsetTop,
+    1,
+    0,
+    offsetLeft,
+    canvasHeight + offsetTop,
+    0,
+    1,
+    offsetLeft,
+    canvasHeight + offsetTop,
+    0,
+    1,
+    canvasWidth + offsetLeft,
+    offsetTop,
+    1,
+    0,
+    canvasWidth + offsetLeft,
+    canvasHeight + offsetTop,
+    1,
+    1
+  ]);
+  const vertexBuffer = gl.createBuffer();
+  gl.bindBuffer(gl.ARRAY_BUFFER, vertexBuffer);
+  gl.bufferData(gl.ARRAY_BUFFER, vertices, gl.STATIC_DRAW);
+  const aPosition = gl.getAttribLocation(program, "aPosition");
+  const aTexCoord = gl.getAttribLocation(program, "aTexCoord");
+  gl.enableVertexAttribArray(aPosition);
+  gl.vertexAttribPointer(aPosition, 2, gl.FLOAT, false, 4 * 4, 0);
+  gl.enableVertexAttribArray(aTexCoord);
+  gl.vertexAttribPointer(aTexCoord, 2, gl.FLOAT, false, 4 * 4, 2 * 4);
+  const texture = gl.createTexture();
+  gl.bindTexture(gl.TEXTURE_2D, texture);
+  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+  gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, sourceCanvas);
+  const transformMatrix = matrix.toFloat32Array();
+  const zScale = 1e9;
+  const projectionMatrix = new Float32Array([
+    2 / canvasWidth,
+    0,
+    0,
+    0,
+    0,
+    -2 / canvasHeight,
+    0,
+    0,
+    0,
+    0,
+    -2 / zScale,
+    0,
+    -1,
+    1,
+    0,
+    1
+  ]);
+  const uTransform = gl.getUniformLocation(program, "uTransform");
+  const uProjection = gl.getUniformLocation(program, "uProjection");
+  const uTexture = gl.getUniformLocation(program, "uTexture");
+  gl.uniformMatrix4fv(uTransform, false, transformMatrix);
+  gl.uniformMatrix4fv(uProjection, false, projectionMatrix);
+  gl.uniform1i(uTexture, 0);
+  gl.clearColor(0, 0, 0, 0);
+  gl.clear(gl.COLOR_BUFFER_BIT);
+  gl.enable(gl.BLEND);
+  gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+  gl.drawArrays(gl.TRIANGLES, 0, 6);
+  return canvas;
+};
+
+// src/drawing/draw-element-to-canvas.ts
+var drawElementToCanvas = async ({
+  element,
+  context,
+  draw
+}) => {
+  const { totalMatrix, reset, dimensions, opacity, computedStyle } = calculateTransforms(element);
+  if (opacity === 0) {
+    reset();
+    return;
+  }
+  if (dimensions.width <= 0 || dimensions.height <= 0) {
+    reset();
+    return;
+  }
+  if (!totalMatrix.is2D) {
+    const offsetLeft = Math.min(dimensions.left, 0);
+    const offsetTop = Math.min(dimensions.top, 0);
+    const tempCanvasWidth = Math.max(dimensions.width, dimensions.right);
+    const tempCanvasHeight = Math.max(dimensions.height, dimensions.bottom);
+    const tempCanvas = new OffscreenCanvas(tempCanvasWidth, tempCanvasHeight);
+    const context2 = tempCanvas.getContext("2d");
+    if (!context2) {
+      throw new Error("Could not get context");
+    }
+    const adjustedDimensions = new DOMRect(dimensions.left - offsetLeft, dimensions.top - offsetTop, dimensions.width, dimensions.height);
+    await drawElement({
+      dimensions: adjustedDimensions,
+      computedStyle,
+      context: context2,
+      draw,
+      opacity,
+      totalMatrix: new DOMMatrix
+    });
+    const transformed = transformIn3d({
+      canvasWidth: tempCanvasWidth,
+      canvasHeight: tempCanvasHeight,
+      matrix: totalMatrix,
+      sourceCanvas: tempCanvas,
+      offsetLeft,
+      offsetTop
+    });
+    context.drawImage(transformed, 0, 0);
+  } else {
+    await drawElement({
+      dimensions,
+      computedStyle,
+      context,
+      draw,
+      opacity,
+      totalMatrix
+    });
+  }
   reset();
 };
 

package/dist/find-canvas-elements.d.ts

@@ -0,0 +1 @@
+export declare const findCanvasElements: (element: HTMLDivElement) => HTMLCanvasElement[];

package/dist/find-canvas-elements.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findCanvasElements = void 0;
+const findCanvasElements = (element) => {
+    const canvasElements = element.querySelectorAll('canvas');
+    const composables = [];
+    Array.from(canvasElements).forEach((canvasElement) => {
+        const canvas = canvasElement;
+        composables.push(canvas);
+    });
+    return composables;
+};
+exports.findCanvasElements = findCanvasElements;

package/dist/find-capturable-elements.d.ts

@@ -0,0 +1,2 @@
+import type { Composable } from './composable';
+export declare const findCapturableElements: (element: HTMLDivElement, context: OffscreenCanvasRenderingContext2D) => Promise<Composable[]>;

package/dist/find-capturable-elements.js

@@ -0,0 +1,26 @@
+import { drawElementToCanvas } from './drawing/draw-element-to-canvas';
+export const findCapturableElements = async (element, context) => {
+    const treeWalker = document.createTreeWalker(element, NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT, (node) => {
+        if (node instanceof Element) {
+            const computedStyle = getComputedStyle(node);
+            return computedStyle.display === 'none'
+                ? NodeFilter.FILTER_REJECT
+                : NodeFilter.FILTER_ACCEPT;
+        }
+        return NodeFilter.FILTER_ACCEPT;
+    });
+    const composables = [];
+    while (treeWalker.nextNode()) {
+        const node = treeWalker.currentNode;
+        if (node instanceof HTMLCanvasElement ||
+            node instanceof SVGSVGElement ||
+            node instanceof HTMLImageElement) {
+            await drawElementToCanvas(node, context);
+            composables.push({
+                type: 'element',
+                element: node,
+            });
+        }
+    }
+    return composables;
+};

package/dist/opacity.d.ts

@@ -0,0 +1,4 @@
+export declare const setOpacity: ({ ctx, opacity, }: {
+    ctx: OffscreenCanvasRenderingContext2D;
+    opacity: number;
+}) => () => void;

package/dist/opacity.js

@@ -0,0 +1,7 @@
+export const setOpacity = ({ ctx, opacity, }) => {
+    const previousAlpha = ctx.globalAlpha;
+    ctx.globalAlpha = opacity;
+    return () => {
+        ctx.globalAlpha = previousAlpha;
+    };
+};

package/dist/parse-transform-origin.d.ts

@@ -0,0 +1,4 @@
+export declare const parseTransformOrigin: (transformOrigin: string) => {
+    x: number;
+    y: number;
+} | null;

package/dist/parse-transform-origin.js

@@ -0,0 +1,7 @@
+export const parseTransformOrigin = (transformOrigin) => {
+    if (transformOrigin.trim() === '') {
+        return null;
+    }
+    const [x, y] = transformOrigin.split(' ');
+    return { x: parseFloat(x), y: parseFloat(y) };
+};

package/dist/transform.d.ts

@@ -0,0 +1,4 @@
+export declare const setTransform: ({ ctx, transform, }: {
+    ctx: OffscreenCanvasRenderingContext2D;
+    transform: DOMMatrix;
+}) => () => void;

package/dist/transform.js

@@ -0,0 +1,6 @@
+export const setTransform = ({ ctx, transform, }) => {
+    ctx.setTransform(transform);
+    return () => {
+        ctx.setTransform(new DOMMatrix());
+    };
+};

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/web-renderer"
 	},
 	"name": "@remotion/web-renderer",
-	"version": "4.0.390",
+	"version": "4.0.392",
 	"main": "dist/index.js",
 	"sideEffects": false,
 	"scripts": {
@@ -16,13 +16,13 @@
 	"author": "Remotion <jonny@remotion.dev>",
 	"license": "UNLICENSED",
 	"dependencies": {
-		"remotion": "4.0.390",
+		"remotion": "4.0.392",
 		"mediabunny": "1.25.8"
 	},
 	"devDependencies": {
-		"@remotion/eslint-config-internal": "4.0.390",
-		"@remotion/player": "4.0.390",
-		"@remotion/media": "4.0.390",
+		"@remotion/eslint-config-internal": "4.0.392",
+		"@remotion/player": "4.0.392",
+		"@remotion/media": "4.0.392",
 		"@vitejs/plugin-react": "4.1.0",
 		"@vitest/browser-playwright": "4.0.9",
 		"playwright": "1.55.1",