@remotion/effects 4.0.539 → 4.0.540

package/dist/esm/scale.mjs

@@ -1,38 +1,14 @@
-// src/scale/index.ts
-import { Internals } from "remotion";
-
-// src/validate-effect-param.ts
-var assertEffectParamsObject = (params, effectLabel) => {
-  if (params === null || typeof params !== "object") {
-    throw new TypeError(`${effectLabel} effect requires a parameters object, but got ${JSON.stringify(params)}`);
-  }
-};
-var assertRequiredFiniteNumber = (value, name) => {
-  if (typeof value !== "number" || !Number.isFinite(value)) {
-    throw new TypeError(`"${name}" must be a finite number, but got ${JSON.stringify(value)}`);
-  }
-};
-var assertRequiredColor = (value, name) => {
-  if (typeof value !== "string" || value.length === 0) {
-    throw new TypeError(`"${name}" must be a non-empty string, but got ${JSON.stringify(value)}`);
-  }
-};
-var assertOptionalColor = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  assertRequiredColor(value, name);
-};
-var assertOptionalBoolean = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  if (typeof value !== "boolean") {
-    throw new TypeError(`"${name}" must be a boolean, but got ${JSON.stringify(value)}`);
-  }
-};
+import"./index-8p04sssx.mjs";
+import {
+  createRectTransformImplementations
+} from "./index-s9mrx750.mjs";
+import {
+  assertEffectParamsObject,
+  assertRequiredFiniteNumber
+} from "./index-4fvp93ps.mjs";
 
 // src/scale/index.ts
