From a3ff9c945985d5ed9e3dc8abc1bde8108ca07f9a Mon Sep 17 00:00:00 2001
From: fit2cloudrd <reaperww@gmail.com>
Date: Wed, 27 Apr 2022 11:24:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=B5=81?=
 =?UTF-8?q?=E5=AA=92=E4=BD=93,=E5=85=B3=E9=97=ADIO=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=BC=93=E5=86=B2=E5=8C=BA=E7=AD=89=20(#2200)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 优化流媒体,直播视频关闭IO隐藏缓冲区等

* refactor: 优化流媒体,直播视频关闭IO隐藏缓冲

Co-authored-by: wangjiahao <1522128093@qq.com>
---
 .../components/Editor/StreamMediaLinks.vue    | 34 +++++++++++--------
 .../canvas/custom-component/DeStreamMedia.vue | 26 +++++++++++---
 .../canvas/custom-component/component-list.js |  3 +-
 3 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/StreamMediaLinks.vue b/frontend/src/components/canvas/components/Editor/StreamMediaLinks.vue
index 02e782cf2f..4bc2e0f46f 100644
--- a/frontend/src/components/canvas/components/Editor/StreamMediaLinks.vue
+++ b/frontend/src/components/canvas/components/Editor/StreamMediaLinks.vue
@@ -24,10 +24,14 @@
               <el-radio :label="false">{{ $t('panel.no') }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="!streamMediaInfoTemp[streamMediaInfoTemp.videoType].isLive" :label="$t('panel.auto_play')">
-            <el-switch v-model="streamMediaInfoTemp[streamMediaInfoTemp.videoType].autoplay" size="mini" />
-          </el-form-item>
-          <el-form-item v-if="!streamMediaInfoTemp[streamMediaInfoTemp.videoType].isLive" :label="$t('panel.play_frequency')">
+          <!--This button is currently disabled and temporarily masked-->
+          <!--          <el-form-item v-if="!streamMediaInfoTemp[streamMediaInfoTemp.videoType].isLive" :label="$t('panel.auto_play')">-->
+          <!--            <el-switch v-model="streamMediaInfoTemp[streamMediaInfoTemp.videoType].autoplay" size="mini" />-->
+          <!--          </el-form-item>-->
+          <el-form-item
+            v-if="!streamMediaInfoTemp[streamMediaInfoTemp.videoType].isLive"
+            :label="$t('panel.play_frequency')"
+          >
             <el-radio-group v-model="streamMediaInfoTemp[streamMediaInfoTemp.videoType].loop">
               <el-radio :label="false">{{ $t('panel.play_once') }}</el-radio>
               <el-radio :label="true">{{ $t('panel.play_circle') }}</el-radio>
@@ -123,7 +127,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .slot-class{
+  .slot-class {
     color: white;
   }
 
@@ -132,13 +136,14 @@ export default {
     text-align: center;
 
   }
-  .ellip{
+
+  .ellip {
     /*width: 100%;*/
     margin-left: 10px;
     margin-right: 10px;
-    overflow: hidden;/*超出部分隐藏*/
-    white-space: nowrap;/*不换行*/
-    text-overflow:ellipsis;/*超出部分文字以...显示*/
+    overflow: hidden; /*超出部分隐藏*/
+    white-space: nowrap; /*不换行*/
+    text-overflow: ellipsis; /*超出部分文字以...显示*/
     background-color: #f7f8fa;
     color: #3d4d66;
     font-size: 12px;
@@ -147,20 +152,21 @@ export default {
     border-radius: 3px;
   }
 
-  .select-filed{
+  .select-filed {
     /*width: 100%;*/
     margin-left: 10px;
     margin-right: 10px;
-    overflow: hidden;/*超出部分隐藏*/
-    white-space: nowrap;/*不换行*/
-    text-overflow:ellipsis;/*超出部分文字以...显示*/
+    overflow: hidden; /*超出部分隐藏*/
+    white-space: nowrap; /*不换行*/
+    text-overflow: ellipsis; /*超出部分文字以...显示*/
     color: #3d4d66;
     font-size: 12px;
     line-height: 35px;
     height: 35px;
     border-radius: 3px;
   }
-  >>>.el-popover{
+
+  > > > .el-popover {
     height: 200px;
     overflow: auto;
   }
diff --git a/frontend/src/components/canvas/custom-component/DeStreamMedia.vue b/frontend/src/components/canvas/custom-component/DeStreamMedia.vue
index af831b6de1..baf58c9699 100644
--- a/frontend/src/components/canvas/custom-component/DeStreamMedia.vue
+++ b/frontend/src/components/canvas/custom-component/DeStreamMedia.vue
@@ -71,8 +71,8 @@ export default {
   mounted() {
     this.initOption()
     bus.$on('streamMediaLinksChange-' + this.element.id, () => {
-      this.pOption = this.element.streamMediaLinks[this.element.streamMediaLinks.videoType],
-      this.flvPlayer = null,
+      this.pOption = this.element.streamMediaLinks[this.element.streamMediaLinks.videoType]
+      this.flvPlayer = null
       this.videoShow = false
       this.$nextTick(() => {
         this.videoShow = true
@@ -80,14 +80,24 @@ export default {
       })
     })
   },
+  beforeDestroy() {
+    this.destroyPlayer()
+  },
   methods: {
     initOption() {
       if (flvjs.isSupported() && this.pOption.url) {
+        this.destroyPlayer()
         const video = this.$refs.player
         if (video) {
-          this.flvPlayer = flvjs.createPlayer(this.pOption)
-          this.flvPlayer.attachMediaElement(video)
           try {
+            this.flvPlayer = flvjs.createPlayer(this.pOption,
+              {
+                enableWorker: false, // 不启用分离线程
+                enableStashBuffer: false, // 关闭IO隐藏缓冲区
+                isLive: this.pOption.isLive,
+                lazyLoad: false
+              })
+            this.flvPlayer.attachMediaElement(video)
             this.flvPlayer.load()
             this.flvPlayer.play()
           } catch (error) {
@@ -95,6 +105,14 @@ export default {
           }
         }
       }
+    },
+    destroyPlayer() {
+    // Destroy
+      if (this.flvPlayer) {
+        this.flvPlayer.pause()
+        this.flvPlayer.destroy()
+        this.flvPlayer = null
+      }
     }
   }
 }
diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js
index d86abc6945..4d353d9f15 100644
--- a/frontend/src/components/canvas/custom-component/component-list.js
+++ b/frontend/src/components/canvas/custom-component/component-list.js
@@ -106,7 +106,8 @@ export const STREAMMEDIALINKS = {
     type: 'flv',
     isLive: false,
     cors: true, // 允许跨域
-    loop: true
+    loop: true,
+    autoplay: false
     // url: null // 网络动画视频
   }
 }