mediabunny 1.44.0 → 1.44.2

package/dist/bundles/mediabunny.cjs

@@ -24890,8 +24890,7 @@ var Mediabunny = (() => {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     onTrackClose(track) {
     }
-    validateAndNormalizeTimestamp(track, timestampInSeconds, isKeyPacket) {
-      timestampInSeconds += track.source._timestampOffset;
+    validateTimestamp(track, timestampInSeconds, isKeyPacket) {
       if (timestampInSeconds < 0) {
         throw new Error(`Timestamps must be non-negative (got ${timestampInSeconds}s).`);
       }
@@ -24916,7 +24915,6 @@ var Mediabunny = (() => {
         }
         timestampInfo.maxTimestamp = Math.max(timestampInfo.maxTimestamp, timestampInSeconds);
       }
-      return timestampInSeconds;
     }
   };
 
@@ -24947,7 +24945,7 @@ var Mediabunny = (() => {
     async addEncodedAudioPacket(track, packet, meta) {
       const release = await this.mutex.acquire();
       try {
-        this.validateAndNormalizeTimestamp(track, packet.timestamp, packet.type === "key");
+        this.validateTimestamp(track, packet.timestamp, packet.type === "key");
         if (this.inputIsAdts === null) {
           validateAudioChunkMetadata(meta);
           const description = meta?.decoderConfig?.description;
@@ -25112,7 +25110,7 @@ var Mediabunny = (() => {
     async addEncodedAudioPacket(track, packet, meta) {
       const release = await this.mutex.acquire();
       try {
-        this.validateAndNormalizeTimestamp(
+        this.validateTimestamp(
           track,
           packet.timestamp,
           packet.type === "key"
@@ -27973,7 +27971,7 @@ var Mediabunny = (() => {
           }
           packetData = concatNalUnitsInLengthPrefixed(nalUnits, 4);
         }
-        const timestamp = this.validateAndNormalizeTimestamp(
+        this.validateTimestamp(
           trackData.track,
           packet.timestamp,
           packet.type === "key"
@@ -27981,7 +27979,7 @@ var Mediabunny = (() => {
         const internalSample = this.createSampleForTrack(
           trackData,
           packetData,
-          timestamp,
+          packet.timestamp,
           packet.duration,
           packet.type
         );
@@ -28003,11 +28001,12 @@ var Mediabunny = (() => {
           const headerLength = adtsFrame.crcCheck === null ? MIN_ADTS_FRAME_HEADER_SIZE : MAX_ADTS_FRAME_HEADER_SIZE;
           packetData = packetData.subarray(headerLength);
         }
-        let timestamp = this.validateAndNormalizeTimestamp(
+        this.validateTimestamp(
           trackData.track,
           packet.timestamp,
           packet.type === "key"
         );
+        let timestamp = packet.timestamp;
         let duration = packet.duration;
         if (trackData.info.requiresPcmTransformation) {
           const pcmInfo = parsePcmCodec(
@@ -28066,7 +28065,7 @@ var Mediabunny = (() => {
       const release = await this.mutex.acquire();
       try {
         const trackData = this.getSubtitleTrackData(track, meta);
-        this.validateAndNormalizeTimestamp(trackData.track, cue.timestamp, true);
+        this.validateTimestamp(trackData.track, cue.timestamp, true);
         if (track.source._codec === "webvtt") {
           trackData.cueQueue.push(cue);
           await this.processWebVTTCues(trackData, cue.timestamp);
@@ -29296,7 +29295,8 @@ var Mediabunny = (() => {
       try {
         const trackData = this.getVideoTrackData(track, packet, meta);
         const isKeyFrame = packet.type === "key";
-        let timestamp = this.validateAndNormalizeTimestamp(trackData.track, packet.timestamp, isKeyFrame);
+        this.validateTimestamp(trackData.track, packet.timestamp, isKeyFrame);
+        let timestamp = packet.timestamp;
         let duration = packet.duration;
         if (track.metadata.frameRate !== void 0) {
           timestamp = roundToDivisor(timestamp, track.metadata.frameRate);
@@ -29325,8 +29325,8 @@ var Mediabunny = (() => {
           packetData = packetData.subarray(headerLength);
         }
         const isKeyFrame = packet.type === "key";
-        const timestamp = this.validateAndNormalizeTimestamp(trackData.track, packet.timestamp, isKeyFrame);
-        const audioChunk = this.createInternalChunk(packetData, timestamp, packet.duration, packet.type);
+        this.validateTimestamp(trackData.track, packet.timestamp, isKeyFrame);
+        const audioChunk = this.createInternalChunk(packetData, packet.timestamp, packet.duration, packet.type);
         trackData.chunkQueue.push(audioChunk);
         await this.interleaveChunks();
       } finally {
@@ -29337,9 +29337,9 @@ var Mediabunny = (() => {
       const release = await this.mutex.acquire();
       try {
         const trackData = this.getSubtitleTrackData(track, meta);
-        const timestamp = this.validateAndNormalizeTimestamp(trackData.track, cue.timestamp, true);
+        this.validateTimestamp(trackData.track, cue.timestamp, true);
         let bodyText = cue.text;
-        const timestampMs = Math.round(timestamp * 1e3);
+        const timestampMs = Math.round(cue.timestamp * 1e3);
         inlineTimestampRegex.lastIndex = 0;
         bodyText = bodyText.replace(inlineTimestampRegex, (match) => {
           const time = parseSubtitleTimestamp(match.slice(1, -1));
@@ -29352,7 +29352,7 @@ ${cue.identifier ?? ""}
 ${cue.notes ?? ""}`;
         const subtitleChunk = this.createInternalChunk(
           body,
-          timestamp,
+          cue.timestamp,
           cue.duration,
           "key",
           additions.trim() ? textEncoder.encode(additions) : null
@@ -29746,7 +29746,7 @@ ${cue.notes ?? ""}`;
           this.mp3Writer.writeXingFrame(this.xingFrameData);
           this.frameCount++;
         }
-        this.validateAndNormalizeTimestamp(track, packet.timestamp, packet.type === "key");
+        this.validateTimestamp(track, packet.timestamp, packet.type === "key");
         if (writeXingHeader) {
           this.framePositions.push(this.writer.getPos());
         }
@@ -29953,7 +29953,7 @@ ${cue.notes ?? ""}`;
       const release = await this.mutex.acquire();
       try {
         const trackData = this.getTrackData(track, meta);
-        this.validateAndNormalizeTimestamp(trackData.track, packet.timestamp, packet.type === "key");
+        this.validateTimestamp(trackData.track, packet.timestamp, packet.type === "key");
         const currentTimestampInSamples = trackData.currentTimestampInSamples;
         const { durationInSamples, vorbisBlockSize } = extractSampleMetadata(
           packet.data,
@@ -30276,7 +30276,7 @@ ${cue.notes ?? ""}`;
       const release = await this.mutex.acquire();
       try {
         const trackData = this.getVideoTrackData(track, meta);
-        const timestamp = this.validateAndNormalizeTimestamp(
+        this.validateTimestamp(
           trackData.track,
           packet.timestamp,
           packet.type === "key"
@@ -30287,7 +30287,7 @@ ${cue.notes ?? ""}`;
         }
         trackData.timestampProcessingQueue.push({
           data: preparedData,
-          presentationTimestamp: timestamp,
+          presentationTimestamp: packet.timestamp,
           decodeTimestamp: null,
           isKeyframe: packet.type === "key"
         });
@@ -30299,7 +30299,7 @@ ${cue.notes ?? ""}`;
       const release = await this.mutex.acquire();
       try {
         const trackData = this.getAudioTrackData(track, meta);
-        const timestamp = this.validateAndNormalizeTimestamp(
+        this.validateTimestamp(
           trackData.track,
           packet.timestamp,
           packet.type === "key"
@@ -30310,7 +30310,7 @@ ${cue.notes ?? ""}`;
         }
         trackData.timestampProcessingQueue.push({
           data: preparedData,
-          presentationTimestamp: timestamp,
+          presentationTimestamp: packet.timestamp,
           decodeTimestamp: null,
           isKeyframe: packet.type === "key"
         });
@@ -30783,7 +30783,7 @@ ${cue.notes ?? ""}`;
           this.sampleRate = meta.decoderConfig.sampleRate;
           this.headerWritten = true;
         }
-        this.validateAndNormalizeTimestamp(track, packet.timestamp, packet.type === "key");
+        this.validateTimestamp(track, packet.timestamp, packet.type === "key");
         if (!this.isRf64 && this.writer.getPos() + packet.data.byteLength >= 2 ** 32) {
           throw new Error(
             "Adding more audio data would exceed the maximum RIFF size of 4 GiB. To write larger files, use RF64 by setting `large: true` in the WavOutputFormatOptions."
@@ -31032,13 +31032,13 @@ ${cue.notes ?? ""}`;
       this.maxWrittenFrame = null;
       this.targetSampleRate = options.targetSampleRate;
       this.targetNumberOfChannels = options.targetNumberOfChannels;
-      this.startTime = options.startTime;
       this.endTime = options.endTime;
       this.onSample = options.onSample;
       this.bufferSizeInFrames = Math.floor(this.targetSampleRate * 5);
       this.bufferSizeInSamples = this.bufferSizeInFrames * this.targetNumberOfChannels;
       this.outputBuffer = new Float32Array(this.bufferSizeInSamples);
-      this.bufferStartFrame = Math.floor(this.startTime * this.targetSampleRate);
+      this.bufferStartFrame = Math.floor(options.startTime * this.targetSampleRate);
+      this.timestampOffset = options.startTime - this.bufferStartFrame / this.targetSampleRate;
     }
     /**
      * Sets up the channel mixer to handle up/downmixing in the case where input and output channel counts don't match.
@@ -31188,7 +31188,7 @@ ${cue.notes ?? ""}`;
         format: "f32",
         sampleRate: this.targetSampleRate,
         numberOfChannels: this.targetNumberOfChannels,
-        timestamp: timestampSeconds,
+        timestamp: timestampSeconds + this.timestampOffset,
         data: outputData
       });
       await this.onSample(audioSample);
@@ -31209,11 +31209,6 @@ ${cue.notes ?? ""}`;
       this._closingPromise = null;
       /** @internal */
       this._closed = false;
-      /**
-       * @internal
-       * A time offset in seconds that is added to all timestamps generated by this source.
-       */
-      this._timestampOffset = 0;
     }
     /** @internal */
     _ensureValidAdd() {
@@ -32212,7 +32207,7 @@ ${cue.notes ?? ""}`;
       let frameCount = 0;
       let errored = false;
       let lastSampleTimestamp = null;
-      let pauseOffset = 0;
+      let timestampOffset = 0;
       const tick = () => {
         assert(frameRate !== null);
         if (!this._lastVideoFrame) {
@@ -32262,7 +32257,7 @@ ${cue.notes ?? ""}`;
           if (frameSeen) {
             if (lastSampleTimestamp !== null && this._options.timestampBase !== "unix") {
               const timeDelta = currentTimestamp - lastSampleTimestamp;
-              pauseOffset -= timeDelta;
+              timestampOffset -= timeDelta;
             }
             lastSampleTimestamp = currentTimestamp;
           }
@@ -32286,7 +32281,7 @@ ${cue.notes ?? ""}`;
               target = now / 1e3 - output._firstMediaStreamTimestamp;
             }
           }
-          this._timestampOffset = target - firstVideoFrameTimestamp;
+          timestampOffset = target - firstVideoFrameTimestamp;
         }
         lastSampleTimestamp = currentTimestamp;
         if (this._encoder.getQueueSize() >= 8) {
@@ -32294,7 +32289,7 @@ ${cue.notes ?? ""}`;
           return;
         }
         const sample = new VideoSample(videoFrame, {
-          timestamp: currentTimestamp + pauseOffset
+          timestamp: currentTimestamp + timestampOffset
         });
         void this._encoder.add(sample, true).catch((error) => {
           errored = true;
@@ -33022,7 +33017,7 @@ ${cue.notes ?? ""}`;
       let firstAudioDataTimestamp = null;
       let errored = false;
       let lastSampleTimestamp = null;
-      let pauseOffset = 0;
+      let timestampOffset = 0;
       const onAudioSample = (audioSample) => {
         if (errored) {
           audioSample.close();
@@ -33034,7 +33029,7 @@ ${cue.notes ?? ""}`;
           if (dataSeen) {
             if (lastSampleTimestamp !== null && this._options.timestampBase !== "unix") {
               const timeDelta = currentTimestamp - lastSampleTimestamp;
-              pauseOffset -= timeDelta;
+              timestampOffset -= timeDelta;
             }
             lastSampleTimestamp = currentTimestamp;
           }
@@ -33058,14 +33053,14 @@ ${cue.notes ?? ""}`;
               target = performance.now() / 1e3 - output._firstMediaStreamTimestamp;
             }
           }
-          this._timestampOffset = target - firstAudioDataTimestamp;
+          timestampOffset = target - firstAudioDataTimestamp;
         }
         lastSampleTimestamp = currentTimestamp;
         if (this._encoder.getQueueSize() >= 8) {
           audioSample.close();
           return;
         }
-        audioSample.setTimestamp(currentTimestamp + pauseOffset);
+        audioSample.setTimestamp(currentTimestamp + timestampOffset);
         void this._encoder.add(audioSample, true).catch((error) => {
           errored = true;
           this._abortController?.abort();
@@ -33667,15 +33662,14 @@ ${cue.notes ?? ""}`;
       const playlist = trackData.playlist;
       const release = await playlist.mutex.acquire();
       try {
-        const timestamp = this.validateAndNormalizeTimestamp(track, packet.timestamp, packet.type === "key");
-        const adjustedPacket = packet.clone({ timestamp });
-        trackData.packets.push(adjustedPacket);
+        this.validateTimestamp(track, packet.timestamp, packet.type === "key");
+        trackData.packets.push(packet);
         if (playlist.currentSegmentStartTimestamp === null) {
-          playlist.currentSegmentStartTimestamp = adjustedPacket.timestamp;
+          playlist.currentSegmentStartTimestamp = packet.timestamp;
         } else if (!playlist.currentSegmentStartTimestampIsFixed) {
           playlist.currentSegmentStartTimestamp = Math.min(
             playlist.currentSegmentStartTimestamp,
-            adjustedPacket.timestamp
+            packet.timestamp
           );
         }
         await this.advancePlaylist(playlist);
@@ -33688,15 +33682,14 @@ ${cue.notes ?? ""}`;
       const playlist = trackData.playlist;
       const release = await playlist.mutex.acquire();
       try {
-        const timestamp = this.validateAndNormalizeTimestamp(track, packet.timestamp, packet.type === "key");
-        const adjustedPacket = packet.clone({ timestamp });
-        trackData.packets.push(adjustedPacket);
+        this.validateTimestamp(track, packet.timestamp, packet.type === "key");
+        trackData.packets.push(packet);
         if (playlist.currentSegmentStartTimestamp === null) {
-          playlist.currentSegmentStartTimestamp = adjustedPacket.timestamp;
+          playlist.currentSegmentStartTimestamp = packet.timestamp;
         } else if (!playlist.currentSegmentStartTimestampIsFixed) {
           playlist.currentSegmentStartTimestamp = Math.min(
             playlist.currentSegmentStartTimestamp,
-            adjustedPacket.timestamp
+            packet.timestamp
           );
         }
         await this.advancePlaylist(playlist);
@@ -36628,6 +36621,7 @@ The @mediabunny/mp3-encoder extension package provides support for encoding MP3.
           startTime: this._startTimestamp,
           endTime: this._endTimestamp,
           onSample: async (sample) => {
+            assert(sample.timestamp >= this._startTimestamp);
             sample.setTimestamp(sample.timestamp - this._startTimestamp);
             await this._registerAudioSample(trackOptions, outputTrackId, source, sample);
             sample.close();