fix bug

langhuihui · Dec 25, 2024 · c27bf00 · c27bf00
1 parent 0b5388e
commit c27bf00
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 8 deletions.
diff --git a/demo/document.md b/demo/document.md
@@ -927,8 +927,7 @@ https://blog.csdn.net/nbwgl/article/details/122652003
 
 使用`http`协议启动，可以配合`nginx`或者`node` 启动。
 
-> pro 支持通过配置参数，只使用mse解码，不启动worker。 见 demo-file.html
-
+> ~~pro 支持通过配置参数，只使用mse解码，不启动worker。 见 demo-file.html~~ 暂不推荐，这种只能走硬解码，没法走软解码。推荐走加载CDN资源的方案。
 
 #### 方案二：加载CDN资源
 

diff --git a/demo/public/dist.zip b/demo/public/dist.zip
diff --git a/demo/public/pro.zip b/demo/public/pro.zip
diff --git a/demo/public/pro/demo-ai-check-frame.html b/demo/public/pro/demo-ai-check-frame.html
@@ -79,6 +79,15 @@
                 /><span>检测到黑屏、绿屏、花屏、马赛克丢弃渲染</span>
             </div>
         </div>
+        <div class="input">
+           <div>
+               <input
+                   onclick="replay()"
+                   type="checkbox"
+                   id="isFlv"
+               /><span>强制识别成flv <span style="color: red">(播放路径path不是以.flv结尾的，建议勾选上)</span> </span>
+           </div>
+        </div>
 
         <div class="input">
             <div>输入URL：</div>
@@ -113,6 +122,7 @@
     var showOperateBtns = true; // 是否显示按钮
     var forceNoOffscreen = true; //
     var jessibuca = null;
+    var $isFlv = document.getElementById('isFlv');
 
     function create() {
         jessibuca = new JessibucaPro({
@@ -128,6 +138,7 @@
             useMSE: false,
             useWCS: false,
             useSIMD: true,
+            isFlv: $isFlv.checked === true,
             showBandwidth: showOperateBtns, // 显示网速
             showPerformance: showOperateBtns, // 显示性能
             operateBtns: {

diff --git a/demo/public/qrcode.jpeg b/demo/public/qrcode.jpeg
diff --git a/dist/decoder.js b/dist/decoder.js
diff --git a/dist/jessibuca.js b/dist/jessibuca.js
diff --git a/src/demux/m7sLoader.js b/src/demux/m7sLoader.js
@@ -11,7 +11,6 @@ export default class M7sLoader extends CommonLoader {
     destroy() {
         super.destroy();
         this.player.debug.log('M7sDemux', 'destroy')
-        this.player = null;
     }
 
     dispatch(data) {

diff --git a/src/recorder/recordRTCLoader.js b/src/recorder/recordRTCLoader.js
@@ -13,6 +13,7 @@ export default class RecordRTCLoader extends Emitter {
         this.isRecording = false;
         this.recordingTimestamp = 0;
         this.recordingInterval = null;
+        this.recorder = null;
         player.debug.log('Recorder', 'init');
     }
 

diff --git a/src/worker/index.js b/src/worker/index.js
@@ -10,9 +10,12 @@ export default class DecoderWorker {
     }
 
     async destroy() {
-        this.decoderWorker.postMessage({cmd: WORKER_SEND_TYPE.close})
-        this.decoderWorker.terminate();
-        this.decoderWorker = null;
+        if (this.decoderWorker) {
+            this.decoderWorker.postMessage({cmd: WORKER_SEND_TYPE.close})
+            this.decoderWorker.terminate();
+            this.decoderWorker = null;
+        }
+
         this.player.debug.log(`decoderWorker`, 'destroy');
     }