@remotion/media 4.0.352 → 4.0.354

package/dist/esm/index.mjs

@@ -2,7 +2,7 @@
 import { useCallback as useCallback2, useContext as useContext5 } from "react";
 import {
   cancelRender as cancelRender3,
-  Internals as Internals2,
+  Internals as Internals6,
   Sequence,
   useRemotionEnvironment as useRemotionEnvironment3
 } from "remotion";
@@ -42,52 +42,57 @@ import { jsx, jsxs } from "react/jsx-runtime";
 var SharedAudioContext = createContext2(null);
 
 // src/audio/audio-for-rendering.tsx
-import { useContext as useContext4, useLayoutEffect, useMemo as useMemo3, useState as useState3 } from "react";
+import { useContext as useContext4, useLayoutEffect, useState as useState3 } from "react";
 import {
   cancelRender as cancelRender2,
-  Internals,
+  Internals as Internals5,
   useCurrentFrame,
   useDelayRender,
   useRemotionEnvironment as useRemotionEnvironment2
 } from "remotion";
 
-// src/caches.ts
-import { cancelRender } from "remotion";
-
-// src/log.ts
-var logLevels = ["trace", "verbose", "info", "warn", "error"];
-var getNumberForLogLevel = (level) => {
-  return logLevels.indexOf(level);
-};
-var isEqualOrBelowLogLevel = (currentLevel, level) => {
-  return getNumberForLogLevel(currentLevel) <= getNumberForLogLevel(level);
-};
-var Log2 = {
-  trace: (logLevel, ...args) => {
-    if (isEqualOrBelowLogLevel(logLevel, "trace")) {
-      return console.log(...args);
-    }
-  },
-  verbose: (logLevel, ...args) => {
-    if (isEqualOrBelowLogLevel(logLevel, "verbose")) {
-      return console.log(...args);
-    }
-  },
-  info: (logLevel, ...args) => {
-    if (isEqualOrBelowLogLevel(logLevel, "info")) {
-      return console.log(...args);
-    }
-  },
-  warn: (logLevel, ...args) => {
-    if (isEqualOrBelowLogLevel(logLevel, "warn")) {
-      return console.warn(...args);
+// src/convert-audiodata/apply-volume.ts
+var applyVolume = (array, volume) => {
+  if (volume === 1) {
+    return;
+  }
+  for (let i = 0;i < array.length; i++) {
+    const newValue = array[i] * volume;
+    if (newValue < -32768) {
+      array[i] = -32768;
+    } else if (newValue > 32767) {
+      array[i] = 32767;
+    } else {
+      array[i] = newValue;
     }
-  },
-  error: (...args) => {
-    return console.error(...args);
   }
 };
 
+// src/looped-frame.ts
+var frameForVolumeProp = ({
+  behavior,
+  loop,
+  assetDurationInSeconds,
+  fps,
+  frame,
+  startsAt
+}) => {
+  if (!loop) {
+    return frame + startsAt;
+  }
+  if (behavior === "extend") {
+    return frame + startsAt;
+  }
+  const assetDurationInFrames = Math.floor(assetDurationInSeconds * fps) - startsAt;
+  return frame % assetDurationInFrames + startsAt;
+};
+
+// src/caches.ts
+import { cancelRender, Internals as Internals4 } from "remotion";
+
+// src/audio-extraction/audio-iterator.ts
+import { Internals } from "remotion";
+
 // src/audio-extraction/audio-cache.ts
 var makeAudioCache = () => {
   const timestamps = [];
@@ -206,7 +211,7 @@ var makeAudioIterator = ({
     return samples;
   };
   const logOpenFrames = (logLevel) => {
-    Log2.verbose(logLevel, "[Audio] Open samples for src", src, cache.getOpenTimestamps().map((t) => t.toFixed(3)).join(", "));
+    Internals.Log.verbose({ logLevel, tag: "@remotion/media" }, "Open audio samples for src", src, cache.getOpenTimestamps().map((t) => t.toFixed(3)).join(", "));
   };
   const getCacheStats = () => {
     return {
@@ -343,6 +348,9 @@ var makeAudioManager = () => {
   };
 };
 
+// src/video-extraction/keyframe-manager.ts
+import { Internals as Internals3 } from "remotion";
+
 // ../../node_modules/.pnpm/mediabunny@1.17.0/node_modules/mediabunny/dist/modules/src/misc.js
 /*!
  * Copyright (c) 2025-present, Vanilagy and contributors
@@ -13280,6 +13288,7 @@ class Input {
  */
 
 // src/video-extraction/keyframe-bank.ts
+import { Internals as Internals2 } from "remotion";
 var roundTo4Digits = (timestamp) => {
   return Math.round(timestamp * 1000) / 1000;
 };
@@ -13291,7 +13300,7 @@ var makeKeyframeBank = ({
   const frames = {};
   const frameTimestamps = [];
   let lastUsed = Date.now();
-  let alloctionSize = 0;
+  let allocationSize = 0;
   const hasDecodedEnoughForTimestamp = (timestamp) => {
     const lastFrameTimestamp = frameTimestamps[frameTimestamps.length - 1];
     if (!lastFrameTimestamp) {
@@ -13306,7 +13315,7 @@ var makeKeyframeBank = ({
   const addFrame = (frame) => {
     frames[frame.timestamp] = frame;
     frameTimestamps.push(frame.timestamp);
-    alloctionSize += frame.allocationSize();
+    allocationSize += frame.allocationSize();
     lastUsed = Date.now();
   };
   const ensureEnoughFramesForTimestamp = async (timestamp) => {
@@ -13353,7 +13362,7 @@ var makeKeyframeBank = ({
       if (!frames[frameTimestamp]) {
         continue;
       }
-      alloctionSize -= frames[frameTimestamp].allocationSize();
+      allocationSize -= frames[frameTimestamp].allocationSize();
       frames[frameTimestamp].close();
       delete frames[frameTimestamp];
     }
@@ -13373,17 +13382,17 @@ var makeKeyframeBank = ({
         if (!frames[frameTimestamp]) {
           continue;
         }
-        alloctionSize -= frames[frameTimestamp].allocationSize();
+        allocationSize -= frames[frameTimestamp].allocationSize();
         frameTimestamps.splice(frameTimestamps.indexOf(frameTimestamp), 1);
         frames[frameTimestamp].close();
         delete frames[frameTimestamp];
-        Log2.verbose(logLevel, `[Video] Deleted frame ${frameTimestamp} for src ${src}`);
+        Internals2.Log.verbose({ logLevel, tag: "@remotion/media" }, `Deleted frame ${frameTimestamp} for src ${src}`);
       }
     }
   };
   const getOpenFrameCount = () => {
     return {
-      size: alloctionSize,
+      size: allocationSize,
       timestamps: frameTimestamps
     };
   };
@@ -13433,16 +13442,13 @@ var getSinks = async (src) => {
   });
   const format = await input.getFormat();
   const videoTrack = await input.getPrimaryVideoTrack();
-  if (!videoTrack) {
-    throw new Error(`No video track found for ${src}`);
-  }
   const audioTrack = await input.getPrimaryAudioTrack();
   const isMatroska = format === MATROSKA;
   return {
-    video: {
+    video: videoTrack ? {
       sampleSink: new VideoSampleSink(videoTrack),
       packetSink: new EncodedPacketSink(videoTrack)
-    },
+    } : null,
     audio: audioTrack ? {
       sampleSink: new AudioSampleSink(audioTrack)
     } : null,
@@ -13457,7 +13463,7 @@ var getFramesSinceKeyframe = async ({
   startPacket
 }) => {
   const nextKeyPacket = await packetSink.getNextKeyPacket(startPacket, {
-    verifyKeyPackets: false
+    verifyKeyPackets: true
   });
   const sampleIterator = videoSampleSink.samples(startPacket.timestamp, nextKeyPacket ? nextKeyPacket.timestamp : Infinity);
   const keyframeBank = makeKeyframeBank({
@@ -13491,10 +13497,10 @@ var makeKeyframeManager = () => {
         if (size === 0) {
           continue;
         }
-        Log2.verbose(logLevel, `[Video] Open frames for src ${src}: ${timestamps.join(", ")}`);
+        Internals3.Log.verbose({ logLevel, tag: "@remotion/media" }, `Open frames for src ${src}: ${timestamps.join(", ")}`);
       }
     }
-    Log2.verbose(logLevel, `[Video] Cache stats: ${count} open frames, ${totalSize} bytes`);
+    Internals3.Log.verbose({ logLevel, tag: "@remotion/media" }, `Video cache stats: ${count} open frames, ${totalSize} bytes`);
   };
   const getCacheStats = async () => {
     let count = 0;
@@ -13535,7 +13541,7 @@ var makeKeyframeManager = () => {
     if (mostInThePastBank) {
       await mostInThePastBank.prepareForDeletion();
       delete sources[mostInThePastSrc][mostInThePastBank.startTimestampInSeconds];
-      Log2.verbose(logLevel, `[Video] Deleted frames for src ${mostInThePastSrc} from ${mostInThePastBank.startTimestampInSeconds}sec to ${mostInThePastBank.endTimestampInSeconds}sec to free up memory.`);
+      Internals3.Log.verbose({ logLevel, tag: "@remotion/media" }, `Deleted frames for src ${mostInThePastSrc} from ${mostInThePastBank.startTimestampInSeconds}sec to ${mostInThePastBank.endTimestampInSeconds}sec to free up memory.`);
     }
   };
   const ensureToStayUnderMaxCacheSize = async (logLevel) => {
@@ -13561,7 +13567,7 @@ var makeKeyframeManager = () => {
       const { endTimestampInSeconds, startTimestampInSeconds } = bank;
       if (endTimestampInSeconds < threshold) {
         await bank.prepareForDeletion();
-        Log2.verbose(logLevel, `[Video] Cleared frames for src ${src} from ${startTimestampInSeconds}sec to ${endTimestampInSeconds}sec`);
+        Internals3.Log.verbose({ logLevel, tag: "@remotion/media" }, `[Video] Cleared frames for src ${src} from ${startTimestampInSeconds}sec to ${endTimestampInSeconds}sec`);
         delete sources[src][startTimeInSeconds];
       } else {
         bank.deleteFramesBeforeTimestamp({
@@ -13600,7 +13606,7 @@ var makeKeyframeManager = () => {
     if (await (await existingBank).hasTimestampInSecond(timestamp)) {
       return existingBank;
     }
-    Log2.verbose(logLevel, `[Video] Bank exists but frames have already been evicted!`);
+    Internals3.Log.verbose({ logLevel, tag: "@remotion/media" }, `Keyframe bank exists but frames have already been evicted!`);
     await (await existingBank).prepareForDeletion();
     delete sources[src][startTimestampInSeconds];
     const replacementKeybank = getFramesSinceKeyframe({
@@ -13672,20 +13678,20 @@ var getUncachedMaxCacheSize = (logLevel) => {
     if (window.remotion_mediaCacheSizeInBytes > 20000 * 1024 * 1024) {
       cancelRender(new Error(`The maximum value for the "mediaCacheSizeInBytes" prop is 20GB (${20000 * 1024 * 1024}), got: ${window.remotion_mediaCacheSizeInBytes}`));
     }
-    Log2.verbose(logLevel, `Using @remotion/media cache size set using "mediaCacheSizeInBytes": ${(window.remotion_mediaCacheSizeInBytes / 1024 / 1024).toFixed(1)} MB`);
+    Internals4.Log.verbose({ logLevel, tag: "@remotion/media" }, `Using cache size set using "mediaCacheSizeInBytes": ${(window.remotion_mediaCacheSizeInBytes / 1024 / 1024).toFixed(1)} MB`);
     return window.remotion_mediaCacheSizeInBytes;
   }
   if (window.remotion_initialMemoryAvailable !== undefined && window.remotion_initialMemoryAvailable !== null) {
     const value = window.remotion_initialMemoryAvailable / 2;
     if (value < 240 * 1024 * 1024) {
-      Log2.verbose(logLevel, `Using @remotion/media cache size set based on minimum value of 240MB (which is more than half of the available system memory!)`);
+      Internals4.Log.verbose({ logLevel, tag: "@remotion/media" }, `Using cache size set based on minimum value of 240MB (which is more than half of the available system memory!)`);
       return 240 * 1024 * 1024;
     }
     if (value > 20000 * 1024 * 1024) {
-      Log2.verbose(logLevel, `Using @remotion/media cache size set based on maximum value of 20GB (which is less than half of the available system memory)`);
+      Internals4.Log.verbose({ logLevel, tag: "@remotion/media" }, `Using cache size set based on maximum value of 20GB (which is less than half of the available system memory)`);
       return 20000 * 1024 * 1024;
     }
-    Log2.verbose(logLevel, `Using @remotion/media cache size set based on available memory (50% of available memory): ${(value / 1024 / 1024).toFixed(1)} MB`);
+    Internals4.Log.verbose({ logLevel, tag: "@remotion/media" }, `Using cache size set based on available memory (50% of available memory): ${(value / 1024 / 1024).toFixed(1)} MB`);
     return value;
   }
   return 1000 * 1000 * 1000;
@@ -13742,36 +13748,53 @@ var combineAudioDataAndClosePrevious = (audioDataArray) => {
 // src/convert-audiodata/resample-audiodata.ts
 var TARGET_NUMBER_OF_CHANNELS = 2;
 var TARGET_SAMPLE_RATE = 48000;
+var fixFloatingPoint = (value) => {
+  if (value % 1 < 0.0000001) {
+    return Math.floor(value);
+  }
+  if (value % 1 > 0.9999999) {
+    return Math.ceil(value);
+  }
+  return value;
+};
 var resampleAudioData = ({
   srcNumberOfChannels,
   sourceChannels,
   destination,
   targetFrames,
-  chunkSize,
-  volume
+  chunkSize
 }) => {
-  const getSourceValues = (start, end, channelIndex) => {
-    const sampleCountAvg = end - start;
-    let itemSum = 0;
-    let itemCount = 0;
-    for (let k = 0;k < sampleCountAvg; k++) {
-      const num = sourceChannels[(start + k) * srcNumberOfChannels + channelIndex];
-      itemSum += num;
-      itemCount++;
-    }
-    const average = itemSum / itemCount;
-    const averageVolume = average * volume;
-    if (averageVolume < -32768) {
-      return -32768;
-    }
-    if (averageVolume > 32767) {
-      return 32767;
-    }
-    return averageVolume;
+  const getSourceValues = (startUnfixed, endUnfixed, channelIndex) => {
+    const start = fixFloatingPoint(startUnfixed);
+    const end = fixFloatingPoint(endUnfixed);
+    const startFloor = Math.floor(start);
+    const startCeil = Math.ceil(start);
+    const startFraction = start - startFloor;
+    const endFraction = end - Math.floor(end);
+    const endFloor = Math.floor(end);
+    let weightedSum = 0;
+    let totalWeight = 0;
+    if (startFraction > 0) {
+      const firstSample = sourceChannels[startFloor * srcNumberOfChannels + channelIndex];
+      weightedSum += firstSample * (1 - startFraction);
+      totalWeight += 1 - startFraction;
+    }
+    for (let k = startCeil;k < endFloor; k++) {
+      const num = sourceChannels[k * srcNumberOfChannels + channelIndex];
+      weightedSum += num;
+      totalWeight += 1;
+    }
+    if (endFraction > 0) {
+      const lastSample = sourceChannels[endFloor * srcNumberOfChannels + channelIndex];
+      weightedSum += lastSample * endFraction;
+      totalWeight += endFraction;
+    }
+    const average = weightedSum / totalWeight;
+    return average;
   };
   for (let newFrameIndex = 0;newFrameIndex < targetFrames; newFrameIndex++) {
-    const start = Math.floor(newFrameIndex * chunkSize);
-    const end = Math.max(Math.floor(start + chunkSize), start + 1);
+    const start = newFrameIndex * chunkSize;
+    const end = start + chunkSize;
     if (TARGET_NUMBER_OF_CHANNELS === srcNumberOfChannels) {
       for (let i = 0;i < srcNumberOfChannels; i++) {
         destination[newFrameIndex * srcNumberOfChannels + i] = getSourceValues(start, end, i);
@@ -13796,8 +13819,9 @@ var resampleAudioData = ({
       const c = getSourceValues(start, end, 2);
       const sl = getSourceValues(start, end, 3);
       const sr = getSourceValues(start, end, 4);
-      const l2 = l + Math.sqrt(1 / 2) * (c + sl);
-      const r2 = r + Math.sqrt(1 / 2) * (c + sr);
+      const sq = Math.sqrt(1 / 2);
+      const l2 = l + sq * (c + sl);
+      const r2 = r + sq * (c + sr);
       destination[newFrameIndex * 2 + 0] = l2;
       destination[newFrameIndex * 2 + 1] = r2;
     } else {
@@ -13810,13 +13834,19 @@ var resampleAudioData = ({
 
 // src/convert-audiodata/convert-audiodata.ts
 var FORMAT = "s16";
+var roundButRoundDownZeroPointFive = (value) => {
+  if (value % 1 <= 0.5) {
+    return Math.floor(value);
+  }
+  return Math.ceil(value);
+};
 var convertAudioData = ({
   audioData,
   newSampleRate,
   trimStartInSeconds,
   trimEndInSeconds,
   targetNumberOfChannels,
-  volume
+  playbackRate
 }) => {
   const {
     numberOfChannels: srcNumberOfChannels,
@@ -13824,9 +13854,10 @@ var convertAudioData = ({
     numberOfFrames
   } = audioData;
   const ratio = currentSampleRate / newSampleRate;
-  const frameOffset = Math.round(trimStartInSeconds * audioData.sampleRate);
-  const frameCount = numberOfFrames - Math.round((trimEndInSeconds + trimStartInSeconds) * audioData.sampleRate);
-  const newNumberOfFrames = Math.round(frameCount / ratio);
+  const frameOffset = roundButRoundDownZeroPointFive(trimStartInSeconds * audioData.sampleRate);
+  const unroundedFrameCount = numberOfFrames - (trimEndInSeconds + trimStartInSeconds) * audioData.sampleRate;
+  const frameCount = Math.round(unroundedFrameCount);
+  const newNumberOfFrames = Math.round(unroundedFrameCount / ratio / playbackRate);
   if (newNumberOfFrames === 0) {
     throw new Error("Cannot resample - the given sample rate would result in less than 1 sample");
   }
@@ -13842,7 +13873,7 @@ var convertAudioData = ({
   });
   const data = new Int16Array(newNumberOfFrames * targetNumberOfChannels);
   const chunkSize = frameCount / newNumberOfFrames;
-  if (newNumberOfFrames === frameCount && targetNumberOfChannels === srcNumberOfChannels && volume === 1) {
+  if (newNumberOfFrames === frameCount && targetNumberOfChannels === srcNumberOfChannels && playbackRate === 1) {
     return {
       data: srcChannels,
       numberOfChannels: targetNumberOfChannels,
@@ -13856,8 +13887,7 @@ var convertAudioData = ({
     sourceChannels: srcChannels,
     destination: data,
     targetFrames: newNumberOfFrames,
-    chunkSize,
-    volume
+    chunkSize
   });
   const newAudioData = {
     data,
@@ -13882,6 +13912,9 @@ var extractFrame = async ({
     sinkPromises[src] = getSinks(src);
   }
   const { video, getDuration } = await sinkPromises[src];
+  if (video === null) {
+    throw new Error(`No video track found for ${src}`);
+  }
   const timeInSeconds = loop ? unloopedTimeinSeconds % await getDuration() : unloopedTimeinSeconds;
   const keyframeBank = await keyframeManager.requestKeyframeBank({
     packetSink: video.packetSink,
@@ -13899,18 +13932,22 @@ var extractAudio = async ({
   src,
   timeInSeconds: unloopedTimeInSeconds,
   durationInSeconds,
-  volume,
   logLevel,
-  loop
+  loop,
+  playbackRate
 }) => {
   if (!sinkPromises[src]) {
     sinkPromises[src] = getSinks(src);
   }
   const { audio, actualMatroskaTimestamps, isMatroska, getDuration } = await sinkPromises[src];
+  let duration = null;
+  if (loop) {
+    duration = await getDuration();
+  }
   if (audio === null) {
-    return null;
+    return { data: null, durationInSeconds: null };
   }
-  const timeInSeconds = loop ? unloopedTimeInSeconds % await getDuration() : unloopedTimeInSeconds;
+  const timeInSeconds = loop ? unloopedTimeInSeconds % duration : unloopedTimeInSeconds;
   const sampleIterator = await audioManager.getIterator({
     src,
     timeInSeconds,
@@ -13937,6 +13974,12 @@ var extractAudio = async ({
     let trimEndInSeconds = 0;
     if (isFirstSample) {
       trimStartInSeconds = timeInSeconds - sample.timestamp;
+      if (trimStartInSeconds < 0 && trimStartInSeconds > -0.0000000001) {
+        trimStartInSeconds = 0;
+      }
+      if (trimStartInSeconds < 0) {
+        throw new Error(`trimStartInSeconds is negative: ${trimStartInSeconds}`);
+      }
     }
     if (isLastSample) {
       trimEndInSeconds = Math.max(0, sample.timestamp + sample.duration - (timeInSeconds + durationInSeconds));
@@ -13947,7 +13990,7 @@ var extractAudio = async ({
       trimStartInSeconds,
       trimEndInSeconds,
       targetNumberOfChannels: TARGET_NUMBER_OF_CHANNELS,
-      volume
+      playbackRate
     });
     audioDataRaw.close();
     if (audioData.numberOfFrames === 0) {
@@ -13956,10 +13999,10 @@ var extractAudio = async ({
     audioDataArray.push(audioData);
   }
   if (audioDataArray.length === 0) {
-    return null;
+    return { data: null, durationInSeconds: duration };
   }
   const combined = combineAudioDataAndClosePrevious(audioDataArray);
-  return combined;
+  return { data: combined, durationInSeconds: duration };
 };
 
 // src/extract-frame-and-audio.ts
@@ -13968,9 +14011,9 @@ var extractFrameAndAudio = async ({
   timeInSeconds,
   logLevel,
   durationInSeconds,
+  playbackRate,
   includeAudio,
   includeVideo,
-  volume,
   loop
 }) => {
   const [frame, audio] = await Promise.all([
@@ -13984,14 +14027,15 @@ var extractFrameAndAudio = async ({
       src,
       timeInSeconds,
       durationInSeconds,
-      volume,
       logLevel,
-      loop
+      loop,
+      playbackRate
     }) : null
   ]);
   return {
     frame: frame?.toVideoFrame() ?? null,
-    audio
+    audio: audio?.data ?? null,
+    durationInSeconds: audio?.durationInSeconds ?? null
   };
 };
 
@@ -14001,14 +14045,14 @@ if (window.remotion_broadcastChannel && window.remotion_isMainTab) {
     const data = event.data;
     if (data.type === "request") {
       try {
-        const { frame, audio } = await extractFrameAndAudio({
+        const { frame, audio, durationInSeconds } = await extractFrameAndAudio({
           src: data.src,
           timeInSeconds: data.timeInSeconds,
           logLevel: data.logLevel,
           durationInSeconds: data.durationInSeconds,
+          playbackRate: data.playbackRate,
           includeAudio: data.includeAudio,
           includeVideo: data.includeVideo,
-          volume: data.volume,
           loop: data.loop
         });
         const videoFrame = frame;
@@ -14020,7 +14064,8 @@ if (window.remotion_broadcastChannel && window.remotion_isMainTab) {
           type: "response-success",
           id: data.id,
           frame: imageBitmap,
-          audio
+          audio,
+          durationInSeconds: durationInSeconds ?? null
         };
         window.remotion_broadcastChannel.postMessage(response);
         videoFrame?.close();
@@ -14042,10 +14087,10 @@ var extractFrameViaBroadcastChannel = ({
   timeInSeconds,
   logLevel,
   durationInSeconds,
+  playbackRate,
   includeAudio,
   includeVideo,
   isClientSideRendering,
-  volume,
   loop
 }) => {
   if (isClientSideRendering || window.remotion_isMainTab) {
@@ -14054,9 +14099,9 @@ var extractFrameViaBroadcastChannel = ({
       src,
       timeInSeconds,
       durationInSeconds,
+      playbackRate,
       includeAudio,
       includeVideo,
-      volume,
       loop
     });
   }
@@ -14070,7 +14115,8 @@ var extractFrameViaBroadcastChannel = ({
       if (data.type === "response-success" && data.id === requestId) {
         resolve({
           frame: data.frame ? data.frame : null,
-          audio: data.audio ? data.audio : null
+          audio: data.audio ? data.audio : null,
+          durationInSeconds: data.durationInSeconds ? data.durationInSeconds : null
         });
         window.remotion_broadcastChannel.removeEventListener("message", onMessage);
       } else if (data.type === "response-error" && data.id === requestId) {
@@ -14087,9 +14133,9 @@ var extractFrameViaBroadcastChannel = ({
     id: requestId,
     logLevel,
     durationInSeconds,
+    playbackRate,
     includeAudio,
     includeVideo,
-    volume,
     loop
   };
   window.remotion_broadcastChannel.postMessage(request);
@@ -14119,11 +14165,11 @@ var AudioForRendering = ({
   logLevel = window.remotion_logLevel,
   loop
 }) => {
-  const absoluteFrame = Internals.useTimelinePosition();
-  const videoConfig = Internals.useUnsafeVideoConfig();
-  const { registerRenderAsset, unregisterRenderAsset } = useContext4(Internals.RenderAssetManager);
   const frame = useCurrentFrame();
-  const volumePropsFrame = Internals.useFrameForVolumeProp(loopVolumeCurveBehavior ?? "repeat");
+  const absoluteFrame = Internals5.useTimelinePosition();
+  const videoConfig = Internals5.useUnsafeVideoConfig();
+  const { registerRenderAsset, unregisterRenderAsset } = useContext4(Internals5.RenderAssetManager);
+  const startsAt = Internals5.useMediaStartsAt();
   const environment = useRemotionEnvironment2();
   const [id] = useState3(() => `${Math.random()}`.replace("0.", ""));
   if (!videoConfig) {
@@ -14132,24 +14178,6 @@ var AudioForRendering = ({
   if (!src) {
     throw new TypeError("No `src` was passed to <Audio>.");
   }
-  const volume = Internals.evaluateVolume({
-    volume: volumeProp,
-    frame: volumePropsFrame,
-    mediaVolume: 1
-  });
-  Internals.warnAboutTooHighVolume(volume);
-  const shouldRenderAudio = useMemo3(() => {
-    if (!window.remotion_audioEnabled) {
-      return false;
-    }
-    if (muted) {
-      return false;
-    }
-    if (volume <= 0) {
-      return false;
-    }
-    return true;
-  }, [muted, volume]);
   const { fps } = videoConfig;
   const { delayRender, continueRender } = useDelayRender();
   useLayoutEffect(() => {
@@ -14160,18 +14188,42 @@ var AudioForRendering = ({
       retries: delayRenderRetries ?? undefined,
       timeoutInMilliseconds: delayRenderTimeoutInMilliseconds ?? undefined
     });
+    const shouldRenderAudio = (() => {
+      if (!window.remotion_audioEnabled) {
+        return false;
+      }
+      if (muted) {
+        return false;
+      }
+      return true;
+    })();
     extractFrameViaBroadcastChannel({
       src,
       timeInSeconds: timestamp,
       durationInSeconds,
+      playbackRate: playbackRate ?? 1,
       logLevel: logLevel ?? "info",
       includeAudio: shouldRenderAudio,
       includeVideo: false,
       isClientSideRendering: environment.isClientSideRendering,
-      volume,
       loop: loop ?? false
-    }).then(({ audio }) => {
-      if (audio) {
+    }).then(({ audio, durationInSeconds: assetDurationInSeconds }) => {
+      const volumePropsFrame = frameForVolumeProp({
+        behavior: loopVolumeCurveBehavior ?? "repeat",
+        loop: loop ?? false,
+        assetDurationInSeconds: assetDurationInSeconds ?? 0,
+        fps,
+        frame,
+        startsAt
+      });
+      const volume = Internals5.evaluateVolume({
+        volume: volumeProp,
+        frame: volumePropsFrame,
+        mediaVolume: 1
+      });
+      Internals5.warnAboutTooHighVolume(volume);
+      if (audio && volume > 0) {
+        applyVolume(audio.data, volume);
         registerRenderAsset({
           type: "inline-audio",
           id,
@@ -14202,13 +14254,15 @@ var AudioForRendering = ({
     frame,
     id,
     logLevel,
+    loop,
+    loopVolumeCurveBehavior,
+    muted,
     playbackRate,
     registerRenderAsset,
-    shouldRenderAudio,
     src,
+    startsAt,
     unregisterRenderAsset,
-    volume,
-    loop
+    volumeProp
   ]);
   return null;
 };
@@ -14220,7 +14274,8 @@ var {
   resolveTrimProps,
   validateMediaProps,
   AudioForPreview
-} = Internals2;
+} = Internals6;
+var onRemotionError = (_e) => {};
 var Audio = (props) => {
   const audioContext = useContext5(SharedAudioContext);
   const {
@@ -14230,7 +14285,6 @@ var Audio = (props) => {
     pauseWhenBuffering,
     stack,
     showInTimeline,
-    onError: onRemotionError,
     loop,
     ...otherProps
   } = props;
@@ -14266,7 +14320,7 @@ var Audio = (props) => {
       onRemotionError?.(new Error(errMessage));
       console.warn(errMessage);
     }
-  }, [onRemotionError, loop]);
+  }, [loop]);
   if (typeof trimBeforeValue !== "undefined" || typeof trimAfterValue !== "undefined") {
     return /* @__PURE__ */ jsx2(Sequence, {
       layout: "none",
@@ -14287,8 +14341,6 @@ var Audio = (props) => {
     });
   }
   const {
-    onAutoPlayError,
-    crossOrigin,
     delayRenderRetries,
     delayRenderTimeoutInMilliseconds,
     ...propsForPreview
@@ -14307,19 +14359,19 @@ var Audio = (props) => {
 };
 // src/video/video.tsx
 import { useCallback as useCallback3 } from "react";
-import { Internals as Internals4, Sequence as Sequence2, useRemotionEnvironment as useRemotionEnvironment5 } from "remotion";
+import { Internals as Internals8, Sequence as Sequence2, useRemotionEnvironment as useRemotionEnvironment5 } from "remotion";
 
 // src/video/video-for-rendering.tsx
 import {
   useContext as useContext6,
   useLayoutEffect as useLayoutEffect2,
-  useMemo as useMemo4,
+  useMemo as useMemo3,
   useRef as useRef2,
   useState as useState4
 } from "react";
 import {
   cancelRender as cancelRender4,
-  Internals as Internals3,
+  Internals as Internals7,
   useCurrentFrame as useCurrentFrame2,
   useDelayRender as useDelayRender2,
   useRemotionEnvironment as useRemotionEnvironment4,
@@ -14340,36 +14392,18 @@ var VideoForRendering = ({
   style,
   className
 }) => {
-  const absoluteFrame = Internals3.useTimelinePosition();
-  const { fps } = useVideoConfig();
-  const canvasRef = useRef2(null);
-  const { registerRenderAsset, unregisterRenderAsset } = useContext6(Internals3.RenderAssetManager);
-  const frame = useCurrentFrame2();
-  const volumePropsFrame = Internals3.useFrameForVolumeProp(loopVolumeCurveBehavior ?? "repeat");
-  const environment = useRemotionEnvironment4();
-  const [id] = useState4(() => `${Math.random()}`.replace("0.", ""));
   if (!src) {
     throw new TypeError("No `src` was passed to <Video>.");
   }
-  const volume = Internals3.evaluateVolume({
-    volume: volumeProp,
-    frame: volumePropsFrame,
-    mediaVolume: 1
-  });
-  Internals3.warnAboutTooHighVolume(volume);
-  const shouldRenderAudio = useMemo4(() => {
-    if (!window.remotion_audioEnabled) {
-      return false;
-    }
-    if (muted) {
-      return false;
-    }
-    if (volume <= 0) {
-      return false;
-    }
-    return true;
-  }, [muted, volume]);
+  const frame = useCurrentFrame2();
+  const absoluteFrame = Internals7.useTimelinePosition();
+  const { fps } = useVideoConfig();
+  const { registerRenderAsset, unregisterRenderAsset } = useContext6(Internals7.RenderAssetManager);
+  const startsAt = Internals7.useMediaStartsAt();
+  const [id] = useState4(() => `${Math.random()}`.replace("0.", ""));
+  const environment = useRemotionEnvironment4();
   const { delayRender, continueRender } = useDelayRender2();
+  const canvasRef = useRef2(null);
   useLayoutEffect2(() => {
     if (!canvasRef.current) {
       return;
@@ -14381,17 +14415,30 @@ var VideoForRendering = ({
       retries: delayRenderRetries ?? undefined,
       timeoutInMilliseconds: delayRenderTimeoutInMilliseconds ?? undefined
     });
+    const shouldRenderAudio = (() => {
+      if (!window.remotion_audioEnabled) {
+        return false;
+      }
+      if (muted) {
+        return false;
+      }
+      return true;
+    })();
     extractFrameViaBroadcastChannel({
       src,
       timeInSeconds: timestamp,
       durationInSeconds,
+      playbackRate: playbackRate ?? 1,
       logLevel: logLevel ?? "info",
       includeAudio: shouldRenderAudio,
       includeVideo: window.remotion_videoEnabled,
       isClientSideRendering: environment.isClientSideRendering,
-      volume,
       loop: loop ?? false
-    }).then(({ frame: imageBitmap, audio }) => {
+    }).then(({
+      frame: imageBitmap,
+      audio,
+      durationInSeconds: assetDurationInSeconds
+    }) => {
       if (imageBitmap) {
         onVideoFrame?.(imageBitmap);
         const context = canvasRef.current?.getContext("2d");
@@ -14406,7 +14453,22 @@ var VideoForRendering = ({
       } else if (window.remotion_videoEnabled) {
         cancelRender4(new Error("No video frame found"));
       }
-      if (audio) {
+      const volumePropsFrame = frameForVolumeProp({
+        behavior: loopVolumeCurveBehavior ?? "repeat",
+        loop: loop ?? false,
+        assetDurationInSeconds: assetDurationInSeconds ?? 0,
+        fps,
+        frame,
+        startsAt
+      });
+      const volume = Internals7.evaluateVolume({
+        volume: volumeProp,
+        frame: volumePropsFrame,
+        mediaVolume: 1
+      });
+      Internals7.warnAboutTooHighVolume(volume);
+      if (audio && volume > 0) {
+        applyVolume(audio.data, volume);
         registerRenderAsset({
           type: "inline-audio",
           id,
@@ -14437,17 +14499,19 @@ var VideoForRendering = ({
     frame,
     id,
     logLevel,
+    loop,
+    loopVolumeCurveBehavior,
+    muted,
     onVideoFrame,
     playbackRate,
     registerRenderAsset,
-    shouldRenderAudio,
     src,
+    startsAt,
     unregisterRenderAsset,
-    volume,
-    loop
+    volumeProp
   ]);
-  const classNameValue = useMemo4(() => {
-    return [Internals3.OBJECTFIT_CONTAIN_CLASS_NAME, className].filter(Internals3.truthy).join(" ");
+  const classNameValue = useMemo3(() => {
+    return [Internals7.OBJECTFIT_CONTAIN_CLASS_NAME, className].filter(Internals7.truthy).join(" ");
   }, [className]);
   return /* @__PURE__ */ jsx3("canvas", {
     ref: canvasRef,
@@ -14463,7 +14527,7 @@ var {
   resolveTrimProps: resolveTrimProps2,
   validateMediaProps: validateMediaProps2,
   VideoForPreview
-} = Internals4;
+} = Internals8;
 var Video = (props) => {
   const {
     trimBefore,
@@ -14513,9 +14577,7 @@ var Video = (props) => {
     });
   }
   const {
-    onAutoPlayError,
     onVideoFrame,
-    crossOrigin,
     delayRenderRetries,
     delayRenderTimeoutInMilliseconds,
     ...propsForPreview
@@ -14527,9 +14589,7 @@ var Video = (props) => {
     onlyWarnForMediaSeekingError: true,
     pauseWhenBuffering: pauseWhenBuffering ?? false,
     showInTimeline: showInTimeline ?? true,
-    onAutoPlayError: onAutoPlayError ?? undefined,
     onVideoFrame: onVideoFrame ?? null,
-    crossOrigin,
     ...propsForPreview
   });
 };