@give-tech/ec-player 0.0.1-beta.21 → 0.0.1-beta.23

package/dist/demuxer/fMP4Demuxer.d.ts

@@ -59,6 +59,7 @@ export declare class fMP4Demuxer {
     private avcC;
     private hvcC;
     private isHevc;
+    private trackHandlers;
     /**
      * 解析初始化段 (ftyp + moov)
      */
@@ -72,9 +73,9 @@ export declare class fMP4Demuxer {
      */
     private parseTrak;
     /**
-     * 解析 mdia box 并检查是否为视频轨道
+     * 解析 mdia box 并返回 handler type
      */
-    private parseMdiaAndCheckVideo;
+    private parseMdiaAndGetHandlerType;
     /**
      * 解析 mdhd box 获取 timescale
      */

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

@@ -417,6 +417,7 @@ class fMP4Demuxer {
     this.avcC = null;
     this.hvcC = null;
     this.isHevc = false;
+    this.trackHandlers = /* @__PURE__ */ new Map();
   }
   /**
    * 解析初始化段 (ftyp + moov)
@@ -463,7 +464,7 @@ class fMP4Demuxer {
     let offset = trakOffset + 8;
     const endOffset = trakOffset + trakSize;
     let currentTrackId = null;
-    let isVideoTrack = false;
+    let handlerType = null;
     console.log("[fMP4Demuxer] parseTrak called, size:", trakSize);
     while (offset < endOffset - 8) {
       const boxSize = readUint32$1(data, offset);
@@ -479,22 +480,25 @@ class fMP4Demuxer {
         }
         console.log("[fMP4Demuxer] tkhd: version=", version, "trackId=", currentTrackId);
       } else if (boxType === "mdia") {
-        isVideoTrack = this.parseMdiaAndCheckVideo(data, offset, boxSize);
-        if (isVideoTrack && currentTrackId !== null) {
-          this.trackId = currentTrackId;
-          console.log("[fMP4Demuxer] Found video track, trackId:", currentTrackId);
+        handlerType = this.parseMdiaAndGetHandlerType(data, offset, boxSize);
+        if (handlerType && currentTrackId !== null) {
+          this.trackHandlers.set(currentTrackId, handlerType);
+          console.log("[fMP4Demuxer] Track", currentTrackId, "handler:", handlerType);
+          if (handlerType === "vide") {
+            this.trackId = currentTrackId;
+          }
         }
       }
       offset += boxSize;
     }
   }
   /**
-   * 解析 mdia box 并检查是否为视频轨道
+   * 解析 mdia box 并返回 handler type
    */
-  parseMdiaAndCheckVideo(data, mdiaOffset, mdiaSize) {
+  parseMdiaAndGetHandlerType(data, mdiaOffset, mdiaSize) {
     let offset = mdiaOffset + 8;
     const endOffset = mdiaOffset + mdiaSize;
-    let isVideo = false;
+    let handlerType = null;
     while (offset < endOffset - 8) {
       const boxSize = readUint32$1(data, offset);
       const boxType = readFourCC(data, offset + 4);
@@ -502,14 +506,13 @@ class fMP4Demuxer {
       if (boxType === "mdhd") {
         this.parseMdhd(data, offset + 8);
       } else if (boxType === "hdlr") {
-        const handlerType = readFourCC(data, offset + 8 + 8);
-        isVideo = handlerType === "vide";
-      } else if (boxType === "minf" && isVideo) {
+        handlerType = readFourCC(data, offset + 8 + 8);
+      } else if (boxType === "minf" && handlerType === "vide") {
         this.parseMinf(data, offset, boxSize);
       }
       offset += boxSize;
     }
-    return isVideo;
+    return handlerType;
   }
   /**
    * 解析 mdhd box 获取 timescale
@@ -766,13 +769,23 @@ class fMP4Demuxer {
    */
   extractSamples(moof, mdatData, moofOffset, mdatOffset) {
     const samples = [];
+    console.log(`[fMP4Demuxer] extractSamples: moof.trafs=${moof.trafs.length}, trackHandlers=${JSON.stringify(Object.fromEntries(this.trackHandlers))}`);
     for (const traf of moof.trafs) {
       if (!traf.tfhd || !traf.tfdt) {
+        console.log(`[fMP4Demuxer] traf missing tfhd or tfdt`);
         continue;
       }
-      if (traf.tfhd.trackId !== this.trackId) {
+      const trackId = traf.tfhd.trackId;
+      const handlerType = this.trackHandlers.get(trackId);
+      if (handlerType && handlerType !== "vide") {
+        console.log(`[fMP4Demuxer] Skipping non-video track: trackId=${trackId}, handler=${handlerType}`);
         continue;
       }
+      if (!handlerType) {
+        console.log(`[fMP4Demuxer] Unknown trackId=${trackId}, will filter by sample size`);
+      } else {
+        console.log(`[fMP4Demuxer] Processing video track: trackId=${trackId}, truns=${traf.truns.length}`);
+      }
       let baseDts = traf.tfdt.baseMediaDecodeTime;
       const baseDataOffset = traf.tfhd.baseDataOffset ?? moofOffset;
       for (const trun of traf.truns) {
@@ -790,6 +803,11 @@ class fMP4Demuxer {
             console.log(`[fMP4Demuxer] Skipping sample: no data available`);
             continue;
           }
+          if (!handlerType && sampleSize < 1e3) {
+            dataOffset += sampleSize;
+            baseDts += sample.duration ?? 0;
+            continue;
+          }
           const sampleData = mdatData.slice(dataOffset, dataOffset + sampleSize);
           const isSync = (sample.flags ?? 0) & 16777216;
           const cto = sample.compositionTimeOffset ?? 0;
@@ -1509,7 +1527,6 @@ class HLSSegmentPrefetcher extends SegmentPrefetcher {
    * 获取分片数据
    */
   async fetchSegment(segment, index) {
-    console.log("[HLSSegmentPrefetcher] fetchSegment called, index=", index, "uri=", segment.uri);
     if (segment.initSegmentUri && segment.initSegmentUri !== this.currentInitSegmentUri) {
       console.log("[HLSSegmentPrefetcher] Init segment changed:", segment.initSegmentUri);
       await this.player.loadNewInitSegment(segment.initSegmentUri);
@@ -1517,22 +1534,13 @@ class HLSSegmentPrefetcher extends SegmentPrefetcher {
     }
     const baseUrl = this.baseUrl;
     const url = segment.uri.startsWith("http") ? segment.uri : baseUrl + segment.uri;
-    console.log("[HLSSegmentPrefetcher] Fetching URL:", url);
     const headers = {};
     if (segment.byteRange) {
       const { start, end } = segment.byteRange;
       headers["Range"] = `bytes=${start}-${end}`;
     }
-    try {
-      const response = await fetch(url, { headers });
-      console.log("[HLSSegmentPrefetcher] Fetch response:", response.status, response.ok);
-      const buffer = await response.arrayBuffer();
-      console.log("[HLSSegmentPrefetcher] Fetched data size:", buffer.byteLength);
-      return new Uint8Array(buffer);
-    } catch (error) {
-      console.error("[HLSSegmentPrefetcher] Fetch error:", error);
-      throw error;
-    }
+    const response = await fetch(url, { headers });
+    return new Uint8Array(await response.arrayBuffer());
   }
   /**
    * 解析分片数据
@@ -1613,7 +1621,7 @@ class HLSPlayer extends BasePlayer {
           this.frameBuffer.shift();
           this.renderer.render(frame);
           this.accumulatedMediaTime += frameDurationMs;
-          this.setCurrentTime(this.accumulatedMediaTime);
+          this.setCurrentTime(this.accumulatedMediaTime / 1e3);
           this.updateState({ resolution: `${frame.width}x${frame.height}` });
           const fps = this.renderer.updateFps();
           this.updateState({ fps });
@@ -1736,8 +1744,6 @@ class HLSPlayer extends BasePlayer {
     if (this.prefetcher) {
       this.prefetcher.setCurrentSegmentIndex(targetIndex);
     }
-    this.playStartTime = performance.now();
-    this.accumulatedMediaTime = time;
     this.setCurrentTime(time);
     console.log("[HLSPlayer] Seek to", time, "ms, segment:", targetIndex);
   }
@@ -1893,7 +1899,9 @@ class HLSPlayer extends BasePlayer {
         this._sampleQueue.push({ sample });
       }
       totalSampleCount += samples.length;
+      console.log("[parseFMP4Data] Pushed", samples.length, "samples, totalQueue=", this._sampleQueue.length);
     }
+    console.log("[parseFMP4Data] Total samples parsed:", totalSampleCount);
     return totalSampleCount;
   }
   /**
@@ -2055,10 +2063,13 @@ class HLSPlayer extends BasePlayer {
    */
   initDecoderFromHvcC(hvcC) {
     if (this.decoderInitialized || !this.hevcDecoder) return;
-    let offset = 22;
+    console.log("[fMP4] hvcC length:", hvcC.length);
+    console.log("[fMP4] hvcC first 8 bytes:", Array.from(hvcC.slice(0, 8)).map((b) => b.toString(16).padStart(2, "0")).join(" "));
+    console.log("[fMP4] hvcC bytes 8-24:", Array.from(hvcC.slice(8, 24)).map((b) => b.toString(16).padStart(2, "0")).join(" "));
+    let offset = 8 + 22;
     const numOfArrays = hvcC[offset];
+    console.log("[fMP4] hvcC[30] (numOfArrays):", numOfArrays, "0x" + numOfArrays.toString(16));
     offset += 1;
-    console.log(`[fMP4] hvcC: numOfArrays=${numOfArrays}`);
     for (let i = 0; i < numOfArrays && offset < hvcC.length - 3; i++) {
       const typeCompressed = hvcC[offset];
       const arrayType = typeCompressed & 63;