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

package/dist/index.js

@@ -415,6 +415,8 @@ class fMP4Demuxer {
     this.timescale = 1e3;
     this.trackId = 1;
     this.avcC = null;
+    this.hvcC = null;
+    this.isHevc = false;
   }
   /**
    * 解析初始化段 (ftyp + moov)
@@ -433,7 +435,9 @@ class fMP4Demuxer {
     return {
       trackId: this.trackId,
       timescale: this.timescale,
-      avcC: this.avcC || void 0
+      avcC: this.avcC || void 0,
+      hvcC: this.hvcC || void 0,
+      isHevc: this.isHevc
     };
   }
   /**
@@ -458,33 +462,54 @@ class fMP4Demuxer {
   parseTrak(data, trakOffset, trakSize) {
     let offset = trakOffset + 8;
     const endOffset = trakOffset + trakSize;
+    let currentTrackId = null;
+    let isVideoTrack = false;
+    console.log("[fMP4Demuxer] parseTrak called, size:", trakSize);
     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 boxDataStart = offset + 8;
+        const version = data[boxDataStart];
+        if (version === 1) {
+          currentTrackId = readUint32$1(data, boxDataStart + 1 + 3 + 8 + 8);
+        } else {
+          currentTrackId = readUint32$1(data, boxDataStart + 1 + 3 + 4 + 4);
+        }
+        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);
+        }
       }
       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
@@ -530,7 +555,7 @@ class fMP4Demuxer {
     }
   }
   /**
-   * 解析 stsd box 获取 avcC
+   * 解析 stsd box 获取 avcC 或 hvcC
    */
   parseStsd(data, stsdOffset, stsdSize) {
     const boxDataOffset = stsdOffset + 8;
@@ -544,6 +569,10 @@ class fMP4Demuxer {
         this.parseAvcSampleEntry(data, offset, entrySize);
         return;
       }
+      if (entryType === "hvc1" || entryType === "hev1") {
+        this.parseHevcSampleEntry(data, offset, entrySize);
+        return;
+      }
       offset += entrySize;
     }
   }
@@ -564,6 +593,25 @@ class fMP4Demuxer {
       offset += boxSize;
     }
   }
+  /**
+   * 解析 HEVC Sample Entry
+   */
+  parseHevcSampleEntry(data, entryOffset, entrySize) {
+    this.isHevc = true;
+    let offset = entryOffset + 8 + 78;
+    const endOffset = entryOffset + entrySize;
+    while (offset < endOffset - 8) {
+      const boxSize = readUint32$1(data, offset);
+      const boxType = readFourCC(data, offset + 4);
+      if (boxSize < 8) break;
+      if (boxType === "hvcC") {
+        this.hvcC = data.slice(offset, offset + boxSize);
+        console.log("[fMP4Demuxer] Found hvcC, size:", boxSize);
+        return;
+      }
+      offset += boxSize;
+    }
+  }
   /**
    * 解析 moof box
    */
@@ -714,20 +762,35 @@ class fMP4Demuxer {
   }
   /**
    * 从 moof + mdat 提取视频样本
+   * 只提取视频轨道（trackId 匹配）的数据
    */
