mediabunny 1.58.1 → 1.59.1

package/dist/bundles/mediabunny.cjs

@@ -1491,6 +1491,9 @@ var Mediabunny = (() => {
     if (tags.date !== void 0 && (!(tags.date instanceof Date) || Number.isNaN(tags.date.getTime()))) {
       throw new TypeError("tags.date, when provided, must be a valid Date.");
     }
+    if (tags.beatsPerMinute !== void 0 && (!Number.isInteger(tags.beatsPerMinute) || tags.beatsPerMinute <= 0)) {
+      throw new TypeError("tags.beatsPerMinute, when provided, must be a positive integer.");
+    }
     if (tags.lyrics !== void 0 && typeof tags.lyrics !== "string") {
       throw new TypeError("tags.lyrics, when provided, must be a string.");
     }
@@ -1530,7 +1533,7 @@ var Mediabunny = (() => {
     }
   };
   var metadataTagsAreEmpty = (tags) => {
-    return tags.title === void 0 && tags.description === void 0 && tags.artist === void 0 && tags.album === void 0 && tags.albumArtist === void 0 && tags.trackNumber === void 0 && tags.tracksTotal === void 0 && tags.discNumber === void 0 && tags.discsTotal === void 0 && tags.genre === void 0 && tags.date === void 0 && tags.lyrics === void 0 && (!tags.images || tags.images.length === 0) && tags.comment === void 0 && (tags.raw === void 0 || Object.keys(tags.raw).length === 0);
+    return tags.title === void 0 && tags.description === void 0 && tags.artist === void 0 && tags.album === void 0 && tags.albumArtist === void 0 && tags.trackNumber === void 0 && tags.tracksTotal === void 0 && tags.discNumber === void 0 && tags.discsTotal === void 0 && tags.genre === void 0 && tags.beatsPerMinute === void 0 && tags.date === void 0 && tags.lyrics === void 0 && (!tags.images || tags.images.length === 0) && tags.comment === void 0 && (tags.raw === void 0 || Object.keys(tags.raw).length === 0);
   };
   var DEFAULT_TRACK_DISPOSITION = {
     default: true,
@@ -3814,6 +3817,15 @@ var Mediabunny = (() => {
           }
           ;
           break;
+        case "BPM":
+          {
+            const bpm = Number.parseInt(value, 10);
+            if (Number.isInteger(bpm) && bpm > 0) {
+              metadataTags.beatsPerMinute ??= bpm;
+            }
+          }
+          ;
+          break;
         case "GENRE":
           {
             metadataTags.genre ??= value;
@@ -3953,6 +3965,12 @@ var Mediabunny = (() => {
           }
           ;
           break;
+        case "beatsPerMinute":
+          {
+            addCommentTag("BPM", value.toString());
+          }
+          ;
+          break;
         case "images":
           {
             if (!writeImages) {
@@ -8592,6 +8610,17 @@ var Mediabunny = (() => {
                   }
                   ;
                   break;
+                case "tmpo":
+                  {
+                    if (data instanceof Uint8Array && data.length >= 2) {
+                      const bpm = toDataView(data).getInt16(0, false);
+                      if (bpm > 0) {
+                        this.metadataTags.beatsPerMinute ??= bpm;
+                      }
+                    }
+                  }
+                  ;
+                  break;
                 case "covr":
                 case "com.apple.quicktime.artwork":
                   {
@@ -9099,7 +9128,6 @@ var Mediabunny = (() => {
     constructor(internalTrack) {
       super(internalTrack);
       this.decoderConfigPromise = null;
-      this.internalTrack = internalTrack;
     }
     getType() {
       return "video";
@@ -9198,7 +9226,6 @@ var Mediabunny = (() => {
     constructor(internalTrack) {
       super(internalTrack);
       this.decoderConfigPromise = null;
-      this.internalTrack = internalTrack;
     }
     getType() {
       return "audio";
@@ -10251,6 +10278,7 @@ var Mediabunny = (() => {
       };
       this.segments.push(this.currentSegment);
       let currentPos = segmentDataStart;
+      const visitedSeekHeadPositions = /* @__PURE__ */ new Set();
       while (this.currentSegment.elementEndPos === null || currentPos < this.currentSegment.elementEndPos) {
         let slice = this.reader.requestSliceRange(currentPos, MIN_HEADER_SIZE, MAX_HEADER_SIZE);
         if (isThenable(slice)) slice = await slice;
@@ -10277,6 +10305,9 @@ var Mediabunny = (() => {
         if (metadataElementIndex !== -1) {
           const field = METADATA_ELEMENTS[metadataElementIndex].flag;
           this.currentSegment[field] = true;
+          if (id === 290298740 /* SeekHead */) {
+            visitedSeekHeadPositions.add(elementStartPos - segmentDataStart);
+          }
           assertDefinedSize(size);
           let slice2 = this.reader.requestSlice(dataStartPos, size);
           if (isThenable(slice2)) slice2 = await slice2;
@@ -10305,6 +10336,32 @@ var Mediabunny = (() => {
           currentPos = dataStartPos + size;
         }
       }
+      if (this.reader.fileSize !== null) {
+        while (true) {
+          const seekEntry = this.currentSegment.seekEntries.find(
+            (x) => x.id === 290298740 /* SeekHead */ && !visitedSeekHeadPositions.has(x.segmentPosition)
+          );
+          if (!seekEntry) {
+            break;
+          }
+          visitedSeekHeadPositions.add(seekEntry.segmentPosition);
+          let slice = this.reader.requestSliceRange(
+            segmentDataStart + seekEntry.segmentPosition,
+            MIN_HEADER_SIZE,
+            MAX_HEADER_SIZE
+          );
+          if (isThenable(slice)) slice = await slice;
+          if (!slice) continue;
+          const header = readElementHeader(slice);
+          if (!header || header.id !== 290298740 /* SeekHead */) continue;
+          const { size } = header;
+          assertDefinedSize(size);
+          let dataSlice = this.reader.requestSlice(slice.filePos, size);
+          if (isThenable(dataSlice)) dataSlice = await dataSlice;
+          if (!dataSlice) continue;
+          this.readContiguousElements(dataSlice);
+        }
+      }
       this.currentSegment.seekEntries.sort((a, b) => a.segmentPosition - b.segmentPosition);
       if (this.reader.fileSize !== null) {
         for (const seekEntry of this.currentSegment.seekEntries) {
@@ -11608,6 +11665,15 @@ var Mediabunny = (() => {
             }
             ;
             break;
+          case "bpm":
+            {
+              const bpm = Number.parseInt(value, 10);
+              if (Number.isInteger(bpm) && bpm > 0) {
+                metadataTags.beatsPerMinute ??= bpm;
+              }
+            }
+            ;
+            break;
           case "comment":
             {
               metadataTags.comment ??= value;
@@ -12060,7 +12126,6 @@ var Mediabunny = (() => {
     constructor(internalTrack) {
       super(internalTrack);
       this.decoderConfigPromise = null;
-      this.internalTrack = internalTrack;
     }
     getType() {
       return "video";
@@ -12154,7 +12219,6 @@ var Mediabunny = (() => {
     constructor(internalTrack) {
       super(internalTrack);
       this.decoderConfigPromise = null;
-      this.internalTrack = internalTrack;
     }
     getType() {
       return "audio";
@@ -19574,16 +19638,6 @@ var Mediabunny = (() => {
             return;
           }
         }
-        const videoGroupIds = [
-          ...new Set(
-            mediaTags.filter((tag) => tag.attributes.get("type").toLowerCase() === "video").map((tag) => tag.attributes.get("group-id"))
-          )
-        ];
-        const audioGroupIds = [
-          ...new Set(
-            mediaTags.filter((tag) => tag.attributes.get("type").toLowerCase() === "audio").map((tag) => tag.attributes.get("group-id"))
-          )
-        ];
         const internalTracksByVariant = await Promise.all(variantStreams.map(async (variantStream, i) => {
           const result = [];
           const codecsList = variantStream.attributes.get("codecs");
@@ -19609,11 +19663,6 @@ var Mediabunny = (() => {
             (x) => AUDIO_CODECS.includes(inferCodecFromCodecString(x))
           );
           if (videoGroupId !== null && !containsVideoCodecs) {
-            if (!videoGroupIds.includes(videoGroupId)) {
-              throw new Error(
-                `Invalid M3U8 file; variant stream references video group "${videoGroupId}" which is not defined in any #EXT-X-MEDIA tags.`
-              );
-            }
             const matchingVideoMediaTag = mediaTags.find((mediaTag) => {
               const groupId = mediaTag.attributes.get("group-id");
               const type = mediaTag.attributes.get("type");
@@ -19638,11 +19687,6 @@ var Mediabunny = (() => {
               }
           }
           if (audioGroupId !== null && !containsAudioCodecs) {
-            if (!audioGroupIds.includes(audioGroupId)) {
-              throw new Error(
-                `Invalid M3U8 file; variant stream references audio group "${audioGroupId}" which is not defined in any #EXT-X-MEDIA tags.`
-              );
-            }
             const matchingAudioMediaTag = mediaTags.find((tag) => {
               const groupId = tag.attributes.get("group-id");
               const type = tag.attributes.get("type");
@@ -19719,11 +19763,6 @@ var Mediabunny = (() => {
                   }
                 });
               } else {
-                if (!videoGroupIds.includes(videoGroupId2)) {
-                  throw new Error(
-                    `Invalid M3U8 file; variant stream references video group "${videoGroupId2}" which is not defined in any #EXT-X-MEDIA tags.`
-                  );
-                }
                 for (const mediaTag of mediaTags) {
                   const groupId = mediaTag.attributes.get("group-id");
                   const type = mediaTag.attributes.get("type");
@@ -19752,8 +19791,8 @@ var Mediabunny = (() => {
                     fullPath: mediaTag.fullPath ?? variantStream.fullPath,
                     fullCodecString: videoCodecString,
                     pairingMask: 1n << BigInt(i),
-                    peakBitrate: null,
-                    averageBitrate: null,
+                    peakBitrate: mediaTag.fullPath === null ? bandwidth : null,
+                    averageBitrate: mediaTag.fullPath === null ? averageBandwidth : null,
                     name: mediaTag.attributes.get("name"),
                     hasOnlyKeyPackets: variantStream.hasOnlyKeyPackets,
                     info: {
@@ -19796,11 +19835,6 @@ var Mediabunny = (() => {
                   }
                 });
               } else {
-                if (!audioGroupIds.includes(audioGroupId2)) {
-                  throw new Error(
-                    `Invalid M3U8 file; variant stream references audio group "${audioGroupId2}" which is not defined in any #EXT-X-MEDIA tags.`
-                  );
-                }
                 for (const mediaTag of mediaTags) {
                   const groupId = mediaTag.attributes.get("group-id");
                   const type = mediaTag.attributes.get("type");
@@ -19821,8 +19855,8 @@ var Mediabunny = (() => {
                     fullPath: mediaTag.fullPath ?? variantStream.fullPath,
                     fullCodecString: audioCodecString,
                     pairingMask: 1n << BigInt(i),
-                    peakBitrate: null,
-                    averageBitrate: null,
+                    peakBitrate: mediaTag.fullPath === null ? bandwidth : null,
+                    averageBitrate: mediaTag.fullPath === null ? averageBandwidth : null,
                     name: mediaTag.attributes.get("name"),
                     hasOnlyKeyPackets: variantStream.hasOnlyKeyPackets,
                     info: {
@@ -26088,7 +26122,6 @@ var Mediabunny = (() => {
       super(input, backing);
       /** @internal */
       this._pixelAspectRatioCache = null;
-      this._backing = backing;
     }
     get type() {
       return "video";
@@ -26427,7 +26460,6 @@ var Mediabunny = (() => {
     /** @internal */
     constructor(input, backing) {
       super(input, backing);
-      this._backing = backing;
     }
     get type() {
       return "audio";
@@ -27907,6 +27939,17 @@ var Mediabunny = (() => {
           }
           ;
           break;
+        case "TBPM":
+        case "TBP":
+          {
+            const bpmText = reader.readId3V2EncodingAndText(frameEndPos);
+            const bpm = Number.parseInt(bpmText, 10);
+            if (Number.isInteger(bpm)) {
+              tags.beatsPerMinute ??= bpm;
+            }
+          }
+          ;
+          break;
         case "USLT":
         case "ULT":
           {
@@ -28236,6 +28279,13 @@ var Mediabunny = (() => {
             }
             ;
             break;
+          case "beatsPerMinute":
+            {
+              this.writeId3V2TextFrame("TBPM", `${value}`);
+              writtenTags.add("TBPM");
+            }
+            ;
+            break;
           case "lyrics":
             {
               this.writeId3V2LyricsFrame(value);
@@ -30255,6 +30305,7 @@ var Mediabunny = (() => {
         case "discsTotal":
         case "trackNumber":
         case "tracksTotal":
+        case "beatsPerMinute":
         case "images":
           {
           }
@@ -30337,6 +30388,20 @@ var Mediabunny = (() => {
           }
           ;
           break;
+        case "beatsPerMinute":
+          {
+            if (!isMdta) {
+              pairs.push({ key: "tmpo", value: box("data", [
+                u32(21),
+                // Type indicator
+                u32(0),
+                // Locale indicator
+                u16(value)
+              ]) });
+            }
+          }
+          ;
+          break;
         case "lyrics":
           {
             pairs.push({ key: isMdta ? "lyrics" : "\xA9lyr", value: dataStringBoxLong(value) });
@@ -32800,6 +32865,13 @@ var Mediabunny = (() => {
             }
             ;
             break;
+          case "beatsPerMinute":
+            {
+              addSimpleTag("BPM", value.toString());
+              writtenTags.add("BPM");
+            }
+            ;
+            break;
           case "comment":
             {
               addSimpleTag("COMMENT", value);
@@ -34904,6 +34976,7 @@ ${cue.notes ?? ""}`;
           case "discNumber":
           case "tracksTotal":
           case "discsTotal":
+          case "beatsPerMinute":
           case "description":
           case "lyrics":
           case "images":
@@ -34999,7 +35072,6 @@ ${cue.notes ?? ""}`;
       this.onSample = options.onSample;
       this.bufferSizeInFrames = Math.floor(this.targetSampleRate * 5);
       this.bufferSizeInSamples = this.bufferSizeInFrames * this.targetNumberOfChannels;
-      this.outputBuffer = new Float32Array(this.bufferSizeInSamples);
     }
     /**
      * Sets up the channel mixer to handle up/downmixing in the case where input and output channel counts don't match.
@@ -35090,6 +35162,11 @@ ${cue.notes ?? ""}`;
         this.sourceSampleRate = audioSample.sampleRate;
         this.sourceNumberOfChannels = audioSample.numberOfChannels;
         this.startTime = audioSample.timestamp;
+        const overflowFrames = Math.ceil(this.targetSampleRate / this.sourceSampleRate);
+        this.bufferCapacityInFrames = this.bufferSizeInFrames + overflowFrames;
+        this.outputBuffer = new Float32Array(
+          this.bufferCapacityInFrames * this.targetNumberOfChannels
+        );
         this.tempSourceBuffer = new Float32Array(this.sourceSampleRate * this.sourceNumberOfChannels);
         this.doChannelMixerSetup();
       }
@@ -35107,12 +35184,12 @@ ${cue.notes ?? ""}`;
         if (outputFrame < this.bufferStartFrame) {
           continue;
         }
-        while (outputFrame >= this.bufferStartFrame + this.bufferSizeInFrames) {
+        while (outputFrame >= this.bufferStartFrame + this.bufferCapacityInFrames) {
           await this.finalizeCurrentBuffer();
           this.bufferStartFrame += this.bufferSizeInFrames;
         }
         const bufferFrameIndex = outputFrame - this.bufferStartFrame;
-        assert(bufferFrameIndex < this.bufferSizeInFrames);
+        assert(bufferFrameIndex < this.bufferCapacityInFrames);
         const outputTime = outputFrame / this.targetSampleRate;
         const inputTime = outputTime - inputStartTime;
         const sourcePosition = inputTime * this.sourceSampleRate;
@@ -35144,7 +35221,7 @@ ${cue.notes ?? ""}`;
         return;
       }
       assert(this.startTime !== null);
-      const samplesWritten = (this.maxWrittenFrame + 1) * this.targetNumberOfChannels;
+      const samplesWritten = Math.min(this.maxWrittenFrame + 1, this.bufferSizeInFrames) * this.targetNumberOfChannels;
       const outputData = new Float32Array(samplesWritten);
       outputData.set(this.outputBuffer.subarray(0, samplesWritten));
       const audioSample = new AudioSample({
@@ -35155,11 +35232,15 @@ ${cue.notes ?? ""}`;
         data: outputData
       });
       await this.onSample(audioSample);
-      this.outputBuffer.fill(0);
-      this.maxWrittenFrame = null;
+      this.outputBuffer.copyWithin(0, this.bufferSizeInSamples);
+      this.outputBuffer.fill(0, this.outputBuffer.length - this.bufferSizeInSamples);
+      this.maxWrittenFrame = this.maxWrittenFrame >= this.bufferSizeInFrames ? this.maxWrittenFrame - this.bufferSizeInFrames : null;
     }
-    finalize() {
-      return this.finalizeCurrentBuffer();
+    async finalize() {
+      while (this.maxWrittenFrame !== null) {
+        await this.finalizeCurrentBuffer();
+        this.bufferStartFrame += this.bufferSizeInFrames;
+      }
     }
   };
 
@@ -35240,8 +35321,6 @@ ${cue.notes ?? ""}`;
     /** Internal constructor. */
     constructor(codec) {
       super();
-      /** @internal */
-      this._connectedTrack = null;
       if (!VIDEO_CODECS.includes(codec)) {
         throw new TypeError(`Invalid video codec '${codec}'. Must be one of: ${VIDEO_CODECS.join(", ")}.`);
       }
@@ -36382,8 +36461,6 @@ ${cue.notes ?? ""}`;
     /** Internal constructor. */
     constructor(codec) {
       super();
-      /** @internal */
-      this._connectedTrack = null;
       if (!AUDIO_CODECS.includes(codec)) {
         throw new TypeError(`Invalid audio codec '${codec}'. Must be one of: ${AUDIO_CODECS.join(", ")}.`);
       }
@@ -37264,8 +37341,6 @@ ${cue.notes ?? ""}`;
     /** Internal constructor. */
     constructor(codec) {
       super();
-      /** @internal */
-      this._connectedTrack = null;
       if (!SUBTITLE_CODECS.includes(codec)) {
         throw new TypeError(`Invalid subtitle codec '${codec}'. Must be one of: ${SUBTITLE_CODECS.join(", ")}.`);
       }
@@ -40927,6 +41002,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)) {
             if (this._state === "canceled") {
               break;
@@ -40937,8 +41013,13 @@ The @mediabunny/mp3-encoder extension package provides support for encoding MP3.
             if (this._copyBoundaryPolicy === "shrink" && packet.timestamp + packet.duration > this._endTimestamp) {
               break;
             }
+            const packetTimestamp = packet.timestamp + this._timestampOffset;
+            if (maxTimestamp !== null && packetTimestamp < maxTimestamp) {
+              continue;
+            }
+            maxTimestamp = packetTimestamp;
             const modifiedPacket = packet.clone({
-              timestamp: packet.timestamp + this._timestampOffset,
+              timestamp: packetTimestamp,
               duration: packet.duration
             });
             this._reportProgress(outputTrackId, modifiedPacket.timestamp + modifiedPacket.duration);