mediabunny 1.34.1 → 1.34.3

package/README.md

@@ -34,15 +34,15 @@ Mediabunny is a JavaScript library for reading, writing, and converting media fi
   <a href="https://kino.ai/" target="_blank" rel="sponsored">
     <img src="./docs/public/sponsors/kino.jpg" width="60" height="60" alt="Kino">
   </a>
+  &nbsp;&nbsp;&nbsp;&nbsp;
+  <a href="https://screen.studio/" target="_blank" rel="sponsored">
+    <img src="./docs/public/sponsors/screen-studio.webp" width="60" height="60" alt="Screen Studio">
+  </a>
 </div>
 
 ### Silver sponsors
 
 <div align="center">
-  <a href="https://pqina.nl/pintura/" target="_blank" rel="sponsored">
-    <img src="./docs/public/sponsors/pintura-labs.png" width="50" height="50" alt="Pintura Labs">
-  </a>
-  &nbsp;&nbsp;&nbsp;&nbsp;
   <a href="https://ponder.ai/" target="_blank" rel="sponsored">
     <img src="./docs/public/sponsors/ponder.png" width="50" height="50" alt="Ponder">
   </a>

package/dist/bundles/mediabunny.cjs

@@ -14057,8 +14057,12 @@ var Mediabunny = (() => {
       if (!slice) return;
       const id3V2Header = readId3V2Header(slice);
       if (id3V2Header) {
-        const contentSlice = slice.slice(startPos + 10, id3V2Header.size);
-        parseId3V2Tag(contentSlice, id3V2Header, this.metadataTags);
+        const availableSize = size - ID3_V2_HEADER_SIZE;
+        id3V2Header.size = Math.min(id3V2Header.size, availableSize);
+        if (id3V2Header.size > 0) {
+          const contentSlice = slice.slice(startPos + ID3_V2_HEADER_SIZE, id3V2Header.size);
+          parseId3V2Tag(contentSlice, id3V2Header, this.metadataTags);
+        }
       }
     }
     getCodec() {
@@ -24334,9 +24338,6 @@ ${cue.notes ?? ""}`;
       this.allTracksKnown = promiseWithResolvers();
       this.videoTrackIndex = 0;
       this.audioTrackIndex = 0;
-      this.pesHeaderBuffer = new Uint8Array(14);
-      this.pesHeaderView = toDataView(this.pesHeaderBuffer);
-      this.ptsBitstream = new Bitstream(this.pesHeaderBuffer.subarray(9, 14));
       this.adaptationFieldBuffer = new Uint8Array(184);
       this.payloadBuffer = new Uint8Array(184);
       this.format = format;
@@ -24367,6 +24368,7 @@ ${cue.notes ?? ""}`;
         streamType,
         streamId,
         codecString: meta.decoderConfig.codec,
+        timestampProcessingQueue: [],
         packetQueue: [],
         inputIsAnnexB: null,
         inputIsAdts: null,
@@ -24430,6 +24432,7 @@ ${cue.notes ?? ""}`;
         streamType,
         streamId,
         codecString: meta.decoderConfig.codec,
+        timestampProcessingQueue: [],
         packetQueue: [],
         inputIsAnnexB: null,
         inputIsAdts: null,
@@ -24455,12 +24458,15 @@ ${cue.notes ?? ""}`;
           packet.type === "key"
         );
         const preparedData = this.prepareVideoPacket(trackData, packet, meta);
-        trackData.packetQueue.push({
+        if (packet.type === "key") {
+          await this.flushTimestampQueue(trackData);
+        }
+        trackData.timestampProcessingQueue.push({
           data: preparedData,
-          timestamp,
+          presentationTimestamp: timestamp,
+          decodeTimestamp: null,
           isKeyframe: packet.type === "key"
         });
-        await this.interleavePackets();
       } finally {
         release();
       }
@@ -24475,12 +24481,15 @@ ${cue.notes ?? ""}`;
           packet.type === "key"
         );
         const preparedData = this.prepareAudioPacket(trackData, packet, meta);
-        trackData.packetQueue.push({
+        if (packet.type === "key") {
+          await this.flushTimestampQueue(trackData);
+        }
+        trackData.timestampProcessingQueue.push({
           data: preparedData,
-          timestamp,
+          presentationTimestamp: timestamp,
+          decodeTimestamp: null,
           isKeyframe: packet.type === "key"
         });
-        await this.interleavePackets();
       } finally {
         release();
       }
@@ -24606,6 +24615,21 @@ ${cue.notes ?? ""}`;
       }
       return true;
     }
