@remotion/effects 4.0.539 → 4.0.540

package/dist/esm/curves.mjs

@@ -1,112 +1,21 @@
-// src/curves.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 {
+  colorAmountSchema,
+  assertOptionalFiniteNumber,
+  validateUnitInterval
+} from "./index-wxhvgv2s.mjs";
+import {
+  WEBGPU_SINGLE_PASS_VERTEX,
+  setupWebGpuSinglePass,
+  cleanupWebGpuSinglePass,
+  applyWebGpuSinglePass
+} from "./index-tvfexb7s.mjs";
+import {
+  assertEffectParamsObject,
+  assertRequiredFiniteNumber
+} from "./index-4fvp93ps.mjs";
 
 // src/curves.ts
+import { Internals } from "remotion";
 var { createEffect, createCurveSampler, createWebGL2ContextError } = Internals;
 var DEFAULT_POINTS = [
   [0, 0],
@@ -114,7 +23,7 @@ var DEFAULT_POINTS = [
 ];
 var DEFAULT_CHANNEL = "rgb";
 var DEFAULT_INTERPOLATION = "smooth";
-var DEFAULT_AMOUNT2 = 1;
+var DEFAULT_AMOUNT = 1;
 var MAX_POINTS = 32;
 var LUT_SIZE = 1024;
 var CURVES_CHANNELS = ["rgb", "red", "green", "blue"];
@@ -148,12 +57,12 @@ var resolve = (params) => ({
   points: params.points ?? DEFAULT_POINTS,
   channel: params.channel ?? DEFAULT_CHANNEL,
   interpolation: params.interpolation ?? DEFAULT_INTERPOLATION,
-  amount: params.amount ?? DEFAULT_AMOUNT2
+  amount: params.amount ?? DEFAULT_AMOUNT
 });
 var validateCurvesParams = (params) => {
   assertEffectParamsObject(params, "Curves");
   assertOptionalFiniteNumber(params.amount, "amount");
-  validateUnitInterval(params.amount ?? DEFAULT_AMOUNT2, "amount");
+  validateUnitInterval(params.amount ?? DEFAULT_AMOUNT, "amount");
   if (params.channel !== undefined && !CURVES_CHANNELS.includes(params.channel)) {
     throw new TypeError(`"channel" must be "rgb", "red", "green" or "blue", but got ${JSON.stringify(params.channel)}`);
   }
@@ -252,117 +161,192 @@ var createTexture = (gl, filter) => {
   gl.bindTexture(gl.TEXTURE_2D, null);
   return texture;
 };
+var CURVES_WEBGPU_SHADER = `
+${WEBGPU_SINGLE_PASS_VERTEX}
+struct Params {settings: vec4f, curve: array<vec4f, 256>,}
+@group(0) @binding(0) var source: texture_2d<f32>;
+@group(0) @binding(1) var sourceSampler: sampler;
+@group(0) @binding(2) var<uniform> params: Params;
+fn sampleCurve(value: f32) -> f32 {
+ let position = clamp(value, 0.0, 1.0) * 1023.0;
+ let lower = u32(floor(position));
+ let upper = min(lower + 1u, 1023u);
+ return mix(params.curve[lower / 4u][lower % 4u], params.curve[upper / 4u][upper % 4u], fract(position));
+}
+@fragment fn fragment(input: VertexOutput) -> @location(0) vec4f {
+ let sampled = textureSampleLevel(source, sourceSampler, input.uv, 0);
+ if (sampled.a == 0.0) {return vec4f(0);}
+ let color = sampled.rgb / sampled.a;
+ var corrected = color;
+ let channel = params.settings.x;
+ if (channel == 0.0 || channel == 1.0) {corrected.r = sampleCurve(color.r);}
+ if (channel == 0.0 || channel == 2.0) {corrected.g = sampleCurve(color.g);}
+ if (channel == 0.0 || channel == 3.0) {corrected.b = sampleCurve(color.b);}
+ return vec4f(mix(color, corrected, params.settings.y) * sampled.a, sampled.a);
+}
+`;
 var curves = createEffect({
   type: "remotion/curves",
   label: "curves()",
   documentationLink: "https://www.remotion.dev/docs/effects/curves",
-  backend: "webgl2",
   calculateKey: (params) => {
     const { points, channel, interpolation, amount } = resolve(params);
     return `curves-${JSON.stringify(points)}-${channel}-${interpolation}-${amount}`;
   },
-  setup: (target) => {
-    const gl = target.getContext("webgl2", {
-      premultipliedAlpha: true,
-      alpha: true,
-      preserveDrawingBuffer: true
-    });
-    if (!gl)
-      throw createWebGL2ContextError("curves effect");
-    const vertexShader = compileShader(gl, gl.VERTEX_SHADER, VERTEX_SHADER);
-    const fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, FRAGMENT_SHADER);
-    const program = gl.createProgram();
-    if (!program)
-      throw new Error("Failed to create curves shader program");
-    gl.attachShader(program, vertexShader);
-    gl.attachShader(program, fragmentShader);
-    gl.linkProgram(program);
-    gl.deleteShader(vertexShader);
-    gl.deleteShader(fragmentShader);
-    if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
-      const log = gl.getProgramInfoLog(program);
-      gl.deleteProgram(program);
-      throw new Error(`Curves shader link failed: ${log ?? "(no log)"}`);
-    }
-    const vao = gl.createVertexArray();
-    if (!vao)
-      throw new Error("Failed to create curves vertex array");
-    const vbo = gl.createBuffer();
-    if (!vbo)
-      throw new Error("Failed to create curves vertex buffer");
-    gl.bindVertexArray(vao);
-    gl.bindBuffer(gl.ARRAY_BUFFER, vbo);
-    gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([-1, -1, 0, 0, 1, -1, 1, 0, -1, 1, 0, 1, 1, 1, 1, 1]), gl.STATIC_DRAW);
-    const aPos = gl.getAttribLocation(program, "aPos");
-    const aUv = gl.getAttribLocation(program, "aUv");
-    gl.enableVertexAttribArray(aPos);
-    gl.vertexAttribPointer(aPos, 2, gl.FLOAT, false, 16, 0);
-    gl.enableVertexAttribArray(aUv);
-    gl.vertexAttribPointer(aUv, 2, gl.FLOAT, false, 16, 8);
-    gl.bindVertexArray(null);
-    return {
-      gl,
-      program,
-      vao,
-      vbo,
-      sourceTexture: createTexture(gl, gl.LINEAR),
-      curveTexture: createTexture(gl, gl.NEAREST),
-      uniforms: {
-        uSource: gl.getUniformLocation(program, "uSource"),
-        uCurve: gl.getUniformLocation(program, "uCurve"),
-        uChannel: gl.getUniformLocation(program, "uChannel"),
-        uAmount: gl.getUniformLocation(program, "uAmount")
+  implementations: {
+    webgpu: Internals.createEffectImplementation({
+      setup: (target) => ({
+        ...setupWebGpuSinglePass(target, "curves"),
+        cachedCurveKey: null,
+        uniformData: new Float32Array(4 + LUT_SIZE)
+      }),
+      apply: ({ source, width, height, params, state, gpuDevice }) => {
+        if (!gpuDevice)
+          throw new Error("A WebGPU device is required for the curves effect");
+        const { points, channel, interpolation, amount } = resolve(params);
+        const key = `${interpolation}-${JSON.stringify(points)}`;
+        if (state.cachedCurveKey !== key) {
+          const sample = createCurveSampler(points, interpolation);
+          for (let index = 0;index < LUT_SIZE; index++)
+            state.uniformData[4 + index] = sample(index / (LUT_SIZE - 1));
+          state.cachedCurveKey = key;
+        }
+        state.uniformData[0] = CURVES_CHANNELS.indexOf(channel);
+        state.uniformData[1] = amount;
+        applyWebGpuSinglePass({
+          state,
+          source,
+          width,
+          height,
+          device: gpuDevice,
+          shader: CURVES_WEBGPU_SHADER,
+          uniformData: state.uniformData
+        });
       },
-      cachedCurveKey: null
-    };
-  },
-  apply: ({ source, width, height, params, state, flipSourceY }) => {
-    const { points, channel, interpolation, amount } = resolve(params);
-    const { gl, program, sourceTexture, curveTexture, uniforms, vao } = state;
-    const curveKey = `${interpolation}-${JSON.stringify(points)}`;
-    gl.activeTexture(gl.TEXTURE1);
-    gl.bindTexture(gl.TEXTURE_2D, curveTexture);
-    if (state.cachedCurveKey !== curveKey) {
-      const sample = createCurveSampler(points, interpolation);
-      const data = new Float32Array(LUT_SIZE);
-      for (let index = 0;index < LUT_SIZE; index++) {
-        data[index] = sample(index / (LUT_SIZE - 1));
+      cleanup: cleanupWebGpuSinglePass
+    }),
+    webgl2: Internals.createEffectImplementation({
+      setup: (target) => {
+        const gl = target.getContext("webgl2", {
+          premultipliedAlpha: true,
+          alpha: true,
+          preserveDrawingBuffer: true
+        });
+        if (!gl)
+          throw createWebGL2ContextError("curves effect");
+        const vertexShader = compileShader(gl, gl.VERTEX_SHADER, VERTEX_SHADER);
+        const fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, FRAGMENT_SHADER);
+        const program = gl.createProgram();
+        if (!program)
+          throw new Error("Failed to create curves shader program");
+        gl.attachShader(program, vertexShader);
+        gl.attachShader(program, fragmentShader);
+        gl.linkProgram(program);
+        gl.deleteShader(vertexShader);
+        gl.deleteShader(fragmentShader);
+        if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+          const log = gl.getProgramInfoLog(program);
+          gl.deleteProgram(program);
+          throw new Error(`Curves shader link failed: ${log ?? "(no log)"}`);
+        }
+        const vao = gl.createVertexArray();
+        if (!vao)
+          throw new Error("Failed to create curves vertex array");
+        const vbo = gl.createBuffer();
+        if (!vbo)
+          throw new Error("Failed to create curves vertex buffer");
+        gl.bindVertexArray(vao);
+        gl.bindBuffer(gl.ARRAY_BUFFER, vbo);
+        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
+          -1,
+          -1,
+          0,
+          0,
+          1,
+          -1,
+          1,
+          0,
+          -1,
+          1,
+          0,
+          1,
+          1,
+          1,
+          1,
+          1
+        ]), gl.STATIC_DRAW);
+        const aPos = gl.getAttribLocation(program, "aPos");
+        const aUv = gl.getAttribLocation(program, "aUv");
+        gl.enableVertexAttribArray(aPos);
+        gl.vertexAttribPointer(aPos, 2, gl.FLOAT, false, 16, 0);
+        gl.enableVertexAttribArray(aUv);
+        gl.vertexAttribPointer(aUv, 2, gl.FLOAT, false, 16, 8);
+        gl.bindVertexArray(null);
+        return {
+          gl,
+          program,
+          vao,
+          vbo,
+          sourceTexture: createTexture(gl, gl.LINEAR),
+          curveTexture: createTexture(gl, gl.NEAREST),
+          uniforms: {
+            uSource: gl.getUniformLocation(program, "uSource"),
+            uCurve: gl.getUniformLocation(program, "uCurve"),
+            uChannel: gl.getUniformLocation(program, "uChannel"),
+            uAmount: gl.getUniformLocation(program, "uAmount")
+          },
+          cachedCurveKey: null
+        };
+      },
+      apply: ({ source, width, height, params, state, flipSourceY }) => {
+        const { points, channel, interpolation, amount } = resolve(params);
+        const { gl, program, sourceTexture, curveTexture, uniforms, vao } = state;
+        const curveKey = `${interpolation}-${JSON.stringify(points)}`;
+        gl.activeTexture(gl.TEXTURE1);
+        gl.bindTexture(gl.TEXTURE_2D, curveTexture);
+        if (state.cachedCurveKey !== curveKey) {
+          const sample = createCurveSampler(points, interpolation);
+          const data = new Float32Array(LUT_SIZE);
+          for (let index = 0;index < LUT_SIZE; index++) {
+            data[index] = sample(index / (LUT_SIZE - 1));
+          }
+          gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
+          gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
+          gl.texImage2D(gl.TEXTURE_2D, 0, gl.R32F, LUT_SIZE, 1, 0, gl.RED, gl.FLOAT, data);
+          state.cachedCurveKey = curveKey;
+        }
+        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, sourceTexture);
+        gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, true);
+        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 (uniforms.uSource)
+          gl.uniform1i(uniforms.uSource, 0);
+        if (uniforms.uCurve)
+          gl.uniform1i(uniforms.uCurve, 1);
+        if (uniforms.uChannel)
+          gl.uniform1i(uniforms.uChannel, CURVES_CHANNELS.indexOf(channel));
+        if (uniforms.uAmount)
+          gl.uniform1f(uniforms.uAmount, amount);
+        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, sourceTexture, curveTexture }) => {
+        gl.deleteTexture(sourceTexture);
+        gl.deleteTexture(curveTexture);
+        gl.deleteBuffer(vbo);
+        gl.deleteProgram(program);
+        gl.deleteVertexArray(vao);
       }
-      gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
-      gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
-      gl.texImage2D(gl.TEXTURE_2D, 0, gl.R32F, LUT_SIZE, 1, 0, gl.RED, gl.FLOAT, data);
-      state.cachedCurveKey = curveKey;
-    }
-    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, sourceTexture);
-    gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, true);
-    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 (uniforms.uSource)
-      gl.uniform1i(uniforms.uSource, 0);
-    if (uniforms.uCurve)
-      gl.uniform1i(uniforms.uCurve, 1);
-    if (uniforms.uChannel)
-      gl.uniform1i(uniforms.uChannel, CURVES_CHANNELS.indexOf(channel));
-    if (uniforms.uAmount)
-      gl.uniform1f(uniforms.uAmount, amount);
-    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, sourceTexture, curveTexture }) => {
-    gl.deleteTexture(sourceTexture);
-    gl.deleteTexture(curveTexture);
-    gl.deleteBuffer(vbo);
-    gl.deleteProgram(program);
-    gl.deleteVertexArray(vao);
+    })
   },
   schema: curvesSchema,
   validateParams: validateCurvesParams