@remotion/webcodecs 4.0.304 → 4.0.306

package/dist/esm/index.mjs

@@ -462,31 +462,38 @@ var getBytesPerSample = (sampleFormat) => {
 };
 var getWaveAudioDecoder = ({
   onFrame,
-  track,
-  sampleFormat
+  config,
+  sampleFormat,
+  ioSynchronizer,
+  onError
 }) => {
-  let queue = Promise.resolve();
   const processSample = async (audioSample) => {
     const bytesPerSample = getBytesPerSample(sampleFormat);
-    await onFrame(new AudioData({
+    const audioData = new AudioData({
       data: audioSample.data,
       format: sampleFormat,
-      numberOfChannels: track.numberOfChannels,
-      numberOfFrames: audioSample.data.byteLength / bytesPerSample / track.numberOfChannels,
-      sampleRate: track.sampleRate,
+      numberOfChannels: config.numberOfChannels,
+      numberOfFrames: audioSample.data.byteLength / bytesPerSample / config.numberOfChannels,
+      sampleRate: config.sampleRate,
       timestamp: audioSample.timestamp
-    }));
+    });
+    try {
+      await onFrame(audioData);
+    } catch (err) {
+      audioData.close();
+      onError(err);
+    }
   };
   return {
     close() {
       return Promise.resolve();
     },
-    processSample(audioSample) {
-      queue = queue.then(() => processSample(audioSample));
-      return queue;
+    decode(audioSample) {
+      processSample(audioSample);
     },
     flush: () => Promise.resolve(),
-    waitForFinish: () => Promise.resolve()
+    waitForFinish: () => Promise.resolve(),
+    waitForQueueToBeLessThan: ioSynchronizer.waitForQueueSize
   };
 };
 
@@ -562,8 +569,10 @@ var makeTimeoutPromise = ({
   const onResume = () => {
     set();
   };
-  controller.addEventListener("pause", onPause);
-  controller.addEventListener("resume", onResume);
+  if (controller) {
+    controller.addEventListener("pause", onPause);
+    controller.addEventListener("resume", onResume);
+  }
   return {
     timeoutPromise: promise,
     clear: () => {
@@ -571,8 +580,10 @@ var makeTimeoutPromise = ({
         clearTimeout(timeout);
       }
       resolve();
-      controller.removeEventListener("pause", onPause);
-      controller.removeEventListener("resume", onResume);
+      if (controller) {
+        controller.removeEventListener("pause", onPause);
+        controller.removeEventListener("resume", onResume);
+      }
     }
   };
 };
@@ -581,39 +592,26 @@ var makeTimeoutPromise = ({
 var makeIoSynchronizer = ({
   logLevel,
   label,
-  progress
+  controller
 }) => {
   const eventEmitter = new IoEventEmitter;
   let lastInput = 0;
-  let lastInputKeyframe = 0;
   let lastOutput = 0;
   let inputsSinceLastOutput = 0;
   let inputs = [];
-  let keyframes = [];
-  let _unprocessed = 0;
-  const getUnprocessed = () => _unprocessed;
-  const getUnemittedItems = () => {
+  const getQueuedItems = () => {
     inputs = inputs.filter((input) => Math.floor(input) > Math.floor(lastOutput));
     return inputs.length;
   };
-  const getUnemittedKeyframes = () => {
-    keyframes = keyframes.filter((keyframe) => Math.floor(keyframe) > Math.floor(lastOutput));
-    return keyframes.length;
-  };
   const printState = (prefix) => {
-    Log.trace(logLevel, `[${label}] ${prefix}, state: Last input = ${lastInput} Last input keyframe = ${lastInputKeyframe} Last output = ${lastOutput} Inputs since last output = ${inputsSinceLastOutput}, Queue = ${getUnemittedItems()} (${getUnemittedKeyframes()} keyframes), Unprocessed = ${getUnprocessed()}`);
+    Log.trace(logLevel, `[${label}] ${prefix}, state: Last input = ${lastInput} Last output = ${lastOutput} Inputs since last output = ${inputsSinceLastOutput}, Queue = ${getQueuedItems()}`);
   };
-  const inputItem = (timestamp, keyFrame) => {
+  const inputItem = (timestamp) => {
     lastInput = timestamp;
-    if (keyFrame) {
-      lastInputKeyframe = timestamp;
-      keyframes.push(timestamp);
-    }
     inputsSinceLastOutput++;
     inputs.push(timestamp);
     eventEmitter.dispatchEvent("input", {
-      timestamp,
-      keyFrame
+      timestamp
     });
     printState("Input item");
   };
@@ -623,7 +621,6 @@ var makeIoSynchronizer = ({
     eventEmitter.dispatchEvent("output", {
       timestamp
     });
-    _unprocessed++;
     printState("Got output");
   };
   const waitForOutput = () => {
@@ -635,133 +632,98 @@ var makeIoSynchronizer = ({
     eventEmitter.addEventListener("output", on);
     return promise;
   };
-  const waitForProcessed = () => {
-    const { promise, resolve } = withResolvers();
-    const on = () => {
-      eventEmitter.removeEventListener("processed", on);
-      resolve();
-    };
-    eventEmitter.addEventListener("processed", on);
-    return promise;
+  const makeErrorBanner = () => {
+    return [
+      `Waited too long for ${label} to finish:`,
+      `${getQueuedItems()} queued items`,
+      `inputs: ${JSON.stringify(inputs)}`,
+      `last output: ${lastOutput}`
+    ];
   };
-  const waitFor = async ({
-    unprocessed,
-    unemitted,
-    minimumProgress,
-    controller
-  }) => {
-    await controller._internals._mediaParserController._internals.checkForAbortAndPause();
+  const waitForQueueSize = async (queueSize) => {
+    if (getQueuedItems() <= queueSize) {
+      return Promise.resolve();
+    }
     const { timeoutPromise, clear } = makeTimeoutPromise({
       label: () => [
-        `Waited too long for ${label} to finish:`,
-        `${getUnemittedItems()} unemitted items`,
-        `${getUnprocessed()} unprocessed items: ${JSON.stringify(_unprocessed)}`,
-        `smallest progress: ${progress.getSmallestProgress()}`,
-        `inputs: ${JSON.stringify(inputs)}`,
-        `last output: ${lastOutput}`,
-        `wanted: ${unemitted} unemitted items, ${unprocessed} unprocessed items, minimum progress ${minimumProgress}`,
+        ...makeErrorBanner(),
+        `wanted: <${queueSize} queued items`,
         `Report this at https://remotion.dev/report`
       ].join(`
 `),
       ms: 1e4,
       controller
     });
-    controller._internals._mediaParserController._internals.signal.addEventListener("abort", clear);
+    if (controller) {
+      controller._internals._mediaParserController._internals.signal.addEventListener("abort", clear);
+    }
     await Promise.race([
       timeoutPromise,
-      Promise.all([
-        (async () => {
-          while (getUnemittedItems() > unemitted) {
-            await waitForOutput();
-          }
-        })(),
-        (async () => {
-          while (getUnprocessed() > unprocessed) {
-            await waitForProcessed();
-          }
-        })(),
-        minimumProgress === null || progress.getSmallestProgress() === null ? Promise.resolve() : (async () => {
-          while (progress.getSmallestProgress() < minimumProgress) {
-            await progress.waitForProgress();
-          }
-        })()
-      ])
+      (async () => {
+        while (getQueuedItems() > queueSize) {
+          await waitForOutput();
+        }
+      })()
     ]).finally(() => clear());
-    controller._internals._mediaParserController._internals.signal.removeEventListener("abort", clear);
-  };
-  const waitForFinish = async (controller) => {
-    await waitFor({
-      unprocessed: 0,
-      unemitted: 0,
-      minimumProgress: null,
-      controller
-    });
+    if (controller) {
+      controller._internals._mediaParserController._internals.signal.removeEventListener("abort", clear);
+    }
   };
-  const onProcessed = () => {
-    eventEmitter.dispatchEvent("processed", {});
-    _unprocessed--;
+  const waitForFinish = async () => {
+    await waitForQueueSize(0);
   };
   return {
     inputItem,
     onOutput,
-    waitFor,
     waitForFinish,
-    onProcessed,
-    getUnprocessed
+    waitForQueueSize
   };
 };
 
 // src/audio-decoder.ts
-var createAudioDecoder = ({
+var internalCreateAudioDecoder = ({
   onFrame,
   onError,
   controller,
   config,
-  logLevel,
-  track,
-  progressTracker
+  logLevel
 }) => {
-  if (controller._internals._mediaParserController._internals.signal.aborted) {
+  if (controller && controller._internals._mediaParserController._internals.signal.aborted) {
     throw new Error("Not creating audio decoder, already aborted");
   }
-  if (config.codec === "pcm-s16") {
-    return getWaveAudioDecoder({ onFrame, track, sampleFormat: "s16" });
-  }
   const ioSynchronizer = makeIoSynchronizer({
     logLevel,
     label: "Audio decoder",
-    progress: progressTracker
+    controller
   });
-  let outputQueue = Promise.resolve();
+  if (config.codec === "pcm-s16") {
+    return getWaveAudioDecoder({
+      onFrame,
+      config,
+      sampleFormat: "s16",
+      logLevel,
+      ioSynchronizer,
+      onError
+    });
+  }
   const audioDecoder = new AudioDecoder({
-    output(frame) {
-      ioSynchronizer.onOutput(frame.timestamp + (frame.duration ?? 0));
-      const abortHandler = () => {
-        frame.close();
-      };
-      controller._internals._mediaParserController._internals.signal.addEventListener("abort", abortHandler, {
-        once: true
-      });
-      outputQueue = outputQueue.then(() => {
-        if (controller._internals._mediaParserController._internals.signal.aborted) {
-          return;
-        }
-        return onFrame(frame);
-      }).then(() => {
-        ioSynchronizer.onProcessed();
-        controller._internals._mediaParserController._internals.signal.removeEventListener("abort", abortHandler);
-        return Promise.resolve();
-      }).catch((err) => {
+    async output(frame) {
+      try {
+        await onFrame(frame);
+      } catch (err) {
         frame.close();
         onError(err);
-      });
+      }
+      ioSynchronizer.onOutput(frame.timestamp + (frame.duration ?? 0));
     },
     error(error) {
       onError(error);
     }
   });
   const close = () => {
-    controller._internals._mediaParserController._internals.signal.removeEventListener("abort", onAbort);
+    if (controller) {
+      controller._internals._mediaParserController._internals.signal.removeEventListener("abort", onAbort);
+    }
     if (audioDecoder.state === "closed") {
       return;
     }
@@ -770,45 +732,52 @@ var createAudioDecoder = ({
   const onAbort = () => {
     close();
   };
-  controller._internals._mediaParserController._internals.signal.addEventListener("abort", onAbort);
+  if (controller) {
+    controller._internals._mediaParserController._internals.signal.addEventListener("abort", onAbort);
+  }
   audioDecoder.configure(config);
-  const processSample = async (audioSample) => {
+  const processSample = (audioSample) => {
     if (audioDecoder.state === "closed") {
       return;
     }
-    progressTracker.setPossibleLowestTimestamp(Math.min(audioSample.timestamp, audioSample.dts ?? Infinity, audioSample.cts ?? Infinity));
-    await ioSynchronizer.waitFor({
-      unemitted: 20,
-      unprocessed: 20,
-      minimumProgress: audioSample.timestamp - 1e7,
-      controller
-    });
-    const chunk = new EncodedAudioChunk(audioSample);
+    const chunk = audioSample instanceof EncodedAudioChunk ? audioSample : new EncodedAudioChunk(audioSample);
     audioDecoder.decode(chunk);
     if (chunk.byteLength > 16) {
-      ioSynchronizer.inputItem(chunk.timestamp, audioSample.type === "key");
+      ioSynchronizer.inputItem(chunk.timestamp);
     }
   };
-  let queue = Promise.resolve();
   return {
-    processSample: (sample) => {
-      queue = queue.then(() => processSample(sample));
-      return queue;
+    decode: (sample) => {
+      processSample(sample);
     },
     waitForFinish: async () => {
       try {
         await audioDecoder.flush();
       } catch {}
-      await queue;
-      await ioSynchronizer.waitForFinish(controller);
-      await outputQueue;
+      await ioSynchronizer.waitForFinish();
     },
     close,
     flush: async () => {
       await audioDecoder.flush();
-    }
+    },
+    waitForQueueToBeLessThan: ioSynchronizer.waitForQueueSize
   };
 };
+var createAudioDecoder = ({
+  onFrame,
+  onError,
+  controller,
+  track,
+  logLevel
+}) => {
+  return internalCreateAudioDecoder({
+    onFrame,
+    onError,
+    controller: controller ?? null,
+    config: track,
+    logLevel: logLevel ?? "error"
+  });
+};
 // src/audio-encoder.ts
 import {
   MediaParserAbortError
@@ -928,13 +897,14 @@ var convertAudioData = ({
 var getWaveAudioEncoder = ({
   onChunk,
   controller,
-  config
+  config,
+  ioSynchronizer
 }) => {
   return {
     close: () => {
       return Promise.resolve();
     },
-    encodeFrame: (unconvertedAudioData) => {
+    encode: (unconvertedAudioData) => {
       if (controller._internals._mediaParserController._internals.signal.aborted) {
         return Promise.resolve();
       }
@@ -954,7 +924,8 @@ var getWaveAudioEncoder = ({
       return onChunk(chunk);
     },
     flush: () => Promise.resolve(),
-    waitForFinish: () => Promise.resolve()
+    waitForFinish: () => Promise.resolve(),
+    ioSynchronizer
   };
 };
 
@@ -966,39 +937,32 @@ var createAudioEncoder = ({
   controller,
   config: audioEncoderConfig,
   logLevel,
-  onNewAudioSampleRate,
-  progressTracker
+  onNewAudioSampleRate
 }) => {
   if (controller._internals._mediaParserController._internals.signal.aborted) {
     throw new MediaParserAbortError("Not creating audio encoder, already aborted");
   }
+  const ioSynchronizer = makeIoSynchronizer({
+    logLevel,
+    label: "Audio encoder",
+    controller
+  });
   if (codec === "wav") {
     return getWaveAudioEncoder({
       onChunk,
       controller,
-      config: audioEncoderConfig
+      config: audioEncoderConfig,
+      ioSynchronizer
     });
   }
-  const ioSynchronizer = makeIoSynchronizer({
-    logLevel,
-    label: "Audio encoder",
-    progress: progressTracker
-  });
-  let prom = Promise.resolve();
   const encoder = new AudioEncoder({
-    output: (chunk) => {
-      ioSynchronizer.onOutput(chunk.timestamp);
-      prom = prom.then(() => {
-        if (controller._internals._mediaParserController._internals.signal.aborted) {
-          return;
-        }
-        return onChunk(chunk);
-      }).then(() => {
-        ioSynchronizer.onProcessed();
-        return Promise.resolve();
-      }).catch((err) => {
+    output: async (chunk) => {
+      try {
+        await onChunk(chunk);
+      } catch (err) {
         onError(err);
-      });
+      }
+      ioSynchronizer.onOutput(chunk.timestamp);
     },
     error(error) {
       onError(error);
@@ -1019,17 +983,7 @@ var createAudioEncoder = ({
     throw new Error('Only `codec: "opus"` and `codec: "aac"` is supported currently');
   }
   const wantedSampleRate = audioEncoderConfig.sampleRate;
-  const encodeFrame = async (audioData) => {
-    if (encoder.state === "closed") {
-      return;
-    }
-    progressTracker.setPossibleLowestTimestamp(audioData.timestamp);
-    await ioSynchronizer.waitFor({
-      unemitted: 20,
-      unprocessed: 20,
-      minimumProgress: audioData.timestamp - 1e7,
-      controller
-    });
+  const encodeFrame = (audioData) => {
     if (encoder.state === "closed") {
       return;
     }
@@ -1045,23 +999,21 @@ var createAudioEncoder = ({
       }
     }
     encoder.encode(audioData);
-    ioSynchronizer.inputItem(audioData.timestamp, true);
+    ioSynchronizer.inputItem(audioData.timestamp);
   };
-  let queue = Promise.resolve();
   return {
-    encodeFrame: (audioData) => {
-      queue = queue.then(() => encodeFrame(audioData));
-      return queue;
+    encode: (audioData) => {
+      encodeFrame(audioData);
     },
     waitForFinish: async () => {
       await encoder.flush();
-      await ioSynchronizer.waitForFinish(controller);
-      await prom;
+      await ioSynchronizer.waitForFinish();
     },
     close,
     flush: async () => {
       await encoder.flush();
-    }
+    },
+    ioSynchronizer
   };
 };
 // src/can-copy-audio-track.ts
@@ -2552,7 +2504,7 @@ var makeEntry = (entry) => {
   ]);
 };
 var createCttsBox = (samplePositions) => {
-  const offsets = samplePositions.map((s) => s.cts - s.dts);
+  const offsets = samplePositions.map((s) => s.timestamp - s.decodingTimestamp);
   const entries = [];
   let lastOffset = null;
   for (const offset of offsets) {
@@ -2684,9 +2636,9 @@ var createSttsAtom = (samplePositions) => {
   const durations = samplePositions.map((_, i, a) => {
     if (a[i].duration === undefined || a[i].duration === 0) {
       if (a[i + 1] === undefined) {
-        return a[i].dts - (a[i - 1]?.dts ?? a[i].dts);
+        return a[i].decodingTimestamp - (a[i - 1]?.decodingTimestamp ?? a[i].decodingTimestamp);
       }
-      return a[i + 1].dts - a[i].dts;
+      return a[i + 1].decodingTimestamp - a[i].decodingTimestamp;
     }
     return a[i].duration;
   });
@@ -2728,7 +2680,7 @@ var createStbl = ({
   codecSpecificData,
   isVideo
 }) => {
-  const sorted = samplePositions.slice().sort((a, b) => a.dts - b.dts);
+  const sorted = samplePositions.slice().sort((a, b) => a.decodingTimestamp - b.decodingTimestamp);
   return addSize(combineUint8Arrays([
     stringsToUint8Array("stbl"),
     createStsdData(codecSpecificData),
@@ -3019,7 +2971,7 @@ var createIsoBaseMedia = async ({
     await w.write(chunk.data);
     mdatSize += chunk.data.length;
     onBytesProgress(w.getWrittenByteCount());
-    progressTracker.setPossibleLowestTimestamp(Math.min(chunk.timestamp, chunk.cts ?? Infinity, chunk.dts ?? Infinity));
+    progressTracker.setPossibleLowestTimestamp(Math.min(chunk.timestamp, chunk.decodingTimestamp ?? Infinity));
     progressTracker.updateTrackProgress(trackNumber, chunk.timestamp);
     if (codecPrivate) {
       addCodecPrivateToTrack({ trackNumber, codecPrivate });
@@ -3059,8 +3011,8 @@ var createIsoBaseMedia = async ({
       isKeyframe: chunk.type === "key",
       offset: position,
       chunk: sampleChunkIndices[trackNumber],
-      cts: Math.round(chunk.cts / 1e6 * currentTrack.timescale),
-      dts: Math.round(chunk.dts / 1e6 * currentTrack.timescale),
+      timestamp: Math.round(chunk.timestamp / 1e6 * currentTrack.timescale),
+      decodingTimestamp: Math.round(chunk.decodingTimestamp / 1e6 * currentTrack.timescale),
       duration: Math.round((chunk.duration ?? 0) / 1e6 * currentTrack.timescale),
       size: chunk.data.length,
       bigEndian: false,
@@ -3881,7 +3833,7 @@ var createMatroskaMedia = async ({
     chunk,
     isVideo
   }) => {
-    progressTracker.setPossibleLowestTimestamp(Math.min(chunk.timestamp, chunk.cts ?? Infinity, chunk.dts ?? Infinity));
+    progressTracker.setPossibleLowestTimestamp(Math.min(chunk.timestamp, chunk.decodingTimestamp ?? Infinity));
     const smallestProgress = progressTracker.getSmallestProgress();
     if (!currentCluster.shouldMakeNewCluster({
       newT: smallestProgress,
@@ -4132,13 +4084,7 @@ var makeProgressTracker = () => {
       startingTimestamp = Math.min(startingTimestamp, timestamp);
     }
   };
-  const getStartingTimestamp = () => {
-    if (startingTimestamp === null) {
-      throw new Error("No starting timestamp");
-    }
-    return startingTimestamp;
-  };
-  const calculateSmallestProgress = () => {
+  const getSmallestProgress = () => {
     const progressValues = Object.values(trackNumberProgresses).map((p) => {
       if (p !== null) {
         return p;
@@ -4154,26 +4100,16 @@ var makeProgressTracker = () => {
     registerTrack: (trackNumber) => {
       trackNumberProgresses[trackNumber] = null;
     },
-    getSmallestProgress: calculateSmallestProgress,
+    getSmallestProgress,
     updateTrackProgress: (trackNumber, progress) => {
       if (trackNumberProgresses[trackNumber] === undefined) {
         throw new Error(`Tried to update progress for a track that was not registered: ${trackNumber}`);
       }
       trackNumberProgresses[trackNumber] = progress;
       eventEmitter.dispatchEvent("progress", {
-        smallestProgress: calculateSmallestProgress()
+        smallestProgress: getSmallestProgress()
       });
     },
-    waitForProgress: () => {
-      const { promise, resolve } = withResolvers();
-      const on = () => {
-        eventEmitter.removeEventListener("progress", on);
-        resolve();
-      };
-      eventEmitter.addEventListener("progress", on);
-      return promise;
-    },
-    getStartingTimestamp,
     setPossibleLowestTimestamp
   };
 };
@@ -4209,25 +4145,37 @@ var getAvailableVideoCodecs = ({
   throw new Error(`Unsupported container: ${container}`);
 };
 
-// src/on-audio-track.ts
-import {
-  MediaParserInternals as MediaParserInternals7
-} from "@remotion/media-parser";
-
-// src/convert-encoded-chunk.ts
-var convertEncodedChunk = (chunk, trackId) => {
-  const arr = new Uint8Array(chunk.byteLength);
-  chunk.copyTo(arr);
-  return {
-    data: arr,
-    duration: chunk.duration ?? undefined,
-    timestamp: chunk.timestamp,
-    type: chunk.type,
-    cts: chunk.timestamp,
-    dts: chunk.timestamp,
-    trackId,
-    offset: 0,
-    timescale: 1e6
+// src/copy-audio-track.ts
+var copyAudioTrack = async ({
+  state,
+  track,
+  logLevel,
+  onMediaStateUpdate,
+  progressTracker
+}) => {
+  const addedTrack = await state.addTrack({
+    type: "audio",
+    codec: track.codecEnum,
+    numberOfChannels: track.numberOfChannels,
+    sampleRate: track.sampleRate,
+    codecPrivate: track.codecData?.data ?? null,
+    timescale: track.originalTimescale
+  });
+  Log.verbose(logLevel, `Copying audio track ${track.trackId} as track ${addedTrack.trackNumber}. Timescale = ${track.originalTimescale}, codec = ${track.codecEnum} (${track.codec}) `);
+  return async (audioSample) => {
+    progressTracker.setPossibleLowestTimestamp(Math.min(audioSample.timestamp, audioSample.decodingTimestamp ?? Infinity));
+    await state.addSample({
+      chunk: audioSample,
+      trackNumber: addedTrack.trackNumber,
+      isVideo: false,
+      codecPrivate: track.codecData?.data ?? null
+    });
+    onMediaStateUpdate?.((prevState) => {
+      return {
+        ...prevState,
+        encodedAudioFrames: prevState.encodedAudioFrames + 1
+      };
+    });
   };
 };
 
@@ -4284,62 +4232,85 @@ var getDefaultAudioCodec = ({
   throw new Error(`Unhandled container: ${container}`);
 };
 
-// src/on-audio-track.ts
-var makeAudioTrackHandler = ({
-  state,
-  defaultAudioCodec: audioCodec,
-  controller,
-  abortConversion,
-  onMediaStateUpdate,
-  onAudioTrack,
+// src/reencode-audio-track.ts
+import { MediaParserInternals as MediaParserInternals7 } from "@remotion/media-parser";
+
+// src/convert-encoded-chunk.ts
+var convertEncodedChunk = (chunk) => {
+  const arr = new Uint8Array(chunk.byteLength);
+  chunk.copyTo(arr);
+  return {
+    data: arr,
+    duration: chunk.duration ?? undefined,
+    timestamp: chunk.timestamp,
+    type: chunk.type,
+    decodingTimestamp: chunk.timestamp,
+    offset: 0
+  };
+};
+
+// src/processing-queue.ts
+function processingQueue({
+  onOutput,
   logLevel,
-  outputContainer,
-  progressTracker,
-  onAudioData
-}) => async ({ track, container: inputContainer }) => {
-  const canCopyTrack = canCopyAudioTrack({
-    inputCodec: track.codecEnum,
-    outputContainer,
-    inputContainer
-  });
-  const audioOperation = await (onAudioTrack ?? defaultOnAudioTrackHandler)({
-    defaultAudioCodec: audioCodec ?? getDefaultAudioCodec({ container: outputContainer }),
-    track,
+  label,
+  onError,
+  controller
+}) {
+  const ioSynchronizer = makeIoSynchronizer({
     logLevel,
-    outputContainer,
-    inputContainer,
-    canCopyTrack
+    label,
+    controller
   });
-  if (audioOperation.type === "drop") {
-    return null;
-  }
-  if (audioOperation.type === "fail") {
-    throw new Error(`Audio track with ID ${track.trackId} resolved with {"type": "fail"}. This could mean that this audio track could neither be copied to the output container or re-encoded. You have the option to drop the track instead of failing it: https://remotion.dev/docs/webcodecs/track-transformation`);
-  }
-  if (audioOperation.type === "copy") {
-    const addedTrack = await state.addTrack({
-      type: "audio",
-      codec: track.codecEnum,
-      numberOfChannels: track.numberOfChannels,
-      sampleRate: track.sampleRate,
-      codecPrivate: track.codecData?.data ?? null,
-      timescale: track.timescale
+  let queue = Promise.resolve();
+  let stopped = false;
+  const input = (item) => {
+    if (stopped) {
+      return;
+    }
+    if (controller._internals._mediaParserController._internals.signal.aborted) {
+      stopped = true;
+      return;
+    }
+    const { timestamp } = item;
+    ioSynchronizer.inputItem(timestamp);
+    queue = queue.then(() => {
+      if (stopped) {
+        return;
+      }
+      if (controller._internals._mediaParserController._internals.signal.aborted) {
+        stopped = true;
+        return;
+      }
+      return onOutput(item);
+    }).then(() => {
+      ioSynchronizer.onOutput(timestamp);
+      return Promise.resolve();
+    }).catch((err) => {
+      stopped = true;
+      onError(err);
     });
-    Log.verbose(logLevel, `Copying audio track ${track.trackId} as track ${addedTrack.trackNumber}. Timescale = ${track.timescale}, codec = ${track.codecEnum} (${track.codec}) `);
-    return async (audioSample) => {
-      await state.addSample({
-        chunk: audioSample,
-        trackNumber: addedTrack.trackNumber,
-        isVideo: false,
-        codecPrivate: track.codecData?.data ?? null
-      });
-      onMediaStateUpdate?.((prevState) => {
-        return {
-          ...prevState,
-          encodedAudioFrames: prevState.encodedAudioFrames + 1
-        };
-      });
-    };
+  };
+  return {
+    input,
+    ioSynchronizer
+  };
+}
+
+// src/reencode-audio-track.ts
+var reencodeAudioTrack = async ({
+  audioOperation,
+  track,
+  logLevel,
+  abortConversion,
+  state,
+  controller,
+  onMediaStateUpdate,
+  onAudioData,
+  progressTracker
+}) => {
+  if (audioOperation.type !== "reencode") {
+    throw new Error(`Audio track with ID ${track.trackId} could not be resolved with a valid operation. Received ${JSON.stringify(audioOperation)}, but must be either "copy", "reencode", "drop" or "fail"`);
   }
   const audioEncoderConfig = await getAudioEncoderConfig({
     numberOfChannels: track.numberOfChannels,
@@ -4375,7 +4346,7 @@ var makeAudioTrackHandler = ({
     numberOfChannels: audioEncoderConfig.numberOfChannels,
     sampleRate: audioOperation.sampleRate ?? audioEncoderConfig.sampleRate,
     codecPrivate,
-    timescale: track.timescale
+    timescale: track.originalTimescale
   });
   const audioEncoder = createAudioEncoder({
     onNewAudioSampleRate: (sampleRate) => {
@@ -4383,7 +4354,7 @@ var makeAudioTrackHandler = ({
     },
     onChunk: async (chunk) => {
       await state.addSample({
-        chunk: convertEncodedChunk(chunk, trackNumber),
+        chunk: convertEncodedChunk(chunk),
         trackNumber,
         isVideo: false,
         codecPrivate
@@ -4403,11 +4374,18 @@ var makeAudioTrackHandler = ({
     codec: audioOperation.audioCodec,
     controller,
     config: audioEncoderConfig,
-    logLevel,
-    progressTracker
+    logLevel
   });
-  const audioDecoder = createAudioDecoder({
-    onFrame: async (audioData) => {
+  const audioProcessingQueue = processingQueue({
+    controller,
+    label: "AudioData processing queue",
+    logLevel,
+    onError(error) {
+      abortConversion(new Error(`Audio decoder of track ${track.trackId} failed. Config: ${JSON.stringify(audioDecoderConfig)} (see .cause of this error)`, {
+        cause: error
+      }));
+    },
+    onOutput: async (audioData) => {
       const newAudioData = onAudioData ? await onAudioData?.({ audioData, track }) : audioData;
       if (newAudioData !== audioData) {
         if (newAudioData.duration !== audioData.duration) {
@@ -4427,7 +4405,10 @@ var makeAudioTrackHandler = ({
         }
         audioData.close();
       }
-      await audioEncoder.encodeFrame(newAudioData);
+      await controller._internals._mediaParserController._internals.checkForAbortAndPause();
+      await audioEncoder.ioSynchronizer.waitForQueueSize(10);
+      await controller._internals._mediaParserController._internals.checkForAbortAndPause();
+      audioEncoder.encode(newAudioData);
       onMediaStateUpdate?.((prevState) => {
         return {
           ...prevState,
@@ -4435,6 +4416,13 @@ var makeAudioTrackHandler = ({
         };
       });
       newAudioData.close();
+    }
+  });
+  const audioDecoder = internalCreateAudioDecoder({
+    onFrame: async (audioData) => {
+      await controller._internals._mediaParserController._internals.checkForAbortAndPause();
+      await audioProcessingQueue.ioSynchronizer.waitForQueueSize(10);
+      audioProcessingQueue.input(audioData);
     },
     onError(error) {
       abortConversion(new Error(`Audio decoder of track ${track.trackId} failed. Config: ${JSON.stringify(audioDecoderConfig)} (see .cause of this error)`, {
@@ -4443,34 +4431,123 @@ var makeAudioTrackHandler = ({
     },
     controller,
     config: audioDecoderConfig,
-    logLevel,
-    track,
-    progressTracker
+    logLevel
   });
   state.addWaitForFinishPromise(async () => {
     await audioDecoder.waitForFinish();
-    await audioEncoder.waitForFinish();
+    Log.verbose(logLevel, "Audio decoder finished");
     audioDecoder.close();
+    await audioProcessingQueue.ioSynchronizer.waitForFinish();
+    Log.verbose(logLevel, "Audio processing queue finished");
+    await audioEncoder.waitForFinish();
+    Log.verbose(logLevel, "Audio encoder finished");
     audioEncoder.close();
   });
   return async (audioSample) => {
-    await audioDecoder.processSample(audioSample);
+    progressTracker.setPossibleLowestTimestamp(Math.min(audioSample.timestamp, audioSample.decodingTimestamp ?? Infinity));
+    await controller._internals._mediaParserController._internals.checkForAbortAndPause();
+    await audioDecoder.waitForQueueToBeLessThan(10);
+    audioDecoder.decode(audioSample);
   };
 };
 
-// src/arraybuffer-to-uint8-array.ts
-var arrayBufferToUint8Array = (buffer) => {
-  return buffer ? new Uint8Array(buffer) : null;
-};
-
-// src/default-on-video-track-handler.ts
-import { MediaParserInternals as MediaParserInternals8 } from "@remotion/media-parser";
-var defaultOnVideoTrackHandler = async ({
-  track,
-  defaultVideoCodec,
-  logLevel,
-  rotate,
-  canCopyTrack,
+// src/on-audio-track.ts
+var makeAudioTrackHandler = ({
+  state,
+  defaultAudioCodec: audioCodec,
+  controller,
+  abortConversion,
+  onMediaStateUpdate,
+  onAudioTrack,
+  logLevel,
+  outputContainer,
+  onAudioData,
+  progressTracker
+}) => async ({ track, container: inputContainer }) => {
+  const canCopyTrack = canCopyAudioTrack({
+    inputCodec: track.codecEnum,
+    outputContainer,
+    inputContainer
+  });
+  const audioOperation = await (onAudioTrack ?? defaultOnAudioTrackHandler)({
+    defaultAudioCodec: audioCodec ?? getDefaultAudioCodec({ container: outputContainer }),
+    track,
+    logLevel,
+    outputContainer,
+    inputContainer,
+    canCopyTrack
+  });
+  if (audioOperation.type === "drop") {
+    return null;
+  }
+  if (audioOperation.type === "fail") {
+    throw new Error(`Audio track with ID ${track.trackId} resolved with {"type": "fail"}. This could mean that this audio track could neither be copied to the output container or re-encoded. You have the option to drop the track instead of failing it: https://remotion.dev/docs/webcodecs/track-transformation`);
+  }
+  if (audioOperation.type === "copy") {
+    return copyAudioTrack({
+      logLevel,
+      onMediaStateUpdate,
+      state,
+      track,
+      progressTracker
+    });
+  }
+  return reencodeAudioTrack({
+    abortConversion,
+    controller,
+    logLevel,
+    onMediaStateUpdate,
+    audioOperation,
+    onAudioData,
+    state,
+    track,
+    progressTracker
+  });
+};
+
+// src/copy-video-track.ts
+var copyVideoTrack = async ({
+  logLevel,
+  state,
+  track,
+  onMediaStateUpdate,
+  progressTracker
+}) => {
+  Log.verbose(logLevel, `Copying video track with codec ${track.codec} and timescale ${track.originalTimescale}`);
+  const videoTrack = await state.addTrack({
+    type: "video",
+    color: track.advancedColor,
+    width: track.codedWidth,
+    height: track.codedHeight,
+    codec: track.codecEnum,
+    codecPrivate: track.codecData?.data ?? null,
+    timescale: track.originalTimescale
+  });
+  return async (sample) => {
+    progressTracker.setPossibleLowestTimestamp(Math.min(sample.timestamp, sample.decodingTimestamp ?? Infinity));
+    await state.addSample({
+      chunk: sample,
+      trackNumber: videoTrack.trackNumber,
+      isVideo: true,
+      codecPrivate: track.codecData?.data ?? null
+    });
+    onMediaStateUpdate?.((prevState) => {
+      return {
+        ...prevState,
+        decodedVideoFrames: prevState.decodedVideoFrames + 1
+      };
+    });
+  };
+};
+
+// src/default-on-video-track-handler.ts
+import { MediaParserInternals as MediaParserInternals8 } from "@remotion/media-parser";
+var defaultOnVideoTrackHandler = async ({
+  track,
+  defaultVideoCodec,
+  logLevel,
+  rotate,
+  canCopyTrack,
   resizeOperation
 }) => {
   if (canCopyTrack) {
@@ -4516,6 +4593,11 @@ var getDefaultVideoCodec = ({
   throw new Error(`Unhandled container: ${container}`);
 };
 
+// src/arraybuffer-to-uint8-array.ts
+var arrayBufferToUint8Array = (buffer) => {
+  return buffer ? new Uint8Array(buffer) : null;
+};
+
 // src/convert-to-correct-videoframe.ts
 var needsToCorrectVideoFrame = ({
   videoFrame,
@@ -4556,7 +4638,6 @@ var convertToCorrectVideoFrame = ({
 var onFrame = async ({
   frame: unrotatedFrame,
   onVideoFrame,
-  videoEncoder,
   track,
   outputCodec,
   rotation,
@@ -4573,10 +4654,10 @@ var onFrame = async ({
   }
   const userProcessedFrame = onVideoFrame ? await onVideoFrame({ frame: rotated, track }) : rotated;
   if (userProcessedFrame.displayWidth !== rotated.displayWidth) {
-    throw new Error(`Returned VideoFrame of track ${track.trackId} has different displayWidth (${userProcessedFrame.displayWidth}) than the input frame (${userProcessedFrame.displayHeight})`);
+    throw new Error(`Returned VideoFrame of track ${track.trackId} has different displayWidth (${userProcessedFrame.displayWidth}) than the input frame (${rotated.displayWidth})`);
   }
   if (userProcessedFrame.displayHeight !== rotated.displayHeight) {
-    throw new Error(`Returned VideoFrame of track ${track.trackId} has different displayHeight (${userProcessedFrame.displayHeight}) than the input frame (${userProcessedFrame.displayHeight})`);
+    throw new Error(`Returned VideoFrame of track ${track.trackId} has different displayHeight (${userProcessedFrame.displayHeight}) than the input frame (${rotated.displayHeight})`);
   }
   if (userProcessedFrame.timestamp !== rotated.timestamp && !isSafari()) {
     throw new Error(`Returned VideoFrame of track ${track.trackId} has different timestamp (${userProcessedFrame.timestamp}) than the input frame (${rotated.timestamp}). When calling new VideoFrame(), pass {timestamp: frame.timestamp} as second argument`);
@@ -4584,32 +4665,31 @@ var onFrame = async ({
   if ((userProcessedFrame.duration ?? 0) !== (rotated.duration ?? 0)) {
     throw new Error(`Returned VideoFrame of track ${track.trackId} has different duration (${userProcessedFrame.duration}) than the input frame (${rotated.duration}). When calling new VideoFrame(), pass {duration: frame.duration} as second argument`);
   }
+  if (rotated !== userProcessedFrame) {
+    rotated.close();
+  }
   const fixedFrame = convertToCorrectVideoFrame({
     videoFrame: userProcessedFrame,
     outputCodec
   });
-  await videoEncoder.encodeFrame(fixedFrame, fixedFrame.timestamp);
-  fixedFrame.close();
-  if (rotated !== userProcessedFrame) {
-    rotated.close();
-  }
   if (fixedFrame !== userProcessedFrame) {
-    fixedFrame.close();
+    userProcessedFrame.close();
   }
+  return fixedFrame;
 };
 
 // src/sort-video-frames.ts
 var MAX_QUEUE_SIZE = 5;
 var videoFrameSorter = ({
-  onRelease,
-  controller
+  controller,
+  onOutput
 }) => {
   const frames = [];
   const releaseFrame = async () => {
     await controller._internals._mediaParserController._internals.checkForAbortAndPause();
     const frame = frames.shift();
     if (frame) {
-      await onRelease(frame);
+      await onOutput(frame);
     }
   };
   const sortFrames = () => {
@@ -4645,66 +4725,47 @@ var videoFrameSorter = ({
     controller._internals._mediaParserController._internals.signal.removeEventListener("abort", onAbort);
   };
   controller._internals._mediaParserController._internals.signal.addEventListener("abort", onAbort);
+  let promise = Promise.resolve();
   return {
-    inputFrame,
+    inputFrame: (frame) => {
+      promise = promise.then(() => inputFrame(frame));
+    },
+    waitUntilProcessed: () => promise,
     flush
   };
 };
 
 // src/video-decoder.ts
-var createVideoDecoder = ({
+var internalCreateVideoDecoder = ({
   onFrame: onFrame2,
   onError,
   controller,
   config,
-  logLevel,
-  progress
+  logLevel
 }) => {
   const ioSynchronizer = makeIoSynchronizer({
     logLevel,
     label: "Video decoder",
-    progress
-  });
-  let outputQueue = Promise.resolve();
-  const addToQueue = (frame) => {
-    const cleanup = () => {
-      frame.close();
-    };
-    controller._internals._mediaParserController._internals.signal.addEventListener("abort", cleanup, {
-      once: true
-    });
-    outputQueue = outputQueue.then(() => {
-      if (controller._internals._mediaParserController._internals.signal.aborted) {
-        return;
-      }
-      return onFrame2(frame);
-    }).then(() => {
-      ioSynchronizer.onProcessed();
-    }).catch((err) => {
-      onError(err);
-    }).finally(() => {
-      controller._internals._mediaParserController._internals.signal.removeEventListener("abort", cleanup);
-      cleanup();
-    });
-    return outputQueue;
-  };
-  const frameSorter = videoFrameSorter({
-    controller,
-    onRelease: async (frame) => {
-      await addToQueue(frame);
-    }
+    controller
   });
   const videoDecoder = new VideoDecoder({
-    output(frame) {
+    async output(frame) {
+      try {
+        await onFrame2(frame);
+      } catch (err) {
+        onError(err);
+        frame.close();
+      }
       ioSynchronizer.onOutput(frame.timestamp);
-      frameSorter.inputFrame(frame);
     },
     error(error) {
       onError(error);
     }
   });
   const close = () => {
-    controller._internals._mediaParserController._internals.signal.removeEventListener("abort", onAbort);
+    if (controller) {
+      controller._internals._mediaParserController._internals.signal.removeEventListener("abort", onAbort);
+    }
     if (videoDecoder.state === "closed") {
       return;
     }
@@ -4713,49 +4774,48 @@ var createVideoDecoder = ({
   const onAbort = () => {
     close();
   };
-  controller._internals._mediaParserController._internals.signal.addEventListener("abort", onAbort);
+  if (controller) {
+    controller._internals._mediaParserController._internals.signal.addEventListener("abort", onAbort);
+  }
   videoDecoder.configure(config);
-  const processSample = async (sample) => {
+  const decode = (sample) => {
     if (videoDecoder.state === "closed") {
       return;
     }
-    if (videoDecoder.state === "closed") {
-      return;
-    }
-    progress.setPossibleLowestTimestamp(Math.min(sample.timestamp, sample.dts ?? Infinity, sample.cts ?? Infinity));
-    await ioSynchronizer.waitFor({
-      unemitted: 20,
-      unprocessed: 10,
-      minimumProgress: sample.timestamp - 1e7,
-      controller
-    });
-    videoDecoder.decode(new EncodedVideoChunk(sample));
-    ioSynchronizer.inputItem(sample.timestamp, sample.type === "key");
+    const encodedChunk = sample instanceof EncodedVideoChunk ? sample : new EncodedVideoChunk(sample);
+    videoDecoder.decode(encodedChunk);
+    ioSynchronizer.inputItem(sample.timestamp);
   };
-  let inputQueue = Promise.resolve();
   return {
-    processSample: (sample) => {
-      inputQueue = inputQueue.then(() => processSample(sample));
-      return inputQueue;
-    },
+    decode,
     waitForFinish: async () => {
       await videoDecoder.flush();
       Log.verbose(logLevel, "Flushed video decoder");
-      await frameSorter.flush();
-      Log.verbose(logLevel, "Frame sorter flushed");
-      await ioSynchronizer.waitForFinish(controller);
+      await ioSynchronizer.waitForFinish();
       Log.verbose(logLevel, "IO synchro finished");
-      await outputQueue;
-      Log.verbose(logLevel, "Output queue finished");
-      await inputQueue;
-      Log.verbose(logLevel, "Input queue finished");
     },
     close,
     flush: async () => {
       await videoDecoder.flush();
-    }
+    },
+    waitForQueueToBeLessThan: ioSynchronizer.waitForQueueSize
   };
 };
+var createVideoDecoder = ({
+  onFrame: onFrame2,
+  onError,
+  controller,
+  track,
+  logLevel
+}) => {
+  return internalCreateVideoDecoder({
+    onFrame: onFrame2,
+    onError,
+    controller: controller ?? null,
+    config: track,
+    logLevel: logLevel ?? "info"
+  });
+};
 
 // src/video-encoder.ts
 import {
@@ -4768,7 +4828,7 @@ var createVideoEncoder = ({
   config,
   logLevel,
   outputCodec,
-  progress
+  keyframeInterval
 }) => {
   if (controller._internals._mediaParserController._internals.signal.aborted) {
     throw new MediaParserAbortError2("Not creating video encoder, already aborted");
@@ -4776,27 +4836,20 @@ var createVideoEncoder = ({
   const ioSynchronizer = makeIoSynchronizer({
     logLevel,
     label: "Video encoder",
-    progress
+    controller
   });
-  let outputQueue = Promise.resolve();
   const encoder = new VideoEncoder({
     error(error) {
       onError(error);
     },
-    output(chunk, metadata) {
+    async output(chunk, metadata) {
       const timestamp = chunk.timestamp + (chunk.duration ?? 0);
-      ioSynchronizer.onOutput(timestamp);
-      outputQueue = outputQueue.then(() => {
-        if (controller._internals._mediaParserController._internals.signal.aborted) {
-          return;
-        }
-        return onChunk(chunk, metadata ?? null);
-      }).then(() => {
-        ioSynchronizer.onProcessed();
-        return Promise.resolve();
-      }).catch((err) => {
+      try {
+        await onChunk(chunk, metadata ?? null);
+      } catch (err) {
         onError(err);
-      });
+      }
+      ioSynchronizer.onOutput(timestamp);
     }
   });
   const close = () => {
@@ -4813,115 +4866,49 @@ var createVideoEncoder = ({
   Log.verbose(logLevel, "Configuring video encoder", config);
   encoder.configure(config);
   let framesProcessed = 0;
-  const encodeFrame = async (frame) => {
-    if (encoder.state === "closed") {
-      return;
-    }
-    progress.setPossibleLowestTimestamp(frame.timestamp);
-    await ioSynchronizer.waitFor({
-      unemitted: 10,
-      unprocessed: 10,
-      minimumProgress: frame.timestamp - 1e7,
-      controller
-    });
+  const encodeFrame = (frame) => {
     if (encoder.state === "closed") {
       return;
     }
-    const keyFrame = framesProcessed % 40 === 0;
+    const keyFrame = framesProcessed % keyframeInterval === 0;
     encoder.encode(convertToCorrectVideoFrame({ videoFrame: frame, outputCodec }), {
       keyFrame,
       vp9: {
         quantizer: 36
       }
     });
-    ioSynchronizer.inputItem(frame.timestamp, keyFrame);
+    ioSynchronizer.inputItem(frame.timestamp);
     framesProcessed++;
   };
-  let inputQueue = Promise.resolve();
   return {
-    encodeFrame: (frame) => {
-      inputQueue = inputQueue.then(() => encodeFrame(frame));
-      return inputQueue;
+    encode: (frame) => {
+      encodeFrame(frame);
     },
     waitForFinish: async () => {
       await encoder.flush();
-      await outputQueue;
-      await ioSynchronizer.waitForFinish(controller);
+      await ioSynchronizer.waitForFinish();
     },
     close,
     flush: async () => {
       await encoder.flush();
-    }
+    },
+    ioSynchronizer
   };
 };
 
-// src/on-video-track.ts
-var makeVideoTrackHandler = ({
-  state,
-  onVideoFrame,
-  onMediaStateUpdate,
+// src/reencode-video-track.ts
+var reencodeVideoTrack = async ({
+  videoOperation,
+  rotate,
+  track,
+  logLevel,
   abortConversion,
+  onMediaStateUpdate,
   controller,
-  defaultVideoCodec,
-  onVideoTrack,
-  logLevel,
-  outputContainer,
-  rotate,
-  progress,
-  resizeOperation
-}) => async ({ track, container: inputContainer }) => {
-  if (controller._internals._mediaParserController._internals.signal.aborted) {
-    throw new Error("Aborted");
-  }
-  const canCopyTrack = canCopyVideoTrack({
-    inputContainer,
-    outputContainer,
-    rotationToApply: rotate,
-    inputTrack: track,
-    resizeOperation
-  });
-  const videoOperation = await (onVideoTrack ?? defaultOnVideoTrackHandler)({
-    track,
-    defaultVideoCodec: defaultVideoCodec ?? getDefaultVideoCodec({ container: outputContainer }),
-    logLevel,
-    outputContainer,
-    rotate,
-    inputContainer,
-    canCopyTrack,
-    resizeOperation
-  });
-  if (videoOperation.type === "drop") {
-    return null;
-  }
-  if (videoOperation.type === "fail") {
-    throw new Error(`Video track with ID ${track.trackId} resolved with {"type": "fail"}. This could mean that this video track could neither be copied to the output container or re-encoded. You have the option to drop the track instead of failing it: https://remotion.dev/docs/webcodecs/track-transformation`);
-  }
-  if (videoOperation.type === "copy") {
-    Log.verbose(logLevel, `Copying video track with codec ${track.codec} and timescale ${track.timescale}`);
-    const videoTrack = await state.addTrack({
-      type: "video",
-      color: track.advancedColor,
-      width: track.codedWidth,
-      height: track.codedHeight,
-      codec: track.codecEnum,
-      codecPrivate: track.codecData?.data ?? null,
-      timescale: track.timescale
-    });
-    return async (sample) => {
-      await state.addSample({
-        chunk: sample,
-        trackNumber: videoTrack.trackNumber,
-        isVideo: true,
-        codecPrivate: track.codecData?.data ?? null
-      });
-      onMediaStateUpdate?.((prevState) => {
-        return {
-          ...prevState,
-          decodedVideoFrames: prevState.decodedVideoFrames + 1
-        };
-      });
-    };
-  }
+  onVideoFrame,
+  state,
+  progressTracker
+}) => {
   if (videoOperation.type !== "reencode") {
     throw new Error(`Video track with ID ${track.trackId} could not be resolved with a valid operation. Received ${JSON.stringify(videoOperation)}, but must be either "copy", "reencode", "drop" or "fail"`);
   }
@@ -4957,13 +4944,13 @@ var makeVideoTrackHandler = ({
     height: newHeight,
     codec: videoOperation.videoCodec,
     codecPrivate: null,
-    timescale: track.timescale
+    timescale: track.originalTimescale
   });
-  Log.verbose(logLevel, `Created new video track with ID ${trackNumber}, codec ${videoOperation.videoCodec} and timescale ${track.timescale}`);
+  Log.verbose(logLevel, `Created new video track with ID ${trackNumber}, codec ${videoOperation.videoCodec} and timescale ${track.originalTimescale}`);
   const videoEncoder = createVideoEncoder({
     onChunk: async (chunk, metadata) => {
       await state.addSample({
-        chunk: convertEncodedChunk(chunk, trackNumber),
+        chunk: convertEncodedChunk(chunk),
         trackNumber,
         isVideo: true,
         codecPrivate: arrayBufferToUint8Array(metadata?.decoderConfig?.description ?? null)
@@ -4984,20 +4971,47 @@ var makeVideoTrackHandler = ({
     config: videoEncoderConfig,
     logLevel,
     outputCodec: videoOperation.videoCodec,
-    progress
+    keyframeInterval: 40
   });
-  const videoDecoder = createVideoDecoder({
-    config: videoDecoderConfig,
-    onFrame: async (frame) => {
-      await onFrame({
+  const videoProcessingQueue = processingQueue({
+    controller,
+    label: "VideoFrame processing queue",
+    logLevel,
+    onError: (err) => {
+      abortConversion(new Error(`VideoFrame processing queue of track ${track.trackId} failed (see .cause of this error)`, {
+        cause: err
+      }));
+    },
+    onOutput: async (frame) => {
+      await controller._internals._mediaParserController._internals.checkForAbortAndPause();
+      const processedFrame = await onFrame({
         frame,
         track,
-        videoEncoder,
         onVideoFrame,
         outputCodec: videoOperation.videoCodec,
         rotation,
         resizeOperation: videoOperation.resize ?? null
       });
+      await controller._internals._mediaParserController._internals.checkForAbortAndPause();
+      await videoEncoder.ioSynchronizer.waitForQueueSize(10);
+      await controller._internals._mediaParserController._internals.checkForAbortAndPause();
+      videoEncoder.encode(processedFrame);
+      processedFrame.close();
+    }
+  });
+  const frameSorter = videoFrameSorter({
+    controller,
+    onOutput: async (frame) => {
+      await controller._internals._mediaParserController._internals.checkForAbortAndPause();
+      await videoProcessingQueue.ioSynchronizer.waitForQueueSize(10);
+      videoProcessingQueue.input(frame);
+    }
+  });
+  const videoDecoder = createVideoDecoder({
+    track: videoDecoderConfig,
+    onFrame: async (frame) => {
+      await frameSorter.waitUntilProcessed();
+      frameSorter.inputFrame(frame);
     },
     onError: (err) => {
       abortConversion(new Error(`Video decoder of track ${track.trackId} failed (see .cause of this error)`, {
@@ -5005,23 +5019,96 @@ var makeVideoTrackHandler = ({
       }));
     },
     controller,
-    logLevel,
-    progress
+    logLevel
   });
   state.addWaitForFinishPromise(async () => {
     Log.verbose(logLevel, "Waiting for video decoder to finish");
     await videoDecoder.waitForFinish();
     videoDecoder.close();
     Log.verbose(logLevel, "Video decoder finished. Waiting for encoder to finish");
+    await frameSorter.flush();
+    Log.verbose(logLevel, "Frame sorter flushed");
+    await videoProcessingQueue.ioSynchronizer.waitForFinish();
+    Log.verbose(logLevel, "Video processing queue finished");
     await videoEncoder.waitForFinish();
     videoEncoder.close();
-    Log.verbose(logLevel, "Encoder finished");
+    Log.verbose(logLevel, "Video encoder finished");
   });
   return async (chunk) => {
-    await videoDecoder.processSample(chunk);
+    progressTracker.setPossibleLowestTimestamp(Math.min(chunk.timestamp, chunk.decodingTimestamp ?? Infinity));
+    await controller._internals._mediaParserController._internals.checkForAbortAndPause();
+    await videoDecoder.waitForQueueToBeLessThan(10);
+    if (chunk.type === "key") {
+      await videoDecoder.flush();
+    }
+    videoDecoder.decode(chunk);
   };
 };
 
+// src/on-video-track.ts
+var makeVideoTrackHandler = ({
+  state,
+  onVideoFrame,
+  onMediaStateUpdate,
+  abortConversion,
+  controller,
+  defaultVideoCodec,
+  onVideoTrack,
+  logLevel,
+  outputContainer,
+  rotate,
+  resizeOperation,
+  progressTracker
+}) => async ({ track, container: inputContainer }) => {
+  if (controller._internals._mediaParserController._internals.signal.aborted) {
+    throw new Error("Aborted");
+  }
+  const canCopyTrack = canCopyVideoTrack({
+    inputContainer,
+    outputContainer,
+    rotationToApply: rotate,
+    inputTrack: track,
+    resizeOperation
+  });
+  const videoOperation = await (onVideoTrack ?? defaultOnVideoTrackHandler)({
+    track,
+    defaultVideoCodec: defaultVideoCodec ?? getDefaultVideoCodec({ container: outputContainer }),
+    logLevel,
+    outputContainer,
+    rotate,
+    inputContainer,
+    canCopyTrack,
+    resizeOperation
+  });
+  if (videoOperation.type === "drop") {
+    return null;
+  }
+  if (videoOperation.type === "fail") {
+    throw new Error(`Video track with ID ${track.trackId} resolved with {"type": "fail"}. This could mean that this video track could neither be copied to the output container or re-encoded. You have the option to drop the track instead of failing it: https://remotion.dev/docs/webcodecs/track-transformation`);
+  }
+  if (videoOperation.type === "copy") {
+    return copyVideoTrack({
+      logLevel,
+      onMediaStateUpdate,
+      state,
+      track,
+      progressTracker
+    });
+  }
+  return reencodeVideoTrack({
+    videoOperation,
+    abortConversion,
+    controller,
+    logLevel,
+    rotate,
+    track,
+    onVideoFrame,
+    state,
+    onMediaStateUpdate,
+    progressTracker
+  });
+};
+
 // src/send-telemetry-event.ts
 var import_licensing = __toESM(require_dist(), 1);
 var sendUsageEvent = async ({
@@ -5219,6 +5306,7 @@ var convertMedia = async function({
     expectedFrameRate: expectedFrameRate ?? null
   });
   const onVideoTrack = makeVideoTrackHandler({
+    progressTracker,
     state,
     onVideoFrame: onVideoFrame ?? null,
     onMediaStateUpdate: throttledState.update ?? null,
@@ -5229,10 +5317,10 @@ var convertMedia = async function({
     logLevel,
     outputContainer: container,
     rotate: rotate ?? 0,
-    progress: progressTracker,
     resizeOperation: resize ?? null
   });
   const onAudioTrack = makeAudioTrackHandler({
+    progressTracker,
     abortConversion,
     defaultAudioCodec: audioCodec ?? null,
     controller,
@@ -5241,7 +5329,6 @@ var convertMedia = async function({
     onAudioTrack: userAudioResolver ?? null,
     logLevel,
     outputContainer: container,
-    progressTracker,
     onAudioData: onAudioData ?? null
   });
   MediaParserInternals9.internalParseMedia({