mediabunny 1.7.3 → 1.7.5

package/dist/bundles/mediabunny.cjs

@@ -5607,7 +5607,7 @@ var Mediabunny = (() => {
   };
   var MAX_VAR_INT_SIZE = 8;
   var MIN_HEADER_SIZE = 2;
-  var MAX_HEADER_SIZE = 4 + MAX_VAR_INT_SIZE;
+  var MAX_HEADER_SIZE = 2 * MAX_VAR_INT_SIZE;
   var EBMLReader = class {
     constructor(reader) {
       this.reader = reader;
@@ -5631,9 +5631,12 @@ var Mediabunny = (() => {
     readVarIntSize() {
       const { view: view2, offset } = this.reader.getViewAndOffset(this.pos, this.pos + 1);
       const firstByte = view2.getUint8(offset);
+      if (firstByte === 0) {
+        return null;
+      }
       let width = 1;
       let mask = 128;
-      while ((firstByte & mask) === 0 && width < 8) {
+      while ((firstByte & mask) === 0) {
         width++;
         mask >>= 1;
       }
@@ -5642,9 +5645,12 @@ var Mediabunny = (() => {
     readVarInt() {
       const { view: view2, offset } = this.reader.getViewAndOffset(this.pos, this.pos + 1);
       const firstByte = view2.getUint8(offset);
+      if (firstByte === 0) {
+        return null;
+      }
       let width = 1;
       let mask = 1 << 7;
-      while ((firstByte & mask) === 0 && width < MAX_VAR_INT_SIZE) {
+      while ((firstByte & mask) === 0) {
         width++;
         mask >>= 1;
       }
@@ -5700,6 +5706,9 @@ var Mediabunny = (() => {
     }
     readElementId() {
       const size = this.readVarIntSize();
+      if (size === null) {
+        return null;
+      }
       const id = this.readUnsignedInt(size);
       return id;
     }
@@ -5718,6 +5727,9 @@ var Mediabunny = (() => {
     }
     readElementHeader() {
       const id = this.readElementId();
+      if (id === null) {
+        return null;
+      }
       const size = this.readElementSize();
       return { id, size };
     }
@@ -5725,12 +5737,15 @@ var Mediabunny = (() => {
     async searchForNextElementId(ids, until) {
       const loadChunkSize = 2 ** 20;
       const idsSet = new Set(ids);
-      while (this.pos < until - MAX_HEADER_SIZE) {
-        if (!this.reader.rangeIsLoaded(this.pos, this.pos + MAX_HEADER_SIZE)) {
+      while (this.pos <= until - MIN_HEADER_SIZE) {
+        if (!this.reader.rangeIsLoaded(this.pos, Math.min(this.pos + MAX_HEADER_SIZE, until))) {
           await this.reader.loadRange(this.pos, Math.min(this.pos + loadChunkSize, until));
         }
         const elementStartPos = this.pos;
         const elementHeader = this.readElementHeader();
+        if (!elementHeader) {
+          break;
+        }
         if (idsSet.has(elementHeader.id)) {
           return elementStartPos;
         }
@@ -14292,6 +14307,9 @@ ${cue.notes ?? ""}`;
             this.metadataReader.pos + MAX_HEADER_SIZE
           );
           const header = this.metadataReader.readElementHeader();
+          if (!header) {
+            break;
+          }
           const id = header.id;
           let size = header.size;
           const startPos = this.metadataReader.pos;
@@ -14347,13 +14365,17 @@ ${cue.notes ?? ""}`;
         this.metadataReader.pos + 2 ** 14
       );
       let clusterEncountered = false;
-      while (this.metadataReader.pos < this.currentSegment.elementEndPos) {
+      while (this.metadataReader.pos <= this.currentSegment.elementEndPos - MIN_HEADER_SIZE) {
         await this.metadataReader.reader.loadRange(
           this.metadataReader.pos,
           this.metadataReader.pos + MAX_HEADER_SIZE
         );
         const elementStartPos = this.metadataReader.pos;
-        const { id, size } = this.metadataReader.readElementHeader();
+        const header = this.metadataReader.readElementHeader();
+        if (!header) {
+          break;
+        }
+        const { id, size } = header;
         const dataStartPos = this.metadataReader.pos;
         const metadataElementIndex = METADATA_ELEMENTS.findIndex((x) => x.id === id);
         if (metadataElementIndex !== -1) {
@@ -14406,7 +14428,9 @@ ${cue.notes ?? ""}`;
           this.metadataReader.pos + 2 ** 12
           // Load a larger range, assuming the correct element will be there
         );
-        const { id, size } = this.metadataReader.readElementHeader();
+        const header = this.metadataReader.readElementHeader();
+        if (!header) continue;
+        const { id, size } = header;
         if (id !== target.id) continue;
         assertDefinedSize(size);
         this.currentSegment[target.flag] = true;
@@ -14457,6 +14481,7 @@ ${cue.notes ?? ""}`;
       await this.metadataReader.reader.loadRange(this.metadataReader.pos, this.metadataReader.pos + MAX_HEADER_SIZE);
       const elementStartPos = this.metadataReader.pos;
       const elementHeader = this.metadataReader.readElementHeader();
+      assert(elementHeader);
       const id = elementHeader.id;
       let size = elementHeader.size;
       const dataStartPos = this.metadataReader.pos;
@@ -14641,11 +14666,18 @@ ${cue.notes ?? ""}`;
     readContiguousElements(reader, totalSize) {
       const startIndex = reader.pos;
       while (reader.pos - startIndex <= totalSize - MIN_HEADER_SIZE) {
-        this.traverseElement(reader);
+        const foundElement = this.traverseElement(reader);
+        if (!foundElement) {
+          break;
+        }
       }
     }
     traverseElement(reader) {
-      const { id, size } = reader.readElementHeader();
+      const header = reader.readElementHeader();
+      if (!header) {
+        return false;
+      }
+      const { id, size } = header;
       const dataStartPos = reader.pos;
       assertDefinedSize(size);
       switch (id) {
@@ -15042,6 +15074,7 @@ ${cue.notes ?? ""}`;
           {
             if (!this.currentCluster) break;
             const trackNumber = reader.readVarInt();
+            if (trackNumber === null) break;
             const relativeTimestamp = reader.readS16();
             const flags = reader.readU8();
             const isKeyFrame = !!(flags & 128);
@@ -15077,6 +15110,7 @@ ${cue.notes ?? ""}`;
           {
             if (!this.currentCluster) break;
             const trackNumber = reader.readVarInt();
+            if (trackNumber === null) break;
             const relativeTimestamp = reader.readS16();
             const flags = reader.readU8();
             const lacing = flags >> 1 & 3;
@@ -15113,6 +15147,7 @@ ${cue.notes ?? ""}`;
           break;
       }
       reader.pos = dataStartPos + size;
+      return true;
     }
   };
   var MatroskaTrackBacking = class {
@@ -15412,7 +15447,7 @@ ${cue.notes ?? ""}`;
             metadataReader.pos = cuePoint.clusterPosition;
           }
         }
-        while (metadataReader.pos < segment.elementEndPos) {
+        while (metadataReader.pos <= segment.elementEndPos - MIN_HEADER_SIZE) {
           if (prevCluster) {
             const trackData = prevCluster.trackData.get(this.internalTrack.id);
             if (trackData && trackData.startTimestamp > latestTimestamp) {
@@ -15427,6 +15462,9 @@ ${cue.notes ?? ""}`;
           await metadataReader.reader.loadRange(metadataReader.pos, metadataReader.pos + MAX_HEADER_SIZE);
           const elementStartPos = metadataReader.pos;
           const elementHeader = metadataReader.readElementHeader();
+          if (!elementHeader) {
+            break;
+          }
           const id = elementHeader.id;
           let size = elementHeader.size;
           const dataStartPos = metadataReader.pos;
@@ -16632,6 +16670,9 @@ ${cue.notes ?? ""}`;
       return "video/quicktime";
     }
   };
+  function foo() {
+    return 5;
+  }
   var MatroskaInputFormat = class extends InputFormat {
     /** @internal */
     async isSupportedEBMLOfDocType(input, desiredDocType) {
@@ -16641,6 +16682,10 @@ ${cue.notes ?? ""}`;
       }
       const ebmlReader = new EBMLReader(input._mainReader);
       const varIntSize = ebmlReader.readVarIntSize();
+      if (varIntSize === null) {
+        return false;
+      }
+      foo();
       if (varIntSize < 1 || varIntSize > 8) {
         return false;
       }
@@ -16653,8 +16698,10 @@ ${cue.notes ?? ""}`;
         return false;
       }
       const startPos = ebmlReader.pos;
-      while (ebmlReader.pos < startPos + dataSize) {
-        const { id: id2, size } = ebmlReader.readElementHeader();
+      while (ebmlReader.pos <= startPos + dataSize - MIN_HEADER_SIZE) {
+        const header = ebmlReader.readElementHeader();
+        if (!header) break;
+        const { id: id2, size } = header;
         const dataStartPos = ebmlReader.pos;
         if (size === null) return false;
         switch (id2) {
@@ -17297,7 +17344,7 @@ ${cue.notes ?? ""}`;
                 return;
               }
               let adjustedSampleTimestamp = Math.max(timestamp - this._startTimestamp, 0);
-              lastCanvasEndTimestamp = timestamp + duration;
+              lastCanvasEndTimestamp = adjustedSampleTimestamp + duration;
               if (frameRate !== void 0) {
                 const alignedTimestamp = Math.floor(adjustedSampleTimestamp * frameRate) / frameRate;
                 if (lastCanvas !== null) {
@@ -17359,7 +17406,7 @@ ${cue.notes ?? ""}`;
                 return;
               }
               let adjustedSampleTimestamp = Math.max(sample.timestamp - this._startTimestamp, 0);
-              lastSampleEndTimestamp = sample.timestamp + sample.duration;
+              lastSampleEndTimestamp = adjustedSampleTimestamp + sample.duration;
               if (frameRate !== void 0) {
                 const alignedTimestamp = Math.floor(adjustedSampleTimestamp * frameRate) / frameRate;
                 if (lastSample !== null) {