mediabunny 1.45.3 → 1.45.4

package/dist/bundles/mediabunny.cjs

@@ -120,6 +120,7 @@ var Mediabunny = (() => {
     CustomAudioDecoder: () => CustomAudioDecoder,
     CustomAudioEncoder: () => CustomAudioEncoder,
     CustomPathedSource: () => CustomPathedSource,
+    CustomSource: () => CustomSource,
     CustomVideoDecoder: () => CustomVideoDecoder,
     CustomVideoEncoder: () => CustomVideoEncoder,
     EncodedAudioPacketSource: () => EncodedAudioPacketSource,
@@ -2283,7 +2284,7 @@ var Mediabunny = (() => {
   };
 
   // shared/mp3-misc.ts
-  var FRAME_HEADER_SIZE = 4;
+  var MP3_FRAME_HEADER_SIZE = 4;
   var SAMPLING_RATES = [44100, 48e3, 32e3];
   var KILOBIT_RATES = [
     // lowSamplingFrequency === 0
@@ -2551,6 +2552,9 @@ var Mediabunny = (() => {
     }
     return unsynchsafed;
   };
+  var getMp3ChannelCount = (channel) => {
+    return channel === 3 ? 1 : 2;
+  };
 
   // shared/ac3-misc.ts
   var AC3_SAMPLE_RATES = [48e3, 44100, 32e3];
@@ -10880,20 +10884,22 @@ var Mediabunny = (() => {
   };
 
   // src/mp3/mp3-reader.ts
-  var readNextMp3FrameHeader = async (reader, startPos, until) => {
+  var readNextMp3FrameHeader = async (reader, startPos, until, ref = null) => {
     const CHUNK_SIZE = 2 ** 16;
     let currentPos = startPos;
     while (until === null || currentPos < until) {
       const maxLength = until !== null ? Math.min(CHUNK_SIZE, until - currentPos) : CHUNK_SIZE;
-      let slice = reader.requestSliceRange(currentPos, FRAME_HEADER_SIZE, maxLength);
+      let slice = reader.requestSliceRange(currentPos, MP3_FRAME_HEADER_SIZE, maxLength);
       if (slice instanceof Promise) slice = await slice;
-      if (!slice || slice.length < FRAME_HEADER_SIZE) break;
-      while (slice.remainingLength >= FRAME_HEADER_SIZE) {
+      if (!slice || slice.length < MP3_FRAME_HEADER_SIZE) break;
+      while (slice.remainingLength >= MP3_FRAME_HEADER_SIZE) {
         const posBeforeRead = slice.filePos;
         const word = readU32Be(slice);
         const remainingBytes = reader.fileSize !== null ? reader.fileSize - currentPos : null;
         const result = readMp3FrameHeader(word, remainingBytes);
-        if (result.header) {
+        if (result.header && (!ref || // This condition helps us recover malformed streams
+        // https://stackoverflow.com/a/20884944
+        result.header.sampleRate === ref.sampleRate && result.header.mpegVersionId === ref.mpegVersionId && result.header.layer === ref.layer && getMp3ChannelCount(result.header.channel) === getMp3ChannelCount(ref.channel))) {
           return { header: result.header, startPos: currentPos };
         }
         slice.filePos = posBeforeRead + result.bytesAdvanced;
@@ -10948,7 +10954,12 @@ var Mediabunny = (() => {
           this.lastLoadedPos = slice2.filePos + id3V2Header.size;
         }
       }
-      const result = await readNextMp3FrameHeader(this.reader, this.lastLoadedPos, this.reader.fileSize);
+      const result = await readNextMp3FrameHeader(
+        this.reader,
+        this.lastLoadedPos,
+        this.reader.fileSize,
+        this.firstFrameHeader
+      );
       if (!result) {
         this.lastSampleLoaded = true;
         return;
@@ -10982,11 +10993,6 @@ var Mediabunny = (() => {
         this.firstFrameHeader = header;
         this.firstFrameHeaderPos = result.startPos;
       }
-      if (header.sampleRate !== this.firstFrameHeader.sampleRate) {
-        console.warn(
-          `MP3 changed sample rate mid-file: ${this.firstFrameHeader.sampleRate} Hz to ${header.sampleRate} Hz. Might be a bug, so please report this file.`
-        );
-      }
       const sampleDuration = header.audioSamplesInFrame / this.firstFrameHeader.sampleRate;
       const sample = {
         timestamp: this.nextTimestampInSamples / this.firstFrameHeader.sampleRate,
@@ -11113,7 +11119,7 @@ var Mediabunny = (() => {
     }
     getNumberOfChannels() {
       assert(this.demuxer.firstFrameHeader);
-      return this.demuxer.firstFrameHeader.channel === 3 ? 1 : 2;
+      return getMp3ChannelCount(this.demuxer.firstFrameHeader.channel);
     }
     getSampleRate() {
       assert(this.demuxer.firstFrameHeader);
@@ -11128,7 +11134,7 @@ var Mediabunny = (() => {
       assert(this.demuxer.firstFrameHeader);
       return {
         codec: "mp3",
-        numberOfChannels: this.demuxer.firstFrameHeader.channel === 3 ? 1 : 2,
+        numberOfChannels: getMp3ChannelCount(this.demuxer.firstFrameHeader.channel),
         sampleRate: this.demuxer.firstFrameHeader.sampleRate
       };
     }
@@ -13850,7 +13856,7 @@ var Mediabunny = (() => {
                         "Invalid MP3 audio stream; could not read frame header from first packet."
                       );
                     }
-                    elementaryStream.info.numberOfChannels = result.header.channel === 3 ? 1 : 2;
+                    elementaryStream.info.numberOfChannels = getMp3ChannelCount(result.header.channel);
                     elementaryStream.info.sampleRate = result.header.sampleRate;
                   } else if (elementaryStream.info.codec === "ac3") {
                     const frameInfo = parseAc3SyncFrame(context.suppliedPacket.data);
@@ -14914,12 +14920,12 @@ var Mediabunny = (() => {
               }
               this.skip(-1);
               const possibleHeaderStartPos = this.currentPos;
-              let remaining2 = this.ensureBuffered(FRAME_HEADER_SIZE);
+              let remaining2 = this.ensureBuffered(MP3_FRAME_HEADER_SIZE);
               if (remaining2 instanceof Promise) remaining2 = await remaining2;
-              if (remaining2 < FRAME_HEADER_SIZE) {
+              if (remaining2 < MP3_FRAME_HEADER_SIZE) {
                 return;
               }
-              const headerBytes = this.readBytes(FRAME_HEADER_SIZE);
+              const headerBytes = this.readBytes(MP3_FRAME_HEADER_SIZE);
               const word = toDataView(headerBytes).getUint32(0);
               const result = readMp3FrameHeader(word, null);
               if (result.header) {
@@ -15562,9 +15568,15 @@ var Mediabunny = (() => {
   var node = typeof nodeAlias !== "undefined" ? nodeAlias : void 0;
   var DEFAULT_MIN_READ_POSITION = 0;
   var DEFAULT_MAX_READ_POSITION = Infinity;
+  var sourceFinalizationRegistry = null;
+  if (typeof FinalizationRegistry !== "undefined") {
+    sourceFinalizationRegistry = new FinalizationRegistry((cleanup) => {
+      cleanup();
+    });
+  }
   var Source = class extends EventEmitter {
     constructor() {
-      super(...arguments);
+      super();
       /** @internal */
       this._disposed = false;
       /** @internal */
@@ -15574,6 +15586,13 @@ var Mediabunny = (() => {
        * @internal
        */
       this._usedForHls = false;
+      /**
+       * FinalizationRegistry for rogue refs to this source that didn't get freed. It lives on the Source itself so that
+       * in case the Source transitively points back to itself and forms a cycle (for example through a custom
+       * CustomSource callback) that we're not leaking memory.
+       * @internal
+       */
+      this._refFinalizationRegistry = null;
       /** @internal */
       this._sizePromise = null;
       /**
@@ -15582,6 +15601,11 @@ var Mediabunny = (() => {
        * @deprecated Use `source.on('read', ({ start, end }) => ...)` instead.
        */
       this.onread = null;
+      if (typeof FinalizationRegistry !== "undefined") {
+        this._refFinalizationRegistry = new FinalizationRegistry((source) => {
+          source._decrementRefCount();
+        });
+      }
     }
     /**
      * Resolves with the total size of the file in bytes. This function is memoized, meaning only the first call
@@ -15647,6 +15671,18 @@ var Mediabunny = (() => {
     ref() {
       return new SourceRef(this);
     }
+    /** @internal */
+    _incrementRefCount() {
+      this._refCount++;
+    }
+    /** @internal */
+    _decrementRefCount() {
+      this._refCount--;
+      if (this._refCount === 0) {
+        this._dispose();
+        this._disposed = true;
+      }
+    }
   };
   var SourceRef = class {
     /** @internal */
@@ -15656,7 +15692,8 @@ var Mediabunny = (() => {
       if (source._disposed) {
         throw new Error("Cannot ref a disposed source.");
       }
-      source._refCount++;
+      source._incrementRefCount();
+      source._refFinalizationRegistry?.register(this, source, this);
       this._source = source;
     }
     /** The {@link Source} this ref references. Accessing this field throws an error after having freed the ref. */
@@ -15680,11 +15717,8 @@ var Mediabunny = (() => {
       }
       const source = this.source;
       assert(source._refCount > 0);
-      source._refCount--;
-      if (source._refCount === 0) {
-        source._dispose();
-        source._disposed = true;
-      }
+      source._decrementRefCount();
+      source._refFinalizationRegistry?.unregister(this);
       this._freed = true;
       this._source = null;
     }
@@ -16110,10 +16144,14 @@ var Mediabunny = (() => {
       super(filePath, (request) => new _FilePathSource(request.path, options));
       /** @internal */
       this._fileHandle = null;
-      this._streamSource = new StreamSource({
+      this._customSource = new CustomSource({
         getSize: async () => {
-          this._fileHandle = await node.fs.open(filePath, "r");
-          const stats = await this._fileHandle.stat();
+          const fileHandle = await node.fs.open(filePath, "r");
+          this._fileHandle = fileHandle;
+          sourceFinalizationRegistry?.register(this, () => {
+            void fileHandle.close();
+          }, this);
+          const stats = await fileHandle.stat();
           return stats.size;
         },
         read: async (start, end) => {
@@ -16128,21 +16166,24 @@ var Mediabunny = (() => {
     }
     /** @internal */
     _read(start, end, minReadPosition, maxReadPosition) {
-      return this._streamSource._read(start, end, minReadPosition, maxReadPosition);
+      return this._customSource._read(start, end, minReadPosition, maxReadPosition);
     }
     /** @internal */
     _getFileSize() {
-      return this._streamSource._getFileSize();
+      return this._customSource._getFileSize();
     }
     /** @internal */
     _dispose() {
-      this._streamSource._dispose();
-      void this._fileHandle?.close();
-      this._fileHandle = null;
+      this._customSource._dispose();
+      if (this._fileHandle) {
+        void this._fileHandle.close();
+        this._fileHandle = null;
+        sourceFinalizationRegistry?.unregister(this);
+      }
     }
   };
-  var StreamSource = class extends Source {
-    /** Creates a new {@link StreamSource} whose behavior is specified by `options`.  */
+  var CustomSource = class extends Source {
+    /** Creates a new {@link CustomSource} whose behavior is specified by `options`.  */
     constructor(options) {
       if (!options || typeof options !== "object") {
         throw new TypeError("options must be an object.");
@@ -16253,6 +16294,7 @@ var Mediabunny = (() => {
       this._options.dispose?.();
     }
   };
+  var StreamSource = CustomSource;
   var ReadableStreamSource = class extends Source {
     /** Creates a new {@link ReadableStreamSource} backed by the specified `ReadableStream<Uint8Array>`. */
     constructor(stream, options = {}) {
@@ -18449,7 +18491,11 @@ var Mediabunny = (() => {
         return true;
       }
       currentPos = firstResult.startPos + firstResult.header.totalSize;
-      const secondResult = await readNextMp3FrameHeader(input._reader, currentPos, currentPos + FRAME_HEADER_SIZE);
+      const secondResult = await readNextMp3FrameHeader(
+        input._reader,
+        currentPos,
+        currentPos + MP3_FRAME_HEADER_SIZE
+      );
       if (!secondResult) {
         return false;
       }
@@ -24050,16 +24096,6 @@ var Mediabunny = (() => {
   polyfillSymbolDispose();
   var DEFAULT_SOURCE_CACHE_GROUP = 1;
   var ENCRYPTION_KEY_CACHE_GROUP = 2;
-  var inputFinalizationRegistry = null;
-  if (typeof FinalizationRegistry !== "undefined") {
-    inputFinalizationRegistry = new FinalizationRegistry((refs) => {
-      for (const ref of refs) {
-        if (!ref.freed) {
-          ref.free();
-        }
-      }
-    });
-  }
   var Input = class _Input extends EventEmitter {
     /**
      * Creates a new input file from the specified options. No reading operations will be performed until methods are
@@ -24114,7 +24150,6 @@ var Mediabunny = (() => {
         this._rootRef = options.source;
       }
       this._sourceRefs.push(this._rootRef);
-      inputFinalizationRegistry?.register(this, this._sourceRefs, this);
     }
     /** True if the input has been disposed. */
     get disposed() {
@@ -24402,7 +24437,6 @@ var Mediabunny = (() => {
         ref.free();
       }
       this._sourceRefs.length = 0;
-      inputFinalizationRegistry?.unregister(this);
       void this._demuxerPromise?.then((demuxer) => demuxer.dispose());
     }
     /**
@@ -24918,7 +24952,7 @@ var Mediabunny = (() => {
     const yearText = readId3V1String(slice, 4);
     const year = Number.parseInt(yearText, 10);
     if (Number.isInteger(year) && year > 0) {
-      tags.date ??= new Date(year, 0, 1);
+      tags.date ??= new Date(String(year));
     }
     const commentBytes = readBytes(slice, 30);
     let comment;
@@ -25138,7 +25172,7 @@ var Mediabunny = (() => {
             const yearText = reader.readId3V2EncodingAndText(frameEndPos);
             const year = Number.parseInt(yearText, 10);
             if (Number.isInteger(year)) {
-              tags.date ??= new Date(year, 0, 1);
+              tags.date ??= new Date(String(year));
             }
           }
           ;