@give-tech/ec-player 0.0.1-beta.34 → 0.0.1-beta.35

package/dist/demuxer/fMP4Demuxer.d.ts

@@ -52,6 +52,7 @@ export interface InitSegment {
     avcC?: Uint8Array;
     hvcC?: Uint8Array;
     isHevc?: boolean;
+    lengthSizeMinusOne?: number;
 }
 export declare class fMP4Demuxer {
     private timescale;
@@ -59,6 +60,7 @@ export declare class fMP4Demuxer {
     private avcC;
     private hvcC;
     private isHevc;
+    private lengthSizeMinusOne;
     private trackHandlers;
     /**
      * 解析初始化段 (ftyp + moov)
@@ -141,6 +143,10 @@ export declare class fMP4Demuxer {
      * 是否为 HEVC 编码
      */
     isHevcStream(): boolean;
+    /**
+     * 获取 NAL 长度字段大小 - 1
+     */
+    getLengthSizeMinusOne(): number;
 }
 /**
  * 检测是否为 fMP4 格式

package/dist/demuxer/fMP4Demuxer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fMP4Demuxer.d.ts","sourceRoot":"","sources":["../../src/demuxer/fMP4Demuxer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fMP4Demuxer.d.ts","sourceRoot":"","sources":["../../src/demuxer/fMP4Demuxer.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -511,6 +511,7 @@ class fMP4Demuxer {
     this.avcC = null;
     this.hvcC = null;
     this.isHevc = false;
+    this.lengthSizeMinusOne = 3;
     this.trackHandlers = /* @__PURE__ */ new Map();
   }
   /**
@@ -532,7 +533,8 @@ class fMP4Demuxer {
       timescale: this.timescale,
       avcC: this.avcC || void 0,
       hvcC: this.hvcC || void 0,
-      isHevc: this.isHevc
+      isHevc: this.isHevc,
+      lengthSizeMinusOne: this.lengthSizeMinusOne
     };
   }
   /**
@@ -685,6 +687,10 @@ class fMP4Demuxer {
       if (boxSize < 8) break;
       if (boxType === "avcC") {
         this.avcC = data.slice(offset, offset + boxSize);
+        if (boxSize > 12) {
+          this.lengthSizeMinusOne = data[offset + 8 + 4] & 3;
+          console.log("[fMP4Demuxer] avcC lengthSizeMinusOne:", this.lengthSizeMinusOne, "(NAL length size:", this.lengthSizeMinusOne + 1, "bytes)");
+        }
         return;
       }
       offset += boxSize;
@@ -703,6 +709,10 @@ class fMP4Demuxer {
       if (boxSize < 8) break;
       if (boxType === "hvcC") {
         this.hvcC = data.slice(offset, offset + boxSize);
+        if (boxSize > 12) {
+          this.lengthSizeMinusOne = data[offset + 8 + 21] & 3;
+          console.log("[fMP4Demuxer] hvcC lengthSizeMinusOne:", this.lengthSizeMinusOne, "(NAL length size:", this.lengthSizeMinusOne + 1, "bytes)");
+        }
         console.log("[fMP4Demuxer] Found hvcC, size:", boxSize);
         return;
       }
@@ -944,6 +954,12 @@ class fMP4Demuxer {
   isHevcStream() {
     return this.isHevc;
   }
+  /**
+   * 获取 NAL 长度字段大小 - 1
+   */
+  getLengthSizeMinusOne() {
+    return this.lengthSizeMinusOne;
+  }
 }
 class NALParser {
   /**
@@ -1901,7 +1917,7 @@ class HLSPlayer extends BasePlayer {
       if (this.isFMP4) {
         const queueSize = this.sampleQueue.length;
         if (queueSize > 0 || batchCount % 50 === 0) {
-          console.log("[DecodeLoop] fMP4: sampleQueue=", queueSize, "frameBuffer=", this.frameBuffer.length, "batch=", batchCount);
+          console.log("[DecodeLoop] fMP4: sampleQueue=", queueSize, "frameBuffer=", this.frameBuffer.length, "batch=", batchCount, "decoderInit=", this.decoderInitialized);
         }
         while (this.sampleQueue.length > 0 && decodedInBatch < batchSize) {
           const queuedSample = this.sampleQueue.shift();
@@ -1916,6 +1932,8 @@ class HLSPlayer extends BasePlayer {
                 this.droppedFrames++;
               }
             }
+          } else {
+            console.warn("[DecodeLoop] decodeSample returned null, remaining samples=", this.sampleQueue.length);
           }
         }
       } else {
@@ -2091,7 +2109,8 @@ class HLSPlayer extends BasePlayer {
       isHevc: initInfo?.isHevc,
       hasAvcC: !!initInfo?.avcC,
       hasHvcC: !!initInfo?.hvcC,
-      timescale: initInfo?.timescale
+      timescale: initInfo?.timescale,
+      lengthSizeMinusOne: initInfo?.lengthSizeMinusOne
     });
     this._isHevc = initInfo?.isHevc ?? false;
     if (initInfo?.hvcC && this._isHevc) {
@@ -2367,53 +2386,61 @@ class HLSPlayer extends BasePlayer {
   decodeSample(sample) {
     const decoder = this._isHevc ? this.hevcDecoder : this.decoder;
     if (!decoder) {
-      console.warn("[fMP4] Decoder not available");
+      console.warn("[fMP4] Decoder not available, isHevc=", this._isHevc);
       return null;
     }
     if (!this.decoderInitialized) {
-      console.warn("[fMP4] Decoder not initialized, skipping sample");
+      console.warn("[fMP4] Decoder not initialized, isHevc=", this._isHevc, ", sample size=", sample.data.length);
       return null;
     }
     const data = sample.data;
-    const looksLikeStartCode = data.length >= 4 && data[0] === 0 && data[1] === 0 && (data[2] === 1 || data[2] === 0 && data[3] === 1);
-    let hasStartCode = looksLikeStartCode;
-    if (looksLikeStartCode) {
-      const possibleAvccLength = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-      if (possibleAvccLength > 0 && possibleAvccLength + 4 === data.length) {
-        hasStartCode = false;
+    const lengthSize = this.fmp4Demuxer.getLengthSizeMinusOne() + 1;
+    const readNalLength = (data2, offset2, size) => {
+      switch (size) {
+        case 1:
+          return data2[offset2];
+        case 2:
+          return data2[offset2] << 8 | data2[offset2 + 1];
+        case 4:
+        default:
+          return data2[offset2] << 24 | data2[offset2 + 1] << 16 | data2[offset2 + 2] << 8 | data2[offset2 + 3];
       }
-    }
-    if (hasStartCode) {
-      const nalType2 = this._isHevc ? sample.isSync ? HEVC_NAL_TYPE.IDR_W_RADL : 1 : sample.isSync ? 5 : 1;
-      return decoder.decode({
-        type: nalType2,
-        data,
-        size: data.length
-      });
-    }
+    };
+    const hasAnnexBStartCode = data.length >= 4 && data[0] === 0 && data[1] === 0 && (data[2] === 0 && data[3] === 1 || data[2] === 1);
     let nalCount = 0;
     let totalSize = 0;
     let offset = 0;
-    while (offset + 4 <= data.length) {
-      const nalLength = data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3];
-      if (nalLength <= 0 || offset + 4 + nalLength > data.length) {
-        console.warn(`[fMP4] Invalid NAL length: ${nalLength} at offset ${offset}`);
+    let avccParseError = false;
+    while (offset + lengthSize <= data.length) {
+      const nalLength = readNalLength(data, offset, lengthSize);
+      if (nalLength <= 0 || nalLength > 1e7 || offset + lengthSize + nalLength > data.length) {
+        avccParseError = true;
         break;
       }
       totalSize += 4 + nalLength;
-      offset += 4 + nalLength;
+      offset += lengthSize + nalLength;
       nalCount++;
     }
+    if (avccParseError && hasAnnexBStartCode) {
+      const nalType2 = this._isHevc ? sample.isSync ? HEVC_NAL_TYPE.IDR_W_RADL : 1 : sample.isSync ? 5 : 1;
+      console.log("[fMP4] Sample appears to be Annex B format, isSync=", sample.isSync, "size=", data.length);
+      return decoder.decode({
+        type: nalType2,
+        data,
+        size: data.length
+      });
+    }
     if (nalCount === 0) {
-      console.warn("[fMP4] No valid NAL units found in sample");
+      console.warn("[fMP4] No valid NAL units found in sample, data.length=", data.length, "lengthSize=", lengthSize, "firstBytes=", Array.from(data.slice(0, 8)).map((b) => b.toString(16).padStart(2, "0")).join(" "));
       return null;
     }
+    console.log("[fMP4] AVCC sample: nalCount=", nalCount, "annexBSize=", totalSize, "isSync=", sample.isSync, "lengthSize=", lengthSize);
     const annexBData = new Uint8Array(totalSize);
     let writeOffset = 0;
     offset = 0;
-    while (offset + 4 <= data.length) {
-      const nalLength = data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3];
-      if (nalLength <= 0 || offset + 4 + nalLength > data.length) {
+    while (offset + lengthSize <= data.length) {
+      const nalLength = readNalLength(data, offset, lengthSize);
+      if (nalLength <= 0 || offset + lengthSize + nalLength > data.length) {
         break;
       }
       annexBData[writeOffset] = 0;
@@ -2421,9 +2448,9 @@ class HLSPlayer extends BasePlayer {
       annexBData[writeOffset + 2] = 0;
       annexBData[writeOffset + 3] = 1;
       writeOffset += 4;
-      annexBData.set(data.slice(offset + 4, offset + 4 + nalLength), writeOffset);
+      annexBData.set(data.slice(offset + lengthSize, offset + lengthSize + nalLength), writeOffset);
       writeOffset += nalLength;
-      offset += 4 + nalLength;
+      offset += lengthSize + nalLength;
     }
     const nalType = this._isHevc ? sample.isSync ? HEVC_NAL_TYPE.IDR_W_RADL : 1 : sample.isSync ? 5 : 1;
     const frame = decoder.decode({