+import { Internals } from "remotion";
 var { createEffect } = Internals;
 var scaleSchema = {
   scale: {
@@ -79,37 +55,51 @@ var scale = createEffect({
   type: "dev.remotion.effects.scale",
   label: "scale()",
   documentationLink: "https://www.remotion.dev/docs/effects/scale",
-  backend: "2d",
   calculateKey: (params) => {
     const r = resolve(params);
     return `scale-${r.scale}-${r.horizontal}-${r.vertical}`;
   },
-  setup: () => null,
-  apply: ({ source, target, width, height, params }) => {
-    const ctx = target.getContext("2d");
-    if (!ctx) {
-      throw new Error("Failed to acquire 2D context for scale effect. The canvas may have been assigned a different context type.");
-    }
-    const r = resolve(params);
-    const scaleX = r.horizontal ? r.scale : 1;
-    const scaleY = r.vertical ? r.scale : 1;
-    if (scaleX === 1 && scaleY === 1) {
-      ctx.clearRect(0, 0, width, height);
-      ctx.drawImage(source, 0, 0, width, height);
-      return;
-    }
-    ctx.clearRect(0, 0, width, height);
-    ctx.save();
-    const centerX = width / 2;
-    const centerY = height / 2;
-    ctx.translate(centerX, centerY);
-    ctx.scale(scaleX, scaleY);
-    ctx.translate(-centerX, -centerY);
-    ctx.drawImage(source, 0, 0, width, height);
-    ctx.restore();
-  },
-  cleanup: () => {
-    return;
+  implementations: {
+    ...createRectTransformImplementations("scale", (params, width, height) => {
+      const r = resolve(params);
+      const scaledWidth = width * (r.horizontal ? r.scale : 1);
+      const scaledHeight = height * (r.vertical ? r.scale : 1);
+      return {
+        x: (width - scaledWidth) / 2,
+        y: (height - scaledHeight) / 2,
+        width: scaledWidth,
+        height: scaledHeight
+      };
+    }),
+    "2d": Internals.createEffectImplementation({
+      setup: () => null,
+      apply: ({ source, target, width, height, params }) => {
+        const ctx = target.getContext("2d");
+        if (!ctx) {
+          throw new Error("Failed to acquire 2D context for scale effect. The canvas may have been assigned a different context type.");
+        }
+        const r = resolve(params);
+        const scaleX = r.horizontal ? r.scale : 1;
+        const scaleY = r.vertical ? r.scale : 1;
+        if (scaleX === 1 && scaleY === 1) {
+          ctx.clearRect(0, 0, width, height);
+          ctx.drawImage(source, 0, 0, width, height);
+          return;
+        }
+        ctx.clearRect(0, 0, width, height);
+        ctx.save();
+        const centerX = width / 2;
+        const centerY = height / 2;
+        ctx.translate(centerX, centerY);
+        ctx.scale(scaleX, scaleY);
+        ctx.translate(-centerX, -centerY);
+        ctx.drawImage(source, 0, 0, width, height);
+        ctx.restore();
+      },
+      cleanup: () => {
+        return;
+      }
+    })
   },
   schema: scaleSchema,
   validateParams: validateScaleParams

package/dist/esm/scanlines.mjs

@@ -1,114 +1,22 @@
-// src/scanlines.ts
-import { Internals } from "remotion";
-
-// src/validate-effect-param.ts
-var assertEffectParamsObject = (params, effectLabel) => {
-  if (params === null || typeof params !== "object") {
-    throw new TypeError(`${effectLabel} effect requires a parameters object, but got ${JSON.stringify(params)}`);
-  }
-};
-var assertRequiredFiniteNumber = (value, name) => {
-  if (typeof value !== "number" || !Number.isFinite(value)) {
-    throw new TypeError(`"${name}" must be a finite number, but got ${JSON.stringify(value)}`);
-  }
-};
-var assertRequiredColor = (value, name) => {
-  if (typeof value !== "string" || value.length === 0) {
-    throw new TypeError(`"${name}" must be a non-empty string, but got ${JSON.stringify(value)}`);
-  }
-};
-var assertOptionalColor = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  assertRequiredColor(value, name);
-};
-var assertOptionalBoolean = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  if (typeof value !== "boolean") {
-    throw new TypeError(`"${name}" must be a boolean, but got ${JSON.stringify(value)}`);
-  }
-};
-
-// src/color-utils.ts
-var DEFAULT_AMOUNT = 1;
-var DEFAULT_BRIGHTNESS_AMOUNT = 0;
-var DEFAULT_HUE_DEGREES = 0;
-var colorAmountSchema = {
-  type: "number",
-  min: 0,
-  max: 1,
-  step: 0.01,
-  default: DEFAULT_AMOUNT,
-  description: "Amount",
-  hiddenFromList: false
-};
-var colorMultiplierSchema = {
-  type: "number",
-  min: 0,
-  step: 0.01,
-  default: DEFAULT_AMOUNT,
-  description: "Amount",
-  hiddenFromList: false
-};
-var brightnessAmountSchema = {
-  type: "number",
-  min: -1,
-  max: 1,
-  step: 0.01,
-  default: DEFAULT_BRIGHTNESS_AMOUNT,
-  description: "Amount",
-  hiddenFromList: false
-};
-var hueDegreesSchema = {
-  type: "rotation-degrees",
-  step: 1,
-  default: DEFAULT_HUE_DEGREES,
-  description: "Degrees"
-};
-var assertOptionalFiniteNumber = (value, name) => {
-  if (value === undefined) {
-    return;
-  }
-  assertRequiredFiniteNumber(value, name);
-};
-var validateUnitInterval = (value, name) => {
-  if (value < 0) {
-    throw new TypeError(`"${name}" must be >= 0, but got ${JSON.stringify(value)}`);
-  }
-  if (value > 1) {
-    throw new TypeError(`"${name}" must be <= 1, but got ${JSON.stringify(value)}`);
-  }
-};
-var validateNonNegative = (value, name) => {
-  if (value < 0) {
-    throw new TypeError(`"${name}" must be >= 0, but got ${JSON.stringify(value)}`);
-  }
-};
-var validateSignedUnitInterval = (value, name) => {
-  if (value < -1) {
-    throw new TypeError(`"${name}" must be >= -1, but got ${JSON.stringify(value)}`);
-  }
-  if (value > 1) {
-    throw new TypeError(`"${name}" must be <= 1, but got ${JSON.stringify(value)}`);
-  }
-};
-var clampColorChannel = (value) => {
-  return Math.max(0, Math.min(255, value));
-};
-var parseColorRgba = (ctx, color) => {
-  ctx.clearRect(0, 0, 1, 1);
-  ctx.fillStyle = color;
-  ctx.fillRect(0, 0, 1, 1);
-  const { data } = ctx.getImageData(0, 0, 1, 1);
-  return [data[0], data[1], data[2], data[3]];
-};
+import {
+  assertOptionalFiniteNumber,
+  validateUnitInterval,
+  validateNonNegative
+} from "./index-wxhvgv2s.mjs";
+import {
+  WEBGPU_SINGLE_PASS_VERTEX,
+  setupWebGpuSinglePass,
+  cleanupWebGpuSinglePass,
+  applyWebGpuSinglePass
+} from "./index-tvfexb7s.mjs";
+import {
+  assertEffectParamsObject
+} from "./index-4fvp93ps.mjs";
 
 // src/scanlines.ts
+import { Internals } from "remotion";
 var { createEffect, createWebGL2ContextError } = Internals;
-var DEFAULT_AMOUNT2 = 0.15;
+var DEFAULT_AMOUNT = 0.15;
 var DEFAULT_SPACING = 4;
 var DEFAULT_THICKNESS = 1;
 var DEFAULT_OFFSET = 0;
@@ -119,7 +27,7 @@ var scanlinesSchema = {
     min: 0,
     max: 1,
     step: 0.01,
-    default: DEFAULT_AMOUNT2,
+    default: DEFAULT_AMOUNT,
     description: "Amount",
     hiddenFromList: false
   },
@@ -155,13 +63,13 @@ var scanlinesSchema = {
   }
 };
 var resolve = (p) => ({
-  amount: p.amount ?? DEFAULT_AMOUNT2,
+  amount: p.amount ?? DEFAULT_AMOUNT,
   spacing: p.spacing ?? DEFAULT_SPACING,
   thickness: p.thickness ?? DEFAULT_THICKNESS,
   offset: p.offset ?? DEFAULT_OFFSET,
   premultiply: p.premultiply ?? DEFAULT_PREMULTIPLY
 });
-var assertOptionalBoolean2 = (value, name) => {
+var assertOptionalBoolean = (value, name) => {
   if (value === undefined) {
     return;
   }
@@ -180,7 +88,7 @@ var validateScanlinesParams = (params) => {
   assertOptionalFiniteNumber(params.spacing, "spacing");
   assertOptionalFiniteNumber(params.thickness, "thickness");
   assertOptionalFiniteNumber(params.offset, "offset");
-  assertOptionalBoolean2(params.premultiply, "premultiply");
+  assertOptionalBoolean(params.premultiply, "premultiply");
   const r = resolve(params);
   validateUnitInterval(r.amount, "amount");
   validatePositive(r.spacing, "spacing");
@@ -342,51 +250,109 @@ var setupScanlines = (target) => {
     uPremultiply: gl.getUniformLocation(program, "uPremultiply")
   };
 };
+var WEBGPU_SHADER = `
+${WEBGPU_SINGLE_PASS_VERTEX}
+struct Params { controls: vec4f, options: vec4f, }
+@group(0) @binding(0) var source: texture_2d<f32>;
+@group(0) @binding(1) var sourceSampler: sampler;
+@group(0) @binding(2) var<uniform> params: Params;
+@fragment fn fragment(input: VertexOutput) -> @location(0) vec4f {
+ let texColor = textureSampleLevel(source, sourceSampler, input.uv, 0);
+ let alpha = texColor.a;
+ if (alpha <= 0.001) { return vec4f(0); }
+ if (params.controls.x <= 0.0 || params.controls.z <= 0.0) { return texColor; }
+ let spacing = max(params.controls.y, 0.001);
+ let thickness = min(params.controls.z, spacing);
+ let halfThickness = thickness * 0.5;
+ // WebGL fragment coordinates run bottom-to-top.
+ let rawPosition = params.options.y - input.position.y + params.controls.w;
+ let position = rawPosition - spacing * floor(rawPosition / spacing);
+ let distanceToLine = min(position, spacing - position);
+ let line = 1.0 - smoothstep(halfThickness, halfThickness + 1.0, distanceToLine);
+ let dutyCycle = thickness / spacing;
+ let signal = line - dutyCycle;
+ let rgb = texColor.rgb / alpha;
+ let scanlineLayer = select(vec3f(signal), rgb * signal, params.options.x != 0.0);
+ let result = clamp(rgb + scanlineLayer * params.controls.x, vec3f(0), vec3f(1));
+ return vec4f(result * alpha, alpha);
+}
+`;
 var scanlines = createEffect({
   type: "dev.remotion.effects.scanlines",
   label: "scanlines()",
   documentationLink: "https://www.remotion.dev/docs/effects/scanlines",
-  backend: "webgl2",
   calculateKey: (params) => {
     const r = resolve(params);
     return `scanlines-${r.amount}-${r.spacing}-${r.thickness}-${r.offset}-${r.premultiply ? 1 : 0}`;
   },
-  setup: (target) => setupScanlines(target),
-  apply: ({ source, width, height, params, state, flipSourceY }) => {
-    const r = resolve(params);
-    const { gl, program, texture, vao } = state;
-    gl.viewport(0, 0, width, height);
-    gl.bindFramebuffer(gl.FRAMEBUFFER, null);
-    gl.clearColor(0, 0, 0, 0);
-    gl.clear(gl.COLOR_BUFFER_BIT);
-    gl.activeTexture(gl.TEXTURE0);
-    gl.bindTexture(gl.TEXTURE_2D, texture);
-    gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, flipSourceY);
-    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, source);
-    gl.useProgram(program);
-    if (state.uSource)
-      gl.uniform1i(state.uSource, 0);
-    if (state.uAmount)
-      gl.uniform1f(state.uAmount, r.amount);
-    if (state.uSpacing)
-      gl.uniform1f(state.uSpacing, r.spacing);
-    if (state.uThickness)
-      gl.uniform1f(state.uThickness, r.thickness);
-    if (state.uOffset)
-      gl.uniform1f(state.uOffset, r.offset);
-    if (state.uPremultiply)
-      gl.uniform1i(state.uPremultiply, r.premultiply ? 1 : 0);
-    gl.bindVertexArray(vao);
-    gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
-    gl.bindVertexArray(null);
-    gl.bindTexture(gl.TEXTURE_2D, null);
-    gl.useProgram(null);
-  },
-  cleanup: ({ gl, program, vao, vbo, texture }) => {
-    gl.deleteTexture(texture);
-    gl.deleteBuffer(vbo);
-    gl.deleteProgram(program);
-    gl.deleteVertexArray(vao);
+  implementations: {
+    webgpu: Internals.createEffectImplementation({
+      setup: (target) => setupWebGpuSinglePass(target, "scanlines"),
+      apply: ({ source, width, height, params, state, gpuDevice }) => {
+        if (!gpuDevice) {
+          throw new Error("A WebGPU device is required for the scanlines effect");
+        }
+        const r = resolve(params);
+        applyWebGpuSinglePass({
+          source,
+          width,
+          height,
+          state,
+          device: gpuDevice,
+          shader: WEBGPU_SHADER,
+          uniformData: new Float32Array([
+            r.amount,
+            r.spacing,
+            r.thickness,
+            r.offset,
+            r.premultiply ? 1 : 0,
+            height,
+            0,
+            0
+          ])
+        });
+      },
+      cleanup: cleanupWebGpuSinglePass
+    }),
+    webgl2: Internals.createEffectImplementation({
+      setup: (target) => setupScanlines(target),
+      apply: ({ source, width, height, params, state, flipSourceY }) => {
+        const r = resolve(params);
+        const { gl, program, texture, vao } = state;
+        gl.viewport(0, 0, width, height);
+        gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+        gl.clearColor(0, 0, 0, 0);
+        gl.clear(gl.COLOR_BUFFER_BIT);
+        gl.activeTexture(gl.TEXTURE0);
+        gl.bindTexture(gl.TEXTURE_2D, texture);
+        gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, flipSourceY);
+        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, source);
+        gl.useProgram(program);
+        if (state.uSource)
+          gl.uniform1i(state.uSource, 0);
+        if (state.uAmount)
+          gl.uniform1f(state.uAmount, r.amount);
+        if (state.uSpacing)
+          gl.uniform1f(state.uSpacing, r.spacing);
+        if (state.uThickness)
+          gl.uniform1f(state.uThickness, r.thickness);
+        if (state.uOffset)
+          gl.uniform1f(state.uOffset, r.offset);
+        if (state.uPremultiply)
+          gl.uniform1i(state.uPremultiply, r.premultiply ? 1 : 0);
+        gl.bindVertexArray(vao);
+        gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
+        gl.bindVertexArray(null);
+        gl.bindTexture(gl.TEXTURE_2D, null);
+        gl.useProgram(null);
+      },
+      cleanup: ({ gl, program, vao, vbo, texture }) => {
+        gl.deleteTexture(texture);
+        gl.deleteBuffer(vbo);
+        gl.deleteProgram(program);
+        gl.deleteVertexArray(vao);
+      }
+    })
   },
   schema: scanlinesSchema,
   validateParams: validateScanlinesParams