@give-tech/ec-player 0.0.1-beta.10 → 0.0.1-beta.12

package/dist/demuxer/fMP4Demuxer.d.ts

@@ -123,7 +123,7 @@ export declare class fMP4Demuxer {
      * 从 moof + mdat 提取视频样本
      * 只提取视频轨道（trackId 匹配）的数据
      */
-    extractSamples(moof: MoofBox, mdatData: Uint8Array, mdatOffset: number): VideoSample[];
+    extractSamples(moof: MoofBox, mdatData: Uint8Array, moofOffset: number, mdatOffset: number): VideoSample[];
     /**
      * 获取 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

@@ -464,6 +464,7 @@ class fMP4Demuxer {
     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);
@@ -763,19 +764,22 @@ 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;
+      console.log(`[fMP4Demuxer] extractSamples: traf.trackId=${traf.tfhd.trackId}, videoTrackId=${this.trackId}`);
       if (traf.tfhd.trackId !== this.trackId) {
-        console.log(`[fMP4Demuxer] Skipping track ${traf.tfhd.trackId} (expected video track ${this.trackId})`);
+        console.log(`[fMP4Demuxer] Skipping track ${traf.tfhd.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;
@@ -1548,6 +1552,8 @@ class HLSPlayer extends BasePlayer {
     this._sampleQueue = [];
     this.prefetcher = null;
     this.lastRenderTime = 0;
+    this.playStartTime = 0;
+    this.firstFramePts = null;
     this.renderLoop = (timestamp = 0) => {
       if (!this.isPlaying) return;
       const downloaded = this.isFMP4 ? this.sampleQueue.length : this.nalQueue.length;
@@ -1561,17 +1567,24 @@ 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];
+        if (this.playStartTime === 0 || this.firstFramePts === null) {
+          this.playStartTime = performance.now();
+          this.firstFramePts = frame.pts ?? 0;
+        }
+        const elapsedMs = performance.now() - this.playStartTime;
+        const timescale = this.fmp4Demuxer.getTimescale();
+        const currentTargetPts = this.firstFramePts + elapsedMs * timescale / 1e3;
+        const framePts = frame.pts ?? 0;
+        if (framePts <= currentTargetPts) {
+          this.frameBuffer.shift();
+          this.renderer.render(frame);
+          this.setCurrentTime(framePts / timescale);
+          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;
       }
@@ -1651,6 +1664,8 @@ class HLSPlayer extends BasePlayer {
     this.isPlaying = true;
     this.decodeLoopAbort = false;
     this.lastRenderTime = 0;
+    this.playStartTime = 0;
+    this.firstFramePts = null;
     this.updateState({ isPlaying: true });
     if (!this.prefetcher) {
       this.initPrefetcher();
@@ -1817,7 +1832,7 @@ class HLSPlayer extends BasePlayer {
       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 });
       }
@@ -2196,6 +2211,10 @@ class HLSPlayer extends BasePlayer {
       data: annexBData,
       size: annexBData.length
     });
+    if (frame) {
+      frame.pts = sample.pts;
+      frame.dts = sample.dts;
+    }
     return frame;
   }
   /**