Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into...

ZZJ

2021-09-24 0d9ea2d6a84297139e7bfca3424e5b25999d1a4e

Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into bhomebus

 public/libs/wasmPlayer/libffmpeg.wasm

Binary files differ

 public/libs/wasmPlayer/turbo.js

@@ -67,14 +67,23 @@
    })
  }, 'vii')

  Notify = Module.addFunction(function(Type, Value) {
    //type 1:播放失败 2:文件播放到末尾
    //console.log(Type+" "+Value);
    if (Type == 1) self.postMessage({ command: 'play_failed' })
    else if (Type == 2) self.postMessage({ command: 'play_end' })
  }, 'vii')

  Module._Initialize(
    DeliverVideo,
    DeliverAudio,
    GetFileLength,
    ReadFile,
    CreateVideo,
    CreateAudio
    CreateAudio,
    Notify
  )

  self.postMessage({ command: 'initialized' })
}


 src/components/wasmPlayer/index.vue

@@ -9,16 +9,11 @@
    ></canvas>
    <div class="container" id="videoPlayer">
      <div class="canvasDiv">
        <div class="loadEffect" id="loading" style="display:none;">
          <span></span>
          <span></span>
          <span></span>
          <span></span>
          <span></span>
          <span></span>
          <span></span>
          <span></span>
        </div>
        <div
          v-loading="videoLoading"
          element-loading-background="rgba(0, 0, 0, 0.8)"
          style="position: unset !important"
        ></div>
        <canvas
          ref="playCanvas"
          id="paly-canvas"
@@ -85,6 +80,13 @@
        <span class="video-next" v-show="showNext">
          <i class="el-icon-arrow-right" @click="playNext"></i>
        </span>

        <!-- 播放失败 -->
        <span class="video-error" v-show="playerStatus == -1">
          <i class="el-icon-warning-outline" style="font-size:40px"></i>
          <br />
          视频加载失败 无效的视频地址
        </span>
      </div>
    </div>
  </div>
@@ -136,6 +138,14 @@
      type: Boolean,
      default: true,
    },
    autoPlay: {
      type: Boolean,
      default: false,
    },
    preload: {
      type: Boolean,
      default: true,
    },
  },

  computed: {
@@ -175,6 +185,8 @@
      playerStatus: 0,
      videoUrls: [],
      playerIndex: 0,
      isEmptyUrl: false,
      videoLoading: false,
    }
  },
  watch: {
@@ -192,11 +204,8 @@
  },
  mounted() {
    this.player = new Player()

    // 录像URL处理, 可能存在多个录像地址
    if (!this.isStream) {
      this.videoUrls = this.videoUrl.split('||')
    }
    this.player.preload = this.preload
    this.player.statusCallback = this.setPlayerStatus

    if (this.isStream) {
      this.playVideo()
@@ -206,42 +215,24 @@
        this.ctx.lineWidth = 1
        this.initArea()
      })
    } else {
      // 录像URL处理, 可能存在多个录像地址
      if (this.videoUrl === '') {
        this.playerStatus = -1
        return
      }

      this.videoUrls = this.videoUrl.split('||')

      if (this.autoPlay || this.preload) {
        this.playVideo()
      }
    }
  },
  beforeDestroy() {
    this.player.stop()
  },
  methods: {
    checkConnect(id) {
      if (id !== this.playerId) {
        return
      }

      if (this.wfs.websocketLoader && this.wfs.websocketLoader.client) {
        if (this.wfs.websocketLoader.client.disconnected) {
          this.playVideo()
          console.log('实时视频已断开，正在重连')
          return
        }
      }

      let _this = this
      setTimeout(() => {
        _this.checkConnect(id)
      }, 10000)
    },
    getUuid() {
      var s = []
      var hexDigits = '0123456789abcdefghijkopqrst'
      for (var i = 0; i < 36; i++) {
        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1)
      }
      s[14] = '4' // bits 12-15 of the time_hi_and_version field to 0010
      s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1) // bits 6-7 of the clock_seq_hi_and_reserved to 01
      s[8] = s[13] = s[18] = s[23] = '-'
      var uuid = s.join('')
      return uuid
    },
    // 回显cavas数据
    // 点击选中变色 将当前页面所有路径重绘判断当前鼠标的坐标在哪个图形内 如果不传坐标参数就是回显的方法
    clickSelect(e) {
@@ -451,10 +442,7 @@
        url = '/httpImage/' + this.videoUrls[this.playerIndex]
      }

      if (url == '') {
        return
      }

      this.videoLoading = true
      if (this.player.hPlayer == 0) {
        this.player.play(
          url,
@@ -462,19 +450,25 @@
          this.isStream,
          this.$refs.timeTrack,
          this.$refs.timeLabel,
          payload
          payload,
          () => {
            this.videoLoading = false
          }
        )
      } else if (this.player.PlayOrPause == 0) {
        this.player.resume()
        this.videoLoading = false
      } else {
        this.player.pause()
        this.videoLoading = false
      }

      this.playerStatus = this.player.PlayOrPause
      let randomId = this.getUuid()
      this.checkConnect(randomId)
    },

    setPlayerStatus(stat) {
      this.videoLoading = false
      this.playerStatus = stat
    },
    stopVideo() {
      if (this.player.hPlayer == 0) return

@@ -495,7 +489,6 @@
      this.playerIndex++
      this.player.stop()
      this.playVideo()
      console.log(this.playerIndex, this.videoUrls.length)
    },
  },
}
@@ -737,4 +730,12 @@
.video-next {
  right: 0px;
}

.video-error {
  position: absolute;
  top: 35%;
  left: 30%;
  font-size: 14px;
  color: #fff;
}
</style>

 src/components/wasmPlayer/wasm/player.js

@@ -16,6 +16,12 @@
  this.webglPlayer = null

  this.trackTimer = null
  this.loop = false
  this.preload = true
  this.preloadFlag = 0
  this.statusCallback = (stat) => {
    console.log(stat)
  }
}

Player.prototype.play = function(
@@ -69,6 +75,8 @@
          )
        }
        This.startTrackTimer()

        This.statusCallback(0)
        break
      }
      case 'create_audio': {
@@ -79,9 +87,17 @@
          sampleRate: This.AudioParam.sample_rate,
          flushingTime: 5000,
        })

        This.statusCallback(1)
        break
      }
      case 'deliver_video': {
        if (!This.isStream && This.preload && This.preloadFlag == 0) {
          This.preloadFlag = 1
          This.pause()
          This.statusCallback(0)
        }

        //sample:{time_stamp:xxx,data:xxx}
        This.CurPos = evt.data.sample.time_stamp
        This.webglPlayer.renderFrame(
@@ -96,6 +112,18 @@
        This.pcmPlayer.play(evt.data.sample.buf)
        break
      }
      case 'play_failed': {
        This.statusCallback(-1)
        This.stop()
        break
      }
      case 'play_end': {
        if (This.loop) {
          This.seek(0)
        }
        break
      }

      default:
        return
    }