mediabunny 1.57.0 → 1.58.1

package/dist/bundles/mediabunny.cjs

@@ -17527,7 +17527,8 @@ var Mediabunny = (() => {
       }
       this._orchestrator.signalWorkerStoppedRunning(worker);
       if (worker.aborted) {
-        await reader?.cancel();
+        await reader?.cancel().catch(() => {
+        });
       }
     }
     /** @internal */
@@ -17610,6 +17611,10 @@ var Mediabunny = (() => {
        * @internal
        */
       this._sequentialBacking = null;
+      /** @internal */
+      this._abortControllers = /* @__PURE__ */ new Map();
+      /** @internal */
+      this._sequentialAbortController = null;
       this._url = url2;
       this._options = options;
       this._getRetryDelay = options.getRetryDelay ?? DEFAULT_RETRY_DELAY;
@@ -17645,6 +17650,7 @@ var Mediabunny = (() => {
         maxCacheSize: options.maxCacheSize ?? 64 * 2 ** 20,
         maxWorkerCount: options.parallelism ?? DEFAULT_PARALLELISM,
         runWorker: this._runWorker.bind(this),
+        onIdleWorkerRemoved: (worker) => this._abortControllers.delete(worker),
         prefetchProfile: PREFETCH_PROFILES.network,
         handleUnhandledError: options.handleUnhandledError
       });
@@ -17688,7 +17694,12 @@ var Mediabunny = (() => {
     /** @internal */
     async _runWorker(worker) {
       while (true) {
+        if (worker.aborted) {
+          this._orchestrator.signalWorkerStoppedRunning(worker);
+          return;
+        }
         const abortController = new AbortController();
+        this._abortControllers.set(worker, abortController);
         const response = await retriedFetch(
           this._options.fetchFn ?? fetch,
           this._url,
@@ -17700,7 +17711,7 @@ var Mediabunny = (() => {
             signal: abortController.signal
           }),
           this._getRetryDelay,
-          () => this._disposed
+          () => abortController.signal.aborted
         );
         if (!response.ok) {
           throw new Error(`Error fetching ${String(this._url)}: ${response.status} ${response.statusText}`);
@@ -17709,7 +17720,7 @@ var Mediabunny = (() => {
           this.rootPath = response.url;
         }
         outer:
-          if (this._orchestrator.fileSize === null && (response.status === 206 || response.type === "basic" && !response.headers.has("Content-Encoding"))) {
+          if (this._orchestrator.fileSize === null && !response.headers.has("Content-Encoding") && (response.status === 206 || response.type === "basic")) {
             const contentRange = response.headers.get("Content-Range");
             if (contentRange) {
               const match = /\/(\d+)/.exec(contentRange);
@@ -17732,7 +17743,8 @@ var Mediabunny = (() => {
         }
         if (response.status !== 206) {
           if (this._sequentialBacking) {
-            void response.body.cancel();
+            void response.body.cancel().catch(() => {
+            });
             return;
           }
           if (!this._usedForHls) {
@@ -17749,7 +17761,8 @@ var Mediabunny = (() => {
               }
             }
           }
-          this._transitionToSequentialMode(response.body);
+          this._abortControllers.delete(worker);
+          this._transitionToSequentialMode(response.body, abortController);
           return;
         }
         const reader = response.body.getReader();
@@ -17763,7 +17776,7 @@ var Mediabunny = (() => {
           try {
             readResult = await reader.read();
           } catch (error) {
-            if (this._disposed) {
+            if (abortController.signal.aborted) {
               throw error;
             }
             const retryDelayInSeconds = this._getRetryDelay(1, error, this._url);
@@ -17797,7 +17810,8 @@ var Mediabunny = (() => {
       }
     }
     /** @internal */
-    _transitionToSequentialMode(body) {
+    _transitionToSequentialMode(body, abortController) {
+      this._sequentialAbortController = abortController;
       let currentReader = body.getReader();
       let streamPosition = 0;
       let skipRemaining = 0;
@@ -17817,6 +17831,10 @@ var Mediabunny = (() => {
               }
               Logging._error("Error while reading response stream. Attempting to resume.", error);
               await wait(1e3 * retryDelayInSeconds);
+              this._sequentialAbortController = new AbortController();
+              if (this._disposed) {
+                this._sequentialAbortController.abort();
+              }
               const newResponse = await retriedFetch(
                 this._options.fetchFn ?? fetch,
                 this._url,
@@ -17824,7 +17842,8 @@ var Mediabunny = (() => {
                   headers: {
                     // Who knows, maybe the server honors range requests this time
                     Range: `bytes=${streamPosition}-`
-                  }
+                  },
+                  signal: this._sequentialAbortController.signal
                 }),
                 this._getRetryDelay,
                 () => this._disposed
@@ -17862,7 +17881,8 @@ var Mediabunny = (() => {
             return;
           }
         },
-        cancel: () => currentReader.cancel()
+        cancel: () => currentReader.cancel().catch(() => {
+        })
       });
       const backing = new ReadableStreamSource(wrappedStream, {
         maxCacheSize: this._orchestrator.options.maxCacheSize,
@@ -17887,6 +17907,10 @@ var Mediabunny = (() => {
       }
       this._orchestrator.workers.length = 0;
       this._orchestrator.queuedReads.length = 0;
+      for (const [, otherAbortController] of this._abortControllers) {
+        otherAbortController.abort();
+      }
+      this._abortControllers.clear();
       for (const slice of uniqueSlices) {
         const result = backing._read(slice.start, slice.start + slice.bytes.length);
         if (isThenable(result)) {
@@ -17907,6 +17931,11 @@ var Mediabunny = (() => {
     /** @internal */
     _dispose() {
       this._orchestrator.dispose();
+      for (const [, abortController] of this._abortControllers) {
+        abortController.abort();
+      }
+      this._abortControllers.clear();
+      this._sequentialAbortController?.abort();
       if (this._sequentialBacking) {
         this._sequentialBacking._disposed = true;
         this._sequentialBacking._dispose();
@@ -18062,7 +18091,8 @@ var Mediabunny = (() => {
         if (isThenable(data)) data = await data;
         if (worker.aborted) {
           if (data instanceof ReadableStream) {
-            await data.cancel();
+            await data.cancel().catch(() => {
+            });
           }
           break;
         }
@@ -18307,7 +18337,8 @@ var Mediabunny = (() => {
       }
       this._pendingSlices.length = 0;
       this._cache.length = 0;
-      void this._reader?.cancel();
+      void this._reader?.cancel().catch(() => {
+      });
     }
   };
   var PREFETCH_PROFILES = {
@@ -22860,13 +22891,13 @@ var Mediabunny = (() => {
     switch (format) {
       case "u8":
       case "u8-planar":
-        return (view2, offset, value) => view2.setUint8(offset, clamp((value + 1) * 127.5, 0, 255));
+        return (view2, offset, value) => view2.setUint8(offset, clamp(Math.round(value * 128) + 128, 0, 255));
       case "s16":
       case "s16-planar":
-        return (view2, offset, value) => view2.setInt16(offset, clamp(Math.round(value * 32767), -32768, 32767), true);
+        return (view2, offset, value) => view2.setInt16(offset, clamp(Math.round(value * 32768), -32768, 32767), true);
       case "s32":
       case "s32-planar":
-        return (view2, offset, value) => view2.setInt32(offset, clamp(Math.round(value * 2147483647), -2147483648, 2147483647), true);
+        return (view2, offset, value) => view2.setInt32(offset, clamp(Math.round(value * 2147483648), -2147483648, 2147483647), true);
       case "f32":
       case "f32-planar":
         return (view2, offset, value) => view2.setFloat32(offset, value, true);
@@ -23780,7 +23811,7 @@ var Mediabunny = (() => {
   var toUlaw = (s16) => {
     const MULAW_MAX = 8191;
     const MULAW_BIAS = 33;
-    let number = s16;
+    let number = s16 >> 2;
     let mask = 4096;
     let sign = 0;
     let position = 12;
@@ -23811,7 +23842,7 @@ var Mediabunny = (() => {
     }
     position = ((number & 240) >> 4) + 5;
     const decoded = (1 << position | (number & 15) << position - 4 | 1 << position - 5) - MULAW_BIAS;
-    return sign === 0 ? decoded : -decoded;
+    return (sign === 0 ? decoded : -decoded) << 2;
   };
   var toAlaw = (s16) => {
     const ALAW_MAX = 4095;
@@ -23819,9 +23850,10 @@ var Mediabunny = (() => {
     let sign = 0;
     let position = 11;
     let lsb = 0;
-    let number = s16;
+    let number = s16 >> 3;
     if (number < 0) {
-      number = -number;
+      number = -number - 1;
+    } else {
       sign = 128;
     }
     if (number > ALAW_MAX) {
@@ -23849,7 +23881,7 @@ var Mediabunny = (() => {
     } else {
       decoded = number << 1 | 1;
     }
-    return sign === 0 ? decoded : -decoded;
+    return (sign === 0 ? -decoded : decoded) << 3;
   };
 
   // src/media-sink.ts
@@ -26463,7 +26495,7 @@ var Mediabunny = (() => {
         if (customAudioDecoders.some((x) => x.supports(codec, decoderConfig))) {
           return true;
         }
-        if (decoderConfig.codec.startsWith("pcm-")) {
+        if (PCM_AUDIO_CODECS.includes(decoderConfig.codec)) {
           return true;
         } else {
           if (typeof AudioDecoder === "undefined") {
@@ -36596,17 +36628,20 @@ ${cue.notes ?? ""}`;
         const outputView = new DataView(outputBuffer);
         outputs.push({ frameCount, view: outputView });
       }
-      const allocationSize = audioSample.allocationSize({ planeIndex: 0, format: "f32-planar" });
-      const floats = new Float32Array(allocationSize / Float32Array.BYTES_PER_ELEMENT);
+      const isS32 = audioSample.format === "s32" || audioSample.format === "s32-planar";
+      const readFormat = isS32 ? "s32-planar" : "f32-planar";
+      const scale = isS32 ? 1 / 2147483648 : 1;
+      const allocationSize = audioSample.allocationSize({ planeIndex: 0, format: readFormat });
+      const values = isS32 ? new Int32Array(allocationSize / 4) : new Float32Array(allocationSize / 4);
       for (let i = 0; i < numberOfChannels; i++) {
-        audioSample.copyTo(floats, { planeIndex: i, format: "f32-planar" });
+        audioSample.copyTo(values, { planeIndex: i, format: readFormat });
         for (let j = 0; j < outputs.length; j++) {
           const { frameCount, view: view2 } = outputs[j];
           for (let k = 0; k < frameCount; k++) {
             this.writeOutputValue(
               view2,
               (k * numberOfChannels + i) * this.outputSampleSize,
-              floats[j * CHUNK_SIZE + k]
+              values[j * CHUNK_SIZE + k] * scale
             );
           }
         }
@@ -36742,19 +36777,19 @@ ${cue.notes ?? ""}`;
         case 1:
           {
             if (dataType === "unsigned") {
-              this.writeOutputValue = (view2, byteOffset, value) => view2.setUint8(byteOffset, clamp((value + 1) * 127.5, 0, 255));
+              this.writeOutputValue = (view2, byteOffset, value) => view2.setUint8(byteOffset, clamp(Math.round(value * 128) + 128, 0, 255));
             } else if (dataType === "signed") {
               this.writeOutputValue = (view2, byteOffset, value) => {
                 view2.setInt8(byteOffset, clamp(Math.round(value * 128), -128, 127));
               };
             } else if (dataType === "ulaw") {
               this.writeOutputValue = (view2, byteOffset, value) => {
-                const int16 = clamp(Math.floor(value * 32767), -32768, 32767);
+                const int16 = clamp(Math.round(value * 32768), -32768, 32767);
                 view2.setUint8(byteOffset, toUlaw(int16));
               };
             } else if (dataType === "alaw") {
               this.writeOutputValue = (view2, byteOffset, value) => {
-                const int16 = clamp(Math.floor(value * 32767), -32768, 32767);
+                const int16 = clamp(Math.round(value * 32768), -32768, 32767);
                 view2.setUint8(byteOffset, toAlaw(int16));
               };
             } else {
@@ -36766,9 +36801,9 @@ ${cue.notes ?? ""}`;
         case 2:
           {
             if (dataType === "unsigned") {
-              this.writeOutputValue = (view2, byteOffset, value) => view2.setUint16(byteOffset, clamp((value + 1) * 32767.5, 0, 65535), littleEndian);
+              this.writeOutputValue = (view2, byteOffset, value) => view2.setUint16(byteOffset, clamp(Math.round(value * 32768) + 32768, 0, 65535), littleEndian);
             } else if (dataType === "signed") {
-              this.writeOutputValue = (view2, byteOffset, value) => view2.setInt16(byteOffset, clamp(Math.round(value * 32767), -32768, 32767), littleEndian);
+              this.writeOutputValue = (view2, byteOffset, value) => view2.setInt16(byteOffset, clamp(Math.round(value * 32768), -32768, 32767), littleEndian);
             } else {
               assert(false);
             }
@@ -36778,12 +36813,17 @@ ${cue.notes ?? ""}`;
         case 3:
           {
             if (dataType === "unsigned") {
-              this.writeOutputValue = (view2, byteOffset, value) => setUint24(view2, byteOffset, clamp((value + 1) * 83886075e-1, 0, 16777215), littleEndian);
+              this.writeOutputValue = (view2, byteOffset, value) => setUint24(
+                view2,
+                byteOffset,
+                clamp(Math.round(value * 8388608) + 8388608, 0, 16777215),
+                littleEndian
+              );
             } else if (dataType === "signed") {
               this.writeOutputValue = (view2, byteOffset, value) => setInt24(
                 view2,
                 byteOffset,
-                clamp(Math.round(value * 8388607), -8388608, 8388607),
+                clamp(Math.round(value * 8388608), -8388608, 8388607),
                 littleEndian
               );
             } else {
@@ -36795,11 +36835,15 @@ ${cue.notes ?? ""}`;
         case 4:
           {
             if (dataType === "unsigned") {
-              this.writeOutputValue = (view2, byteOffset, value) => view2.setUint32(byteOffset, clamp((value + 1) * 21474836475e-1, 0, 4294967295), littleEndian);
+              this.writeOutputValue = (view2, byteOffset, value) => view2.setUint32(
+                byteOffset,
+                clamp(Math.round(value * 2147483648) + 2147483648, 0, 4294967295),
+                littleEndian
+              );
             } else if (dataType === "signed") {
               this.writeOutputValue = (view2, byteOffset, value) => view2.setInt32(
                 byteOffset,
-                clamp(Math.round(value * 2147483647), -2147483648, 2147483647),
+                clamp(Math.round(value * 2147483648), -2147483648, 2147483647),
                 littleEndian
               );
             } else if (dataType === "float") {
@@ -39984,6 +40028,9 @@ ${cue.notes ?? ""}`;
             "options.copy.boundaryPolicy, when provided, must be 'expand' or 'shrink'."
           );
         }
+        if (options.copy.boundaryTolerance !== void 0 && (!isNumber(options.copy.boundaryTolerance) || options.copy.boundaryTolerance < 0)) {
+          throw new TypeError("options.copy.boundaryTolerance, when provided, must be a non-negative number.");
+        }
       }
       const composable = options.composable ?? false;
       if (!composable) {
@@ -40045,6 +40092,7 @@ ${cue.notes ?? ""}`;
       this._copyMode = options.copy === false ? false : options.copy?.mode ?? "preferred";
       this._copyTimestampShiftTolerance = options.copy === false ? 0 : options.copy?.shiftTolerance ?? 0;
       this._copyBoundaryPolicy = options.copy === false ? "expand" : options.copy?.boundaryPolicy ?? "expand";
+      this._copyBoundaryTolerance = options.copy === false ? Infinity : options.copy?.boundaryTolerance ?? Infinity;
       this._composable = composable;
       this.input = options.input;
       this.output = options.output;
@@ -40514,7 +40562,10 @@ The @mediabunny/mp3-encoder extension package provides support for encoding MP3.
         copyStartPacket = startPacket;
         if (startPacket) {
           const effectiveStartTimestamp = this._copyBoundaryPolicy === "shrink" ? Math.max(startPacket.timestamp, this._startTimestamp) : startPacket.timestamp;
-          if (!this.output.format.supportsTimestampedMediaData) {
+          const boundaryDeviation = this._copyBoundaryPolicy === "shrink" ? effectiveStartTimestamp - this._startTimestamp : Math.max(this._startTimestamp - effectiveStartTimestamp, 0);
+          if (boundaryDeviation > this._copyBoundaryTolerance) {
+            needsTranscode = true;
+          } else if (!this.output.format.supportsTimestampedMediaData) {
             if (this._timestampOffsetAdjusted) {
               const isValid = effectiveStartTimestamp + this._timestampOffset === 0;
               if (!isValid) {
@@ -40565,6 +40616,7 @@ The @mediabunny/mp3-encoder extension package provides support for encoding MP3.
           const sink = new EncodedPacketSink(track);
           const decoderConfig = await track.getDecoderConfig();
           const meta = { decoderConfig: decoderConfig ?? void 0 };
+          let maxTimestamp = null;
           if (copyStartPacket) for await (const packet of sink.packets(
             copyStartPacket,
             void 0,
@@ -40605,10 +40657,16 @@ The @mediabunny/mp3-encoder extension package provides support for encoding MP3.
             }
             packetStartTimestamp += this._timestampOffset;
             packetEndTimestamp += this._timestampOffset;
+            let packetType = packet.type;
+            if (packetType === "key" && maxTimestamp !== null && packetStartTimestamp < maxTimestamp) {
+              packetType = "delta";
+            }
+            maxTimestamp = Math.max(maxTimestamp ?? -Infinity, packetStartTimestamp);
             const modifiedPacket = packet.clone({
               timestamp: packetStartTimestamp,
               duration: packetEndTimestamp - packetStartTimestamp,
-              sideData: alpha === "discard" ? {} : packet.sideData
+              sideData: alpha === "discard" ? {} : packet.sideData,
+              type: packetType
             });
             this._reportProgress(outputTrackId, modifiedPacket.timestamp + modifiedPacket.duration);
             await source.add(modifiedPacket, meta);
@@ -40815,7 +40873,10 @@ The @mediabunny/mp3-encoder extension package provides support for encoding MP3.
         }
         copyStartPacket = startPacket;
         if (startPacket) {
-          if (!this.output.format.supportsTimestampedMediaData) {
+          const boundaryDeviation = this._copyBoundaryPolicy === "shrink" ? Math.max(startPacket.timestamp - this._startTimestamp, 0) : Math.max(this._startTimestamp - startPacket.timestamp, 0);
+          if (boundaryDeviation > this._copyBoundaryTolerance) {
+            needsTranscode = true;
+          } else if (!this.output.format.supportsTimestampedMediaData) {
             if (this._timestampOffsetAdjusted) {
               const isValid = startPacket.timestamp + this._timestampOffset === 0;
               if (!isValid) {