mediabunny 1.59.0 → 1.60.0

package/dist/bundles/mediabunny.cjs

@@ -5403,7 +5403,7 @@ var Mediabunny = (() => {
       return "mp3";
     } else if (codecString.startsWith("mp4a.40.") || codecString === "mp4a.67") {
       return "aac";
-    } else if (codecString === "opus") {
+    } else if (codecString === "opus" || codecString === "Opus") {
       return "opus";
     } else if (codecString === "vorbis") {
       return "vorbis";
@@ -10278,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;
@@ -10304,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;
@@ -10332,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) {
@@ -11698,21 +11728,11 @@ var Mediabunny = (() => {
         }
       }
     }
-    async getDurationFromMetadata(segment) {
+    getDurationFromMetadata(segment) {
       if (segment.duration <= 0) {
         return null;
       }
-      let minTimestamp = null;
-      for (const track of segment.tracks) {
-        assert(track.trackBacking);
-        const firstPacket = await track.trackBacking.getFirstPacket({ metadataOnly: true });
-        if (firstPacket) {
-          minTimestamp = Math.min(minTimestamp ?? Infinity, firstPacket.timestamp);
-        }
-      }
-      let endTimestamp = segment.duration / segment.timestampFactor;
-      endTimestamp += minTimestamp ?? 0;
-      return endTimestamp;
+      return segment.duration / segment.timestampFactor;
     }
   };
   var MatroskaTrackBacking = class {
@@ -32557,7 +32577,7 @@ var Mediabunny = (() => {
         { id: 17138 /* EBMLMaxIDLength */, data: 4 },
         { id: 17139 /* EBMLMaxSizeLength */, data: 8 },
         { id: 17026 /* DocType */, data: this.format instanceof WebMOutputFormat ? "webm" : "matroska" },
-        { id: 17031 /* DocTypeVersion */, data: 2 },
+        { id: 17031 /* DocTypeVersion */, data: 4 },
         { id: 17029 /* DocTypeReadVersion */, data: 2 }
       ] };
       this.ebmlWriter.writeEBML(ebmlHeader);
@@ -32580,14 +32600,6 @@ var Mediabunny = (() => {
       const kaxAttachments = new Uint8Array([25, 65, 164, 105]);
       const kaxTags = new Uint8Array([18, 84, 195, 103]);
       const seekHead = { id: 290298740 /* SeekHead */, data: [
-        { id: 19899 /* Seek */, data: [
-          { id: 21419 /* SeekID */, data: kaxCues },
-          {
-            id: 21420 /* SeekPosition */,
-            size: 5,
-            data: writeOffsets ? this.ebmlWriter.offsets.get(this.cues) - this.segmentDataOffset : 0
-          }
-        ] },
         { id: 19899 /* Seek */, data: [
           { id: 21419 /* SeekID */, data: kaxInfo },
           {
@@ -32619,7 +32631,15 @@ var Mediabunny = (() => {
             size: 5,
             data: writeOffsets ? this.ebmlWriter.offsets.get(this.tagsElement) - this.segmentDataOffset : 0
           }
-        ] } : null
+        ] } : null,
+        { id: 19899 /* Seek */, data: [
+          { id: 21419 /* SeekID */, data: kaxCues },
+          {
+            id: 21420 /* SeekPosition */,
+            size: 5,
+            data: writeOffsets ? this.ebmlWriter.offsets.get(this.cues) - this.segmentDataOffset : 0
+          }
+        ] }
       ] };
       this.seekHead = seekHead;
     }
@@ -32671,8 +32691,7 @@ var Mediabunny = (() => {
           { 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 },
+          seekPreRollNs > 0 ? { id: 22203 /* SeekPreRoll */, data: seekPreRollNs } : null,
           trackData.track.metadata.name !== void 0 ? { id: 21358 /* Name */, data: new EBMLUnicodeString(trackData.track.metadata.name) } : null,
           trackData.type === "video" ? this.videoSpecificTrackInfo(trackData) : null,
           trackData.type === "audio" ? this.audioSpecificTrackInfo(trackData) : null,
@@ -33070,7 +33089,7 @@ var Mediabunny = (() => {
           height: meta.decoderConfig.codedHeight,
           aspectRatio,
           decoderConfig: meta.decoderConfig,
-          alphaMode: packet ? !!packet.sideData.alpha : null
+          alphaMode: track.metadata.canBeTransparent || (packet ? !!packet.sideData.alpha : null)
         },
         chunkQueue: [],
         lastWrittenMsTimestamp: null,
@@ -33497,7 +33516,7 @@ ${cue.notes ?? ""}`;
         const segmentSize = this.writer.getPos() - this.segmentDataOffset;
         this.writer.seek(this.ebmlWriter.offsets.get(this.segment) + 4);
         this.ebmlWriter.writeVarInt(segmentSize, SEGMENT_SIZE_BYTES);
-        const duration = this.startTimestamp === Infinity ? 0 : this.endTimestamp - this.startTimestamp;
+        const duration = this.startTimestamp === Infinity ? 0 : this.endTimestamp;
         this.segmentDuration.data = new EBMLFloat64(duration);
         this.writer.seek(this.ebmlWriter.offsets.get(this.segmentDuration));
         this.ebmlWriter.writeEBML(this.segmentDuration);
@@ -37374,6 +37393,12 @@ ${cue.notes ?? ""}`;
   };
 
   // src/hls/hls-muxer.ts
+  var toHlsCodecString = (codecString) => {
+    if (codecString === "opus") {
+      return "Opus";
+    }
+    return codecString;
+  };
   var HlsMuxer = class extends Muxer {
     constructor(output, format) {
       if (!(output._target instanceof PathedTarget)) {
@@ -38256,8 +38281,31 @@ ${cue.notes ?? ""}`;
       for (const segment of segments) {
         totalBits += 8 * segment.byteSize;
       }
+      let averageBitrate = totalBits / (totalDuration || 1);
+      if (segments.length === 0) {
+        for (const track of playlist.tracks) {
+          const trackData = this.trackDatas.find((x) => x.track === track);
+          let trackPeakBitrate = track.source._nominalBitrate ?? track.metadata.bitrate ?? 0;
+          averageBitrate += track.source._nominalBitrate ?? track.metadata.averageBitrate ?? 0;
+          if (trackPeakBitrate === 0) {
+            const mediumQuality = new Quality("medium");
+            if (track.isVideoTrack()) {
+              const decoderConfig = trackData?.info.decoderConfig;
+              trackPeakBitrate = mediumQuality._toVideoBitrate(
+                track.source._codec,
+                decoderConfig?.codedWidth ?? 1920,
+                // Need to assume a resolution
+                decoderConfig?.codedHeight ?? 1080
+              );
+            } else if (track.isAudioTrack()) {
+              trackPeakBitrate = mediumQuality._toAudioBitrate(track.source._codec) ?? 0;
+            }
+          }
+          peakBitrate += trackPeakBitrate;
+        }
+      }
       playlist.peakBitrate = peakBitrate;
-      playlist.averageBitrate = totalBits / (totalDuration || 1);
+      playlist.averageBitrate = averageBitrate;
     }
     async writePlaylist(playlist) {
       assert(this.output._target instanceof PathedTarget);
@@ -38316,7 +38364,7 @@ ${cue.notes ?? ""}`;
           for (const track of decl.playlist.tracks) {
             const trackData = this.trackDatas.find((x) => x.track === track);
             const codecString = trackData?.info.decoderConfig.codec ?? track.source._codec;
-            codecs.push(codecString);
+            codecs.push(toHlsCodecString(codecString));
           }
           let peakDeclBitrate = 0;
           let maxRefAverageBitrate = 0;
@@ -38325,7 +38373,7 @@ ${cue.notes ?? ""}`;
             const firstTrack = firstRef.playlist.tracks[0];
             const trackData = this.trackDatas.find((x) => x.track === firstTrack);
             const codecString = trackData?.info.decoderConfig.codec ?? firstTrack.source._codec;
-            codecs.push(codecString);
+            codecs.push(toHlsCodecString(codecString));
             for (const ref of decl.references) {
               assert(ref.playlist.peakBitrate !== null);
               peakDeclBitrate = Math.max(peakDeclBitrate, ref.playlist.peakBitrate);
@@ -39554,6 +39602,12 @@ ${cue.notes ?? ""}`;
           `Invalid video frame rate: ${metadata.frameRate}. Must be a positive number.`
         );
       }
+      if (metadata.hasOnlyKeyPackets !== void 0 && typeof metadata.hasOnlyKeyPackets !== "boolean") {
+        throw new TypeError("metadata.hasOnlyKeyPackets, when provided, must be a boolean.");
+      }
+      if (metadata.canBeTransparent !== void 0 && typeof metadata.canBeTransparent !== "boolean") {
+        throw new TypeError("metadata.canBeTransparent, when provided, must be a boolean.");
+      }
       if (metadata.decoderConfig !== void 0) {
         validateVideoChunkMetadata({ decoderConfig: metadata.decoderConfig }, source._codec);
       }
@@ -40865,6 +40919,7 @@ The @mediabunny/mp3-encoder extension package provides support for encoding MP3.
       const trackDisposition = await track.getDisposition();
       const bitrate = needsTranscode ? null : await track.getBitrate();
       const averageBitrate = needsTranscode ? null : await track.getAverageBitrate();
+      const canBeTransparent = alpha === "keep" && await track.canBeTransparent();
       this.output.addVideoTrack(videoSource, {
         frameRate: trackOptions.frameRate,
         // TODO: This condition can be removed when all demuxers properly homogenize to BCP47 in v2
@@ -40874,6 +40929,7 @@ The @mediabunny/mp3-encoder extension package provides support for encoding MP3.
         rotation: outputTrackRotation,
         flip: outputTrackFlip,
         transformationMatrix: outputTrackMatrix ?? void 0,
+        canBeTransparent,
         group: ownGroup ?? trackOptions.group,
         bitrate: bitrate ?? void 0,
         averageBitrate: averageBitrate ?? void 0
@@ -40972,6 +41028,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;
@@ -40982,8 +41039,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);