@give-tech/ec-player 0.0.1-beta.31 → 0.0.1-beta.32

package/dist/index.js

@@ -1238,7 +1238,8 @@ class SegmentPrefetcher extends BasePrefetcher {
       this.prefetchQueue.push({
         data,
         segmentIndex: nextIndex,
-        fetchTime
+        fetchTime,
+        segmentDuration: segment.duration
       });
       this.fetchedSegmentCount++;
       this.updateStatus({
@@ -1276,7 +1277,7 @@ class SegmentPrefetcher extends BasePrefetcher {
       this.prefetchQueue.shift();
       this.updateStatus({ prefetchQueueSize: this.prefetchQueue.length });
       const parseStart = performance.now();
-      const itemCount = this.parseSegment(item.data, item.segmentIndex);
+      const itemCount = this.parseSegment(item.data, item.segmentIndex, item.segmentDuration);
       const parseTime = performance.now() - parseStart;
       this.currentSegmentIndex++;
       this.updateStatus({ currentSegmentIndex: this.currentSegmentIndex });
@@ -1548,11 +1549,11 @@ class HLSSegmentPrefetcher extends SegmentPrefetcher {
   /**
    * 解析分片数据
    */
-  parseSegment(data, index) {
+  parseSegment(data, index, segmentDuration) {
     if (this.player.isFMP4) {
       return this.player.parseFMP4Data(data);
     } else {
-      return this.player.parseTSData(data);
+      return this.player.parseTSData(data, segmentDuration);
     }
   }
   /**
@@ -1584,14 +1585,36 @@ class HLSPlayer extends BasePlayer {
     this.currentPlaylistUrl = "";
     this._nalQueue = [];
     this._sampleQueue = [];
+    this._currentSegmentDuration = 0;
     this.prefetcher = null;
+    this._nalCountInCurrentSegment = 0;
     this.lastRenderTime = 0;
     this.playStartTime = 0;
     this.accumulatedMediaTime = 0;
     this._lastLogTime = 0;
+    this._lastRafTime = 0;
     this.renderLoop = (timestamp = 0) => {
       if (!this.isPlaying) return;
       const now = performance.now();
+      const BACKGROUND_PAUSE_THRESHOLD = 500;
+      if (this._lastRafTime > 0 && now - this._lastRafTime > BACKGROUND_PAUSE_THRESHOLD) {
+        const pauseDuration = now - this._lastRafTime;
+        console.log("[renderLoop] Background pause detected, duration:", pauseDuration.toFixed(0), "ms");
+        if (this.config.isLive) {
+          const KEEP_FRAMES = 5;
+          if (this.frameBuffer.length > KEEP_FRAMES) {
+            const droppedCount = this.frameBuffer.length - KEEP_FRAMES;
+            this.frameBuffer = this.frameBuffer.slice(-KEEP_FRAMES);
+            this.droppedFrames += droppedCount;
+            console.log("[renderLoop] Live resume: dropped", droppedCount, "old frames, keeping latest", KEEP_FRAMES);
+          }
+          this.playStartTime = now;
+          this.accumulatedMediaTime = 0;
+        } else {
+          this.playStartTime = now - this.accumulatedMediaTime;
+        }
+      }
+      this._lastRafTime = now;
       if (!this._lastLogTime || now - this._lastLogTime > 1e3) {
         this._lastLogTime = now;
         console.log("[renderLoop] frameBuffer=", this.frameBuffer.length, "renderer=", !!this.renderer);
@@ -1696,6 +1719,8 @@ class HLSPlayer extends BasePlayer {
       isLoaded: true,
       totalSegments: segments.length
     });
+    this.initPrefetcher();
+    this.prefetcher.start();
   }
   /**
    * 初始化解码器（覆盖基类方法，添加 fMP4 支持）
@@ -1792,11 +1817,12 @@ class HLSPlayer extends BasePlayer {
         while (this.nalQueue.length > 0 && decodedInBatch < batchSize) {
           const queuedNal = this.nalQueue.shift();
           const nalUnit = queuedNal.nalUnit;
+          const segmentDuration = queuedNal.segmentDuration;
           if (!this.decoderInitialized && (nalUnit.type === 7 || nalUnit.type === 8)) {
             this.initDecoderParamsSync([nalUnit]);
           }
           if (nalUnit.type === 5 || nalUnit.type === 1) {
-            const frame = this.decodeNAL(nalUnit);
+            const frame = this.decodeNAL(nalUnit, segmentDuration);
             if (frame) {
               this.frameBuffer.push(frame);
               decodedInBatch++;
@@ -1910,7 +1936,7 @@ class HLSPlayer extends BasePlayer {
   /**
    * 解析 TS 数据
    */
-  parseTSData(tsData) {
+  parseTSData(tsData, segmentDuration) {
     const packets = this.tsDemuxer.parse(tsData);
     let nalCount = 0;
     if (packets.video.length > 0) {
@@ -1920,8 +1946,15 @@ class HLSPlayer extends BasePlayer {
         if (!this.decoderInitialized) {
           this.initDecoderParamsSync(nalUnits);
         }
+        if (segmentDuration !== void 0) {
+          this._currentSegmentDuration = segmentDuration;
+        }
         for (const nalUnit of nalUnits) {
-          this._nalQueue.push({ nalUnit, pts: 0 });
+          this._nalQueue.push({
+            nalUnit,
+            pts: 0,
+            segmentDuration: this._currentSegmentDuration
+          });
         }
         nalCount = nalUnits.length;
       }
@@ -1978,7 +2011,13 @@ class HLSPlayer extends BasePlayer {
     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 headers = {};
+    if (this.initSegment?.uri === uri && this.initSegment.byteRange) {
+      const { start, end } = this.initSegment.byteRange;
+      headers["Range"] = `bytes=${start}-${end}`;
+      console.log("[fMP4] Using byte range for init segment:", { start, end });
+    }
+    const response = await fetch(url, { headers });
     const data = new Uint8Array(await response.arrayBuffer());
     console.log("[fMP4] New init segment data size:", data.length, "bytes");
     const initInfo = this.fmp4Demuxer.parseInitSegment(data);
@@ -2297,16 +2336,22 @@ class HLSPlayer extends BasePlayer {
   /**
    * 解码单个 NAL 单元
    */
-  decodeNAL(nalUnit) {
+  decodeNAL(nalUnit, segmentDuration) {
     if (!this.decoder) return null;
     const nalWithStartCode = new Uint8Array(nalUnit.size + 4);
     nalWithStartCode.set([0, 0, 0, 1], 0);
     nalWithStartCode.set(nalUnit.data, 4);
-    return this.decoder.decode({
+    const frame = this.decoder.decode({
       type: nalUnit.type,
       data: nalWithStartCode,
       size: nalWithStartCode.length
     });
+    if (frame && segmentDuration && segmentDuration > 0) {
+      const timescale = 1e3;
+      const frameDuration = timescale / 60;
+      frame.duration = frameDuration;
+    }
+    return frame;
   }
 }
 const FLV_SIGNATURE = [70, 76, 86];
@@ -2842,6 +2887,7 @@ class FLVPlayer extends BasePlayer {
     this.bufferEmptyStartTime = 0;
     this.playStartTimeOffset = 0;
     this.resyncCount = 0;
+    this._lastRafTime = 0;
     this.renderLoop = () => {
       if (!this.isPlaying) return;
       this.updateState({
@@ -2851,12 +2897,32 @@ class FLVPlayer extends BasePlayer {
       });
       const now = performance.now();
       const isLive = this.config.isLive;
+      const BACKGROUND_PAUSE_THRESHOLD = 500;
+      if (this._lastRafTime > 0 && now - this._lastRafTime > BACKGROUND_PAUSE_THRESHOLD) {
+        const pauseDuration = now - this._lastRafTime;
+        console.log("[FLVPlayer] Background pause detected, duration:", pauseDuration.toFixed(0), "ms, isLive:", isLive, "queue:", this._videoTagQueue.length, "buffer:", this._timedFrameBuffer.length);
+        if (isLive) {
+          const droppedDecoded = this._timedFrameBuffer.length;
+          const droppedQueue = this._videoTagQueue.length;
+          this._timedFrameBuffer = [];
+          this._videoTagQueue = [];
+          this.droppedFrames += droppedDecoded;
+          this.playStartTime = 0;
+          this.firstFrameDts = -1;
+          this.pausedTime = 0;
+          console.log("[FLVPlayer] Live resume: cleared all buffers (decoded:", droppedDecoded, ", queue:", droppedQueue, "), waiting for new data");
+        } else {
+          this.playStartTimeOffset += pauseDuration;
+        }
+      }
+      this._lastRafTime = now;
       if (this._timedFrameBuffer.length > 0 && this.renderer) {
         this.consecutiveEmptyBuffer = 0;
         if (this.playStartTime <= 0) {
           this.firstFrameDts = this._timedFrameBuffer[0].dts;
           this.playStartTime = now;
           this.playStartTimeOffset = 0;
+          this.pausedTime = 0;
           console.log("[FLVPlayer] RenderLoop initialized, firstFrameDts:", this.firstFrameDts, "isLive:", isLive);
         }
         if (isLive) {