-  extractSamples(moof, mdatData, mdatOffset) {
+  extractSamples(moof, mdatData, moofOffset, mdatOffset) {
     const samples = [];
     for (const traf of moof.trafs) {
-      if (!traf.tfhd || !traf.tfdt) continue;
+      if (!traf.tfhd || !traf.tfdt) {
+        continue;
+      }
+      if (traf.tfhd.trackId !== this.trackId) {
+        continue;
+      }
       let baseDts = traf.tfdt.baseMediaDecodeTime;
+      const baseDataOffset = traf.tfhd.baseDataOffset ?? moofOffset;
       for (const trun of traf.truns) {
         let dataOffset = 0;
         if (trun.dataOffset !== void 0) {
-          dataOffset = trun.dataOffset - mdatOffset - 8;
+          const absoluteOffset = baseDataOffset + trun.dataOffset;
+          dataOffset = absoluteOffset - mdatOffset - 8;
         }
         for (const sample of trun.samples) {
-          if (sample.size === void 0 || sample.size <= 0) continue;
-          const sampleData = mdatData.slice(dataOffset, dataOffset + sample.size);
+          let sampleSize = sample.size;
+          if (sampleSize === void 0 || sampleSize <= 0) {
+            sampleSize = mdatData.length - dataOffset;
+          }
+          if (sampleSize <= 0) {
+            console.log(`[fMP4Demuxer] Skipping sample: no data available`);
+            continue;
+          }
+          const sampleData = mdatData.slice(dataOffset, dataOffset + sampleSize);
           const isSync = (sample.flags ?? 0) & 16777216;
           const cto = sample.compositionTimeOffset ?? 0;
           const duration = sample.duration ?? 0;
@@ -738,7 +801,7 @@ class fMP4Demuxer {
             duration,
             isSync: isSync !== 0
           });
-          dataOffset += sample.size;
+          dataOffset += sampleSize;
           baseDts += duration;
         }
       }
@@ -757,6 +820,18 @@ class fMP4Demuxer {
   getAvcC() {
     return this.avcC;
   }
+  /**
+   * 获取 hvcC 配置
+   */
+  getHvcC() {
+    return this.hvcC;
+  }
+  /**
+   * 是否为 HEVC 编码
+   */
+  isHevcStream() {
+    return this.isHevc;
+  }
 }
 class NALParser {
   /**
@@ -804,6 +879,93 @@ class NALParser {
     return units;
   }
 }
+const HEVC_NAL_TYPE = {
+  // Picture Parameter Set
+  IDR_W_RADL: 19
+};
+class HEVCDecoder {
+  constructor(wasmLoader) {
+    this.wasmModule = null;
+    this.decoderContext = null;
+    this.wasmModule = wasmLoader.getModule();
+  }
+  async init() {
+    if (!this.wasmModule) {
+      throw new Error("WASM module not loaded");
+    }
+    this.decoderContext = this.wasmModule._create_decoder(173);
+    if (this.decoderContext === 0 || this.decoderContext === null) {
+      throw new Error("Failed to create HEVC decoder context");
+    }
+    console.log("[HEVCDecoder] Initialized with codec_id=173");
+  }
+  decode(nalUnit) {
+    if (this.decoderContext === null || !this.wasmModule) {
+      return null;
+    }
+    const dataPtr = this.wasmModule._malloc(nalUnit.size);
+    this.wasmModule.HEAPU8.set(nalUnit.data, dataPtr);
+    const result = this.wasmModule._decode_video(
+      this.decoderContext,
+      dataPtr,
+      nalUnit.size
+    );
+    this.wasmModule._free(dataPtr);
+    if (result === 1) {
+      const width = this.wasmModule._get_frame_width(this.decoderContext);
+      const height = this.wasmModule._get_frame_height(this.decoderContext);
+      if (width <= 0 || height <= 0) {
+        return null;
+      }
+      const yPtr = this.wasmModule._get_frame_data(this.decoderContext, 0);
+      const uPtr = this.wasmModule._get_frame_data(this.decoderContext, 1);
+      const vPtr = this.wasmModule._get_frame_data(this.decoderContext, 2);
+      const yLineSize = this.wasmModule._get_frame_linesize(this.decoderContext, 0);
+      const uLineSize = this.wasmModule._get_frame_linesize(this.decoderContext, 1);
+      const vLineSize = this.wasmModule._get_frame_linesize(this.decoderContext, 2);
+      const frameData = this.yuv420pToRgba(
+        yPtr,
+        uPtr,
+        vPtr,
+        width,
+        height,
+        yLineSize,
+        uLineSize,
+        vLineSize
+      );
+      return { width, height, data: frameData };
+    }
+    return null;
+  }
+  yuv420pToRgba(yPtr, uPtr, vPtr, width, height, yLineSize, uLineSize, vLineSize) {
+    const rgba = new Uint8Array(width * height * 4);
+    for (let y = 0; y < height; y++) {
+      for (let x = 0; x < width; x++) {
+        const yIndex = y * yLineSize + x;
+        const uIndex = (y >> 1) * uLineSize + (x >> 1);
+        const vIndex = (y >> 1) * vLineSize + (x >> 1);
+        const yValue = this.wasmModule.HEAPU8[yPtr + yIndex];
+        const uValue = this.wasmModule.HEAPU8[uPtr + uIndex];
+        const vValue = this.wasmModule.HEAPU8[vPtr + vIndex];
+        const c = yValue - 16;
+        const d = uValue - 128;
+        const e = vValue - 128;
+        let r = 298 * c + 409 * e + 128 >> 8;
+        let g = 298 * c - 100 * d - 208 * e + 128 >> 8;
+        let b = 298 * c + 516 * d + 128 >> 8;
+        r = r < 0 ? 0 : r > 255 ? 255 : r;
+        g = g < 0 ? 0 : g > 255 ? 255 : g;
+        b = b < 0 ? 0 : b > 255 ? 255 : b;
+        const rgbaIndex = (y * width + x) * 4;
+        rgba[rgbaIndex] = r;
+        rgba[rgbaIndex + 1] = g;
+        rgba[rgbaIndex + 2] = b;
+        rgba[rgbaIndex + 3] = 255;
+      }
+    }
+    return rgba;
+  }
+}
 class BasePrefetcher {
   constructor(config, callbacks = {}) {
     this.isRunning = false;
@@ -1077,11 +1239,16 @@ class SegmentPrefetcher extends BasePrefetcher {
   /**
    * 处理预取队列中的数据
    *
+   * @param maxSegments 最多处理的分片数量（默认处理所有）
    * @returns 是否有数据被处理
    */
-  processQueue() {
+  processQueue(maxSegments) {
     let processed = false;
+    let processedCount = 0;
     while (this.prefetchQueue.length > 0) {
+      if (maxSegments !== void 0 && processedCount >= maxSegments) {
+        break;
+      }
       const item = this.prefetchQueue[0];
       if (item.segmentIndex !== this.currentSegmentIndex) {
         break;
@@ -1097,6 +1264,7 @@ class SegmentPrefetcher extends BasePrefetcher {
       callbacks.onSegmentParsed?.(item.segmentIndex, itemCount);
       console.log(`[SegmentPrefetcher] Parsed segment #${item.segmentIndex}: ${itemCount} items, ${parseTime.toFixed(0)}ms`);
       processed = true;
+      processedCount++;
     }
     return processed;
   }
@@ -1334,21 +1502,37 @@ 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) {
+    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);
+      this.currentInitSegmentUri = segment.initSegmentUri;
+    }
     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}`;
     }
-    const response = await fetch(url, { headers });
-    return new Uint8Array(await response.arrayBuffer());
+    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;
+    }
   }
   /**
    * 解析分片数据
@@ -1378,19 +1562,29 @@ class HLSPlayer extends BasePlayer {
     this.pesExtractor = new PESExtractor();
     this.nalParser = new NALParser();
     this.fmp4Demuxer = new fMP4Demuxer();
+    this.hevcDecoder = null;
     this.isPrefetching = false;
     this.currentSegmentIndex = 0;
     this.segments = [];
     this.fmp4Segments = [];
     this.initSegment = null;
     this._isFMP4 = false;
+    this._isHevc = false;
     this.currentPlaylistUrl = "";
     this._nalQueue = [];
     this._sampleQueue = [];
     this.prefetcher = null;
     this.lastRenderTime = 0;
+    this.playStartTime = 0;
+    this.accumulatedMediaTime = 0;
+    this._lastLogTime = 0;
     this.renderLoop = (timestamp = 0) => {
       if (!this.isPlaying) return;
+      const now = performance.now();
+      if (!this._lastLogTime || now - this._lastLogTime > 1e3) {
+        this._lastLogTime = now;
+        console.log("[renderLoop] frameBuffer=", this.frameBuffer.length, "renderer=", !!this.renderer);
+      }
       const downloaded = this.isFMP4 ? this.sampleQueue.length : this.nalQueue.length;
       const segments = this.isFMP4 ? this.fmp4Segments : this.segments;
       const totalSegments = segments.length;
@@ -1402,19 +1596,35 @@ class HLSPlayer extends BasePlayer {
         totalSegments
       });
       if (this.frameBuffer.length > 0 && this.renderer) {
-        const frame = this.frameBuffer.shift();
-        this.renderer.render(frame);
-        if (this.lastRenderTime > 0) {
-          const elapsed = timestamp - this.lastRenderTime;
-          this.setCurrentTime(this._currentTime + elapsed);
+        const frame = this.frameBuffer[0];
+        const timescale = this.fmp4Demuxer.getTimescale();
+        if (this.playStartTime === 0) {
+          this.playStartTime = now;
+          this.accumulatedMediaTime = 0;
+          console.log("[renderLoop] Init: timescale=", timescale);
+        }
+        const elapsedWallTime = now - this.playStartTime;
+        const frameDurationMs = frame.duration ? frame.duration * 1e3 / timescale : 33.33;
+        if (Math.floor(elapsedWallTime / 1e3) !== Math.floor((elapsedWallTime - 20) / 1e3)) {
+          console.log("[renderLoop] elapsed=", Math.floor(elapsedWallTime), "accumulated=", Math.floor(this.accumulatedMediaTime), "frameDuration=", frame.duration, "frameDurationMs=", frameDurationMs.toFixed(2), "frameBuffer=", this.frameBuffer.length);
+        }
+        const bufferMs = 50;
+        if (elapsedWallTime >= this.accumulatedMediaTime - bufferMs) {
+          this.frameBuffer.shift();
+          this.renderer.render(frame);
+          this.accumulatedMediaTime += frameDurationMs;
+          this.setCurrentTime(this.accumulatedMediaTime);
+          this.updateState({ resolution: `${frame.width}x${frame.height}` });
+          const fps = this.renderer.updateFps();
+          this.updateState({ fps });
+          this.callbacks.onFrameRender?.(frame);
         }
-        this.lastRenderTime = timestamp;
-        this.updateState({ resolution: `${frame.width}x${frame.height}` });
-        const fps = this.renderer.updateFps();
-        this.updateState({ fps });
-        this.callbacks.onFrameRender?.(frame);
       } else {
-        this.lastRenderTime = 0;
+        if (this.playStartTime !== 0) {
+          const oldPlayStartTime = this.playStartTime;
+          this.playStartTime = now - this.accumulatedMediaTime;
+          console.log("[renderLoop] No frames, adjusting playStartTime from", oldPlayStartTime, "to", this.playStartTime, "accumulated=", this.accumulatedMediaTime);
+        }
       }
       this.frameTimer = requestAnimationFrame(this.renderLoop);
     };
@@ -1423,6 +1633,9 @@ class HLSPlayer extends BasePlayer {
   get isFMP4() {
     return this._isFMP4;
   }
+  get isHevc() {
+    return this._isHevc;
+  }
   get nalQueue() {
     return this._nalQueue;
   }
@@ -1489,6 +1702,8 @@ class HLSPlayer extends BasePlayer {
     this.isPlaying = true;
     this.decodeLoopAbort = false;
     this.lastRenderTime = 0;
+    this.playStartTime = 0;
+    this.accumulatedMediaTime = 0;
     this.updateState({ isPlaying: true });
     if (!this.prefetcher) {
       this.initPrefetcher();
@@ -1521,6 +1736,8 @@ 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);
   }
@@ -1531,10 +1748,22 @@ class HLSPlayer extends BasePlayer {
     console.log("[DecodeLoop] START, isFMP4:", this.isFMP4);
     let batchCount = 0;
     while (this.isPlaying && !this.decodeLoopAbort) {
-      this.prefetcher?.processQueue();
+      const sampleQueueSize = this.sampleQueue.length;
+      const maxSamplesBeforePause = this.config.maxQueueSize * 3;
+      if (sampleQueueSize < maxSamplesBeforePause && this.prefetcher) {
+        this.prefetcher.processQueue(1);
+      }
+      if (!this.config.isLive && this.frameBuffer.length >= this.config.targetBufferSize) {
+        await this.sleep(10);
+        continue;
+      }
       const batchSize = this.config.decodeBatchSize;
       let decodedInBatch = 0;
       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);
+        }
         while (this.sampleQueue.length > 0 && decodedInBatch < batchSize) {
           const queuedSample = this.sampleQueue.shift();
           const sample = queuedSample.sample;
@@ -1542,9 +1771,11 @@ class HLSPlayer extends BasePlayer {
           if (frame) {
             this.frameBuffer.push(frame);
             decodedInBatch++;
-            while (this.frameBuffer.length > this.config.targetBufferSize) {
-              this.frameBuffer.shift();
-              this.droppedFrames++;
+            if (this.config.isLive) {
+              while (this.frameBuffer.length > this.config.targetBufferSize) {
+                this.frameBuffer.shift();
+                this.droppedFrames++;
+              }
             }
           }
         }
@@ -1560,9 +1791,11 @@ class HLSPlayer extends BasePlayer {
             if (frame) {
               this.frameBuffer.push(frame);
               decodedInBatch++;
-              while (this.frameBuffer.length > this.config.targetBufferSize) {
-                this.frameBuffer.shift();
-                this.droppedFrames++;
+              if (this.config.isLive) {
+                while (this.frameBuffer.length > this.config.targetBufferSize) {
+                  this.frameBuffer.shift();
+                  this.droppedFrames++;
+                }
               }
             }
           }
@@ -1604,7 +1837,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 {
@@ -1620,33 +1855,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;
       }
-      offset += boxSize;
-    }
-    let sampleCount = 0;
-    if (moofOffset >= 0 && mdatOffset >= 0) {
+      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;
+      }
+      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);
+      const samples = this.fmp4Demuxer.extractSamples(moof, mdatData, moofOffset, mdatOffset);
       for (const sample of samples) {
         this._sampleQueue.push({ sample });
       }
-      sampleCount = samples.length;
+      totalSampleCount += samples.length;
     }
-    return sampleCount;
+    return totalSampleCount;
   }
   /**
    * 解析 TS 数据
@@ -1690,16 +1938,74 @@ class HLSPlayer extends BasePlayer {
     const data = new Uint8Array(await response.arrayBuffer());
     console.log("[fMP4] Init segment data size:", data.length, "bytes");
     const initInfo = this.fmp4Demuxer.parseInitSegment(data);
-    console.log("[fMP4] Parse result:", initInfo);
-    if (initInfo?.avcC) {
+    console.log("[fMP4] Parse result:", {
+      isHevc: initInfo?.isHevc,
+      hasAvcC: !!initInfo?.avcC,
+      hasHvcC: !!initInfo?.hvcC,
+      timescale: initInfo?.timescale
+    });
+    this._isHevc = initInfo?.isHevc ?? false;
+    if (initInfo?.hvcC && this._isHevc) {
+      console.log("[fMP4] hvcC size:", initInfo.hvcC.length);
+      await this.initHevcDecoder();
+      this.initDecoderFromHvcC(initInfo.hvcC);
+      console.log("[fMP4] HEVC decoder initialized, timescale:", initInfo.timescale);
+    } else if (initInfo?.avcC) {
       console.log("[fMP4] avcC size:", initInfo.avcC.length);
       this.initDecoderFromAvcC(initInfo.avcC);
-      console.log("[fMP4] Init segment loaded, timescale:", initInfo.timescale);
+      console.log("[fMP4] AVC decoder initialized, timescale:", initInfo.timescale);
+    } else {
+      console.error("[fMP4] Failed to parse init segment or no avcC/hvcC found!");
+      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;
+    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 init segment or no avcC found!");
-      throw new Error("Failed to parse fMP4 init segment");
+      console.error("[fMP4] Failed to parse new init segment!");
     }
   }
+  /**
+   * 初始化 HEVC 解码器
+   */
+  async initHevcDecoder() {
+    if (this.hevcDecoder) return;
+    this.hevcDecoder = new HEVCDecoder(this.wasmLoader);
+    await this.hevcDecoder.init();
+    console.log("[fMP4] HEVC decoder created");
+  }
   /**
    * 从 avcC 初始化解码器
    */
@@ -1744,6 +2050,40 @@ class HLSPlayer extends BasePlayer {
     this.decoderInitialized = true;
     console.log("[fMP4] Decoder initialized from avcC");
   }
+  /**
+   * 从 hvcC 初始化 HEVC 解码器
+   */
+  initDecoderFromHvcC(hvcC) {
+    if (this.decoderInitialized || !this.hevcDecoder) return;
+    let offset = 22;
+    const numOfArrays = hvcC[offset];
+    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;
+      const numNalus = hvcC[offset + 1] << 8 | hvcC[offset + 2];
+      offset += 3;
+      console.log(`[fMP4] HEVC array: type=${arrayType}, count=${numNalus}`);
+      for (let j = 0; j < numNalus && offset < hvcC.length - 2; j++) {
+        const nalUnitLength = hvcC[offset] << 8 | hvcC[offset + 1];
+        offset += 2;
+        if (offset + nalUnitLength > hvcC.length) break;
+        const nalUnitData = hvcC.slice(offset, offset + nalUnitLength);
+        offset += nalUnitLength;
+        const nalWithStartCode = new Uint8Array(4 + nalUnitLength);
+        nalWithStartCode.set([0, 0, 0, 1], 0);
+        nalWithStartCode.set(nalUnitData, 4);
+        if (arrayType === 32 || arrayType === 33 || arrayType === 34) {
+          this.hevcDecoder.decode({ type: arrayType, data: nalWithStartCode, size: nalWithStartCode.length });
+          const typeName = arrayType === 32 ? "VPS" : arrayType === 33 ? "SPS" : "PPS";
+          console.log(`[fMP4] HEVC ${typeName} decoded, length=${nalUnitLength}`);
+        }
+      }
+    }
+    this.decoderInitialized = true;
+    console.log("[fMP4] HEVC decoder initialized from hvcC");
+  }
   /**
    * 解析 HLS 播放列表
    */
@@ -1776,25 +2116,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;
@@ -1812,7 +2158,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 });
           }
@@ -1855,7 +2207,8 @@ class HLSPlayer extends BasePlayer {
    * 解码 fMP4 sample
    */
   decodeSample(sample) {
-    if (!this.decoder) {
+    const decoder = this._isHevc ? this.hevcDecoder : this.decoder;
+    if (!decoder) {
       console.warn("[fMP4] Decoder not available");
       return null;
     }
@@ -1866,8 +2219,9 @@ class HLSPlayer extends BasePlayer {
     const data = sample.data;
     const hasStartCode = data.length >= 4 && data[0] === 0 && data[1] === 0 && (data[2] === 1 || data[2] === 0 && data[3] === 1);
     if (hasStartCode) {
-      return this.decoder.decode({
-        type: sample.isSync ? 5 : 1,
+      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
       });
@@ -1906,11 +2260,17 @@ class HLSPlayer extends BasePlayer {
       writeOffset += nalLength;
       offset += 4 + nalLength;
     }
-    const frame = this.decoder.decode({
-      type: sample.isSync ? 5 : 1,
+    const nalType = this._isHevc ? sample.isSync ? HEVC_NAL_TYPE.IDR_W_RADL : 1 : sample.isSync ? 5 : 1;
+    const frame = decoder.decode({
+      type: nalType,
       data: annexBData,
       size: annexBData.length
     });
+    if (frame) {
+      frame.pts = sample.pts;
+      frame.dts = sample.dts;
+      frame.duration = sample.duration;
+    }
     return frame;
   }
   /**
@@ -2388,89 +2748,6 @@ class FLVDemuxer {
     return tag.frameType === FRAME_TYPE_KEYFRAME;
   }
 }
-class HEVCDecoder {
-  constructor(wasmLoader) {
-    this.wasmModule = null;
-    this.decoderContext = null;
-    this.wasmModule = wasmLoader.getModule();
-  }
-  async init() {
-    if (!this.wasmModule) {
-      throw new Error("WASM module not loaded");
-    }
-    this.decoderContext = this.wasmModule._create_decoder(173);
-    if (this.decoderContext === 0 || this.decoderContext === null) {
-      throw new Error("Failed to create HEVC decoder context");
-    }
-    console.log("[HEVCDecoder] Initialized with codec_id=173");
-  }
-  decode(nalUnit) {
-    if (this.decoderContext === null || !this.wasmModule) {
-      return null;
-    }
-    const dataPtr = this.wasmModule._malloc(nalUnit.size);
-    this.wasmModule.HEAPU8.set(nalUnit.data, dataPtr);
-    const result = this.wasmModule._decode_video(
-      this.decoderContext,
-      dataPtr,
-      nalUnit.size
-    );
-    this.wasmModule._free(dataPtr);
-    if (result === 1) {
-      const width = this.wasmModule._get_frame_width(this.decoderContext);
-      const height = this.wasmModule._get_frame_height(this.decoderContext);
-      if (width <= 0 || height <= 0) {
-        return null;
-      }
-      const yPtr = this.wasmModule._get_frame_data(this.decoderContext, 0);
-      const uPtr = this.wasmModule._get_frame_data(this.decoderContext, 1);
-      const vPtr = this.wasmModule._get_frame_data(this.decoderContext, 2);
-      const yLineSize = this.wasmModule._get_frame_linesize(this.decoderContext, 0);
-      const uLineSize = this.wasmModule._get_frame_linesize(this.decoderContext, 1);
-      const vLineSize = this.wasmModule._get_frame_linesize(this.decoderContext, 2);
-      const frameData = this.yuv420pToRgba(
-        yPtr,
-        uPtr,
-        vPtr,
-        width,
-        height,
-        yLineSize,
-        uLineSize,
-        vLineSize
-      );
-      return { width, height, data: frameData };
-    }
-    return null;
-  }
-  yuv420pToRgba(yPtr, uPtr, vPtr, width, height, yLineSize, uLineSize, vLineSize) {
-    const rgba = new Uint8Array(width * height * 4);
-    for (let y = 0; y < height; y++) {
-      for (let x = 0; x < width; x++) {
-        const yIndex = y * yLineSize + x;
-        const uIndex = (y >> 1) * uLineSize + (x >> 1);
-        const vIndex = (y >> 1) * vLineSize + (x >> 1);
-        const yValue = this.wasmModule.HEAPU8[yPtr + yIndex];
-        const uValue = this.wasmModule.HEAPU8[uPtr + uIndex];
-        const vValue = this.wasmModule.HEAPU8[vPtr + vIndex];
-        const c = yValue - 16;
-        const d = uValue - 128;
-        const e = vValue - 128;
-        let r = 298 * c + 409 * e + 128 >> 8;
-        let g = 298 * c - 100 * d - 208 * e + 128 >> 8;
-        let b = 298 * c + 516 * d + 128 >> 8;
-        r = r < 0 ? 0 : r > 255 ? 255 : r;
-        g = g < 0 ? 0 : g > 255 ? 255 : g;
-        b = b < 0 ? 0 : b > 255 ? 255 : b;
-        const rgbaIndex = (y * width + x) * 4;
-        rgba[rgbaIndex] = r;
-        rgba[rgbaIndex + 1] = g;
-        rgba[rgbaIndex + 2] = b;
-        rgba[rgbaIndex + 3] = 255;
-      }
-    }
-    return rgba;
-  }
-}
 const CODEC_ID_AVC = 7;
 const CODEC_ID_HEVC = 12;
 const FLV_PREFETCHER_CONFIG = {
@@ -2734,8 +3011,8 @@ class FLVPlayer extends BasePlayer {
    * 开始播放（覆盖基类方法）
    */
   async play() {
-    const MIN_BUFFER_SIZE = this.dynamicMinBufferSize;
-    const MAX_WAIT_TIME = 1e4;
+    const MIN_BUFFER_SIZE = this.config.isLive ? 3 : this.dynamicMinBufferSize;
+    const MAX_WAIT_TIME = this.config.isLive ? 3e3 : 1e4;
     const startTime = Date.now();
     console.log(`[FLVPlayer] Waiting for buffer (target: ${MIN_BUFFER_SIZE} frames)...`);
     let aggressiveDecodeCount = 0;
@@ -2766,6 +3043,12 @@ class FLVPlayer extends BasePlayer {
     }
     console.log("[FLVPlayer] Buffer ready, frames:", this._timedFrameBuffer.length, "queue:", this._videoTagQueue.length);
     if (this._timedFrameBuffer.length > 0) {
+      if (this.config.isLive && this._timedFrameBuffer.length > 60) {
+        const droppedCount = this._timedFrameBuffer.length - 30;
+        this._timedFrameBuffer = this._timedFrameBuffer.slice(-30);
+        this.droppedFrames += droppedCount;
+        console.log("[FLVPlayer] Live resume: dropped", droppedCount, "old frames, keeping latest 30");
+      }
       this.firstFrameDts = this._timedFrameBuffer[0].dts;
       this.playStartTime = performance.now();
       console.log("[FLVPlayer] Play time initialized, firstFrameDts:", this.firstFrameDts);
@@ -2788,8 +3071,7 @@ class FLVPlayer extends BasePlayer {
       this.prefetcher.stop();
     }
     if (this.config.isLive) {
-      console.log("[FLVPlayer] Pausing live stream, stopping download");
-      this.stopLiveDownload();
+      console.log("[FLVPlayer] Pausing live stream, keeping download running");
     }
   }
   /**