@remotion/effects 4.0.539 → 4.0.540

package/dist/esm/fisheye.mjs

@@ -1,119 +1,26 @@
+import {
+  publicUvToShaderUv
+} from "./index-gnsce796.mjs";
+import {
+  assertOptionalFiniteNumber,
+  validateNonNegative
+} from "./index-wxhvgv2s.mjs";
+import {
+  WEBGPU_SINGLE_PASS_VERTEX,
+  setupWebGpuSinglePass,
+  cleanupWebGpuSinglePass,
+  applyWebGpuSinglePass
+} from "./index-tvfexb7s.mjs";
+import {
+  assertEffectParamsObject
+} from "./index-4fvp93ps.mjs";
+
 // src/fisheye/index.ts
 import { Internals as Internals2 } 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]];
-};
-
 // src/fisheye/fisheye-runtime.ts
 import { Internals } from "remotion";
 
-// src/uv-coordinate.ts
-var publicUvToShaderUv = (uv) => {
-  return [uv[0], 1 - uv[1]];
-};
-
 // src/fisheye/fisheye-shaders.ts
 var FISHEYE_VS = `#version 300 es
 layout(location = 0) in vec2 aPos;
@@ -341,6 +248,38 @@ var applyFisheye = ({
   gl.useProgram(null);
 };
 
+// src/fisheye/webgpu-shader.ts
+var FISHEYE_WEBGPU_SHADER = `
+${WEBGPU_SINGLE_PASS_VERTEX}
+@group(0) @binding(0) var source: texture_2d<f32>;
+@group(0) @binding(1) var sourceSampler: sampler;
+@group(0) @binding(2) var<uniform> params: Params;
+struct Params { centerAndLens: vec4f, zoomAndAspect: vec4f, }
+@fragment fn fragment(input: VertexOutput) -> @location(0) vec4f {
+  let center = params.centerAndLens.xy;
+  let fieldOfView = params.centerAndLens.z;
+  let radius = params.centerAndLens.w;
+  let zoom = params.zoomAndAspect.x;
+  let aspect = params.zoomAndAspect.y;
+  let toCenter = input.uv - center;
+  let corrected = vec2f(toCenter.x * aspect, toCenter.y);
+  let dist = length(corrected);
+  let r = dist / max(radius, 0.0001);
+  if (r > 1.0 || fieldOfView <= 0.0001) {
+    return textureSampleLevel(source, sourceSampler, input.uv, 0);
+  }
+  let halfFov = fieldOfView * 0.5;
+  let warped = tan(r * halfFov) / tan(halfFov);
+  var scale = 0.0;
+  if (dist > 0.00001) { scale = warped * radius / dist; }
+  let warpedAspect = corrected * scale;
+  let offset = vec2f(warpedAspect.x / aspect, warpedAspect.y) / max(zoom, 0.0001);
+  let uv = center + offset;
+  if (any(uv < vec2f(0)) || any(uv > vec2f(1))) { return vec4f(0); }
+  return textureSampleLevel(source, sourceSampler, uv, 0);
+}
+`;
+
 // src/fisheye/index.ts
 var { createEffect } = Internals2;
 var DEFAULT_FISHEYE_FIELD_OF_VIEW = 2.5;
@@ -422,27 +361,59 @@ var fisheye = createEffect({
   type: "dev.remotion.effects.fisheye",
   label: "fisheye()",
   documentationLink: "https://www.remotion.dev/docs/effects/fisheye",
-  backend: "webgl2",
   calculateKey: (params) => {
     const r = resolve(params);
     return `fisheye-${r.fieldOfView}-${r.center.join(":")}-${r.radius}-${r.zoom}`;
   },
-  setup: (target) => setupFisheye(target),
-  apply: ({ source, width, height, params, state, flipSourceY }) => {
-    const r = resolve(params);
-    applyFisheye({
-      state,
-      source,
-      width,
-      height,
-      center: r.center,
-      fieldOfView: r.fieldOfView,
-      radius: r.radius,
-      zoom: r.zoom,
-      flipSourceY
-    });
+  implementations: {
+    webgpu: Internals2.createEffectImplementation({
+      setup: (target) => setupWebGpuSinglePass(target, "fisheye"),
+      apply: ({ source, width, height, params, state, gpuDevice }) => {
+        if (!gpuDevice) {
+          throw new Error("A WebGPU device is required for the fisheye effect");
+        }
+        const r = resolve(params);
+        const uniformData = new Float32Array([
+          r.center[0],
+          r.center[1],
+          r.fieldOfView,
+          r.radius,
+          r.zoom,
+          width / height,
+          0,
+          0
+        ]);
+        applyWebGpuSinglePass({
+          state,
+          source,
+          width,
+          height,
+          device: gpuDevice,
+          shader: FISHEYE_WEBGPU_SHADER,
+          uniformData
+        });
+      },
+      cleanup: cleanupWebGpuSinglePass
+    }),
+    webgl2: Internals2.createEffectImplementation({
+      setup: (target) => setupFisheye(target),
+      apply: ({ source, width, height, params, state, flipSourceY }) => {
+        const r = resolve(params);
+        applyFisheye({
+          state,
+          source,
+          width,
+          height,
+          center: r.center,
+          fieldOfView: r.fieldOfView,
+          radius: r.radius,
+          zoom: r.zoom,
+          flipSourceY
+        });
+      },
+      cleanup: (state) => cleanupFisheye(state)
+    })
   },
-  cleanup: (state) => cleanupFisheye(state),
   schema: fisheyeSchema,
   validateParams: validateFisheyeParams
 });

package/dist/esm/flannel.mjs

@@ -1,114 +1,76 @@
+import {
+  setupWebGpuColors,
+  getWebGpuColors
+} from "./index-8jx11jyn.mjs";
+import {
+  assertOptionalFiniteNumber,
+  validateUnitInterval,
+  parseColorRgba
+} from "./index-wxhvgv2s.mjs";
+import {
+  WEBGPU_SINGLE_PASS_VERTEX,
+  cleanupWebGpuSinglePass,
+  applyWebGpuSinglePass
+} from "./index-tvfexb7s.mjs";
+import {
+  assertEffectParamsObject,
+  assertOptionalColor
+} from "./index-4fvp93ps.mjs";
+
 // src/flannel.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/flannel-webgpu-shader.ts
+var FLANNEL_WEBGPU_SHADER = `
+${WEBGPU_SINGLE_PASS_VERTEX}
+@group(0) @binding(0) var sourceTexture: texture_2d<f32>;
+@group(0) @binding(1) var sourceSampler: sampler;
+@group(0) @binding(2) var<uniform> params: Params;
+struct Params {
+ geometry: vec4f,
+ values: vec4f,
+ base: vec4f,
+ stripe: vec4f,
+}
+fn sampleSource(uv: vec2f) -> vec4f {
+ return textureSampleLevel(sourceTexture, sourceSampler, vec2f(uv.x, 1.0 - uv.y), 0);
+}
+fn stripe(coordinate: f32, center: f32, width: f32, softness: f32) -> f32 {
+ let distanceFromCenter = abs(fract(coordinate) - center);
+ let halfWidth = width * 0.5;
+ return 1.0 - smoothstep(halfWidth, halfWidth + softness, distanceFromCenter);
+}
+@fragment fn fragment(input: VertexOutput) -> @location(0) vec4f {
+ let vUv = vec2f(input.uv.x, 1.0 - input.uv.y);
 
-// 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]];
-};
+ let source = sampleSource(vUv);
+ if (source.a <= 0.001 || params.geometry.z <= 0.0) { return source; }
+ let pixel = vec2f(input.position.x, params.geometry.y - input.position.y);
+ let plaid = pixel / max(params.geometry.w, 0.001);
+ let edge = mix(0.002, 0.08, params.values.x);
+ let verticalWide = stripe(plaid.x, 0.5, 0.34, edge);
+ let horizontalWide = stripe(plaid.y, 0.5, 0.34, edge);
+ let verticalFine = stripe(plaid.x * 2.0, 0.5, 0.07, edge * 0.5);
+ let horizontalFine = stripe(plaid.y * 2.0, 0.5, 0.07, edge * 0.5);
+ let bands = max(max(verticalWide, horizontalWide), max(verticalFine, horizontalFine) * 0.72);
+ let crossing = max(verticalWide * horizontalWide, verticalFine * horizontalFine);
+ let threadX = 0.5 + 0.5 * sin(pixel.x * 3.14159265);
+ let threadY = 0.5 + 0.5 * sin(pixel.y * 3.14159265);
+ let weave = (threadX - 0.5) * (threadY - 0.5) * 0.12;
+ let sourceRgb = source.rgb / source.a;
+ let luminance = dot(sourceRgb, vec3f(0.2126, 0.7152, 0.0722));
+ var plaidColor = mix(params.base.rgb, params.stripe.rgb, bands * params.stripe.a);
+ plaidColor = mix(plaidColor, params.stripe.rgb * 0.72, crossing * params.stripe.a);
+ plaidColor *= mix(0.58, 1.18, luminance) + weave;
+ let result = mix(sourceRgb, clamp(plaidColor, vec3f(0), vec3f(1)), params.geometry.z);
+ return vec4f(result * source.a, source.a);
+
+}
+`;
 
 // src/flannel.ts
 var { createEffect, createWebGL2ContextError } = Internals;
-var DEFAULT_AMOUNT2 = 0.7;
+var DEFAULT_AMOUNT = 0.7;
 var DEFAULT_SIZE = 96;
 var DEFAULT_SOFTNESS = 0.18;
 var DEFAULT_BASE_COLOR = "#c92f3d";
@@ -119,7 +81,7 @@ var flannelSchema = {
     min: 0,
     max: 1,
     step: 0.01,
-    default: DEFAULT_AMOUNT2,
+    default: DEFAULT_AMOUNT,
     description: "Amount",
     hiddenFromList: false
   },
@@ -153,7 +115,7 @@ var flannelSchema = {
   }
 };
 var resolve = (params) => ({
-  amount: params.amount ?? DEFAULT_AMOUNT2,
+  amount: params.amount ?? DEFAULT_AMOUNT,
   size: params.size ?? DEFAULT_SIZE,
   softness: params.softness ?? DEFAULT_SOFTNESS,
   baseColor: params.baseColor ?? DEFAULT_BASE_COLOR,
@@ -210,7 +172,7 @@ void main() {
 		return;
 	}
 
-	vec2 pixel = vUv * uResolution;
+	vec2 pixel = gl_FragCoord.xy;
 	vec2 plaid = pixel / max(uSize, 0.001);
 	float edge = mix(0.002, 0.08, uSoftness);
 
@@ -337,59 +299,99 @@ var flannel = createEffect({
   type: "dev.remotion.effects.flannel",
   label: "flannel()",
   documentationLink: "https://www.remotion.dev/docs/effects/flannel",
-  backend: "webgl2",
   calculateKey: (params) => {
     const resolved = resolve(params);
     return `flannel-${resolved.amount}-${resolved.size}-${resolved.softness}-${resolved.baseColor}-${resolved.stripeColor}`;
   },
-  setup: setupFlannel,
-  apply: ({ source, width, height, params, state, flipSourceY }) => {
-    const resolved = resolve(params);
-    if (state.cachedBaseColor !== resolved.baseColor) {
-      state.cachedBaseColor = resolved.baseColor;
-      state.cachedBaseColorRgba = parseColorRgba(state.colorCtx, resolved.baseColor);
-    }
-    if (state.cachedStripeColor !== resolved.stripeColor) {
-      state.cachedStripeColor = resolved.stripeColor;
-      state.cachedStripeColorRgba = parseColorRgba(state.colorCtx, resolved.stripeColor);
-    }
-    const base = normalizedRgba(state.cachedBaseColorRgba);
-    const stripe = normalizedRgba(state.cachedStripeColorRgba);
-    const { gl } = 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.useProgram(state.program);
-    gl.bindVertexArray(state.vao);
-    gl.activeTexture(gl.TEXTURE0);
-    gl.bindTexture(gl.TEXTURE_2D, state.texture);
-    gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, flipSourceY);
-    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, source);
-    if (state.uSource)
-      gl.uniform1i(state.uSource, 0);
-    if (state.uResolution)
-      gl.uniform2f(state.uResolution, width, height);
-    if (state.uAmount)
-      gl.uniform1f(state.uAmount, resolved.amount);
-    if (state.uSize)
-      gl.uniform1f(state.uSize, resolved.size);
-    if (state.uSoftness)
-      gl.uniform1f(state.uSoftness, resolved.softness);
-    if (state.uBaseColor)
-      gl.uniform4f(state.uBaseColor, ...base);
-    if (state.uStripeColor)
-      gl.uniform4f(state.uStripeColor, ...stripe);
-    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) => setupWebGpuColors(target, "flannel"),
+      apply: ({ source, width, height, params, state, gpuDevice }) => {
+        if (!gpuDevice)
+          throw new Error("A WebGPU device is required for the flannel effect");
+        const r = resolve(params);
+        const colors = getWebGpuColors(state, [r.baseColor, r.stripeColor]);
+        const uniformData = new Float32Array([
+          width,
+          height,
+          r.amount,
+          r.size,
+          r.softness,
+          0,
+          0,
+          0,
+          colors[0] / 255,
+          colors[1] / 255,
+          colors[2] / 255,
+          colors[3] / 255,
+          colors[4] / 255,
+          colors[5] / 255,
+          colors[6] / 255,
+          colors[7] / 255
+        ]);
+        applyWebGpuSinglePass({
+          state,
+          source,
+          width,
+          height,
+          device: gpuDevice,
+          shader: FLANNEL_WEBGPU_SHADER,
+          uniformData
+        });
+      },
+      cleanup: cleanupWebGpuSinglePass
+    }),
+    webgl2: Internals.createEffectImplementation({
+      setup: setupFlannel,
+      apply: ({ source, width, height, params, state, flipSourceY }) => {
+        const resolved = resolve(params);
+        if (state.cachedBaseColor !== resolved.baseColor) {
+          state.cachedBaseColor = resolved.baseColor;
+          state.cachedBaseColorRgba = parseColorRgba(state.colorCtx, resolved.baseColor);
+        }
+        if (state.cachedStripeColor !== resolved.stripeColor) {
+          state.cachedStripeColor = resolved.stripeColor;
+          state.cachedStripeColorRgba = parseColorRgba(state.colorCtx, resolved.stripeColor);
+        }
+        const base = normalizedRgba(state.cachedBaseColorRgba);
+        const stripe = normalizedRgba(state.cachedStripeColorRgba);
+        const { gl } = 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.useProgram(state.program);
+        gl.bindVertexArray(state.vao);
+        gl.activeTexture(gl.TEXTURE0);
+        gl.bindTexture(gl.TEXTURE_2D, state.texture);
+        gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, flipSourceY);
+        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, source);
+        if (state.uSource)
+          gl.uniform1i(state.uSource, 0);
+        if (state.uResolution)
+          gl.uniform2f(state.uResolution, width, height);
+        if (state.uAmount)
+          gl.uniform1f(state.uAmount, resolved.amount);
+        if (state.uSize)
+          gl.uniform1f(state.uSize, resolved.size);
+        if (state.uSoftness)
+          gl.uniform1f(state.uSoftness, resolved.softness);
+        if (state.uBaseColor)
+          gl.uniform4f(state.uBaseColor, ...base);
+        if (state.uStripeColor)
+          gl.uniform4f(state.uStripeColor, ...stripe);
+        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: flannelSchema,
   validateParams: validateFlannelParams