mediabunny 1.0.4 → 1.0.6

package/dist/bundles/mediabunny.cjs

@@ -6224,6 +6224,9 @@ ${cue.notes ?? ""}`;
       return null;
     }
     reader.pos += 1;
+    if (firstByte !== 255) {
+      return null;
+    }
     if ((secondByte & 224) !== 224) {
       return null;
     }
@@ -11823,6 +11826,7 @@ ${cue.notes ?? ""}`;
               fragmentLookupTable: null,
               currentFragmentState: null,
               fragments: [],
+              fragmentsWithKeyFrame: [],
               editListPreviousSegmentDurations: 0,
               editListOffset: 0
             };
@@ -11901,14 +11905,18 @@ ${cue.notes ?? ""}`;
                 continue;
               }
               if (relevantEntryFound) {
-                throw new Error("Unsupported edit list: multiple edits are not supported.");
+                console.warn(
+                  "Unsupported edit list: multiple edits are not currently supported. Only using first edit."
+                );
+                break;
               }
               if (mediaTime === -1) {
                 previousSegmentDurations += segmentDuration;
                 continue;
               }
               if (mediaRate !== 1) {
-                throw new Error("Unsupported edit list: media rate must be 1.");
+                console.warn("Unsupported edit list entry: media rate must be 1.");
+                break;
               }
               track.editListPreviousSegmentDurations = previousSegmentDurations;
               track.editListOffset = mediaTime;
@@ -12096,7 +12104,8 @@ ${cue.notes ?? ""}`;
                   } else if (sampleSize === 16) {
                     track.info.codec = "pcm-s16be";
                   } else {
-                    throw new Error(`Unsupported sample size ${sampleSize} for codec 'twos'.`);
+                    console.warn(`Unsupported sample size ${sampleSize} for codec 'twos'.`);
+                    track.info.codec = null;
                   }
                 } else if (lowercaseBoxName === "sowt") {
                   if (sampleSize === 8) {
@@ -12104,7 +12113,8 @@ ${cue.notes ?? ""}`;
                   } else if (sampleSize === 16) {
                     track.info.codec = "pcm-s16";
                   } else {
-                    throw new Error(`Unsupported sample size ${sampleSize} for codec 'sowt'.`);
+                    console.warn(`Unsupported sample size ${sampleSize} for codec 'sowt'.`);
+                    track.info.codec = null;
                   }
                 } else if (lowercaseBoxName === "raw ") {
                   track.info.codec = "pcm-u8";
@@ -12324,7 +12334,8 @@ ${cue.notes ?? ""}`;
                 } else if (pcmSampleSize === 32) {
                   track.info.codec = "pcm-s32";
                 } else {
-                  throw new Error(`Invalid ipcm sample size ${pcmSampleSize}.`);
+                  console.warn(`Invalid ipcm sample size ${pcmSampleSize}.`);
+                  track.info.codec = null;
                 }
               } else {
                 if (pcmSampleSize === 16) {
@@ -12334,7 +12345,8 @@ ${cue.notes ?? ""}`;
                 } else if (pcmSampleSize === 32) {
                   track.info.codec = "pcm-s32be";
                 } else {
-                  throw new Error(`Invalid ipcm sample size ${pcmSampleSize}.`);
+                  console.warn(`Invalid ipcm sample size ${pcmSampleSize}.`);
+                  track.info.codec = null;
                 }
               }
             } else if (track.info.codec === "pcm-f32be") {
@@ -12344,7 +12356,8 @@ ${cue.notes ?? ""}`;
                 } else if (pcmSampleSize === 64) {
                   track.info.codec = "pcm-f64";
                 } else {
-                  throw new Error(`Invalid fpcm sample size ${pcmSampleSize}.`);
+                  console.warn(`Invalid fpcm sample size ${pcmSampleSize}.`);
+                  track.info.codec = null;
                 }
               } else {
                 if (pcmSampleSize === 32) {
@@ -12352,7 +12365,8 @@ ${cue.notes ?? ""}`;
                 } else if (pcmSampleSize === 64) {
                   track.info.codec = "pcm-f64be";
                 } else {
-                  throw new Error(`Invalid fpcm sample size ${pcmSampleSize}.`);
+                  console.warn(`Invalid fpcm sample size ${pcmSampleSize}.`);
+                  track.info.codec = null;
                 }
               }
             }
@@ -12502,9 +12516,24 @@ ${cue.notes ?? ""}`;
           break;
         case "stz2":
           {
-            throw new Error("Unsupported.");
+            const track = this.currentTrack;
+            assert(track);
+            if (!track.sampleTable) {
+              break;
+            }
+            this.metadataReader.pos += 4;
+            this.metadataReader.pos += 3;
+            const fieldSize = this.metadataReader.readU8();
+            const sampleCount = this.metadataReader.readU32();
+            const bytes2 = this.metadataReader.readBytes(Math.ceil(sampleCount * fieldSize / 8));
+            const bitstream = new Bitstream(bytes2);
+            for (let i = 0; i < sampleCount; i++) {
+              const sampleSize = bitstream.readBits(fieldSize);
+              track.sampleTable.sampleSizes.push(sampleSize);
+            }
           }
           ;
+          break;
         case "stss":
           {
             const track = this.currentTrack;
@@ -12702,6 +12731,15 @@ ${cue.notes ?? ""}`;
                   (x) => x.moofOffset
                 );
                 this.currentTrack.fragments.splice(insertionIndex + 1, 0, this.currentFragment);
+                const hasKeyFrame = trackData.firstKeyFrameTimestamp !== null;
+                if (hasKeyFrame) {
+                  const insertionIndex2 = binarySearchLessOrEqual(
+                    this.currentTrack.fragmentsWithKeyFrame,
+                    this.currentFragment.moofOffset,
+                    (x) => x.moofOffset
+                  );
+                  this.currentTrack.fragmentsWithKeyFrame.splice(insertionIndex2 + 1, 0, this.currentFragment);
+                }
                 const { currentFragmentState } = this.currentTrack;
                 assert(currentFragmentState);
                 if (currentFragmentState.startTimestamp !== null) {
@@ -12788,7 +12826,8 @@ ${cue.notes ?? ""}`;
             assert(this.currentFragment);
             assert(track.currentFragmentState);
             if (this.currentFragment.trackData.has(track.id)) {
-              throw new Error("Can't have two trun boxes for the same track in one fragment.");
+              console.warn("Can't have two trun boxes for the same track in one fragment. Ignoring...");
+              break;
             }
             const version = this.metadataReader.readU8();
             const flags = this.metadataReader.readU24();
@@ -12816,6 +12855,7 @@ ${cue.notes ?? ""}`;
             const trackData = {
               startTimestamp: 0,
               endTimestamp: 0,
+              firstKeyFrameTimestamp: null,
               samples: [],
               presentationTimestamps: [],
               startTimestampIsFinal: false
@@ -12866,11 +12906,16 @@ ${cue.notes ?? ""}`;
               currentTimestamp += sampleDuration;
             }
             trackData.presentationTimestamps = trackData.samples.map((x, i) => ({ presentationTimestamp: x.presentationTimestamp, sampleIndex: i })).sort((a, b) => a.presentationTimestamp - b.presentationTimestamp);
-            for (let i = 0; i < trackData.presentationTimestamps.length - 1; i++) {
-              const current = trackData.presentationTimestamps[i];
-              const next = trackData.presentationTimestamps[i + 1];
-              const duration = next.presentationTimestamp - current.presentationTimestamp;
-              trackData.samples[current.sampleIndex].duration = duration;
+            for (let i = 0; i < trackData.presentationTimestamps.length; i++) {
+              const currentEntry = trackData.presentationTimestamps[i];
+              const currentSample = trackData.samples[currentEntry.sampleIndex];
+              if (trackData.firstKeyFrameTimestamp === null && currentSample.isKeyFrame) {
+                trackData.firstKeyFrameTimestamp = currentSample.presentationTimestamp;
+              }
+              if (i < trackData.presentationTimestamps.length - 1) {
+                const nextEntry = trackData.presentationTimestamps[i + 1];
+                currentSample.duration = nextEntry.presentationTimestamp - currentEntry.presentationTimestamp;
+              }
             }
             const firstSample = trackData.samples[trackData.presentationTimestamps[0].sampleIndex];
             const lastSample = trackData.samples[last(trackData.presentationTimestamps).sampleIndex];
@@ -13069,7 +13114,7 @@ ${cue.notes ?? ""}`;
               while (currentFragment.nextFragment) {
                 currentFragment = currentFragment.nextFragment;
                 const trackData2 = currentFragment.trackData.get(this.internalTrack.id);
-                if (trackData2) {
+                if (trackData2 && trackData2.firstKeyFrameTimestamp !== null) {
                   const fragmentIndex2 = binarySearchExact(
                     this.internalTrack.fragments,
                     currentFragment.moofOffset,
@@ -13077,9 +13122,7 @@ ${cue.notes ?? ""}`;
                   );
                   assert(fragmentIndex2 !== -1);
                   const keyFrameIndex = trackData2.samples.findIndex((x) => x.isKeyFrame);
-                  if (keyFrameIndex === -1) {
-                    throw new Error("Not supported: Fragment does not contain key sample.");
-                  }
+                  assert(keyFrameIndex !== -1);
                   return {
                     fragmentIndex: fragmentIndex2,
                     sampleIndex: keyFrameIndex,
@@ -13192,24 +13235,29 @@ ${cue.notes ?? ""}`;
       return { fragmentIndex, sampleIndex, correctSampleFound };
     }
     findKeySampleInFragmentsForTimestamp(timestampInTimescale) {
-      const fragmentIndex = binarySearchLessOrEqual(
+      const indexInKeyFrameFragments = binarySearchLessOrEqual(
         // This array is technically not sorted by start timestamp, but for any reasonable file, it basically is.
-        this.internalTrack.fragments,
+        this.internalTrack.fragmentsWithKeyFrame,
         timestampInTimescale,
         (x) => x.trackData.get(this.internalTrack.id).startTimestamp
       );
+      let fragmentIndex = -1;
       let sampleIndex = -1;
       let correctSampleFound = false;
-      if (fragmentIndex !== -1) {
-        const fragment = this.internalTrack.fragments[fragmentIndex];
+      if (indexInKeyFrameFragments !== -1) {
+        const fragment = this.internalTrack.fragmentsWithKeyFrame[indexInKeyFrameFragments];
+        fragmentIndex = binarySearchExact(
+          this.internalTrack.fragments,
+          fragment.moofOffset,
+          (x) => x.moofOffset
+        );
+        assert(fragmentIndex !== -1);
         const trackData = fragment.trackData.get(this.internalTrack.id);
         const index = findLastIndex(trackData.presentationTimestamps, (x) => {
           const sample = trackData.samples[x.sampleIndex];
           return sample.isKeyFrame && x.presentationTimestamp <= timestampInTimescale;
         });
-        if (index === -1) {
-          throw new Error("Not supported: Fragment does not begin with a key sample.");
-        }
+        assert(index !== -1);
         const entry = trackData.presentationTimestamps[index];
         sampleIndex = entry.sampleIndex;
         correctSampleFound = timestampInTimescale < trackData.endTimestamp;
@@ -13732,20 +13780,15 @@ ${cue.notes ?? ""}`;
           trackData.blocks = sortBlocksByReferences(trackData.blocks);
         }
         trackData.presentationTimestamps = trackData.blocks.map((block, i) => ({ timestamp: block.timestamp, blockIndex: i })).sort((a, b) => a.timestamp - b.timestamp);
-        let hasKeyFrame = false;
         for (let i = 0; i < trackData.presentationTimestamps.length; i++) {
-          const entry = trackData.presentationTimestamps[i];
-          const block = trackData.blocks[entry.blockIndex];
-          if (block.isKeyFrame) {
-            hasKeyFrame = true;
-            if (trackData.firstKeyFrameTimestamp === null && block.isKeyFrame) {
-              trackData.firstKeyFrameTimestamp = block.timestamp;
-            }
+          const currentEntry = trackData.presentationTimestamps[i];
+          const currentBlock = trackData.blocks[currentEntry.blockIndex];
+          if (trackData.firstKeyFrameTimestamp === null && currentBlock.isKeyFrame) {
+            trackData.firstKeyFrameTimestamp = currentBlock.timestamp;
           }
           if (i < trackData.presentationTimestamps.length - 1) {
             const nextEntry = trackData.presentationTimestamps[i + 1];
-            const nextBlock = trackData.blocks[nextEntry.blockIndex];
-            block.duration = nextBlock.timestamp - block.timestamp;
+            currentBlock.duration = nextEntry.timestamp - currentBlock.timestamp;
           }
         }
         const firstBlock = trackData.blocks[trackData.presentationTimestamps[0].blockIndex];
@@ -13760,6 +13803,7 @@ ${cue.notes ?? ""}`;
             (x) => x.elementStartPos
           );
           track.clusters.splice(insertionIndex2 + 1, 0, cluster);
+          const hasKeyFrame = trackData.firstKeyFrameTimestamp !== null;
           if (hasKeyFrame) {
             const insertionIndex3 = binarySearchLessOrEqual(
               track.clustersWithKeyFrame,
@@ -14798,7 +14842,7 @@ ${cue.notes ?? ""}`;
     readNextFrameHeader(until) {
       assert(this.fileSize);
       until ??= this.fileSize;
-      while (this.pos < until - FRAME_HEADER_SIZE) {
+      while (this.pos <= until - FRAME_HEADER_SIZE) {
         const word = this.readU32();
         this.pos -= 4;
         const header = readFrameHeader(word, this);
@@ -15840,7 +15884,8 @@ ${cue.notes ?? ""}`;
         return true;
       }
       mp3Reader.pos = firstHeader.startPos + firstHeader.totalSize;
-      const secondHeader = mp3Reader.readNextFrameHeader(Math.min(framesStartPos + 4096, sourceSize));
+      await mp3Reader.reader.loadRange(mp3Reader.pos, mp3Reader.pos + FRAME_HEADER_SIZE);
+      const secondHeader = mp3Reader.readNextFrameHeader(mp3Reader.pos + FRAME_HEADER_SIZE);
       if (!secondHeader) {
         return false;
       }