mediabunny 1.49.0 → 1.50.0

package/dist/bundles/mediabunny.cjs

@@ -1498,7 +1498,8 @@ var Mediabunny = (() => {
     "hevc",
     "vp9",
     "av1",
-    "vp8"
+    "vp8",
+    "prores"
   ];
   var PCM_AUDIO_CODECS = [
     "pcm-s16",
@@ -1699,7 +1700,35 @@ var Mediabunny = (() => {
   ];
   var VP9_DEFAULT_SUFFIX = ".01.01.01.01.00";
   var AV1_DEFAULT_SUFFIX = ".0.110.01.01.01.0";
-  var buildVideoCodecString = (codec, width, height, bitrate) => {
+  var PRORES_FOURCCS = [
+    "ap4x",
+    // ProRes 4444 XQ
+    "ap4h",
+    // ProRes 4444
+    "apch",
+    // ProRes 422 High Quality
+    "apcn",
+    // ProRes 422 Standard Definition
+    "apcs",
+    // ProRes 422 LT
+    "apco"
+    // ProRes 422 Proxy
+  ];
+  var PRORES_PROFILE_TARGET_BITRATES = [
+    { fourCc: "apco", bitrate: 45e6, alpha: false },
+    // 422 Proxy
+    { fourCc: "apcs", bitrate: 102e6, alpha: false },
+    // 422 LT
+    { fourCc: "apcn", bitrate: 147e6, alpha: false },
+    // 422 Standard
+    { fourCc: "apch", bitrate: 22e7, alpha: false },
+    // 422 HQ
+    { fourCc: "ap4h", bitrate: 33e7, alpha: true },
+    // 4444
+    { fourCc: "ap4x", bitrate: 5e8, alpha: true }
+    // 4444 XQ
+  ];
+  var buildVideoCodecString = (codec, width, height, bitrate, alpha) => {
     if (codec === "avc") {
       const profileIndication = 100;
       const totalMacroblocks = Math.ceil(width / 16) * Math.ceil(height / 16);
@@ -1740,8 +1769,24 @@ var Mediabunny = (() => {
       const level = levelInfo.level.toString().padStart(2, "0");
       const bitDepth = "08";
       return `av01.${profile}.${level}${levelInfo.tier}.${bitDepth}`;
+    } else if (codec === "prores") {
+      const referencePixels = 1920 * 1080;
+      const scaleFactor = Math.pow(width * height / referencePixels, 0.95);
+      const candidates = PRORES_PROFILE_TARGET_BITRATES.filter((x) => x.alpha === alpha);
+      let bestFourCc = candidates[0].fourCc;
+      let smallestDifference = Infinity;
+      for (const { fourCc, bitrate: targetBitrate } of candidates) {
+        const difference = Math.abs(targetBitrate * scaleFactor - bitrate);
+        if (difference < smallestDifference) {
+          smallestDifference = difference;
+          bestFourCc = fourCc;
+        }
+      }
+      return bestFourCc;
+    } else {
+      assertNever(codec);
     }
-    throw new TypeError(`Unhandled codec '${codec}'.`);
+    throw new TypeError(`Unhandled codec '${String(codec)}'.`);
   };
   var generateVp9CodecConfigurationFromCodecString = (codecString) => {
     const parts = codecString.split(".");
@@ -1787,7 +1832,16 @@ var Mediabunny = (() => {
     return [firstByte, secondByte, thirdByte, fourthByte];
   };
   var extractVideoCodecString = (trackInfo) => {
-    const { codec, codecDescription, colorSpace, avcCodecInfo, hevcCodecInfo, vp9CodecInfo, av1CodecInfo } = trackInfo;
+    const {
+      codec,
+      codecDescription,
+      colorSpace,
+      avcCodecInfo,
+      hevcCodecInfo,
+      vp9CodecInfo,
+      av1CodecInfo,
+      proresFormat
+    } = trackInfo;
     if (codec === "avc") {
       assert(trackInfo.avcType !== null);
       if (avcCodecInfo) {
@@ -1907,6 +1961,10 @@ var Mediabunny = (() => {
         string = string.slice(0, -AV1_DEFAULT_SUFFIX.length);
       }
       return string;
+    } else if (codec === "prores") {
+      return proresFormat ?? "apch";
+    } else if (codec !== null) {
+      assertNever(codec);
     }
     throw new TypeError(`Unhandled codec '${codec}'.`);
   };
@@ -2036,6 +2094,8 @@ var Mediabunny = (() => {
       return "vp9";
     } else if (codecString.startsWith("av01")) {
       return "av1";
+    } else if (PRORES_FOURCCS.includes(codecString)) {
+      return "prores";
     }
     if (codecString === "mp3" || codecString === "mp4a.69" || codecString === "mp4a.6B" || codecString === "mp4a.6b" || codecString === "mp4a.40.34") {
       return "mp3";
@@ -2098,7 +2158,7 @@ var Mediabunny = (() => {
     }
     return {};
   };
-  var VALID_VIDEO_CODEC_STRING_PREFIXES = ["avc1", "avc3", "hev1", "hvc1", "vp8", "vp09", "av01"];
+  var VALID_VIDEO_CODEC_STRING_PREFIXES = ["avc1", "avc3", "hev1", "hvc1", "vp8", "vp09", "av01", ...PRORES_FOURCCS];
   var AVC_CODEC_STRING_REGEX = /^(avc1|avc3)\.[0-9a-fA-F]{6}$/;
   var HEVC_CODEC_STRING_REGEX = /^(hev1|hvc1)\.(?:[ABC]?\d+)\.[0-9a-fA-F]{1,8}\.[LH]\d+(?:\.[0-9a-fA-F]{1,2}){0,6}$/;
   var VP9_CODEC_STRING_REGEX = /^vp09(?:\.\d{2}){3}(?:(?:\.\d{2}){5})?$/;
@@ -2215,6 +2275,12 @@ var Mediabunny = (() => {
           'Video chunk metadata decoder configuration codec string for AV1 must be a valid AV1 codec string as specified in Section "Codecs Parameter String" of https://aomediacodec.github.io/av1-isobmff/.'
         );
       }
+    } else if (PRORES_FOURCCS.some((x) => metadata.decoderConfig.codec.startsWith(x))) {
+      if (!PRORES_FOURCCS.some((x) => metadata.decoderConfig.codec === x)) {
+        throw new TypeError(
+          `Video chunk metadata decoder configuration codec string for ProRes must be one of the valid ProRes four-character codes: ${PRORES_FOURCCS.join(", ")}.`
+        );
+      }
     }
   };
   var VALID_AUDIO_CODEC_STRING_PREFIXES = [
@@ -4338,6 +4404,11 @@ var Mediabunny = (() => {
           return null;
         }
         ;
+      case "prores":
+        {
+          return "key";
+        }
+        ;
       default:
         {
           assertNever(codec);
@@ -6009,7 +6080,8 @@ var Mediabunny = (() => {
                 avcCodecInfo: null,
                 hevcCodecInfo: null,
                 vp9CodecInfo: null,
-                av1CodecInfo: null
+                av1CodecInfo: null,
+                proresFormat: null
               };
             } else if (handlerType === "soun") {
               track.info = {
@@ -6084,6 +6156,9 @@ var Mediabunny = (() => {
                   track.info.codec = "vp9";
                 } else if (codecName === "av01") {
                   track.info.codec = "av1";
+                } else if (PRORES_FOURCCS.includes(lowercaseBoxName)) {
+                  track.info.codec = "prores";
+                  track.info.proresFormat = lowercaseBoxName;
                 } else if (codecName === null) {
                   Logging._warn(`Unknown encrypted video codec due to missing frma box.`);
                 } else {
@@ -8046,7 +8121,7 @@ var Mediabunny = (() => {
       };
     }
     async canBeTransparent() {
-      return false;
+      return this.internalTrack.info.codec === "prores" && (this.internalTrack.info.proresFormat === "ap4h" || this.internalTrack.info.proresFormat === "ap4x");
     }
     async getDecoderConfig() {
       if (!this.internalTrack.info.codec) {
@@ -8941,6 +9016,7 @@ var Mediabunny = (() => {
     "vp8": "V_VP8",
     "vp9": "V_VP9",
     "av1": "V_AV1",
+    "prores": "V_PRORES",
     "aac": "A_AAC",
     "mp3": "A_MPEG/L3",
     "opus": "A_OPUS",
@@ -9604,6 +9680,13 @@ var Mediabunny = (() => {
                   this.currentTrack.info.codec = "vp9";
                 } else if (codecIdWithoutSuffix === CODEC_STRING_MAP.av1) {
                   this.currentTrack.info.codec = "av1";
+                } else if (codecIdWithoutSuffix === CODEC_STRING_MAP.prores) {
+                  const format = this.currentTrack.codecPrivate ? textDecoder.decode(this.currentTrack.codecPrivate) : "";
+                  if (PRORES_FOURCCS.includes(format)) {
+                    this.currentTrack.info.codec = "prores";
+                    this.currentTrack.info.proresFormat = format;
+                  } else {
+                  }
                 }
                 const videoTrack = this.currentTrack;
                 this.currentTrack.trackBacking = new MatroskaVideoTrackBacking(videoTrack);
@@ -9695,7 +9778,8 @@ var Mediabunny = (() => {
                 codec: null,
                 codecDescription: null,
                 colorSpace: null,
-                alphaMode: false
+                alphaMode: false,
+                proresFormat: null
               };
             } else if (type === 2) {
               this.currentTrack.info = {
@@ -10878,7 +10962,7 @@ var Mediabunny = (() => {
       };
     }
     async canBeTransparent() {
-      return this.internalTrack.info.alphaMode;
+      return this.internalTrack.info.alphaMode || this.internalTrack.info.codec === "prores" && (this.internalTrack.info.proresFormat === "ap4h" || this.internalTrack.info.proresFormat === "ap4x");
     }
     async getDecoderConfig() {
       if (!this.internalTrack.info.codec) {
@@ -10902,7 +10986,8 @@ var Mediabunny = (() => {
             avcCodecInfo: this.internalTrack.info.codec === "avc" && firstPacket ? extractAvcDecoderConfigurationRecord(firstPacket.data) : null,
             hevcCodecInfo: this.internalTrack.info.codec === "hevc" && firstPacket ? extractHevcDecoderConfigurationRecord(firstPacket.data) : null,
             vp9CodecInfo: this.internalTrack.info.codec === "vp9" && firstPacket ? extractVp9CodecInfoFromPacket(firstPacket.data) : null,
-            av1CodecInfo: this.internalTrack.info.codec === "av1" && firstPacket ? extractAv1CodecInfoFromPacket(firstPacket.data) : null
+            av1CodecInfo: this.internalTrack.info.codec === "av1" && firstPacket ? extractAv1CodecInfoFromPacket(firstPacket.data) : null,
+            proresFormat: this.internalTrack.info.proresFormat
           }),
           codedWidth: this.internalTrack.info.width,
           codedHeight: this.internalTrack.info.height,
@@ -13922,7 +14007,8 @@ var Mediabunny = (() => {
                       avcCodecInfo: elementaryStream.info.avcCodecInfo,
                       hevcCodecInfo: elementaryStream.info.hevcCodecInfo,
                       vp9CodecInfo: null,
-                      av1CodecInfo: null
+                      av1CodecInfo: null,
+                      proresFormat: null
                     }),
                     codedWidth: elementaryStream.info.width,
                     codedHeight: elementaryStream.info.height,
@@ -19064,7 +19150,7 @@ var Mediabunny = (() => {
       ...options,
       codedWidth: options.codedWidth ?? 1280,
       codedHeight: options.codedHeight ?? 720,
-      codec: options.codec ?? buildVideoCodecString(codec, 1280, 720, 1e6)
+      codec: options.codec ?? buildVideoCodecString(codec, 1280, 720, 1e6, false)
     };
     resolvedOptions.description ??= guessDescriptionForVideo(resolvedOptions);
     const key = JSON.stringify(resolvedOptions);
@@ -19272,12 +19358,11 @@ var Mediabunny = (() => {
             "init.displayWidth and init.displayHeight must be either both provided or both omitted."
           );
         }
-        this._data = init._doNotCopy ? toUint8Array(data) : toUint8Array(data).slice();
-        this._layout = init.layout ?? createDefaultPlaneLayout(init.format, init.codedWidth, init.codedHeight);
         this.format = init.format;
         this.rotation = init.rotation ?? 0;
         this.timestamp = init.timestamp;
         this.duration = init.duration ?? 0;
+        const layout = init.layout ?? createDefaultPlaneLayout(init.format, init.codedWidth, init.codedHeight);
         let colorSpaceInit = init.colorSpace ?? null;
         if (colorSpaceInit === null) {
           if (this.format === "RGBA" || this.format === "RGBX" || this.format === "BGRA" || this.format === "BGRX") {
@@ -19296,7 +19381,6 @@ var Mediabunny = (() => {
             };
           }
         }
-        this.colorSpace = new VideoSampleColorSpace(colorSpaceInit);
         this.visibleRect = {
           left: init.visibleRect?.left ?? 0,
           top: init.visibleRect?.top ?? 0,
@@ -19310,6 +19394,9 @@ var Mediabunny = (() => {
           this.squarePixelWidth = this.visibleRect.width;
           this.squarePixelHeight = this.visibleRect.height;
         }
+        this._data = init._doNotCopy ? toUint8Array(data) : toUint8Array(data).slice();
+        this._layout = layout;
+        this.colorSpace = new VideoSampleColorSpace(colorSpaceInit);
       } else if (typeof VideoFrame !== "undefined" && data instanceof VideoFrame) {
         if (init?.rotation !== void 0 && ![0, 90, 180, 270].includes(init.rotation)) {
           throw new TypeError("init.rotation, when provided, must be 0, 90, 180, or 270.");
@@ -19768,6 +19855,7 @@ var Mediabunny = (() => {
           timestamp: this.microsecondTimestamp,
           duration: this.microsecondDuration,
           colorSpace: this.colorSpace,
+          visibleRect: this.visibleRect,
           displayWidth: this.squarePixelWidth,
           // Not display* since we're not passing rotation
           displayHeight: this.squarePixelHeight
@@ -19779,13 +19867,18 @@ var Mediabunny = (() => {
           // Drag 0 duration to undefined, glitches some codecs
         });
       } else if (this._data instanceof Uint8Array) {
+        assert(this._layout);
         return new VideoFrame(this._data, {
           format: this.format,
           codedWidth: this.codedWidth,
+          // This is technically wrong! codedWidth is a lie technically. But, since
           codedHeight: this.codedHeight,
+          // we pass the layout (which contains the true coded width), we're good.
+          layout: this._layout,
           timestamp: this.microsecondTimestamp,
           duration: this.microsecondDuration || void 0,
           colorSpace: this.colorSpace,
+          visibleRect: this.visibleRect,
           displayWidth: this.squarePixelWidth,
           // Not display* since we're not passing rotation
           displayHeight: this.squarePixelHeight
@@ -21303,7 +21396,8 @@ var Mediabunny = (() => {
         options.codec,
         options.width,
         options.height,
-        resolvedBitrate
+        resolvedBitrate,
+        options.alpha === "keep"
       ),
       width: options.width,
       height: options.height,
@@ -21400,6 +21494,10 @@ var Mediabunny = (() => {
     /** @internal */
     _toVideoBitrate(codec, width, height) {
       const pixels = width * height;
+      const referencePixels = 1920 * 1080;
+      const referenceBitrate = 3e6;
+      const scaleFactor = Math.pow(pixels / referencePixels, 0.95);
+      const baseBitrate = referenceBitrate * scaleFactor;
       const codecEfficiencyFactors = {
         avc: 1,
         // H.264/AVC (baseline)
@@ -21409,13 +21507,11 @@ var Mediabunny = (() => {
         // Similar to HEVC
         av1: 0.4,
         // ~60% more efficient than AVC
-        vp8: 1.2
+        vp8: 1.2,
         // Slightly less efficient than AVC
+        prores: 22e7 / referenceBitrate
+        // Apple ProRes white paper claims 220 Mbps for 1080p 422 HQ @30Hz
       };
-      const referencePixels = 1920 * 1080;
-      const referenceBitrate = 3e6;
-      const scaleFactor = Math.pow(pixels / referencePixels, 0.95);
-      const baseBitrate = referenceBitrate * scaleFactor;
       const codecAdjustedBitrate = baseBitrate * codecEfficiencyFactors[codec];
       const finalBitrate = codecAdjustedBitrate * this._factor;
       return Math.ceil(finalBitrate / 1e3) * 1e3;
@@ -22009,6 +22105,7 @@ var Mediabunny = (() => {
       let ended = false;
       let terminated = false;
       let outOfBandError = null;
+      let hasOutOfBandError = false;
       const timestamps = [];
       const maxQueueSize = () => Math.max(2, timestamps.length);
       (async () => {
@@ -22030,8 +22127,9 @@ var Mediabunny = (() => {
         ended = true;
         onQueueNotEmpty();
       })().catch((error) => {
-        if (!outOfBandError) {
+        if (!hasOutOfBandError) {
           outOfBandError = error;
+          hasOutOfBandError = true;
           onQueueNotEmpty();
         }
       });
@@ -22043,7 +22141,7 @@ var Mediabunny = (() => {
               throw new InputDisposedError();
             } else if (terminated) {
               return { value: void 0, done: true };
-            } else if (outOfBandError) {
+            } else if (hasOutOfBandError) {
               throw outOfBandError;
             } else if (packetQueue.length > 0) {
               const value = packetQueue.shift();
@@ -22096,6 +22194,7 @@ var Mediabunny = (() => {
       let ended = false;
       let terminated = false;
       let outOfBandError = null;
+      let hasOutOfBandError = false;
       const packetRetrievalOptions = {
         ...options,
         verifyKeyPackets: true,
@@ -22129,8 +22228,9 @@ var Mediabunny = (() => {
             ({ promise: queueNotEmpty, resolve: onQueueNotEmpty } = promiseWithResolvers());
           }
         }, (error) => {
-          if (!outOfBandError) {
+          if (!hasOutOfBandError) {
             outOfBandError = error;
+            hasOutOfBandError = true;
             onQueueNotEmpty();
           }
         });
@@ -22165,8 +22265,9 @@ var Mediabunny = (() => {
         decoderIsFlushed = true;
         onQueueNotEmpty();
       })().catch((error) => {
-        if (!outOfBandError) {
+        if (!hasOutOfBandError) {
           outOfBandError = error;
+          hasOutOfBandError = true;
           onQueueNotEmpty();
         }
       });
@@ -22185,7 +22286,7 @@ var Mediabunny = (() => {
               throw new InputDisposedError();
             } else if (terminated) {
               return { value: void 0, done: true };
-            } else if (outOfBandError) {
+            } else if (hasOutOfBandError) {
               closeSamples();
               throw outOfBandError;
             } else if (sampleQueue.length > 0) {
@@ -22226,6 +22327,7 @@ var Mediabunny = (() => {
       let decoderIsFlushed = false;
       let terminated = false;
       let outOfBandError = null;
+      let hasOutOfBandError = false;
       const pushToQueue = (sample) => {
         sampleQueue.push(sample);
         onQueueNotEmpty();
@@ -22256,8 +22358,9 @@ var Mediabunny = (() => {
             sample.close();
           }
         }, (error) => {
-          if (!outOfBandError) {
+          if (!hasOutOfBandError) {
             outOfBandError = error;
+            hasOutOfBandError = true;
             onQueueNotEmpty();
           }
         });
@@ -22327,8 +22430,9 @@ var Mediabunny = (() => {
         decoderIsFlushed = true;
         onQueueNotEmpty();
       })().catch((error) => {
-        if (!outOfBandError) {
+        if (!hasOutOfBandError) {
           outOfBandError = error;
+          hasOutOfBandError = true;
           onQueueNotEmpty();
         }
       });
@@ -22346,7 +22450,7 @@ var Mediabunny = (() => {
               throw new InputDisposedError();
             } else if (terminated) {
               return { value: void 0, done: true };
-            } else if (outOfBandError) {
+            } else if (hasOutOfBandError) {
               closeSamples();
               throw outOfBandError;
             } else if (sampleQueue.length > 0) {
@@ -22411,7 +22515,8 @@ var Mediabunny = (() => {
       this.currentAlphaPacketIndex = 0;
       this.alphaRaslSkipped = false;
       // For HEVC stuff
-      this.frameHandlerSerializer = new CallSerializer();
+      this.finalSamples = [];
+      this.mergeAlphaPromises = [];
       const MatchingCustomDecoder = customVideoDecoders.find((x) => x.supports(codec, decoderConfig));
       if (MatchingCustomDecoder) {
         this.customDecoder = new MatchingCustomDecoder();
@@ -22423,18 +22528,19 @@ var Mediabunny = (() => {
           }
           this.finalizeAndEmitSample(sample);
         };
-        void this.customDecoderCallSerializer.call(() => this.customDecoder.init());
+        this.customDecoder.onError = (error) => {
+          onError(error);
+        };
+        void this.customDecoderCallSerializer.call(() => this.customDecoder.init()).catch((error) => onError(error));
       } else {
         const colorHandler = (frame) => {
-          this.frameHandlerSerializer.call(async () => {
-            if (this.alphaQueue.length > 0) {
-              const alphaFrame = this.alphaQueue.shift();
-              assert(alphaFrame !== void 0);
-              await this.mergeAlpha(frame, alphaFrame);
-            } else {
-              this.colorQueue.push(frame);
-            }
-          }).catch((error) => this.onError(error));
+          if (this.alphaQueue.length > 0) {
+            const alphaFrame = this.alphaQueue.shift();
+            assert(alphaFrame !== void 0);
+            void this.mergeAlpha(frame, alphaFrame);
+          } else {
+            this.colorQueue.push(frame);
+          }
         };
         if (codec === "avc" && this.decoderConfig.description && isChromium()) {
           const record = deserializeAvcDecoderConfigurationRecord(toUint8Array(this.decoderConfig.description));
@@ -22485,7 +22591,7 @@ var Mediabunny = (() => {
       }
       if (this.customDecoder) {
         this.customDecoderQueueSize++;
-        void this.customDecoderCallSerializer.call(() => this.customDecoder.decode(packet)).then(() => this.customDecoderQueueSize--);
+        void this.customDecoderCallSerializer.call(() => this.customDecoder.decode(packet)).catch((error) => this.onError(error)).finally(() => this.customDecoderQueueSize--);
       } else {
         assert(this.decoder);
         if (!isWebKit()) {
@@ -22527,27 +22633,25 @@ var Mediabunny = (() => {
       }
       if (!this.alphaDecoder) {
         const alphaHandler = (frame) => {
-          this.frameHandlerSerializer.call(async () => {
+          if (this.colorQueue.length > 0) {
+            const colorFrame = this.colorQueue.shift();
+            assert(colorFrame !== void 0);
+            void this.mergeAlpha(colorFrame, frame);
+          } else {
+            this.alphaQueue.push(frame);
+          }
+          this.decodedAlphaChunkCount++;
+          while (this.nullAlphaFrameQueue.length > 0 && this.nullAlphaFrameQueue[0] === this.decodedAlphaChunkCount) {
+            this.nullAlphaFrameQueue.shift();
             if (this.colorQueue.length > 0) {
               const colorFrame = this.colorQueue.shift();
               assert(colorFrame !== void 0);
-              await this.mergeAlpha(colorFrame, frame);
+              void this.mergeAlpha(colorFrame, null);
             } else {
-              this.alphaQueue.push(frame);
-            }
-            this.decodedAlphaChunkCount++;
-            while (this.nullAlphaFrameQueue.length > 0 && this.nullAlphaFrameQueue[0] === this.decodedAlphaChunkCount) {
-              this.nullAlphaFrameQueue.shift();
-              if (this.colorQueue.length > 0) {
-                const colorFrame = this.colorQueue.shift();
-                assert(colorFrame !== void 0);
-                await this.mergeAlpha(colorFrame, null);
-              } else {
-                this.alphaQueue.push(null);
-              }
+              this.alphaQueue.push(null);
             }
-            this.alphaDecoderQueueSize--;
-          }).catch((error) => this.onError(error));
+          }
+          this.alphaDecoderQueueSize--;
         };
         const stack = new Error("Decoding error").stack;
         this.alphaDecoder = new VideoDecoder({
@@ -22630,15 +22734,29 @@ var Mediabunny = (() => {
       this.onSample(sample);
     }
     async mergeAlpha(color, alpha) {
-      if (!alpha) {
-        const finalSample2 = new VideoSample(color);
-        this.sampleHandler(finalSample2);
-        return;
+      const resolver = promiseWithResolvers();
+      this.mergeAlphaPromises.push(resolver.promise);
+      const result = { sample: null };
+      this.finalSamples.push(result);
+      try {
+        if (!alpha) {
+          result.sample = new VideoSample(color);
+        } else {
+          assert(this.merger);
+          const finalFrame = await this.merger.merge(color, alpha);
+          result.sample = new VideoSample(finalFrame);
+        }
+        while (this.finalSamples.length > 0 && this.finalSamples[0].sample !== null) {
+          const next = this.finalSamples.shift();
+          this.sampleHandler(next.sample);
+        }
+      } catch (error) {
+        removeItem(this.finalSamples, result);
+        this.onError(error);
+      } finally {
+        removeItem(this.mergeAlphaPromises, resolver.promise);
+        resolver.resolve();
       }
-      assert(this.merger);
-      const finalFrame = await this.merger.update(color, alpha);
-      const finalSample = new VideoSample(finalFrame);
-      this.sampleHandler(finalSample);
     }
     async flush() {
       if (this.customDecoder) {
@@ -22649,7 +22767,7 @@ var Mediabunny = (() => {
           this.decoder.flush(),
           this.alphaDecoder?.flush()
         ]);
-        await this.frameHandlerSerializer.currentPromise;
+        await Promise.all(this.mergeAlphaPromises);
         this.colorQueue.forEach((x) => x.close());
         this.colorQueue.length = 0;
         this.alphaQueue.forEach((x) => x?.close());
@@ -22689,205 +22807,62 @@ var Mediabunny = (() => {
       this.sampleQueue.length = 0;
     }
   };
-  var mergerGpuUnavailable = false;
-  var _ColorAlphaMerger = class _ColorAlphaMerger {
+  var mergerWorkerUrl = null;
+  var ColorAlphaMerger = class {
     constructor() {
-      this.canvas = null;
-      this.gl = null;
-      this.program = null;
-      this.vao = null;
-      this.colorTexture = null;
-      this.alphaTexture = null;
-      this.worker = null;
+      this.workers = [];
+      this.nextWorkerIndex = 0;
       this.pendingRequests = /* @__PURE__ */ new Map();
       this.nextRequestId = 0;
-      const canMakeCanvas = typeof OffscreenCanvas !== "undefined" || typeof document !== "undefined" && typeof document.createElement === "function";
-      if (!_ColorAlphaMerger.forceCpu && canMakeCanvas && !mergerGpuUnavailable) {
-        try {
-          if (typeof OffscreenCanvas !== "undefined") {
-            this.canvas = new OffscreenCanvas(300, 150);
-          } else {
-            this.canvas = document.createElement("canvas");
-          }
-          const gl = this.canvas.getContext("webgl2", {
-            premultipliedAlpha: false
+    }
+    merge(color, alpha) {
+      if (this.workers.length === 0) {
+        if (!mergerWorkerUrl) {
+          const blob = new Blob(
+            [`(${colorAlphaMergerWorkerCode.toString()})()`],
+            { type: "application/javascript" }
+          );
+          mergerWorkerUrl = URL.createObjectURL(blob);
+        }
+        const poolSize = clamp(navigator.hardwareConcurrency, 1, 4);
+        for (let i = 0; i < poolSize; i++) {
+          const worker2 = new Worker(mergerWorkerUrl);
+          worker2.addEventListener("message", (event) => {
+            const data = event.data;
+            const pending2 = this.pendingRequests.get(data.id);
+            if (!pending2) {
+              return;
+            }
+            this.pendingRequests.delete(data.id);
+            if ("error" in data) {
+              pending2.reject(new Error(data.error));
+            } else {
+              pending2.resolve(data.frame);
+            }
           });
-          if (!gl) {
-            throw new Error("Couldn't acquire WebGL 2 context.");
-          }
-          this.gl = gl;
-          this.program = this.createProgram();
-          this.vao = this.createVAO();
-          this.colorTexture = this.createTexture();
-          this.alphaTexture = this.createTexture();
-          this.gl.useProgram(this.program);
-          this.gl.uniform1i(this.gl.getUniformLocation(this.program, "u_colorTexture"), 0);
-          this.gl.uniform1i(this.gl.getUniformLocation(this.program, "u_alphaTexture"), 1);
-        } catch (error) {
-          this.gl = null;
-          this.canvas = null;
-          mergerGpuUnavailable = true;
-          Logging._warn("Falling back to CPU for color/alpha merging.", error);
+          worker2.addEventListener("error", (event) => {
+            const error = new Error(event.message || "Color/alpha merge worker error.");
+            for (const pending2 of this.pendingRequests.values()) {
+              pending2.reject(error);
+            }
+            this.pendingRequests.clear();
+          });
+          this.workers.push(worker2);
         }
       }
-    }
-    async update(color, alpha) {
-      if (this.gl) {
-        return this.updateGpu(color, alpha);
-      } else {
-        return this.updateCpu(color, alpha);
-      }
-    }
-    createProgram() {
-      assert(this.gl);
-      const vertexShader = this.createShader(this.gl.VERTEX_SHADER, `#version 300 es
-			in vec2 a_position;
-			in vec2 a_texCoord;
-			out vec2 v_texCoord;
-			
-			void main() {
-				gl_Position = vec4(a_position, 0.0, 1.0);
-				v_texCoord = a_texCoord;
-			}
-		`);
-      const fragmentShader = this.createShader(this.gl.FRAGMENT_SHADER, `#version 300 es
-			precision highp float;
-			
-			uniform sampler2D u_colorTexture;
-			uniform sampler2D u_alphaTexture;
-			in vec2 v_texCoord;
-			out vec4 fragColor;
-			
-			void main() {
-				vec3 color = texture(u_colorTexture, v_texCoord).rgb;
-				float alpha = texture(u_alphaTexture, v_texCoord).r;
-				fragColor = vec4(color, alpha);
-			}
-		`);
-      const program = this.gl.createProgram();
-      this.gl.attachShader(program, vertexShader);
-      this.gl.attachShader(program, fragmentShader);
-      this.gl.linkProgram(program);
-      return program;
-    }
-    createShader(type, source) {
-      assert(this.gl);
-      const shader = this.gl.createShader(type);
-      this.gl.shaderSource(shader, source);
-      this.gl.compileShader(shader);
-      return shader;
-    }
-    createVAO() {
-      assert(this.gl);
-      assert(this.program);
-      const vao = this.gl.createVertexArray();
-      this.gl.bindVertexArray(vao);
-      const vertices = new Float32Array([
-        -1,
-        -1,
-        0,
-        1,
-        1,
-        -1,
-        1,
-        1,
-        -1,
-        1,
-        0,
-        0,
-        1,
-        1,
-        1,
-        0
-      ]);
-      const buffer = this.gl.createBuffer();
-      this.gl.bindBuffer(this.gl.ARRAY_BUFFER, buffer);
-      this.gl.bufferData(this.gl.ARRAY_BUFFER, vertices, this.gl.STATIC_DRAW);
-      const positionLocation = this.gl.getAttribLocation(this.program, "a_position");
-      const texCoordLocation = this.gl.getAttribLocation(this.program, "a_texCoord");
-      this.gl.enableVertexAttribArray(positionLocation);
-      this.gl.vertexAttribPointer(positionLocation, 2, this.gl.FLOAT, false, 16, 0);
-      this.gl.enableVertexAttribArray(texCoordLocation);
-      this.gl.vertexAttribPointer(texCoordLocation, 2, this.gl.FLOAT, false, 16, 8);
-      return vao;
-    }
-    createTexture() {
-      assert(this.gl);
-      const texture = this.gl.createTexture();
-      this.gl.bindTexture(this.gl.TEXTURE_2D, texture);
-      this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_S, this.gl.CLAMP_TO_EDGE);
-      this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_T, this.gl.CLAMP_TO_EDGE);
-      this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MIN_FILTER, this.gl.LINEAR);
-      this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MAG_FILTER, this.gl.LINEAR);
-      return texture;
-    }
-    updateGpu(color, alpha) {
-      assert(this.gl);
-      assert(this.canvas);
-      if (color.displayWidth !== this.canvas.width || color.displayHeight !== this.canvas.height) {
-        this.canvas.width = color.displayWidth;
-        this.canvas.height = color.displayHeight;
-      }
-      this.gl.activeTexture(this.gl.TEXTURE0);
-      this.gl.bindTexture(this.gl.TEXTURE_2D, this.colorTexture);
-      this.gl.texImage2D(this.gl.TEXTURE_2D, 0, this.gl.RGBA, this.gl.RGBA, this.gl.UNSIGNED_BYTE, color);
-      this.gl.activeTexture(this.gl.TEXTURE1);
-      this.gl.bindTexture(this.gl.TEXTURE_2D, this.alphaTexture);
-      this.gl.texImage2D(this.gl.TEXTURE_2D, 0, this.gl.RGBA, this.gl.RGBA, this.gl.UNSIGNED_BYTE, alpha);
-      this.gl.viewport(0, 0, this.canvas.width, this.canvas.height);
-      this.gl.clear(this.gl.COLOR_BUFFER_BIT);
-      this.gl.bindVertexArray(this.vao);
-      this.gl.drawArrays(this.gl.TRIANGLE_STRIP, 0, 4);
-      const finalFrame = new VideoFrame(this.canvas, {
-        timestamp: color.timestamp,
-        duration: color.duration ?? void 0
-      });
-      color.close();
-      alpha.close();
-      return finalFrame;
-    }
-    updateCpu(color, alpha) {
-      if (!this.worker) {
-        const blob = new Blob(
-          [`(${colorAlphaMergerWorkerCode.toString()})()`],
-          { type: "application/javascript" }
-        );
-        const url2 = URL.createObjectURL(blob);
-        this.worker = new Worker(url2);
-        URL.revokeObjectURL(url2);
-        this.worker.addEventListener("message", (event) => {
-          const data = event.data;
-          const pending2 = this.pendingRequests.get(data.id);
-          if (!pending2) {
-            return;
-          }
-          this.pendingRequests.delete(data.id);
-          if ("error" in data) {
-            pending2.reject(new Error(data.error));
-          } else {
-            pending2.resolve(data.frame);
-          }
-        });
-        this.worker.addEventListener("error", (event) => {
-          const error = new Error(event.message || "Color/alpha merge worker error.");
-          for (const pending2 of this.pendingRequests.values()) {
-            pending2.reject(error);
-          }
-          this.pendingRequests.clear();
-        });
-      }
       const id = this.nextRequestId++;
       const pending = promiseWithResolvers();
       this.pendingRequests.set(id, pending);
-      this.worker.postMessage({ id, color, alpha }, { transfer: [color, alpha] });
+      const worker = this.workers[this.nextWorkerIndex];
+      this.nextWorkerIndex = (this.nextWorkerIndex + 1) % this.workers.length;
+      worker.postMessage({ id, color, alpha }, { transfer: [color, alpha] });
       return pending.promise;
     }
     close() {
-      this.gl?.getExtension("WEBGL_lose_context")?.loseContext();
-      this.gl = null;
-      this.canvas = null;
-      this.worker?.terminate();
-      this.worker = null;
+      for (const worker of this.workers) {
+        worker.terminate();
+      }
+      this.workers.length = 0;
       const error = new Error("Color/alpha merger closed.");
       for (const pending of this.pendingRequests.values()) {
         pending.reject(error);
@@ -22895,8 +22870,6 @@ var Mediabunny = (() => {
       this.pendingRequests.clear();
     }
   };
-  _ColorAlphaMerger.forceCpu = true;
-  var ColorAlphaMerger = _ColorAlphaMerger;
   var colorAlphaMergerWorkerCode = () => {
     let cpuAlphaBuffer = null;
     let cpuColorBuffer = null;
@@ -22930,18 +22903,18 @@ var Mediabunny = (() => {
           `CPU color/alpha merging requires the alpha frame to have the same bit depth as the color frame (color: '${format}', alpha: '${alphaFormat}').`
         );
       }
-      const width = color.codedWidth;
-      const height = color.codedHeight;
       if (format === "RGBX" || format === "RGBA" || format === "BGRX" || format === "BGRA") {
-        return await mergeInterleavedRgba(color, alpha, width, height, format);
+        return await mergeInterleavedRgba(color, alpha, format);
       } else if (format === "I420" || format === "I420P10" || format === "I420P12" || format === "I422" || format === "I422P10" || format === "I422P12" || format === "I444" || format === "I444P10" || format === "I444P12") {
-        return await mergePlanarYuv(color, alpha, width, height, format);
+        return await mergePlanarYuv(color, alpha, format);
       } else if (format === "NV12") {
-        return await mergeNv12(color, alpha, width, height);
+        return await mergeNv12(color, alpha);
       }
       throw new Error(`CPU color/alpha merging does not support format '${format}'.`);
     };
-    const mergeInterleavedRgba = async (color, alpha, width, height, format) => {
+    const mergeInterleavedRgba = async (color, alpha, format) => {
+      const width = color.visibleRect?.width ?? color.codedWidth;
+      const height = color.visibleRect?.height ?? color.codedHeight;
       const pixelCount = width * height;
       const output = new Uint8Array(pixelCount * 4);
       await color.copyTo(output);
@@ -22960,7 +22933,9 @@ var Mediabunny = (() => {
       };
       return new VideoFrame(output, init);
     };
-    const mergePlanarYuv = async (color, alpha, width, height, format) => {
+    const mergePlanarYuv = async (color, alpha, format) => {
+      const width = color.visibleRect?.width ?? color.codedWidth;
+      const height = color.visibleRect?.height ?? color.codedHeight;
       const is10 = format.includes("P10");
       const is12 = format.includes("P12");
       const bytesPerSample = is10 || is12 ? 2 : 1;
@@ -22998,7 +22973,9 @@ var Mediabunny = (() => {
       };
       return new VideoFrame(output, init);
     };
-    const mergeNv12 = async (color, alpha, width, height) => {
+    const mergeNv12 = async (color, alpha) => {
+      const width = color.visibleRect?.width ?? color.codedWidth;
+      const height = color.visibleRect?.height ?? color.codedHeight;
       const ySize = width * height;
       const chromaW = Math.ceil(width / 2);
       const chromaH = Math.ceil(height / 2);
@@ -23361,7 +23338,10 @@ var Mediabunny = (() => {
           }
           sampleHandler(sample);
         };
-        void this.customDecoderCallSerializer.call(() => this.customDecoder.init());
+        this.customDecoder.onError = (error) => {
+          onError(error);
+        };
+        void this.customDecoderCallSerializer.call(() => this.customDecoder.init()).catch((error) => onError(error));
       } else {
         const stack = new Error("Decoding error").stack;
         this.decoder = new AudioDecoder({
@@ -23391,7 +23371,7 @@ var Mediabunny = (() => {
     decode(packet) {
       if (this.customDecoder) {
         this.customDecoderQueueSize++;
-        void this.customDecoderCallSerializer.call(() => this.customDecoder.decode(packet)).then(() => this.customDecoderQueueSize--);
+        void this.customDecoderCallSerializer.call(() => this.customDecoder.decode(packet)).catch((error) => this.onError(error)).finally(() => this.customDecoderQueueSize--);
       } else {
         assert(this.decoder);
         this.expectedFirstTimestamp ??= packet.timestamp;
@@ -27129,7 +27109,7 @@ var Mediabunny = (() => {
     i16(65535)
     // Pre-defined
   ], [
-    VIDEO_CODEC_TO_CONFIGURATION_BOX[trackData.track.source._codec](trackData),
+    VIDEO_CODEC_TO_CONFIGURATION_BOX[trackData.track.source._codec]?.(trackData) ?? null,
     pasp(trackData),
     colorSpaceIsComplete(trackData.info.decoderConfig.colorSpace) ? colr(trackData) : null
   ]);
@@ -28124,6 +28104,8 @@ var Mediabunny = (() => {
         return "vp09";
       case "av1":
         return "av01";
+      case "prores":
+        return fullCodecString;
     }
   };
   var VIDEO_CODEC_TO_CONFIGURATION_BOX = {
@@ -28131,7 +28113,8 @@ var Mediabunny = (() => {
     hevc: hvcC,
     vp8: vpcC,
     vp9: vpcC,
-    av1: av1C
+    av1: av1C,
+    prores: null
   };
   var audioCodecToBoxName = (codec, isQuickTime) => {
     switch (codec) {
@@ -30088,6 +30071,7 @@ var Mediabunny = (() => {
           { id: 156 /* FlagLacing */, data: 0 },
           { id: 2274716 /* Language */, data: trackData.track.metadata.languageCode ?? UNDETERMINED_LANGUAGE },
           { id: 134 /* CodecID */, data: codecId },
+          trackData.codecPrivate ? { id: 25506 /* CodecPrivate */, data: toUint8Array(trackData.codecPrivate) } : null,
           { id: 22186 /* CodecDelay */, data: 0 },
           { id: 22203 /* SeekPreRoll */, data: seekPreRollNs },
           trackData.track.metadata.name !== void 0 ? { id: 21358 /* Name */, data: new EBMLUnicodeString(trackData.track.metadata.name) } : null,
@@ -30100,10 +30084,6 @@ var Mediabunny = (() => {
     videoSpecificTrackInfo(trackData) {
       const { frameRate, rotation } = trackData.track.metadata;
       const elements = [
-        trackData.info.decoderConfig.description ? {
-          id: 25506 /* CodecPrivate */,
-          data: toUint8Array(trackData.info.decoderConfig.description)
-        } : null,
         frameRate ? {
           id: 2352003 /* DefaultDuration */,
           data: 1e9 / frameRate
@@ -30163,10 +30143,6 @@ var Mediabunny = (() => {
     audioSpecificTrackInfo(trackData) {
       const pcmInfo = PCM_AUDIO_CODECS.includes(trackData.track.source._codec) ? parsePcmCodec(trackData.track.source._codec) : null;
       return [
-        trackData.info.decoderConfig.description ? {
-          id: 25506 /* CodecPrivate */,
-          data: toUint8Array(trackData.info.decoderConfig.description)
-        } : null,
         { id: 225 /* Audio */, data: [
           { id: 181 /* SamplingFrequency */, data: new EBMLFloat32(trackData.info.sampleRate) },
           { id: 159 /* Channels */, data: trackData.info.numberOfChannels },
@@ -30174,10 +30150,9 @@ var Mediabunny = (() => {
         ] }
       ];
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     subtitleSpecificTrackInfo(trackData) {
-      return [
-        { id: 25506 /* CodecPrivate */, data: textEncoder.encode(trackData.info.config.description) }
-      ];
+      return [];
     }
     maybeCreateTags() {
       const simpleTags = [];
@@ -30466,22 +30441,19 @@ var Mediabunny = (() => {
         },
         chunkQueue: [],
         lastWrittenMsTimestamp: null,
+        codecPrivate: meta.decoderConfig.description ?? null,
         closed: false
       };
       if (track.source._codec === "vp9") {
-        newTrackData.info.decoderConfig = {
-          ...newTrackData.info.decoderConfig,
-          description: new Uint8Array(
-            generateVp9CodecConfigurationFromCodecString(newTrackData.info.decoderConfig.codec)
-          )
-        };
+        newTrackData.codecPrivate = new Uint8Array(
+          generateVp9CodecConfigurationFromCodecString(newTrackData.info.decoderConfig.codec)
+        );
       } else if (track.source._codec === "av1") {
-        newTrackData.info.decoderConfig = {
-          ...newTrackData.info.decoderConfig,
-          description: new Uint8Array(
-            generateAv1CodecConfigurationFromCodecString(newTrackData.info.decoderConfig.codec)
-          )
-        };
+        newTrackData.codecPrivate = new Uint8Array(
+          generateAv1CodecConfigurationFromCodecString(newTrackData.info.decoderConfig.codec)
+        );
+      } else if (track.source._codec === "prores") {
+        newTrackData.codecPrivate = textEncoder.encode(meta.decoderConfig.codec);
       }
       this.trackDatas.push(newTrackData);
       this.trackDatas.sort((a, b) => a.track.id - b.track.id);
@@ -30530,6 +30502,7 @@ var Mediabunny = (() => {
         },
         chunkQueue: [],
         lastWrittenMsTimestamp: null,
+        codecPrivate: decoderConfig.description ?? null,
         closed: false
       };
       this.trackDatas.push(newTrackData);
@@ -30555,6 +30528,7 @@ var Mediabunny = (() => {
         },
         chunkQueue: [],
         lastWrittenMsTimestamp: null,
+        codecPrivate: textEncoder.encode(meta.config.description),
         closed: false
       };
       this.trackDatas.push(newTrackData);
@@ -32628,8 +32602,15 @@ ${cue.notes ?? ""}`;
        * So, we keep track of the encoder error and throw it as soon as we get the chance.
        */
       this.error = null;
-      this.closed = false;
+      this.errorSet = false;
       this.lastMuxerPromise = Promise.resolve();
+      this.closed = false;
+    }
+    setError(error) {
+      if (!this.errorSet) {
+        this.error = error;
+        this.errorSet = true;
+      }
     }
     async add(videoSample, shouldClose, encodeOptions) {
       const originalSample = videoSample;
@@ -32780,7 +32761,8 @@ ${cue.notes ?? ""}`;
           if (this.customEncoder) {
             this.customEncoderQueueSize++;
             const clonedSample = sampleToEncode.clone();
-            const promise = this.customEncoderCallSerializer.call(() => this.customEncoder.encode(clonedSample, finalEncodeOptions)).then(() => this.customEncoderQueueSize--).catch((error) => this.error ??= error).finally(() => {
+            const promise = this.customEncoderCallSerializer.call(() => this.customEncoder.encode(clonedSample, finalEncodeOptions)).catch((error) => this.setError(error)).finally(() => {
+              this.customEncoderQueueSize--;
               clonedSample.close();
             });
             if (this.customEncoderQueueSize >= 4) {
@@ -32824,12 +32806,10 @@ ${cue.notes ?? ""}`;
                 this.encoder.encode(videoFrame, finalEncodeOptions);
                 videoFrame.close();
               } else {
-                const width = videoFrame.displayWidth;
-                const height = videoFrame.displayHeight;
                 if (!this.splitter) {
-                  this.splitter = new ColorAlphaSplitter(width, height);
+                  this.splitter = new ColorAlphaSplitter();
                 }
-                const { colorFrame, alphaFrame } = await this.splitter.update(videoFrame);
+                const { colorFrame, alphaFrame } = await this.splitter.split(videoFrame);
                 this.alphaFrameQueue.push(alphaFrame);
                 this.encoder.encode(colorFrame, finalEncodeOptions);
                 colorFrame.close();
@@ -32893,9 +32873,12 @@ ${cue.notes ?? ""}`;
             maybeEnsureIsKeyPacket(this.source._connectedTrack, packet);
             this.encodingConfig.onEncodedPacket?.(packet, meta);
             this.lastMuxerPromise = this.muxer.addEncodedVideoPacket(this.source._connectedTrack, packet, meta).catch((error) => {
-              this.error ??= error;
+              this.setError(error);
             });
           };
+          this.customEncoder.onError = (error) => {
+            this.setError(error);
+          };
           await this.customEncoder.init();
         } else {
           if (typeof VideoEncoder === "undefined") {
@@ -32953,7 +32936,7 @@ ${cue.notes ?? ""}`;
             maybeEnsureIsKeyPacket(this.source._connectedTrack, packet);
             this.encodingConfig.onEncodedPacket?.(packet, meta);
             this.lastMuxerPromise = this.muxer.addEncodedVideoPacket(this.source._connectedTrack, packet, meta).catch((error) => {
-              this.error ??= error;
+              this.setError(error);
             });
             this.emittedEncoderPackets++;
           };
@@ -32987,7 +32970,7 @@ ${cue.notes ?? ""}`;
             },
             error: (error) => {
               error.stack = stack;
-              this.error ??= error;
+              this.setError(error);
             }
           });
           this.encoder.configure(encoderConfig);
@@ -33011,7 +32994,7 @@ ${cue.notes ?? ""}`;
               },
               error: (error) => {
                 error.stack = stack2;
-                this.error ??= error;
+                this.setError(error);
               }
             });
             this.alphaEncoder.configure(encoderConfig);
@@ -33065,274 +33048,28 @@ ${cue.notes ?? ""}`;
       }
     }
     checkForEncoderError() {
-      if (this.error) {
+      if (this.errorSet) {
         throw this.error;
       }
     }
   };
-  var splitterGpuUnavailable = false;
-  var _ColorAlphaSplitter = class _ColorAlphaSplitter {
-    constructor(initialWidth, initialHeight) {
-      this.canvas = null;
-      this.gl = null;
-      this.colorProgram = null;
-      this.alphaProgram = null;
-      this.vao = null;
-      this.sourceTexture = null;
-      this.alphaResolutionLocation = null;
+  var splitterWorkerUrl = null;
+  var ColorAlphaSplitter = class {
+    constructor() {
       this.worker = null;
       this.pendingRequests = /* @__PURE__ */ new Map();
       this.nextRequestId = 0;
-      const canMakeCanvas = typeof OffscreenCanvas !== "undefined" || typeof document !== "undefined" && typeof document.createElement === "function";
-      if (!_ColorAlphaSplitter.forceCpu && canMakeCanvas && !splitterGpuUnavailable) {
-        try {
-          if (typeof OffscreenCanvas !== "undefined") {
-            this.canvas = new OffscreenCanvas(initialWidth, initialHeight);
-          } else {
-            this.canvas = document.createElement("canvas");
-            this.canvas.width = initialWidth;
-            this.canvas.height = initialHeight;
-          }
-          const gl = this.canvas.getContext("webgl2", {
-            alpha: true
-            // Needed due to the YUV thing we do for alpha
-          });
-          if (!gl) {
-            throw new Error("Couldn't acquire WebGL 2 context.");
-          }
-          this.gl = gl;
-          this.colorProgram = this.createColorProgram();
-          this.alphaProgram = this.createAlphaProgram();
-          this.vao = this.createVAO();
-          this.sourceTexture = this.createTexture();
-          this.alphaResolutionLocation = this.gl.getUniformLocation(this.alphaProgram, "u_resolution");
-          this.gl.useProgram(this.colorProgram);
-          this.gl.uniform1i(this.gl.getUniformLocation(this.colorProgram, "u_sourceTexture"), 0);
-          this.gl.useProgram(this.alphaProgram);
-          this.gl.uniform1i(this.gl.getUniformLocation(this.alphaProgram, "u_sourceTexture"), 0);
-        } catch (error) {
-          this.gl = null;
-          this.canvas = null;
-          splitterGpuUnavailable = true;
-          Logging._warn("Falling back to CPU for color/alpha splitting.", error);
-        }
-      }
     }
-    async update(sourceFrame) {
-      if (this.gl) {
-        return this.updateGpu(sourceFrame);
-      } else {
-        return this.updateCpu(sourceFrame);
-      }
-    }
-    updateGpu(sourceFrame) {
-      assert(this.gl);
-      assert(this.canvas);
-      if (sourceFrame.displayWidth !== this.canvas.width || sourceFrame.displayHeight !== this.canvas.height) {
-        this.canvas.width = sourceFrame.displayWidth;
-        this.canvas.height = sourceFrame.displayHeight;
-      }
-      this.gl.activeTexture(this.gl.TEXTURE0);
-      this.gl.bindTexture(this.gl.TEXTURE_2D, this.sourceTexture);
-      this.gl.texImage2D(this.gl.TEXTURE_2D, 0, this.gl.RGBA, this.gl.RGBA, this.gl.UNSIGNED_BYTE, sourceFrame);
-      const colorFrame = this.runColorProgram(sourceFrame);
-      const alphaFrame = this.runAlphaProgram(sourceFrame);
-      sourceFrame.close();
-      return { colorFrame, alphaFrame };
-    }
-    createVertexShader() {
-      assert(this.gl);
-      return this.createShader(this.gl.VERTEX_SHADER, `#version 300 es
-			in vec2 a_position;
-			in vec2 a_texCoord;
-			out vec2 v_texCoord;
-			
-			void main() {
-				gl_Position = vec4(a_position, 0.0, 1.0);
-				v_texCoord = a_texCoord;
-			}
-		`);
-    }
-    createColorProgram() {
-      assert(this.gl);
-      const vertexShader = this.createVertexShader();
-      const fragmentShader = this.createShader(this.gl.FRAGMENT_SHADER, `#version 300 es
-			precision highp float;
-			
-			uniform sampler2D u_sourceTexture;
-			in vec2 v_texCoord;
-			out vec4 fragColor;
-			
-			void main() {
-				vec4 source = texture(u_sourceTexture, v_texCoord);
-				fragColor = vec4(source.rgb, 1.0);
-			}
-		`);
-      const program = this.gl.createProgram();
-      this.gl.attachShader(program, vertexShader);
-      this.gl.attachShader(program, fragmentShader);
-      this.gl.linkProgram(program);
-      return program;
-    }
-    createAlphaProgram() {
-      assert(this.gl);
-      const vertexShader = this.createVertexShader();
-      const fragmentShader = this.createShader(this.gl.FRAGMENT_SHADER, `#version 300 es
-			precision highp float;
-			
-			uniform sampler2D u_sourceTexture;
-			uniform vec2 u_resolution; // The width and height of the canvas
-			in vec2 v_texCoord;
-			out vec4 fragColor;
-
-			// This function determines the value for a single byte in the YUV stream
-			float getByteValue(float byteOffset) {
-				float width = u_resolution.x;
-				float height = u_resolution.y;
-
-				float yPlaneSize = width * height;
-
-				if (byteOffset < yPlaneSize) {
-					// This byte is in the luma plane. Find the corresponding pixel coordinates to sample from
-					float y = floor(byteOffset / width);
-					float x = mod(byteOffset, width);
-					
-					// Add 0.5 to sample the center of the texel
-					vec2 sampleCoord = (vec2(x, y) + 0.5) / u_resolution;
-					
-					// The luma value is the alpha from the source texture
-					return texture(u_sourceTexture, sampleCoord).a;
-				} else {
-					// Write a fixed value for chroma and beyond
-					return 128.0 / 255.0;
-				}
-			}
-			
-			void main() {
-				// Each fragment writes 4 bytes (R, G, B, A)
-				float pixelIndex = floor(gl_FragCoord.y) * u_resolution.x + floor(gl_FragCoord.x);
-				float baseByteOffset = pixelIndex * 4.0;
-
-				vec4 result;
-				for (int i = 0; i < 4; i++) {
-					float currentByteOffset = baseByteOffset + float(i);
-					result[i] = getByteValue(currentByteOffset);
-				}
-				
-				fragColor = result;
-			}
-		`);
-      const program = this.gl.createProgram();
-      this.gl.attachShader(program, vertexShader);
-      this.gl.attachShader(program, fragmentShader);
-      this.gl.linkProgram(program);
-      return program;
-    }
-    createShader(type, source) {
-      assert(this.gl);
-      const shader = this.gl.createShader(type);
-      this.gl.shaderSource(shader, source);
-      this.gl.compileShader(shader);
-      if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) {
-        Logging._error("Shader compile error:", this.gl.getShaderInfoLog(shader));
-      }
-      return shader;
-    }
-    createVAO() {
-      assert(this.gl);
-      assert(this.colorProgram);
-      const vao = this.gl.createVertexArray();
-      this.gl.bindVertexArray(vao);
-      const vertices = new Float32Array([
-        -1,
-        -1,
-        0,
-        1,
-        1,
-        -1,
-        1,
-        1,
-        -1,
-        1,
-        0,
-        0,
-        1,
-        1,
-        1,
-        0
-      ]);
-      const buffer = this.gl.createBuffer();
-      this.gl.bindBuffer(this.gl.ARRAY_BUFFER, buffer);
-      this.gl.bufferData(this.gl.ARRAY_BUFFER, vertices, this.gl.STATIC_DRAW);
-      const positionLocation = this.gl.getAttribLocation(this.colorProgram, "a_position");
-      const texCoordLocation = this.gl.getAttribLocation(this.colorProgram, "a_texCoord");
-      this.gl.enableVertexAttribArray(positionLocation);
-      this.gl.vertexAttribPointer(positionLocation, 2, this.gl.FLOAT, false, 16, 0);
-      this.gl.enableVertexAttribArray(texCoordLocation);
-      this.gl.vertexAttribPointer(texCoordLocation, 2, this.gl.FLOAT, false, 16, 8);
-      return vao;
-    }
-    createTexture() {
-      assert(this.gl);
-      const texture = this.gl.createTexture();
-      this.gl.bindTexture(this.gl.TEXTURE_2D, texture);
-      this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_S, this.gl.CLAMP_TO_EDGE);
-      this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_T, this.gl.CLAMP_TO_EDGE);
-      this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MIN_FILTER, this.gl.LINEAR);
-      this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MAG_FILTER, this.gl.LINEAR);
-      return texture;
-    }
-    runColorProgram(sourceFrame) {
-      assert(this.gl);
-      assert(this.canvas);
-      this.gl.useProgram(this.colorProgram);
-      this.gl.viewport(0, 0, this.canvas.width, this.canvas.height);
-      this.gl.clear(this.gl.COLOR_BUFFER_BIT);
-      this.gl.bindVertexArray(this.vao);
-      this.gl.drawArrays(this.gl.TRIANGLE_STRIP, 0, 4);
-      return new VideoFrame(this.canvas, {
-        timestamp: sourceFrame.timestamp,
-        duration: sourceFrame.duration ?? void 0,
-        alpha: "discard"
-      });
-    }
-    runAlphaProgram(sourceFrame) {
-      assert(this.gl);
-      assert(this.canvas);
-      this.gl.useProgram(this.alphaProgram);
-      this.gl.uniform2f(this.alphaResolutionLocation, this.canvas.width, this.canvas.height);
-      this.gl.viewport(0, 0, this.canvas.width, this.canvas.height);
-      this.gl.clear(this.gl.COLOR_BUFFER_BIT);
-      this.gl.bindVertexArray(this.vao);
-      this.gl.drawArrays(this.gl.TRIANGLE_STRIP, 0, 4);
-      const { width, height } = this.canvas;
-      const chromaSamples = Math.ceil(width / 2) * Math.ceil(height / 2);
-      const yuvSize = width * height + chromaSamples * 2;
-      const requiredHeight = Math.ceil(yuvSize / (width * 4));
-      let yuv = new Uint8Array(4 * width * requiredHeight);
-      this.gl.readPixels(0, 0, width, requiredHeight, this.gl.RGBA, this.gl.UNSIGNED_BYTE, yuv);
-      yuv = yuv.subarray(0, yuvSize);
-      assert(yuv[width * height] === 128);
-      assert(yuv[yuv.length - 1] === 128);
-      const init = {
-        format: "I420",
-        codedWidth: width,
-        codedHeight: height,
-        timestamp: sourceFrame.timestamp,
-        duration: sourceFrame.duration ?? void 0,
-        transfer: [yuv.buffer]
-      };
-      return new VideoFrame(yuv, init);
-    }
-    updateCpu(sourceFrame) {
+    split(sourceFrame) {
       if (!this.worker) {
-        const blob = new Blob(
-          [`(${colorAlphaSplitterWorkerCode.toString()})()`],
-          { type: "application/javascript" }
-        );
-        const url2 = URL.createObjectURL(blob);
-        this.worker = new Worker(url2);
-        URL.revokeObjectURL(url2);
+        if (!splitterWorkerUrl) {
+          const blob = new Blob(
+            [`(${colorAlphaSplitterWorkerCode.toString()})()`],
+            { type: "application/javascript" }
+          );
+          splitterWorkerUrl = URL.createObjectURL(blob);
+        }
+        this.worker = new Worker(splitterWorkerUrl);
         this.worker.addEventListener("message", (event) => {
           const data = event.data;
           const pending2 = this.pendingRequests.get(data.id);
@@ -33361,9 +33098,6 @@ ${cue.notes ?? ""}`;
       return pending.promise;
     }
     close() {
-      this.gl?.getExtension("WEBGL_lose_context")?.loseContext();
-      this.gl = null;
-      this.canvas = null;
       this.worker?.terminate();
       this.worker = null;
       const error = new Error("Color/alpha splitter closed.");
@@ -33373,8 +33107,6 @@ ${cue.notes ?? ""}`;
       this.pendingRequests.clear();
     }
   };
-  _ColorAlphaSplitter.forceCpu = true;
-  var ColorAlphaSplitter = _ColorAlphaSplitter;
   var colorAlphaSplitterWorkerCode = () => {
     let cpuSourceBuffer = null;
     let chain = Promise.resolve();
@@ -33396,21 +33128,21 @@ ${cue.notes ?? ""}`;
       if (!format) {
         throw new Error("CPU color/alpha splitting requires a known VideoFrame format.");
       }
-      const width = sourceFrame.codedWidth;
-      const height = sourceFrame.codedHeight;
       const sourceSize = sourceFrame.allocationSize();
       if (!cpuSourceBuffer || cpuSourceBuffer.byteLength !== sourceSize) {
         cpuSourceBuffer = new Uint8Array(sourceSize);
       }
       await sourceFrame.copyTo(cpuSourceBuffer);
       if (format === "RGBA" || format === "BGRA") {
-        return splitInterleavedRgba(cpuSourceBuffer, width, height, format, sourceFrame);
+        return splitInterleavedRgba(cpuSourceBuffer, format, sourceFrame);
       } else if (format === "I420A" || format === "I420AP10" || format === "I420AP12" || format === "I422A" || format === "I422AP10" || format === "I422AP12" || format === "I444A" || format === "I444AP10" || format === "I444AP12") {
-        return splitPlanarYuvA(cpuSourceBuffer, width, height, format, sourceFrame);
+        return splitPlanarYuvA(cpuSourceBuffer, format, sourceFrame);
       }
       throw new Error(`CPU color/alpha splitting does not support format '${format}'.`);
     };
-    const splitInterleavedRgba = (source, width, height, format, sourceFrame) => {
+    const splitInterleavedRgba = (source, format, sourceFrame) => {
+      const width = sourceFrame.visibleRect?.width ?? sourceFrame.codedWidth;
+      const height = sourceFrame.visibleRect?.height ?? sourceFrame.codedHeight;
       const pixelCount = width * height;
       const chromaW = Math.ceil(width / 2);
       const chromaH = Math.ceil(height / 2);
@@ -33439,7 +33171,9 @@ ${cue.notes ?? ""}`;
       const alphaFrame = new VideoFrame(alphaBuffer, alphaInit);
       return { colorFrame, alphaFrame };
     };
-    const splitPlanarYuvA = (source, width, height, format, sourceFrame) => {
+    const splitPlanarYuvA = (source, format, sourceFrame) => {
+      const width = sourceFrame.visibleRect?.width ?? sourceFrame.codedWidth;
+      const height = sourceFrame.visibleRect?.height ?? sourceFrame.codedHeight;
       const is10 = format.includes("P10");
       const is12 = format.includes("P12");
       const bytesPerSample = is10 || is12 ? 2 : 1;
@@ -33904,9 +33638,16 @@ ${cue.notes ?? ""}`;
        * So, we keep track of the encoder error and throw it as soon as we get the chance.
        */
       this.error = null;
+      this.errorSet = false;
       this.lastMuxerPromise = Promise.resolve();
       this.closed = false;
     }
+    setError(error) {
+      if (!this.errorSet) {
+        this.error = error;
+        this.errorSet = true;
+      }
+    }
     async add(audioSample, shouldClose) {
       try {
         this.checkForEncoderError();
@@ -34028,7 +33769,8 @@ ${cue.notes ?? ""}`;
         if (this.customEncoder) {
           this.customEncoderQueueSize++;
           const clonedSample = audioSample.clone();
-          const promise = this.customEncoderCallSerializer.call(() => this.customEncoder.encode(clonedSample)).then(() => this.customEncoderQueueSize--).catch((error) => this.error ??= error).finally(() => {
+          const promise = this.customEncoderCallSerializer.call(() => this.customEncoder.encode(clonedSample)).catch((error) => this.setError(error)).finally(() => {
+            this.customEncoderQueueSize--;
             clonedSample.close();
           });
           if (this.customEncoderQueueSize >= 4) {
@@ -34134,9 +33876,12 @@ ${cue.notes ?? ""}`;
             }
             this.encodingConfig.onEncodedPacket?.(packet, meta);
             this.lastMuxerPromise = this.muxer.addEncodedAudioPacket(this.source._connectedTrack, packet, meta).catch((error) => {
-              this.error ??= error;
+              this.setError(error);
             });
           };
+          this.customEncoder.onError = (error) => {
+            this.setError(error);
+          };
           await this.customEncoder.init();
         } else if (PCM_AUDIO_CODECS.includes(this.encodingConfig.codec)) {
           this.initPcmEncoder();
@@ -34179,12 +33924,12 @@ ${cue.notes ?? ""}`;
               });
               this.encodingConfig.onEncodedPacket?.(packet, meta);
               this.lastMuxerPromise = this.muxer.addEncodedAudioPacket(this.source._connectedTrack, packet, meta).catch((error) => {
-                this.error ??= error;
+                this.setError(error);
               });
             },
             error: (error) => {
               error.stack = stack;
-              this.error ??= error;
+              this.setError(error);
             }
           });
           this.encoder.configure(encoderConfig);
@@ -34325,7 +34070,7 @@ ${cue.notes ?? ""}`;
       }
     }
     checkForEncoderError() {
-      if (this.error) {
+      if (this.errorSet) {
         throw this.error;
       }
     }
@@ -34685,12 +34430,14 @@ ${cue.notes ?? ""}`;
       /** @internal */
       this._error = null;
       /** @internal */
+      this._errorSet = false;
+      /** @internal */
       this._lastMuxerPromise = Promise.resolve();
       this._parser = new SubtitleParser({
         codec,
         output: (cue, metadata) => {
           this._lastMuxerPromise = this._connectedTrack.output._muxer.addSubtitleCue(this._connectedTrack, cue, metadata).catch((error) => {
-            this._error ??= error;
+            this._setError(error);
           });
         }
       });
@@ -34712,8 +34459,15 @@ ${cue.notes ?? ""}`;
       return this._lastMuxerPromise;
     }
     /** @internal */
+    _setError(error) {
+      if (!this._errorSet) {
+        this._error = error;
+        this._errorSet = true;
+      }
+    }
+    /** @internal */
     _checkForError() {
-      if (this._error) {
+      if (this._errorSet) {
         throw this._error;
       }
     }
@@ -37739,7 +37493,7 @@ The @mediabunny/mp3-encoder extension package provides support for encoding MP3.
       let numberOfChannels = trackOptions.numberOfChannels ?? originalNumberOfChannels;
       let sampleRate = trackOptions.sampleRate ?? originalSampleRate;
       const needsTrimming = firstTimestamp < this._startTimestamp;
-      const needsPadding = firstTimestamp > this._startTimestamp && !this.output.format.supportsTimestampedMediaData;
+      let needsPadding = firstTimestamp > this._startTimestamp && !this.output.format.supportsTimestampedMediaData;
       let audioCodecs = this.output.format.getSupportedAudioCodecs();
       if (!trackOptions.forceTranscode && !trackOptions.bitrate && numberOfChannels === originalNumberOfChannels && sampleRate === originalSampleRate && !needsTrimming && !needsPadding && audioCodecs.includes(sourceCodec) && (!trackOptions.codec || trackOptions.codec === sourceCodec) && !trackOptions.process && trackOptions.sampleFormat === void 0) {
         const source = new EncodedAudioPacketSource(sourceCodec);
@@ -37835,24 +37589,32 @@ The @mediabunny/mp3-encoder extension package provides support for encoding MP3.
         audioSource = source;
         this._trackPromises.push((async () => {
           await this._started;
-          if (needsPadding) {
-            const paddingLength = firstTimestamp - this._startTimestamp;
-            const paddingLengthSamples = Math.round(paddingLength * originalSampleRate);
-            const silentSample = new AudioSample({
-              data: new Float32Array(paddingLengthSamples * originalNumberOfChannels),
-              format: "f32-planar",
-              numberOfChannels: originalNumberOfChannels,
-              sampleRate: originalSampleRate,
-              timestamp: 0
-            });
-            await this._registerAudioSample(silentSample, source, outputTrackId, () => lastSampleTimestamp);
-          }
           const sink = new AudioSampleSink(track);
           for await (let sample of sink.samples(this._startTimestamp, this._endTimestamp)) {
             if (this._canceled) {
               sample.close();
               return;
             }
+            if (needsPadding) {
+              const paddingLength = firstTimestamp - this._startTimestamp;
+              const paddingLengthSamples = Math.round(paddingLength * originalSampleRate);
+              const bytesPerSample = getBytesPerSample(sample.format);
+              const data = new Uint8Array(bytesPerSample * paddingLengthSamples * originalNumberOfChannels);
+              if (sample.format === "u8" || sample.format === "u8-planar") {
+                data.fill(2 ** 7);
+              }
+              const silentSample = new AudioSample({
+                data,
+                // Use the same format the decoder is spitting out. This avoids feeding changing sample
+                // formats to the audio encoder.
+                format: sample.format,
+                numberOfChannels: originalNumberOfChannels,
+                sampleRate: originalSampleRate,
+                timestamp: 0
+              });
+              await this._registerAudioSample(silentSample, source, outputTrackId, () => lastSampleTimestamp);
+              needsPadding = false;
+            }
             let startFrame = 0;
             let endFrame = sample.numberOfFrames;
             if (sample.timestamp < this._startTimestamp) {