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

package/dist/decoder/H264Decoder.d.ts

@@ -6,9 +6,14 @@ import { WASMLoader } from './WASMLoader';
 export declare class H264Decoder {
     private wasmModule;
     private decoderContext;
+    private destroyed;
     constructor(wasmLoader: WASMLoader);
     init(): Promise<void>;
     decode(nalUnit: NALUnit): VideoFrame | null;
+    /**
+     * 销毁解码器，释放 WASM 资源
+     */
+    destroy(): void;
     private yuv420pToRgba;
 }
 //# sourceMappingURL=H264Decoder.d.ts.map

package/dist/decoder/H264Decoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"H264Decoder.d.ts","sourceRoot":"","sources":["../../src/decoder/H264Decoder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAA8B,UAAU,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,qBAAa,WAAW;IACtB,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,cAAc,CAA8B;gBAExC,UAAU,EAAE,UAAU;IAI5B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI;IA4C3C,OAAO,CAAC,aAAa;CAuCtB"}
+{"version":3,"file":"H264Decoder.d.ts","sourceRoot":"","sources":["../../src/decoder/H264Decoder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAA8B,UAAU,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,qBAAa,WAAW;IACtB,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,SAAS,CAAQ;gBAEb,UAAU,EAAE,UAAU;IAI5B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI;IA4C3C;;OAEG;IACH,OAAO,IAAI,IAAI;IAaf,OAAO,CAAC,aAAa;CAuCtB"}

package/dist/decoder/HEVCDecoder.d.ts

@@ -13,9 +13,14 @@ export declare const HEVC_NAL_TYPE: {
 export declare class HEVCDecoder {
     private wasmModule;
     private decoderContext;
+    private destroyed;
     constructor(wasmLoader: WASMLoader);
     init(): Promise<void>;
     decode(nalUnit: NALUnit): VideoFrame | null;
+    /**
+     * 销毁解码器，释放 WASM 资源
+     */
+    destroy(): void;
     private yuv420pToRgba;
 }
 //# sourceMappingURL=HEVCDecoder.d.ts.map

package/dist/decoder/HEVCDecoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HEVCDecoder.d.ts","sourceRoot":"","sources":["../../src/decoder/HEVCDecoder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAA8B,UAAU,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,eAAO,MAAM,aAAa;;;;;;CAMhB,CAAA;AAEV,qBAAa,WAAW;IACtB,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,cAAc,CAA8B;gBAExC,UAAU,EAAE,UAAU;IAI5B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAe3B,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI;IA4C3C,OAAO,CAAC,aAAa;CAuCtB"}
+{"version":3,"file":"HEVCDecoder.d.ts","sourceRoot":"","sources":["../../src/decoder/HEVCDecoder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAA8B,UAAU,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,eAAO,MAAM,aAAa;;;;;;CAMhB,CAAA;AAEV,qBAAa,WAAW;IACtB,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,SAAS,CAAQ;gBAEb,UAAU,EAAE,UAAU;IAI5B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAe3B,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI;IA4C3C;;OAEG;IACH,OAAO,IAAI,IAAI;IAaf,OAAO,CAAC,aAAa;CAuCtB"}

package/dist/decoder/WASMLoader.d.ts

@@ -1,10 +1,39 @@
 /**
- * WASM 加载器
+ * WASM 加载器（多模块缓存）
+ *
+ * 支持同时缓存多个 WASM 模块（如 SIMD 和非 SIMD 版本）
+ * 使用懒加载，按需加载所需模块
+ * 解决快速切换源时的竞态条件问题
  */
 import type { WASMModule } from '../types';
 export declare class WASMLoader {
-    private module;
+    private localModule;
+    private localPath;
+    /**
+     * 加载 WASM 模块
+     */
     load(wasmPath: string): Promise<WASMModule>;
+    private doLoad;
     getModule(): WASMModule | null;
+    /**
+     * 预加载 WASM 模块（后台加载，不阻塞）
+     */
+    static preload(wasmPath: string): void;
+    /**
+     * 批量预加载
+     */
+    static preloadAll(wasmPaths: string[]): void;
+    /**
+     * 检查是否已加载
+     */
+    static isLoaded(wasmPath?: string): boolean;
+    /**
+     * 获取已缓存的路径
+     */
+    static getLoadedPaths(): string[];
+    /**
+     * 重置（仅用于测试）
+     */
+    static reset(): void;
 }
 //# sourceMappingURL=WASMLoader.d.ts.map

package/dist/decoder/WASMLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WASMLoader.d.ts","sourceRoot":"","sources":["../../src/decoder/WASMLoader.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAE1C,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAA0B;IAElC,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAmCjD,SAAS,IAAI,UAAU,GAAG,IAAI;CAG/B"}
+{"version":3,"file":"WASMLoader.d.ts","sourceRoot":"","sources":["../../src/decoder/WASMLoader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAQ1C,qBAAa,UAAU;IACrB,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,SAAS,CAAsB;IAEvC;;OAEG;IACG,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAsCnC,MAAM;IAuCpB,SAAS,IAAI,UAAU,GAAG,IAAI;IAI9B;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAWtC;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAI5C;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;IAO3C;;OAEG;IACH,MAAM,CAAC,cAAc,IAAI,MAAM,EAAE;IAIjC;;OAEG;IACH,MAAM,CAAC,KAAK,IAAI,IAAI;CAIrB"}

package/dist/index.d.ts

@@ -6,6 +6,7 @@
  */
 export { EcPlayerCore, type EcPlayerCoreConfig } from './player';
 export { EnvDetector, type EnvInfo, type EnvCapabilities } from './env';
+export { WASMLoader } from './decoder/WASMLoader';
 export type { PlayerState as EcPlayerState, PlayerCallbacks as EcPlayerCallbacks } from './types';
 export { LogLevel, setLogLevel } from './utils';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,YAAY,EAAE,KAAK,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAGhE,OAAO,EACL,WAAW,EACX,KAAK,OAAO,EACZ,KAAK,eAAe,EACrB,MAAM,OAAO,CAAA;AAGd,YAAY,EACV,WAAW,IAAI,aAAa,EAC5B,eAAe,IAAI,iBAAiB,EACrC,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,YAAY,EAAE,KAAK,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAGhE,OAAO,EACL,WAAW,EACX,KAAK,OAAO,EACZ,KAAK,eAAe,EACrB,MAAM,OAAO,CAAA;AAGd,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,YAAY,EACV,WAAW,IAAI,aAAa,EAC5B,eAAe,IAAI,iBAAiB,EACrC,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA"}

package/dist/index.js

@@ -1,8 +1,43 @@
+const moduleCache = /* @__PURE__ */ new Map();
+const loadingPromises = /* @__PURE__ */ new Map();
 class WASMLoader {
   constructor() {
-    this.module = null;
+    this.localModule = null;
+    this.localPath = null;
   }
+  /**
+   * 加载 WASM 模块
+   */
   async load(wasmPath) {
+    if (this.localModule && this.localPath === wasmPath) {
+      return this.localModule;
+    }
+    const cachedModule = moduleCache.get(wasmPath);
+    if (cachedModule) {
+      this.localModule = cachedModule;
+      this.localPath = wasmPath;
+      return cachedModule;
+    }
+    const loadingPromise = loadingPromises.get(wasmPath);
+    if (loadingPromise) {
+      const module = await loadingPromise;
+      this.localModule = module;
+      this.localPath = wasmPath;
+      return module;
+    }
+    const loadPromise = this.doLoad(wasmPath);
+    loadingPromises.set(wasmPath, loadPromise);
+    try {
+      const module = await loadPromise;
+      this.localModule = module;
+      this.localPath = wasmPath;
+      return module;
+    } catch (error) {
+      loadingPromises.delete(wasmPath);
+      throw error;
+    }
+  }
+  async doLoad(wasmPath) {
     return new Promise((resolve, reject) => {
       const script = document.createElement("script");
       script.src = wasmPath;
@@ -14,30 +49,75 @@ class WASMLoader {
             reject(new Error("createFFmpegDecoder not found"));
             return;
           }
-          this.module = await createFFmpegDecoder();
-          if (typeof this.module?._create_decoder !== "function") {
+          const module = await createFFmpegDecoder();
+          if (typeof module?._create_decoder !== "function") {
             reject(new Error("Module initialization failed"));
             return;
           }
-          resolve(this.module);
+          moduleCache.set(wasmPath, module);
+          loadingPromises.delete(wasmPath);
+          resolve(module);
         } catch (e) {
+          loadingPromises.delete(wasmPath);
           reject(new Error(`Failed to initialize decoder: ${e.message}`));
         }
       };
       script.onerror = () => {
+        loadingPromises.delete(wasmPath);
         reject(new Error(`Failed to load script: ${wasmPath}`));
       };
       document.head.appendChild(script);
     });
   }
   getModule() {
-    return this.module;
+    return this.localModule;
+  }
+  /**
+   * 预加载 WASM 模块（后台加载，不阻塞）
+   */
+  static preload(wasmPath) {
+    if (moduleCache.has(wasmPath) || loadingPromises.has(wasmPath)) {
+      return;
+    }
+    const loader = new WASMLoader();
+    loader.load(wasmPath).catch((err) => {
+      console.warn(`[WASMLoader] Preload failed for ${wasmPath}:`, err.message);
+    });
+  }
+  /**
+   * 批量预加载
+   */
+  static preloadAll(wasmPaths) {
+    wasmPaths.forEach((path) => this.preload(path));
+  }
+  /**
+   * 检查是否已加载
+   */
+  static isLoaded(wasmPath) {
+    if (wasmPath) {
+      return moduleCache.has(wasmPath);
+    }
+    return moduleCache.size > 0;
+  }
+  /**
+   * 获取已缓存的路径
+   */
+  static getLoadedPaths() {
+    return Array.from(moduleCache.keys());
+  }
+  /**
+   * 重置（仅用于测试）
+   */
+  static reset() {
+    moduleCache.clear();
+    loadingPromises.clear();
   }
 }
 class H264Decoder {
   constructor(wasmLoader) {
     this.wasmModule = null;
     this.decoderContext = null;
+    this.destroyed = false;
     this.wasmModule = wasmLoader.getModule();
   }
   async init() {
@@ -50,7 +130,7 @@ class H264Decoder {
     }
   }
   decode(nalUnit) {
-    if (this.decoderContext === null || !this.wasmModule) {
+    if (this.destroyed || this.decoderContext === null || !this.wasmModule) {
       return null;
     }
     const dataPtr = this.wasmModule._malloc(nalUnit.size);
@@ -87,6 +167,18 @@ class H264Decoder {
     }
     return null;
   }
+  /**
+   * 销毁解码器，释放 WASM 资源
+   */
+  destroy() {
+    if (this.destroyed) return;
+    this.destroyed = true;
+    if (this.decoderContext !== null && this.wasmModule?._destroy_decoder) {
+      this.wasmModule._destroy_decoder(this.decoderContext);
+    }
+    this.decoderContext = null;
+    this.wasmModule = null;
+  }
   yuv420pToRgba(yPtr, uPtr, vPtr, width, height, yLineSize, uLineSize, vLineSize) {
     const rgba = new Uint8Array(width * height * 4);
     for (let y = 0; y < height; y++) {
@@ -907,6 +999,7 @@ class HEVCDecoder {
   constructor(wasmLoader) {
     this.wasmModule = null;
     this.decoderContext = null;
+    this.destroyed = false;
     this.wasmModule = wasmLoader.getModule();
   }
   async init() {
@@ -920,7 +1013,7 @@ class HEVCDecoder {
     console.log("[HEVCDecoder] Initialized with codec_id=173");
   }
   decode(nalUnit) {
-    if (this.decoderContext === null || !this.wasmModule) {
+    if (this.destroyed || this.decoderContext === null || !this.wasmModule) {
       return null;
     }
     const dataPtr = this.wasmModule._malloc(nalUnit.size);
@@ -957,6 +1050,18 @@ class HEVCDecoder {
     }
     return null;
   }
+  /**
+   * 销毁解码器，释放 WASM 资源
+   */
+  destroy() {
+    if (this.destroyed) return;
+    this.destroyed = true;
+    if (this.decoderContext !== null && this.wasmModule?._destroy_decoder) {
+      this.wasmModule._destroy_decoder(this.decoderContext);
+    }
+    this.decoderContext = null;
+    this.wasmModule = null;
+  }
   yuv420pToRgba(yPtr, uPtr, vPtr, width, height, yLineSize, uLineSize, vLineSize) {
     const rgba = new Uint8Array(width * height * 4);
     for (let y = 0; y < height; y++) {
@@ -2926,18 +3031,27 @@ class FLVPlayer extends BasePlayer {
           console.log("[FLVPlayer] RenderLoop initialized, firstFrameDts:", this.firstFrameDts, "isLive:", isLive);
         }
         if (isLive) {
-          const elapsed = now - this.playStartTime - this.pausedTime;
-          const currentTargetDts = this.firstFrameDts + elapsed;
-          this.setCurrentTime(Math.floor(currentTargetDts));
-          let frameToRender = null;
-          while (this._timedFrameBuffer.length > 0 && this._timedFrameBuffer[0].dts <= currentTargetDts) {
+          if (this.lastRenderedDts < 0 && this._timedFrameBuffer.length > 0) {
+            const firstFrame = this._timedFrameBuffer.shift();
+            this.renderFrame(firstFrame, now);
+            this.firstFrameDts = firstFrame.dts;
+            this.playStartTime = now;
+            this.pausedTime = 0;
+            console.log("[FLVPlayer] Live first frame rendered immediately, dts:", firstFrame.dts);
+          } else {
+            const elapsed = now - this.playStartTime - this.pausedTime;
+            const currentTargetDts = this.firstFrameDts + elapsed;
+            this.setCurrentTime(Math.floor(currentTargetDts));
+            let frameToRender = null;
+            while (this._timedFrameBuffer.length > 0 && this._timedFrameBuffer[0].dts <= currentTargetDts) {
+              if (frameToRender) {
+                this.droppedFrames++;
+              }
+              frameToRender = this._timedFrameBuffer.shift();
+            }
             if (frameToRender) {
-              this.droppedFrames++;
+              this.renderFrame(frameToRender, now);
             }
-            frameToRender = this._timedFrameBuffer.shift();
-          }
-          if (frameToRender) {
-            this.renderFrame(frameToRender, now);
           }
         } else {
           const nextFrame = this._timedFrameBuffer[0];
@@ -3161,6 +3275,25 @@ class FLVPlayer extends BasePlayer {
       console.log("[FLVPlayer] Pausing live stream, keeping download running");
     }
   }
+  /**
+   * 销毁播放器，释放所有资源
+   */
+  destroy() {
+    this.stopLiveDownload();
+    if (this.h264Decoder) {
+      this.h264Decoder.destroy();
+      this.h264Decoder = null;
+    }
+    if (this.hevcDecoder) {
+      this.hevcDecoder.destroy();
+      this.hevcDecoder = null;
+    }
+    if (this.prefetcher) {
+      this.prefetcher.reset();
+      this.prefetcher = null;
+    }
+    super.destroy();
+  }
   /**
    * 处理预取缓冲区数据（供预取器调用）
    */
@@ -3731,6 +3864,13 @@ class Canvas2DRenderer {
     if (!this.ctx) {
       throw new Error("Invalid canvas element");
     }
+    this.clear();
+  }
+  /**
+   * 清除 canvas 内容
+   */
+  clear() {
+    this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
   }
   render(frame) {
     const { width, height, data } = frame;
@@ -4254,6 +4394,7 @@ export {
   EcPlayerCore,
   EnvDetector,
   LogLevel,
+  WASMLoader,
   setLogLevel
 };
 //# sourceMappingURL=index.js.map