@give-tech/ec-player 0.0.1-beta.6 → 0.0.1-beta.8

package/dist/index.js

@@ -1460,12 +1460,18 @@ const DEFAULT_HLS_CONFIG = {
 class HLSSegmentPrefetcher extends SegmentPrefetcher {
   constructor(config, callbacks, player) {
     super(config, callbacks);
+    this.currentInitSegmentUri = null;
     this.player = player;
   }
   /**
    * 获取分片数据
    */
   async fetchSegment(segment, index) {
+    if (segment.initSegmentUri && segment.initSegmentUri !== this.currentInitSegmentUri) {
+      console.log("[HLSSegmentPrefetcher] Init segment changed:", segment.initSegmentUri);
+      await this.player.loadNewInitSegment(segment.initSegmentUri);
+      this.currentInitSegmentUri = segment.initSegmentUri;
+    }
     const baseUrl = this.baseUrl;
     const url = segment.uri.startsWith("http") ? segment.uri : baseUrl + segment.uri;
     const headers = {};
@@ -1735,7 +1741,9 @@ class HLSPlayer extends BasePlayer {
       const segmentInfos = this.fmp4Segments.map((seg) => ({
         uri: seg.uri,
         duration: seg.duration,
-        byteRange: seg.byteRange
+        byteRange: seg.byteRange,
+        initSegmentUri: seg.initSegmentUri
+        // 传递初始化段 URI
       }));
       this.prefetcher.setSegments(segmentInfos, baseUrl);
     } else {
@@ -1751,33 +1759,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 数据
@@ -1842,6 +1863,45 @@ class HLSPlayer extends BasePlayer {
       throw new Error("Failed to parse fMP4 init segment: no valid codec config found");
     }
   }
+  /**
+   * 加载新的初始化段（用于不连续性流）
+   */
+  async loadNewInitSegment(uri) {
+    console.log("[fMP4] Loading new init segment for discontinuity:", uri);
+    this._sampleQueue.length = 0;
+    this._nalQueue.length = 0;
+    this.frameBuffer = [];
+    const url = uri.startsWith("http") ? uri : this.currentPlaylistUrl.substring(0, this.currentPlaylistUrl.lastIndexOf("/") + 1) + uri;
+    const response = await fetch(url);
+    const data = new Uint8Array(await response.arrayBuffer());
+    console.log("[fMP4] New init segment data size:", data.length, "bytes");
+    const initInfo = this.fmp4Demuxer.parseInitSegment(data);
+    console.log("[fMP4] New init segment parse result:", {
+      isHevc: initInfo?.isHevc,
+      hasAvcC: !!initInfo?.avcC,
+      hasHvcC: !!initInfo?.hvcC
+    });
+    const newIsHevc = initInfo?.isHevc ?? false;
+    if (newIsHevc !== this._isHevc) {
+      console.log("[fMP4] Codec type changed from", this._isHevc ? "HEVC" : "AVC", "to", newIsHevc ? "HEVC" : "AVC");
+      this._isHevc = newIsHevc;
+      this.decoderInitialized = false;
+      if (newIsHevc) {
+        await this.initHevcDecoder();
+      }
+    } else {
+      this.decoderInitialized = false;
+    }
+    if (initInfo?.hvcC && this._isHevc) {
+      this.initDecoderFromHvcC(initInfo.hvcC);
+      console.log("[fMP4] HEVC decoder re-initialized for discontinuity");
+    } else if (initInfo?.avcC) {
+      this.initDecoderFromAvcC(initInfo.avcC);
+      console.log("[fMP4] AVC decoder re-initialized for discontinuity");
+    } else {
+      console.error("[fMP4] Failed to parse new init segment!");
+    }
+  }
   /**
    * 初始化 HEVC 解码器
    */
@@ -1961,25 +2021,31 @@ class HLSPlayer extends BasePlayer {
     }
     const isFMP4 = lines.some((line) => line.includes("#EXT-X-MAP:"));
     console.log("[parsePlaylist] isFMP4:", isFMP4, "url:", url);
+    let currentInitSegment;
     for (let i = 0; i < lines.length; i++) {
       const line = lines[i].trim();
       if (line.startsWith("#EXT-X-MAP:")) {
         const mapInfo = line.substring("#EXT-X-MAP:".length);
         const uriMatch = mapInfo.match(/URI="([^"]+)"/);
         if (uriMatch) {
-          initSegment = { uri: uriMatch[1] };
+          currentInitSegment = { uri: uriMatch[1] };
           const byteRangeMatch = mapInfo.match(/BYTERANGE="(\d+)@(\d+)"/);
           if (byteRangeMatch) {
-            initSegment.byteRange = {
+            currentInitSegment.byteRange = {
               start: parseInt(byteRangeMatch[2]),
               end: parseInt(byteRangeMatch[2]) + parseInt(byteRangeMatch[1]) - 1
             };
           }
+          if (!initSegment) {
+            initSegment = currentInitSegment;
+          }
         }
+        continue;
+      }
+      if (line === "#EXT-X-DISCONTINUITY") {
+        console.log("[parsePlaylist] Found EXT-X-DISCONTINUITY");
+        continue;
       }
-    }
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i].trim();
       if (line.startsWith("#EXTINF:")) {
         const duration = parseFloat(line.split(":")[1].split(",")[0]);
         let byteRange;
@@ -1997,7 +2063,13 @@ class HLSPlayer extends BasePlayer {
         const uri = nextLine;
         if (uri && !uri.startsWith("#")) {
           if (isFMP4) {
-            fmp4Segments.push({ uri, duration, byteRange });
+            fmp4Segments.push({
+              uri,
+              duration,
+              byteRange,
+              initSegmentUri: currentInitSegment?.uri
+              // 关联当前初始化段
+            });
           } else {
             segments.push({ uri, duration });
           }