agentroam-runtime-darwin-arm64 0.2.0-preview.64 → 0.2.0-preview.65

package/runtime/node_modules/mediabunny/dist/bundles/mediabunny.mjs

@@ -1699,7 +1699,7 @@ var AC3_SAMPLE_RATES = [48e3, 44100, 32e3];
 var EAC3_REDUCED_SAMPLE_RATES = [24e3, 22050, 16e3];
 
 // src/version.ts
-var VERSION = "1.62.0";
+var VERSION = "1.62.1";
 var VERSIONED_NAME = `Mediabunny v${VERSION}`;
 
 // src/codec-data.ts
@@ -9143,7 +9143,7 @@ var IsobmffTrackBacking = class {
     return packet;
   }
   /** Looks for a packet in the fragments while trying to load as few fragments as possible to retrieve it. */
-  async performFragmentedLookup(startFragment, getMatchInFragment, searchTimestamp, latestTimestamp, options, isRetry = false) {
+  async performFragmentedLookup(startFragment, getMatchInFragment, searchTimestamp, latestTimestamp, options, stopPos = Infinity, lookupRetryCount = 0) {
     const demuxer = this.internalTrack.demuxer;
     let currentFragment = null;
     let bestFragment = null;
@@ -9174,6 +9174,7 @@ var IsobmffTrackBacking = class {
       lookupEntry?.moofOffset ?? 0,
       positionCacheEntry?.moofOffset ?? 0
     ) || null;
+    const lookupTableWins = !!lookupEntry && lookupEntry.moofOffset >= (positionCacheEntry?.moofOffset ?? 0);
     let currentPos;
     if (!startFragment) {
       currentPos = lookupEntryPosition ?? 0;
@@ -9185,12 +9186,14 @@ var IsobmffTrackBacking = class {
         currentPos = lookupEntryPosition;
       }
     }
-    while (true) {
+    const scanStartPos = currentFragment ? currentFragment.moofOffset : currentPos;
+    while (currentPos < stopPos) {
       if (currentFragment) {
         const trackData = currentFragment.trackData.get(this.internalTrack.id);
         if (trackData && trackData.startTimestamp > latestTimestamp) {
           break;
         }
+        currentFragment = null;
       }
       const summary = demuxer.fragmentSummaries.get(currentPos);
       if (summary && !summary.trackIds.has(this.internalTrack.id)) {
@@ -9221,16 +9224,19 @@ var IsobmffTrackBacking = class {
       }
       currentPos = boxStartPos + boxInfo.totalSize;
     }
-    if (lookupEntry && (!bestFragment || bestFragment.moofOffset < lookupEntry.moofOffset)) {
-      const previousLookupEntry = this.internalTrack.fragmentLookupTable[lookupEntryIndex - 1];
-      const newSearchTimestamp = !isRetry && previousLookupEntry ? previousLookupEntry.timestamp : -Infinity;
+    if (lookupEntryPosition !== null && (!bestFragment || bestFragment.moofOffset < lookupEntryPosition)) {
+      const step = 1 << lookupRetryCount;
+      const previousEntryTimestamp = lookupTableWins ? this.internalTrack.fragmentLookupTable[lookupEntryIndex - step]?.timestamp : this.internalTrack.fragmentPositionCache[positionCacheIndex - step]?.startTimestamp;
+      const newSearchTimestamp = previousEntryTimestamp ?? -Infinity;
       return this.performFragmentedLookup(
         null,
         getMatchInFragment,
         newSearchTimestamp,
         latestTimestamp,
         options,
-        true
+        scanStartPos,
+        // So we don't read the same fragments again
+        lookupRetryCount + 1
       );
     }
     if (bestFragment) {
@@ -12250,7 +12256,7 @@ var MatroskaTrackBacking = class {
     return packet;
   }
   /** Looks for a packet in the clusters while trying to load as few clusters as possible to retrieve it. */
-  async performClusterLookup(startCluster, getMatchInCluster, searchTimestamp, latestTimestamp, options, isRetry = false) {
+  async performClusterLookup(startCluster, getMatchInCluster, searchTimestamp, latestTimestamp, options, stopPos = Infinity, lookupRetryCount = 0) {
     const { demuxer, segment } = this.internalTrack;
     let currentCluster = null;
     let bestCluster = null;
@@ -12281,6 +12287,7 @@ var MatroskaTrackBacking = class {
       cuePoint?.clusterPosition ?? 0,
       positionCacheEntry?.elementStartPos ?? 0
     ) || null;
+    const cuePointWins = !!cuePoint && cuePoint.clusterPosition >= (positionCacheEntry?.elementStartPos ?? 0);
     let currentPos;
     if (!startCluster) {
       currentPos = lookupEntryPosition ?? segment.clusterSeekStartPos;
@@ -12292,12 +12299,14 @@ var MatroskaTrackBacking = class {
         currentPos = lookupEntryPosition;
       }
     }
-    while (segment.elementEndPos === null || currentPos <= segment.elementEndPos - MIN_HEADER_SIZE) {
+    const scanStartPos = currentCluster ? currentCluster.elementStartPos : currentPos;
+    while ((segment.elementEndPos === null || currentPos <= segment.elementEndPos - MIN_HEADER_SIZE) && currentPos < stopPos) {
       if (currentCluster) {
         const trackData = currentCluster.trackData.get(this.internalTrack.id);
         if (trackData && trackData.startTimestamp > latestTimestamp) {
           break;
         }
+        currentCluster = null;
       }
       const summary = segment.clusterSummaries.get(currentPos);
       if (summary && !summary.trackIds.has(this.internalTrack.id)) {
@@ -12361,16 +12370,19 @@ var MatroskaTrackBacking = class {
       }
       currentPos = endPos;
     }
-    if (cuePoint && (!bestCluster || bestCluster.elementStartPos < cuePoint.clusterPosition)) {
-      const previousCuePoint = this.internalTrack.cuePoints[cuePointIndex - 1];
-      const newSearchTimestamp = !isRetry && previousCuePoint ? previousCuePoint.time : -Infinity;
+    if (lookupEntryPosition !== null && (!bestCluster || bestCluster.elementStartPos < lookupEntryPosition)) {
+      const step = 1 << lookupRetryCount;
+      const previousEntryTimestamp = cuePointWins ? this.internalTrack.cuePoints[cuePointIndex - step]?.time : this.internalTrack.clusterPositionCache[positionCacheIndex - step]?.startTimestamp;
+      const newSearchTimestamp = previousEntryTimestamp ?? -Infinity;
       return this.performClusterLookup(
         null,
         getMatchInCluster,
         newSearchTimestamp,
         latestTimestamp,
         options,
-        true
+        scanStartPos,
+        // So we don't read the same clusters again
+        lookupRetryCount + 1
       );
     }
     if (bestCluster) {

package/runtime/node_modules/mediabunny/dist/bundles/mediabunny.node.cjs

@@ -1853,7 +1853,7 @@ var Mediabunny = (() => {
   var EAC3_REDUCED_SAMPLE_RATES = [24e3, 22050, 16e3];
 
   // src/version.ts
-  var VERSION = "1.62.0";
+  var VERSION = "1.62.1";
   var VERSIONED_NAME = `Mediabunny v${VERSION}`;
 
   // src/codec-data.ts
@@ -9297,7 +9297,7 @@ var Mediabunny = (() => {
       return packet;
     }
     /** Looks for a packet in the fragments while trying to load as few fragments as possible to retrieve it. */
-    async performFragmentedLookup(startFragment, getMatchInFragment, searchTimestamp, latestTimestamp, options, isRetry = false) {
+    async performFragmentedLookup(startFragment, getMatchInFragment, searchTimestamp, latestTimestamp, options, stopPos = Infinity, lookupRetryCount = 0) {
       const demuxer = this.internalTrack.demuxer;
       let currentFragment = null;
       let bestFragment = null;
@@ -9328,6 +9328,7 @@ var Mediabunny = (() => {
         lookupEntry?.moofOffset ?? 0,
         positionCacheEntry?.moofOffset ?? 0
       ) || null;
+      const lookupTableWins = !!lookupEntry && lookupEntry.moofOffset >= (positionCacheEntry?.moofOffset ?? 0);
       let currentPos;
       if (!startFragment) {
         currentPos = lookupEntryPosition ?? 0;
@@ -9339,12 +9340,14 @@ var Mediabunny = (() => {
           currentPos = lookupEntryPosition;
         }
       }
-      while (true) {
+      const scanStartPos = currentFragment ? currentFragment.moofOffset : currentPos;
+      while (currentPos < stopPos) {
         if (currentFragment) {
           const trackData = currentFragment.trackData.get(this.internalTrack.id);
           if (trackData && trackData.startTimestamp > latestTimestamp) {
             break;
           }
+          currentFragment = null;
         }
         const summary = demuxer.fragmentSummaries.get(currentPos);
         if (summary && !summary.trackIds.has(this.internalTrack.id)) {
@@ -9375,16 +9378,19 @@ var Mediabunny = (() => {
         }
         currentPos = boxStartPos + boxInfo.totalSize;
       }
-      if (lookupEntry && (!bestFragment || bestFragment.moofOffset < lookupEntry.moofOffset)) {
-        const previousLookupEntry = this.internalTrack.fragmentLookupTable[lookupEntryIndex - 1];
-        const newSearchTimestamp = !isRetry && previousLookupEntry ? previousLookupEntry.timestamp : -Infinity;
+      if (lookupEntryPosition !== null && (!bestFragment || bestFragment.moofOffset < lookupEntryPosition)) {
+        const step = 1 << lookupRetryCount;
+        const previousEntryTimestamp = lookupTableWins ? this.internalTrack.fragmentLookupTable[lookupEntryIndex - step]?.timestamp : this.internalTrack.fragmentPositionCache[positionCacheIndex - step]?.startTimestamp;
+        const newSearchTimestamp = previousEntryTimestamp ?? -Infinity;
         return this.performFragmentedLookup(
           null,
           getMatchInFragment,
           newSearchTimestamp,
           latestTimestamp,
           options,
-          true
+          scanStartPos,
+          // So we don't read the same fragments again
+          lookupRetryCount + 1
         );
       }
       if (bestFragment) {
@@ -12404,7 +12410,7 @@ var Mediabunny = (() => {
       return packet;
     }
     /** Looks for a packet in the clusters while trying to load as few clusters as possible to retrieve it. */
-    async performClusterLookup(startCluster, getMatchInCluster, searchTimestamp, latestTimestamp, options, isRetry = false) {
+    async performClusterLookup(startCluster, getMatchInCluster, searchTimestamp, latestTimestamp, options, stopPos = Infinity, lookupRetryCount = 0) {
       const { demuxer, segment } = this.internalTrack;
       let currentCluster = null;
       let bestCluster = null;
@@ -12435,6 +12441,7 @@ var Mediabunny = (() => {
         cuePoint?.clusterPosition ?? 0,
         positionCacheEntry?.elementStartPos ?? 0
       ) || null;
+      const cuePointWins = !!cuePoint && cuePoint.clusterPosition >= (positionCacheEntry?.elementStartPos ?? 0);
       let currentPos;
       if (!startCluster) {
         currentPos = lookupEntryPosition ?? segment.clusterSeekStartPos;
@@ -12446,12 +12453,14 @@ var Mediabunny = (() => {
           currentPos = lookupEntryPosition;
         }
       }
-      while (segment.elementEndPos === null || currentPos <= segment.elementEndPos - MIN_HEADER_SIZE) {
+      const scanStartPos = currentCluster ? currentCluster.elementStartPos : currentPos;
+      while ((segment.elementEndPos === null || currentPos <= segment.elementEndPos - MIN_HEADER_SIZE) && currentPos < stopPos) {
         if (currentCluster) {
           const trackData = currentCluster.trackData.get(this.internalTrack.id);
           if (trackData && trackData.startTimestamp > latestTimestamp) {
             break;
           }
+          currentCluster = null;
         }
         const summary = segment.clusterSummaries.get(currentPos);
         if (summary && !summary.trackIds.has(this.internalTrack.id)) {
@@ -12515,16 +12524,19 @@ var Mediabunny = (() => {
         }
         currentPos = endPos;
       }
-      if (cuePoint && (!bestCluster || bestCluster.elementStartPos < cuePoint.clusterPosition)) {
-        const previousCuePoint = this.internalTrack.cuePoints[cuePointIndex - 1];
-        const newSearchTimestamp = !isRetry && previousCuePoint ? previousCuePoint.time : -Infinity;
+      if (lookupEntryPosition !== null && (!bestCluster || bestCluster.elementStartPos < lookupEntryPosition)) {
+        const step = 1 << lookupRetryCount;
+        const previousEntryTimestamp = cuePointWins ? this.internalTrack.cuePoints[cuePointIndex - step]?.time : this.internalTrack.clusterPositionCache[positionCacheIndex - step]?.startTimestamp;
+        const newSearchTimestamp = previousEntryTimestamp ?? -Infinity;
         return this.performClusterLookup(
           null,
           getMatchInCluster,
           newSearchTimestamp,
           latestTimestamp,
           options,
-          true
+          scanStartPos,
+          // So we don't read the same clusters again
+          lookupRetryCount + 1
         );
       }
       if (bestCluster) {

package/runtime/node_modules/mediabunny/dist/modules/src/isobmff/isobmff-demuxer.js

@@ -2860,7 +2860,11 @@ class IsobmffTrackBacking {
     // The timestamp with which we can search the lookup table
     searchTimestamp, 
     // The timestamp for which we know the correct sample will not come after it
-    latestTimestamp, options, isRetry = false) {
+    latestTimestamp, options, 
+    // The position for which we know the correct sample will not come after it
+    stopPos = Infinity, 
+    // How many times we've retried due to a faulty lookup table entry
+    lookupRetryCount = 0) {
         const demuxer = this.internalTrack.demuxer;
         let currentFragment = null;
         let bestFragment = null;
@@ -2886,6 +2890,7 @@ class IsobmffTrackBacking {
             ? this.internalTrack.fragmentPositionCache[positionCacheIndex]
             : null;
         const lookupEntryPosition = Math.max(lookupEntry?.moofOffset ?? 0, positionCacheEntry?.moofOffset ?? 0) || null;
+        const lookupTableWins = !!lookupEntry && lookupEntry.moofOffset >= (positionCacheEntry?.moofOffset ?? 0);
         let currentPos;
         if (!startFragment) {
             currentPos = lookupEntryPosition ?? 0;
@@ -2900,13 +2905,15 @@ class IsobmffTrackBacking {
                 currentPos = lookupEntryPosition;
             }
         }
-        while (true) {
+        const scanStartPos = currentFragment ? currentFragment.moofOffset : currentPos;
+        while (currentPos < stopPos) {
             if (currentFragment) {
                 const trackData = currentFragment.trackData.get(this.internalTrack.id);
                 if (trackData && trackData.startTimestamp > latestTimestamp) {
                     // We're already past the upper bound, no need to keep searching
                     break;
                 }
+                currentFragment = null; // So we don't process it again next iteration
             }
             const summary = demuxer.fragmentSummaries.get(currentPos);
             if (summary && !summary.trackIds.has(this.internalTrack.id)) {
@@ -2941,15 +2948,19 @@ class IsobmffTrackBacking {
             }
             currentPos = boxStartPos + boxInfo.totalSize;
         }
-        // Catch faulty lookup table entries
-        if (lookupEntry && (!bestFragment || bestFragment.moofOffset < lookupEntry.moofOffset)) {
-            // The lookup table entry lied to us! We found a lookup entry but no fragment there that satisfied
-            // the match. In this case, let's search again but using the lookup entry before that. If that one lies
-            // too, we stop trusting the table altogether, since walking back through many faulty entries would mean
-            // rescanning the file over and over.
-            const previousLookupEntry = this.internalTrack.fragmentLookupTable[lookupEntryIndex - 1];
-            const newSearchTimestamp = !isRetry && previousLookupEntry ? previousLookupEntry.timestamp : -Infinity;
-            return this.performFragmentedLookup(null, getMatchInFragment, newSearchTimestamp, latestTimestamp, options, true);
+        // Handle unsatisfactory lookup table entries or position cache entries
+        if (lookupEntryPosition !== null && (!bestFragment || bestFragment.moofOffset < lookupEntryPosition)) {
+            // We found a lookup entry but no fragment from there on that satisfied the match. In this case, let's
+            // search again but using a previous entry of the kind we started from. Each time this happens, we double
+            // the backwards step to perform better (and have more sequential reads) if it takes us a long time to find
+            // the media.
+            const step = 1 << lookupRetryCount;
+            const previousEntryTimestamp = lookupTableWins
+                ? this.internalTrack.fragmentLookupTable[lookupEntryIndex - step]?.timestamp
+                : this.internalTrack.fragmentPositionCache[positionCacheIndex - step]?.startTimestamp;
+            const newSearchTimestamp = previousEntryTimestamp ?? -Infinity;
+            return this.performFragmentedLookup(null, getMatchInFragment, newSearchTimestamp, latestTimestamp, options, scanStartPos, // So we don't read the same fragments again
+            lookupRetryCount + 1);
         }
         if (bestFragment) {
             // If we finished looping but didn't find a perfect match, still return the best match we found

package/runtime/node_modules/mediabunny/dist/modules/src/matroska/matroska-demuxer.js

@@ -2141,7 +2141,11 @@ class MatroskaTrackBacking {
     // The timestamp with which we can search the lookup table
     searchTimestamp, 
     // The timestamp for which we know the correct block will not come after it
-    latestTimestamp, options, isRetry = false) {
+    latestTimestamp, options, 
+    // The position for which we know the correct block will not come after it
+    stopPos = Infinity, 
+    // How many times we've retried due to a faulty lookup entry
+    lookupRetryCount = 0) {
         const { demuxer, segment } = this.internalTrack;
         let currentCluster = null;
         let bestCluster = null;
@@ -2168,6 +2172,7 @@ class MatroskaTrackBacking {
             ? this.internalTrack.clusterPositionCache[positionCacheIndex]
             : null;
         const lookupEntryPosition = Math.max(cuePoint?.clusterPosition ?? 0, positionCacheEntry?.elementStartPos ?? 0) || null;
+        const cuePointWins = !!cuePoint && cuePoint.clusterPosition >= (positionCacheEntry?.elementStartPos ?? 0);
         let currentPos;
         if (!startCluster) {
             currentPos = lookupEntryPosition ?? segment.clusterSeekStartPos;
@@ -2182,13 +2187,16 @@ class MatroskaTrackBacking {
                 currentPos = lookupEntryPosition;
             }
         }
-        while (segment.elementEndPos === null || currentPos <= segment.elementEndPos - MIN_HEADER_SIZE) {
+        const scanStartPos = currentCluster ? currentCluster.elementStartPos : currentPos;
+        while ((segment.elementEndPos === null || currentPos <= segment.elementEndPos - MIN_HEADER_SIZE)
+            && currentPos < stopPos) {
             if (currentCluster) {
                 const trackData = currentCluster.trackData.get(this.internalTrack.id);
                 if (trackData && trackData.startTimestamp > latestTimestamp) {
                     // We're already past the upper bound, no need to keep searching
                     break;
                 }
+                currentCluster = null; // So we don't process it again next iteration
             }
             const summary = segment.clusterSummaries.get(currentPos);
             if (summary && !summary.trackIds.has(this.internalTrack.id)) {
@@ -2259,15 +2267,23 @@ class MatroskaTrackBacking {
             }
             currentPos = endPos;
         }
-        // Catch faulty cue points
-        if (cuePoint && (!bestCluster || bestCluster.elementStartPos < cuePoint.clusterPosition)) {
-            // The cue point lied to us! We found a cue point but no cluster there that satisfied the match. In this
-            // case, let's search again but using the cue point before that. If that one lies too, we stop trusting the
-            // cues altogether, since walking back through many faulty cue points would mean rescanning the file over
-            // and over.
-            const previousCuePoint = this.internalTrack.cuePoints[cuePointIndex - 1];
-            const newSearchTimestamp = !isRetry && previousCuePoint ? previousCuePoint.time : -Infinity;
-            return this.performClusterLookup(null, getMatchInCluster, newSearchTimestamp, latestTimestamp, options, true);
+        // Handle unsatisfactoy cue points or position cache entries
+        if (lookupEntryPosition !== null && (!bestCluster || bestCluster.elementStartPos < lookupEntryPosition)) {
+            // We found a lookup entry but no cluster from there on that satisfied the match. In this case, let's search
+            // again but using a previous entry of the kind we started from. Each time this happens, we double the
+            // backwards step to perform better (and have more sequential reads) if it takes us a long time to find
+            // the media.
+            //
+            // Note that this doesn't only kick for faulty cue points but also for multi-track files where only one
+            // track has cue points. Since we distribute the cue points to the track with none, they might not
+            // accurately reflect where media can be found.
+            const step = 1 << lookupRetryCount;
+            const previousEntryTimestamp = cuePointWins
+                ? this.internalTrack.cuePoints[cuePointIndex - step]?.time
+                : this.internalTrack.clusterPositionCache[positionCacheIndex - step]?.startTimestamp;
+            const newSearchTimestamp = previousEntryTimestamp ?? -Infinity;
+            return this.performClusterLookup(null, getMatchInCluster, newSearchTimestamp, latestTimestamp, options, scanStartPos, // So we don't read the same clusters again
+            lookupRetryCount + 1);
         }
         if (bestCluster) {
             // If we finished looping but didn't find a perfect match, still return the best match we found