@give-tech/ec-player 0.0.1-beta.7 → 0.0.1-beta.9

package/dist/demuxer/fMP4Demuxer.d.ts

@@ -72,9 +72,9 @@ export declare class fMP4Demuxer {
      */
     private parseTrak;
     /**
-     * 解析 mdia box
+     * 解析 mdia box 并检查是否为视频轨道
      */
-    private parseMdia;
+    private parseMdiaAndCheckVideo;
     /**
      * 解析 mdhd box 获取 timescale
      */
@@ -121,6 +121,7 @@ export declare class fMP4Demuxer {
     private parseTrun;
     /**
      * 从 moof + mdat 提取视频样本
+     * 只提取视频轨道（trackId 匹配）的数据
      */
     extractSamples(moof: MoofBox, mdatData: Uint8Array, mdatOffset: number): VideoSample[];
     /**

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

@@ -462,33 +462,51 @@ class fMP4Demuxer {
   parseTrak(data, trakOffset, trakSize) {
     let offset = trakOffset + 8;
     const endOffset = trakOffset + trakSize;
+    let currentTrackId = null;
+    let isVideoTrack = false;
     while (offset < endOffset - 8) {
       const boxSize = readUint32$1(data, offset);
       const boxType = readFourCC(data, offset + 4);
       if (boxSize < 8) break;
-      if (boxType === "mdia") {
-        this.parseMdia(data, offset, boxSize);
+      if (boxType === "tkhd") {
+        const version = data[offset + 8];
+        if (version === 1) {
+          currentTrackId = readUint32$1(data, offset + 8 + 16 + 4);
+        } else {
+          currentTrackId = readUint32$1(data, offset + 8 + 8 + 4);
+        }
+      } 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);
+        }
       }
       offset += boxSize;
     }
   }
   /**
-   * 解析 mdia box
+   * 解析 mdia box 并检查是否为视频轨道
    */
-  parseMdia(data, mdiaOffset, mdiaSize) {
+  parseMdiaAndCheckVideo(data, mdiaOffset, mdiaSize) {
     let offset = mdiaOffset + 8;
     const endOffset = mdiaOffset + mdiaSize;
+    let isVideo = false;
     while (offset < endOffset - 8) {
       const boxSize = readUint32$1(data, offset);
       const boxType = readFourCC(data, offset + 4);
       if (boxSize < 8) break;
       if (boxType === "mdhd") {
         this.parseMdhd(data, offset + 8);
-      } else if (boxType === "minf") {
+      } else if (boxType === "hdlr") {
+        const handlerType = readFourCC(data, offset + 8 + 8);
+        isVideo = handlerType === "vide";
+      } else if (boxType === "minf" && isVideo) {
         this.parseMinf(data, offset, boxSize);
       }
       offset += boxSize;
     }
+    return isVideo;
   }
   /**
    * 解析 mdhd box 获取 timescale
@@ -741,11 +759,16 @@ class fMP4Demuxer {
   }
   /**
    * 从 moof + mdat 提取视频样本
+   * 只提取视频轨道（trackId 匹配）的数据
    */
   extractSamples(moof, mdatData, mdatOffset) {
     const samples = [];
     for (const traf of moof.trafs) {
       if (!traf.tfhd || !traf.tfdt) continue;
+      if (traf.tfhd.trackId !== this.trackId) {
+        console.log(`[fMP4Demuxer] Skipping track ${traf.tfhd.trackId} (expected video track ${this.trackId})`);
+        continue;
+      }
       let baseDts = traf.tfdt.baseMediaDecodeTime;
       for (const trun of traf.truns) {
         let dataOffset = 0;
@@ -1759,33 +1782,46 @@ class HLSPlayer extends BasePlayer {
    * 解析 fMP4 数据
    */
   parseFMP4Data(data) {
-    let moofOffset = -1;
-    let mdatOffset = -1;
-    let mdatSize = 0;
+    let totalSampleCount = 0;
     let offset = 0;
     while (offset < data.length - 8) {
-      const boxSize = this.readBoxSize(data, offset);
-      const boxType = this.readBoxType(data, offset + 4);
-      if (boxType === "moof") {
-        moofOffset = offset;
-      } else if (boxType === "mdat") {
-        mdatOffset = offset;
-        mdatSize = boxSize;
-        break;
+      let moofOffset = -1;
+      let mdatOffset = -1;
+      let mdatSize = 0;
+      while (offset < data.length - 8) {
+        const boxSize = this.readBoxSize(data, offset);
+        const boxType = this.readBoxType(data, offset + 4);
+        if (boxSize < 8) break;
+        if (boxType === "moof") {
+          moofOffset = offset;
+          offset += boxSize;
+          break;
+        }
+        offset += boxSize;
+      }
+      if (moofOffset < 0) break;
+      while (offset < data.length - 8) {
+        const boxSize = this.readBoxSize(data, offset);
+        const boxType = this.readBoxType(data, offset + 4);
+        if (boxSize < 8) break;
+        if (boxType === "mdat") {
+          mdatOffset = offset;
+          mdatSize = boxSize;
+          offset += boxSize;
+          break;
+        }
+        offset += boxSize;
       }
-      offset += boxSize;
-    }
-    let sampleCount = 0;
-    if (moofOffset >= 0 && mdatOffset >= 0) {
+      if (mdatOffset < 0) break;
       const moof = this.fmp4Demuxer.parseMoof(data, moofOffset);
       const mdatData = data.slice(mdatOffset + 8, mdatOffset + mdatSize);
       const samples = this.fmp4Demuxer.extractSamples(moof, mdatData, mdatOffset);
       for (const sample of samples) {
         this._sampleQueue.push({ sample });
       }
-      sampleCount = samples.length;
+      totalSampleCount += samples.length;
     }
-    return sampleCount;
+    return totalSampleCount;
   }
   /**
    * 解析 TS 数据