+    async flushTimestampQueue(trackData, alsoInterleave = true) {
+      if (trackData.timestampProcessingQueue.length === 0) {
+        return;
+      }
+      const sortedTimestamps = trackData.timestampProcessingQueue.map((packet) => packet.presentationTimestamp).sort((a, b) => a - b);
+      for (let i = 0; i < trackData.timestampProcessingQueue.length; i++) {
+        const queuedPacket = trackData.timestampProcessingQueue[i];
+        queuedPacket.decodeTimestamp = sortedTimestamps[i];
+        trackData.packetQueue.push(queuedPacket);
+      }
+      trackData.timestampProcessingQueue.length = 0;
+      if (alsoInterleave) {
+        await this.interleavePackets();
+      }
+    }
     async interleavePackets(isFinalCall = false) {
       if (!this.tablesWritten) {
         if (!this.allTracksAreKnown() && !isFinalCall) {
@@ -24621,9 +24645,9 @@ ${cue.notes ?? ""}`;
             if (!isFinalCall && trackData.packetQueue.length === 0 && !trackData.track.source._closed) {
               break outer;
             }
-            if (trackData.packetQueue.length > 0 && trackData.packetQueue[0].timestamp < minTimestamp) {
+            if (trackData.packetQueue.length > 0 && trackData.packetQueue[0].presentationTimestamp < minTimestamp) {
               trackWithMinTimestamp = trackData;
-              minTimestamp = trackData.packetQueue[0].timestamp;
+              minTimestamp = trackData.packetQueue[0].presentationTimestamp;
             }
           }
           if (!trackWithMinTimestamp) {
@@ -24664,24 +24688,39 @@ ${cue.notes ?? ""}`;
       }
     }
     writePesPacket(trackData, queuedPacket) {
-      const pesView = this.pesHeaderView;
+      const includeDts = trackData.track.type === "video";
+      const headerDataLength = includeDts ? 10 : 5;
+      const pesHeaderBuffer = new Uint8Array(9 + headerDataLength);
+      const pesView = toDataView(pesHeaderBuffer);
+      const ptsDtsBitstream = new Bitstream(pesHeaderBuffer.subarray(9));
       setUint24(pesView, 0, 1, false);
-      this.pesHeaderBuffer[3] = trackData.streamId;
+      pesHeaderBuffer[3] = trackData.streamId;
       const pesPacketLength = trackData.track.type === "video" ? 0 : Math.min(8 + queuedPacket.data.length, 65535);
       pesView.setUint16(4, pesPacketLength, false);
       pesView.setUint8(6, 132);
-      pesView.setUint8(7, 128);
-      pesView.setUint8(8, 5);
-      const pts = Math.round(queuedPacket.timestamp * TIMESCALE);
-      this.ptsBitstream.pos = 0;
-      this.ptsBitstream.writeBits(4, 2);
-      this.ptsBitstream.writeBits(3, pts >>> 30 & 7);
-      this.ptsBitstream.writeBits(1, 1);
-      this.ptsBitstream.writeBits(15, pts >>> 15 & 32767);
-      this.ptsBitstream.writeBits(1, 1);
-      this.ptsBitstream.writeBits(15, pts & 32767);
-      this.ptsBitstream.writeBits(1, 1);
-      const totalLength = this.pesHeaderBuffer.length + queuedPacket.data.length;
+      pesView.setUint8(7, includeDts ? 192 : 128);
+      pesView.setUint8(8, headerDataLength);
+      const pts = Math.round(queuedPacket.presentationTimestamp * TIMESCALE);
+      ptsDtsBitstream.pos = 0;
+      ptsDtsBitstream.writeBits(4, includeDts ? 3 : 2);
+      ptsDtsBitstream.writeBits(3, pts >>> 30 & 7);
+      ptsDtsBitstream.writeBits(1, 1);
+      ptsDtsBitstream.writeBits(15, pts >>> 15 & 32767);
+      ptsDtsBitstream.writeBits(1, 1);
+      ptsDtsBitstream.writeBits(15, pts & 32767);
+      ptsDtsBitstream.writeBits(1, 1);
+      if (includeDts) {
+        assert(queuedPacket.decodeTimestamp !== null);
+        const dts = Math.round(queuedPacket.decodeTimestamp * TIMESCALE);
+        ptsDtsBitstream.writeBits(4, 1);
+        ptsDtsBitstream.writeBits(3, dts >>> 30 & 7);
+        ptsDtsBitstream.writeBits(1, 1);
+        ptsDtsBitstream.writeBits(15, dts >>> 15 & 32767);
+        ptsDtsBitstream.writeBits(1, 1);
+        ptsDtsBitstream.writeBits(15, dts & 32767);
+        ptsDtsBitstream.writeBits(1, 1);
+      }
+      const totalLength = pesHeaderBuffer.length + queuedPacket.data.length;
       let offset = 0;
       let isFirstTsPacket = true;
       while (offset < totalLength) {
@@ -24711,12 +24750,12 @@ ${cue.notes ?? ""}`;
         const payloadSize = Math.min(184 - adaptationFieldSize, remainingData);
         const payload = this.payloadBuffer.subarray(0, payloadSize);
         let payloadOffset = 0;
-        if (offset < this.pesHeaderBuffer.length) {
-          const headerBytes = Math.min(this.pesHeaderBuffer.length - offset, payloadSize);
-          payload.set(this.pesHeaderBuffer.subarray(offset, offset + headerBytes), 0);
+        if (offset < pesHeaderBuffer.length) {
+          const headerBytes = Math.min(pesHeaderBuffer.length - offset, payloadSize);
+          payload.set(pesHeaderBuffer.subarray(offset, offset + headerBytes), 0);
           payloadOffset = headerBytes;
         }
-        const dataStart = Math.max(0, offset - this.pesHeaderBuffer.length);
+        const dataStart = Math.max(0, offset - pesHeaderBuffer.length);
         const dataEnd = dataStart + (payloadSize - payloadOffset);
         if (payloadOffset < payloadSize) {
           payload.set(queuedPacket.data.subarray(dataStart, dataEnd), payloadOffset);
@@ -24754,17 +24793,24 @@ ${cue.notes ?? ""}`;
       }
     }
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    async onTrackClose() {
+    async onTrackClose(track) {
       const release = await this.mutex.acquire();
       if (this.allTracksAreKnown()) {
         this.allTracksKnown.resolve();
       }
+      const trackData = this.trackDatas.find((x) => x.track === track);
+      if (trackData) {
+        await this.flushTimestampQueue(trackData, false);
+      }
       await this.interleavePackets();
       release();
     }
     async finalize() {
       const release = await this.mutex.acquire();
       this.allTracksKnown.resolve();
+      for (const trackData of this.trackDatas) {
+        await this.flushTimestampQueue(trackData, false);
+      }
       await this.interleavePackets(true);
       release();
     }