supervision 0.2.0-next.2 → 0.2.0-next.3

package/dist/index.js

@@ -1114,10 +1114,11 @@ async function openMediabunnyMediaSource(sourceInput) {
             })
                 .catch(() => null)
             : Promise.resolve(null);
-        const [displayWidth, displayHeight, firstTimestamp, packetStats] = await Promise.all([
+        const [displayWidth, displayHeight, firstTimestamp, timeResolution, packetStats,] = await Promise.all([
             primaryVideoTrack.getDisplayWidth(),
             primaryVideoTrack.getDisplayHeight(),
             primaryVideoTrack.getFirstTimestamp(),
+            primaryVideoTrack.getTimeResolution(),
             packetStatsPromise,
         ]);
         const duration = isUrlSourceInput(sourceInput)
@@ -1145,6 +1146,7 @@ async function openMediabunnyMediaSource(sourceInput) {
                 mimeType,
                 primaryVideoHeight: displayHeight,
                 primaryVideoWidth: displayWidth,
+                timeResolution,
                 trackCount: tracks.length,
                 videoTrackCount: videoTracks.length,
             },
@@ -3151,6 +3153,7 @@ function createMediaRendererTransport(options) {
     // play the hold is waiting for, so a pause taken during it is not undone by
     // the readiness that arrives afterwards.
     let playbackIntent = 0;
+    let stepIntent = null;
     /** Intent a readiness wait belongs to, or null while none is running. */
     let readinessHoldIntent = null;
     /** Whether a readiness hold still owes the producer its release. */
@@ -3169,8 +3172,15 @@ function createMediaRendererTransport(options) {
     const beginPlaybackIntent = () => {
         activeReadinessWait?.abort();
         activeReadinessWait = undefined;
+        stepIntent = null;
         return ++playbackIntent;
     };
+    const beginStepIntent = () => {
+        if (stepIntent !== null)
+            return stepIntent;
+        stepIntent = beginPlaybackIntent();
+        return stepIntent;
+    };
     const publishSeekSignals = () => {
         options.onScrubbing(gestureInFlight);
         options.onSeeking(isSettling(channel.getStatus(), channel.getSeeking()));
@@ -3460,15 +3470,23 @@ function createMediaRendererTransport(options) {
             options.invalidatePresentedFrame?.();
             const navigationPresentation = ++presentationWait;
             presentationHold = null;
-            beginPlaybackIntent();
+            const intent = beginStepIntent();
             await releaseGesture();
+            if (intent !== playbackIntent)
+                return;
             if (navigationPresentation === presentationWait) {
                 await releaseReadinessFreeze();
             }
+            if (intent !== playbackIntent)
+                return;
             const presentation = options.beginPresentedFrameNavigation?.();
             const before = channel.getPlayhead().frame;
             try {
                 await channel.step(direction);
+                if (intent !== playbackIntent) {
+                    presentation?.cancel();
+                    return;
+                }
                 const after = channel.getPlayhead().frame;
                 if (before.index === after.index && before.ticks === after.ticks) {
                     // A boundary step intentionally emits no replacement frame. The
@@ -4002,6 +4020,7 @@ async function createMediaRendererCore(options, providers) {
     let pushPresentationReady = false;
     let sampleSink;
     let firstTimestamp = 0;
+    let sampleTimeResolution = null;
     let navigationVersion = 0;
     let outstandingSourceReads = 0;
     let pendingPullScrubTime = null;
@@ -4654,6 +4673,12 @@ async function createMediaRendererCore(options, providers) {
         }
         const { metadata } = mediaSource;
         firstTimestamp = metadata.firstTimestamp;
+        sampleTimeResolution =
+            metadata.timeResolution !== undefined &&
+                Number.isFinite(metadata.timeResolution) &&
+                metadata.timeResolution > 0
+                ? metadata.timeResolution
+                : null;
         // One central projection step for every detection input this renderer can
         // receive: static frames, a caller-owned source, or a composite source.
         // Media dimensions are known here, so a producer can declare its own
@@ -4901,21 +4926,38 @@ async function createMediaRendererCore(options, providers) {
         playbackController.pause();
         runtimeState.setPaused();
         const currentTime = runtimeState.currentTime();
-        const epsilon = 1e-6;
         let sample = null;
         try {
             if (direction === "backward") {
-                sample = await trackSourceRead(sampleSink.getSample(Math.max(firstTimestamp, currentTime - epsilon), {
+                if (currentTime <= firstTimestamp) {
+                    return;
+                }
+                const stepSeconds = sampleTimeResolution === null ? 1e-6 : 1 / sampleTimeResolution;
+                sample = await trackSourceRead(sampleSink.getSample(Math.max(firstTimestamp, currentTime - stepSeconds), {
                     skipLiveWait: true,
                 }));
             }
             else {
-                const iterator = sampleSink.samples(currentTime + epsilon, undefined, {
+                const iterator = sampleSink.samples(currentTime, undefined, {
                     skipLiveWait: true,
                 });
                 try {
-                    const result = await trackSourceRead(iterator.next());
-                    sample = result.done ? null : result.value;
+                    while (true) {
+                        const result = await trackSourceRead(iterator.next());
+                        if (result.done) {
+                            break;
+                        }
+                        if (requestVersion !== navigationVersion ||
+                            runtimeState.isDestroyed()) {
+                            result.value.close();
+                            return;
+                        }
+                        if (result.value.timestamp > currentTime) {
+                            sample = result.value;
+                            break;
+                        }
+                        result.value.close();
+                    }
                 }
                 finally {
                     await iterator.return?.();