mediabunny 1.48.0 → 1.48.1

package/dist/bundles/mediabunny.cjs

@@ -13546,6 +13546,10 @@ var Mediabunny = (() => {
             currentPos += this.packetStride;
             continue;
           }
+          if (hasProgramMap && !this.elementaryStreams.some((x) => x.pid === packetHeader.pid)) {
+            currentPos += this.packetStride;
+            continue;
+          }
           const section = await this.readSection(
             currentPos,
             true,
@@ -14845,7 +14849,10 @@ var Mediabunny = (() => {
         if (codec !== "avc" && codec !== "hevc") {
           throw new Error("Unhandled.");
         }
+        const nalHeaderSize = codec === "avc" ? 1 : 2;
         let packetStartPos = null;
+        let frameStartFound = false;
+        let lastFirstMacroblockInSlice = 0;
         while (true) {
           let remaining = this.ensureBuffered(CHUNK_SIZE);
           if (remaining instanceof Promise) remaining = await remaining;
@@ -14863,7 +14870,7 @@ var Mediabunny = (() => {
             }
             i = zeroIndex;
             const posBeforeZero = chunkStartPos + i;
-            if (i + 4 >= length) {
+            if (i + 3 >= length) {
               this.seekTo(posBeforeZero);
               break;
             }
@@ -14871,32 +14878,68 @@ var Mediabunny = (() => {
             const b2 = chunk[i + 2];
             const b3 = chunk[i + 3];
             let startCodeLength = 0;
-            let nalUnitTypeByte = null;
             if (b1 === 0 && b2 === 0 && b3 === 1) {
               startCodeLength = 4;
-              nalUnitTypeByte = chunk[i + 4];
             } else if (b1 === 0 && b2 === 1) {
               startCodeLength = 3;
-              nalUnitTypeByte = b3;
             }
             if (startCodeLength === 0) {
               i++;
               continue;
             }
             const startCodePos = posBeforeZero;
-            if (packetStartPos === null) {
-              packetStartPos = startCodePos;
-              i += startCodeLength;
-              continue;
+            packetStartPos ??= startCodePos;
+            const nalHeaderStart = i + startCodeLength;
+            const payloadStart = nalHeaderStart + nalHeaderSize;
+            const AVC_SLICE_HEADER_PEEK_SIZE = 6;
+            const bytesNeeded = payloadStart + (codec === "avc" ? AVC_SLICE_HEADER_PEEK_SIZE : 1);
+            if (bytesNeeded > length) {
+              this.seekTo(posBeforeZero);
+              break;
             }
-            if (nalUnitTypeByte !== null) {
-              const nalUnitType = codec === "avc" ? extractNalUnitTypeForAvc(nalUnitTypeByte) : extractNalUnitTypeForHevc(nalUnitTypeByte);
-              const isAud = codec === "avc" ? nalUnitType === 9 /* AUD */ : nalUnitType === 35 /* AUD_NUT */;
-              if (isAud) {
-                const packetLength = startCodePos - packetStartPos;
-                this.seekTo(packetStartPos);
-                return this.supplyPacket(packetLength, 0);
+            const headerByte0 = chunk[nalHeaderStart];
+            let nalUnitType;
+            let isSlice;
+            let isAccessUnitStart;
+            if (codec === "avc") {
+              nalUnitType = extractNalUnitTypeForAvc(headerByte0);
+              isSlice = nalUnitType === 1 /* NON_IDR_SLICE */ || nalUnitType === 2 /* SLICE_DPA */ || nalUnitType === 5 /* IDR */;
+              isAccessUnitStart = nalUnitType === 6 /* SEI */ || nalUnitType === 7 /* SPS */ || nalUnitType === 8 /* PPS */ || nalUnitType === 9 /* AUD */;
+            } else {
+              nalUnitType = extractNalUnitTypeForHevc(headerByte0);
+              const layerId = (headerByte0 & 1) << 5 | chunk[nalHeaderStart + 1] >> 3;
+              if (layerId > 0) {
+                i += startCodeLength;
+                continue;
+              }
+              isSlice = nalUnitType <= 9 /* RASL_R */ || nalUnitType >= 16 /* BLA_W_LP */ && nalUnitType <= 21;
+              isAccessUnitStart = nalUnitType >= 32 /* VPS_NUT */ && nalUnitType <= 37 || nalUnitType === 39 /* PREFIX_SEI_NUT */ || nalUnitType >= 41 && nalUnitType <= 44 || nalUnitType >= 48 && nalUnitType <= 55;
+            }
+            let isFrameBoundary = false;
+            if (isSlice) {
+              let startsNewPicture;
+              if (codec === "avc") {
+                const headerBytes = chunk.subarray(payloadStart, payloadStart + AVC_SLICE_HEADER_PEEK_SIZE);
+                const firstMacroblockInSlice = readExpGolomb(new Bitstream(headerBytes));
+                startsNewPicture = !frameStartFound || firstMacroblockInSlice <= lastFirstMacroblockInSlice;
+                lastFirstMacroblockInSlice = firstMacroblockInSlice;
+              } else {
+                startsNewPicture = chunk[payloadStart] >> 7 === 1;
               }
+              if (startsNewPicture) {
+                if (frameStartFound) {
+                  isFrameBoundary = true;
+                } else {
+                  frameStartFound = true;
+                }
+              }
+            } else if (isAccessUnitStart && frameStartFound) {
+              isFrameBoundary = true;
+            }
+            if (isFrameBoundary) {
+              const packetLength = startCodePos - packetStartPos;
+              this.seekTo(packetStartPos);
+              return this.supplyPacket(packetLength, 0);
             }
             i += startCodeLength;
           }
@@ -14904,7 +14947,7 @@ var Mediabunny = (() => {
             break;
           }
         }
-        if (packetStartPos !== null) {
+        if (packetStartPos !== null && this.endPos > packetStartPos) {
           const packetLength = this.endPos - packetStartPos;
           this.seekTo(packetStartPos);
           return this.supplyPacket(packetLength, 0);