mediabunny 1.13.1 → 1.13.3

package/README.md

@@ -3,6 +3,7 @@
 [![](https://img.shields.io/npm/v/mediabunny)](https://www.npmjs.com/package/mediabunny)
 [![](https://img.shields.io/bundlephobia/minzip/mediabunny)](https://bundlephobia.com/package/mediabunny)
 [![](https://img.shields.io/npm/dm/mediabunny)](https://www.npmjs.com/package/mediabunny)
+[![](https://img.shields.io/discord/1390044844285497344?logo=discord&label=Discord)](https://discord.gg/hmpkyYuS4U)
 
 <div align="center">
     <img src="./docs/public/mediabunny-logo.svg" width="180" height="180">

package/dist/bundles/mediabunny.cjs

@@ -11178,6 +11178,7 @@ ${cue.notes ?? ""}`;
       if (this.encoder) {
         return;
       }
+      const encoderError = new Error();
       return this.ensureEncoderPromise = (async () => {
         const encoderConfig = buildVideoEncoderConfig({
           width: videoSample.codedWidth,
@@ -11222,7 +11223,7 @@ ${cue.notes ?? ""}`;
               void this.muxer.addEncodedVideoPacket(this.source._connectedTrack, packet, meta);
             },
             error: (error) => {
-              error.stack = new Error().stack;
+              error.stack = encoderError.stack;
               this.encoderError ??= error;
             }
           });
@@ -11234,7 +11235,7 @@ ${cue.notes ?? ""}`;
       })();
     }
     async flushAndClose(forceClose) {
-      this.checkForEncoderError();
+      if (!forceClose) this.checkForEncoderError();
       if (this.customEncoder) {
         if (!forceClose) {
           void this.customEncoderCallSerializer.call(() => this.customEncoder.flush());
@@ -11244,9 +11245,11 @@ ${cue.notes ?? ""}`;
         if (!forceClose) {
           await this.encoder.flush();
         }
-        this.encoder.close();
+        if (this.encoder.state !== "closed") {
+          this.encoder.close();
+        }
       }
-      this.checkForEncoderError();
+      if (!forceClose) this.checkForEncoderError();
     }
     getQueueSize() {
       if (this.customEncoder) {
@@ -11257,6 +11260,7 @@ ${cue.notes ?? ""}`;
     }
     checkForEncoderError() {
       if (this.encoderError) {
+        this.encoderError.stack = new Error().stack;
         throw this.encoderError;
       }
     }
@@ -11634,6 +11638,7 @@ ${cue.notes ?? ""}`;
       if (this.encoderInitialized) {
         return;
       }
+      const encoderError = new Error();
       return this.ensureEncoderPromise = (async () => {
         const { numberOfChannels, sampleRate } = audioSample;
         const encoderConfig = buildAudioEncoderConfig({
@@ -11680,7 +11685,7 @@ ${cue.notes ?? ""}`;
               void this.muxer.addEncodedAudioPacket(this.source._connectedTrack, packet, meta);
             },
             error: (error) => {
-              error.stack = new Error().stack;
+              error.stack = encoderError.stack;
               this.encoderError ??= error;
             }
           });
@@ -11787,7 +11792,7 @@ ${cue.notes ?? ""}`;
       }
     }
     async flushAndClose(forceClose) {
-      this.checkForEncoderError();
+      if (!forceClose) this.checkForEncoderError();
       if (this.customEncoder) {
         if (!forceClose) {
           void this.customEncoderCallSerializer.call(() => this.customEncoder.flush());
@@ -11797,9 +11802,11 @@ ${cue.notes ?? ""}`;
         if (!forceClose) {
           await this.encoder.flush();
         }
-        this.encoder.close();
+        if (this.encoder.state !== "closed") {
+          this.encoder.close();
+        }
       }
-      this.checkForEncoderError();
+      if (!forceClose) this.checkForEncoderError();
     }
     getQueueSize() {
       if (this.customEncoder) {
@@ -11812,6 +11819,7 @@ ${cue.notes ?? ""}`;
     }
     checkForEncoderError() {
       if (this.encoderError) {
+        this.encoderError.stack = new Error().stack;
         throw this.encoderError;
       }
     }
@@ -16947,8 +16955,7 @@ ${cue.notes ?? ""}`;
           this.lastLoadedPos += 10 + id3Tag.size;
         }
       }
-      const startPos = this.lastLoadedPos;
-      const result = await readNextFrameHeader(this.reader, startPos, this.reader.fileSize);
+      const result = await readNextFrameHeader(this.reader, this.lastLoadedPos, this.reader.fileSize);
       if (!result) {
         this.lastSampleLoaded = true;
         return;
@@ -16956,13 +16963,14 @@ ${cue.notes ?? ""}`;
       const header = result.header;
       this.lastLoadedPos = result.startPos + header.totalSize - 1;
       const xingOffset = getXingOffset(header.mpegVersionId, header.channel);
-      let slice = this.reader.requestSlice(startPos + xingOffset, 4);
+      let slice = this.reader.requestSlice(result.startPos + xingOffset, 4);
       if (slice instanceof Promise) slice = await slice;
-      assert(slice);
-      const word = readU32Be(slice);
-      const isXing = word === XING || word === INFO;
-      if (isXing) {
-        return;
+      if (slice) {
+        const word = readU32Be(slice);
+        const isXing = word === XING || word === INFO;
+        if (isXing) {
+          return;
+        }
       }
       if (!this.firstFrameHeader) {
         this.firstFrameHeader = header;
@@ -16971,7 +16979,7 @@ ${cue.notes ?? ""}`;
       const sample = {
         timestamp: this.nextTimestampInSamples / header.sampleRate,
         duration: sampleDuration,
-        dataStart: startPos,
+        dataStart: result.startPos,
         dataSize: header.totalSize
       };
       this.loadedSamples.push(sample);
@@ -18771,7 +18779,7 @@ ${cue.notes ?? ""}`;
       }
       const firstTimestamp = await track.getFirstTimestamp();
       const needsTranscode = !!trackOptions.forceTranscode || this._startTimestamp > 0 || firstTimestamp < 0 || !!trackOptions.frameRate;
-      const needsRerender = width !== originalWidth || height !== originalHeight || totalRotation !== 0 && !outputSupportsRotation;
+      let needsRerender = width !== originalWidth || height !== originalHeight || totalRotation !== 0 && !outputSupportsRotation;
       let videoCodecs = this.output.format.getSupportedVideoCodecs();
       if (!needsTranscode && !trackOptions.bitrate && !needsRerender && videoCodecs.includes(sourceCodec) && (!trackOptions.codec || trackOptions.codec === sourceCodec)) {
         const source = new EncodedVideoPacketSource(sourceCodec);
@@ -18824,6 +18832,31 @@ ${cue.notes ?? ""}`;
         };
         const source = new VideoSampleSource(encodingConfig);
         videoSource = source;
+        if (!needsRerender) {
+          const tempOutput = new Output({
+            format: new Mp4OutputFormat(),
+            // Supports all video codecs
+            target: new NullTarget()
+          });
+          const tempSource = new VideoSampleSource(encodingConfig);
+          tempOutput.addVideoTrack(tempSource);
+          await tempOutput.start();
+          const sink = new VideoSampleSink(track);
+          const firstSample = await sink.getSample(this._startTimestamp);
+          if (firstSample) {
+            try {
+              await tempSource.add(firstSample);
+              firstSample.close();
+              await tempOutput.finalize();
+            } catch (error) {
+              console.info("Error when probing encoder support. Falling back to rerender path.", error);
+              needsRerender = true;
+              void tempOutput.cancel();
+            }
+          } else {
+            await tempOutput.cancel();
+          }
+        }
         if (needsRerender) {
           this._trackPromises.push((async () => {
             await this._started;
@@ -19129,12 +19162,8 @@ ${cue.notes ?? ""}`;
       }
       assert(this._totalDuration !== null);
       this._maxTimestamps.set(trackId, Math.max(endTimestamp, this._maxTimestamps.get(trackId) ?? -Infinity));
-      let totalTimestamps = 0;
-      for (const [, timestamp] of this._maxTimestamps) {
-        totalTimestamps += timestamp;
-      }
-      const averageTimestamp = totalTimestamps / this._totalTrackCount;
-      const newProgress = clamp(averageTimestamp / this._totalDuration, 0, 1);
+      const minTimestamp = Math.min(...this._maxTimestamps.values());
+      const newProgress = clamp(minTimestamp / this._totalDuration, 0, 1);
       if (newProgress !== this._lastProgress) {
         this._lastProgress = newProgress;
         this.onProgress?.(newProgress);