From cb897aaeed0f3a24f91dc4265b8ff0d2b31284c6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 23 四月 2023 17:35:00 +0800
Subject: [PATCH] Merge pull request #829 from kairlec/wvp-28181-2.0
---
web_src/src/components/common/jessibuca.vue | 161 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 96 insertions(+), 65 deletions(-)
diff --git a/web_src/src/components/common/jessibuca.vue b/web_src/src/components/common/jessibuca.vue
index ebf5bef..c02960e 100644
--- a/web_src/src/components/common/jessibuca.vue
+++ b/web_src/src/components/common/jessibuca.vue
@@ -1,18 +1,19 @@
<template>
- <div ref="container" @dblclick="fullscreenSwich" style="width:100%;height:100%;background-color: #eee;margin:0 auto;">
+ <div ref="container" @dblclick="fullscreenSwich"
+ style="width:100%;height:100%;background-color: #000000;margin:0 auto;">
<div class="buttons-box" id="buttonsBox">
<div class="buttons-box-left">
<i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
<i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause"></i>
<i class="iconfont icon-stop jessibuca-btn" @click="destroy"></i>
- <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="jessibuca.mute()"></i>
- <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="jessibuca.cancelMute()"></i>
+ <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="mute()"></i>
+ <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="cancelMute()"></i>
</div>
<div class="buttons-box-right">
<span class="jessibuca-btn">{{ kBps }} kb/s</span>
<!-- <i class="iconfont icon-file-record1 jessibuca-btn"></i>-->
<!-- <i class="iconfont icon-xiangqing2 jessibuca-btn" ></i>-->
- <i class="iconfont icon-camera1196054easyiconnet jessibuca-btn" @click="jessibuca.screenshot('鎴浘','png',0.5)"
+ <i class="iconfont icon-camera1196054easyiconnet jessibuca-btn" @click="screenshot"
style="font-size: 1rem !important"></i>
<i class="iconfont icon-shuaxin11 jessibuca-btn" @click="playBtnClick"></i>
<i v-if="!fullscreen" class="iconfont icon-weibiaoti10 jessibuca-btn" @click="fullscreenSwich"></i>
@@ -23,11 +24,11 @@
</template>
<script>
+let jessibucaPlayer = {};
export default {
name: 'jessibuca',
data() {
return {
- jessibuca: null,
playing: false,
isNotMute: false,
quieting: false,
@@ -49,6 +50,7 @@
window.onerror = (msg) => {
// console.error(msg)
};
+ console.log(this._uid)
let paramUrl = decodeURIComponent(this.$route.params.url)
this.$nextTick(() => {
this.updatePlayerDomSize()
@@ -88,99 +90,113 @@
let options = {};
console.log("hasAudio " + this.hasAudio)
- this.jessibuca = new window.Jessibuca(Object.assign(
+ jessibucaPlayer[this._uid] = new window.Jessibuca(Object.assign(
{
container: this.$refs.container,
- videoBuffer: 0.2, // 鏈�澶х紦鍐叉椂闀匡紝鍗曚綅绉�
- isResize: true,
- decoder: "static/js/jessibuca/decoder.js",
- useMSE: false,
- showBandwidth: false,
- isFlv: true,
- // text: "WVP-PRO",
- // background: "static/images/zlm-logo.png",
- loadingText: "鍔犺浇涓�",
- hasAudio: typeof (this.hasAudio) == "undefined" ? true : this.hasAudio,
+ autoWasm: true,
+ background: "",
+ controlAutoHide: false,
debug: false,
- supportDblclickFullscreen: false, // 鏄惁鏀寔灞忓箷鐨勫弻鍑讳簨浠讹紝瑙﹀彂鍏ㄥ睆锛屽彇娑堝叏灞忎簨浠躲��
+ decoder: "static/js/jessibuca/decoder.js",
+ forceNoOffscreen: true,
+ hasAudio: typeof (this.hasAudio) == "undefined" ? true : this.hasAudio,
+ hasVideo: true,
+ heartTimeout: 5,
+ heartTimeoutReplay: true,
+ heartTimeoutReplayTimes: 3,
+ hiddenAutoPause: false,
+ hotKey: false,
+ isFlv: false,
+ isFullResize: false,
+ isNotMute: this.isNotMute,
+ isResize: false,
+ keepScreenOn: false,
+ loadingText: "璇风◢绛�, 瑙嗛鍔犺浇涓�......",
+ loadingTimeout: 10,
+ loadingTimeoutReplay: true,
+ loadingTimeoutReplayTimes: 3,
+ openWebglAlignment: false,
operateBtns: {
fullscreen: false,
screenshot: false,
play: false,
audio: false,
- recorder: false,
+ record: false
},
- record: "record",
- vod: this.vod,
- forceNoOffscreen: this.forceNoOffscreen,
- isNotMute: this.isNotMute,
+ recordType: "webm",
+ rotate: 0,
+ showBandwidth: false,
+ supportDblclickFullscreen: false,
+ timeout: 10,
+ useMSE: location.hostname !== "localhost" && location.protocol !== "https:",
+ useOffscreen: false,
+ useWCS: location.hostname === "localhost" || location.protocol === "https",
+ useWebFullScreen: false,
+ videoBuffer: 0,
+ wasmDecodeAudioSyncVideo: true,
+ wasmDecodeErrorReplay: true,
+ wcsUseVideoRender: true
},
options
));
-
+ let jessibuca = jessibucaPlayer[this._uid];
let _this = this;
- this.jessibuca.on("load", function () {
+ jessibuca.on("load", function () {
console.log("on load init");
});
- this.jessibuca.on("log", function (msg) {
+ jessibuca.on("log", function (msg) {
console.log("on log", msg);
});
- this.jessibuca.on("record", function (msg) {
+ jessibuca.on("record", function (msg) {
console.log("on record:", msg);
});
- this.jessibuca.on("pause", function () {
+ jessibuca.on("pause", function () {
_this.playing = false;
});
- this.jessibuca.on("play", function () {
+ jessibuca.on("play", function () {
_this.playing = true;
});
- this.jessibuca.on("fullscreen", function (msg) {
+ jessibuca.on("fullscreen", function (msg) {
console.log("on fullscreen", msg);
_this.fullscreen = msg
});
- this.jessibuca.on("mute", function (msg) {
+ jessibuca.on("mute", function (msg) {
console.log("on mute", msg);
_this.isNotMute = !msg;
});
- this.jessibuca.on("audioInfo", function (msg) {
- // console.log("audioInfo", msg);
+ jessibuca.on("audioInfo", function (msg) {
+ console.log("audioInfo", msg);
});
- this.jessibuca.on("videoInfo", function (msg) {
- // this.videoInfo = msg;
- console.log("videoInfo", msg);
-
- });
-
- this.jessibuca.on("bps", function (bps) {
+ jessibuca.on("bps", function (bps) {
// console.log('bps', bps);
});
let _ts = 0;
- this.jessibuca.on("timeUpdate", function (ts) {
+ jessibuca.on("timeUpdate", function (ts) {
// console.log('timeUpdate,old,new,timestamp', _ts, ts, ts - _ts);
_ts = ts;
});
- this.jessibuca.on("videoInfo", function (info) {
+ jessibuca.on("videoInfo", function (info) {
console.log("videoInfo", info);
});
- this.jessibuca.on("error", function (error) {
+ jessibuca.on("error", function (error) {
console.log("error", error);
});
- this.jessibuca.on("timeout", function () {
+ jessibuca.on("timeout", function () {
console.log("timeout");
});
- this.jessibuca.on('start', function () {
+ jessibuca.on('start', function () {
console.log('start');
})
- this.jessibuca.on("performance", function (performance) {
+ jessibuca.on("performance", function (performance) {
let show = "鍗￠】";
if (performance === 2) {
show = "闈炲父娴佺晠";
@@ -189,25 +205,25 @@
}
_this.performance = show;
});
- this.jessibuca.on('buffer', function (buffer) {
+ jessibuca.on('buffer', function (buffer) {
// console.log('buffer', buffer);
})
- this.jessibuca.on('stats', function (stats) {
+ jessibuca.on('stats', function (stats) {
// console.log('stats', stats);
})
- this.jessibuca.on('kBps', function (kBps) {
+ jessibuca.on('kBps', function (kBps) {
_this.kBps = Math.round(kBps);
});
// 鏄剧ず鏃堕棿鎴� PTS
- this.jessibuca.on('videoFrame', function () {
+ jessibuca.on('videoFrame', function () {
})
//
- this.jessibuca.on('metadata', function () {
+ jessibuca.on('metadata', function () {
});
},
@@ -216,40 +232,55 @@
},
play: function (url) {
console.log(url)
- if (this.jessibuca) {
+ if (jessibucaPlayer[this._uid]) {
this.destroy();
}
this.create();
- this.jessibuca.on("play", () => {
+ jessibucaPlayer[this._uid].on("play", () => {
this.playing = true;
this.loaded = true;
- this.quieting = this.jessibuca.quieting;
+ this.quieting = jessibuca.quieting;
});
- if (this.jessibuca.hasLoaded()) {
- this.jessibuca.play(url);
+ if (jessibucaPlayer[this._uid].hasLoaded()) {
+ jessibucaPlayer[this._uid].play(url);
} else {
- this.jessibuca.on("load", () => {
+ jessibucaPlayer[this._uid].on("load", () => {
console.log("load 鎾斁")
- this.jessibuca.play(url);
+ jessibucaPlayer[this._uid].play(url);
});
}
},
pause: function () {
- if (this.jessibuca) {
- this.jessibuca.pause();
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].pause();
}
this.playing = false;
this.err = "";
this.performance = "";
},
+ screenshot: function () {
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].screenshot();
+ }
+ },
+ mute: function () {
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].mute();
+ }
+ },
+ cancelMute: function () {
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].cancelMute();
+ }
+ },
destroy: function () {
- if (this.jessibuca) {
- this.jessibuca.destroy();
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].destroy();
}
if (document.getElementById("buttonsBox") == null) {
this.$refs.container.appendChild(this.btnDom)
}
- this.jessibuca = null;
+ jessibucaPlayer[this._uid] = null;
this.playing = false;
this.err = "";
this.performance = "";
@@ -262,7 +293,7 @@
},
fullscreenSwich: function () {
let isFull = this.isFullscreen()
- this.jessibuca.setFullscreen(!isFull)
+ jessibucaPlayer[this._uid].setFullscreen(!isFull)
this.fullscreen = !isFull;
},
isFullscreen: function () {
@@ -273,8 +304,8 @@
}
},
destroyed() {
- if (this.jessibuca) {
- this.jessibuca.destroy();
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].destroy();
}
this.playing = false;
this.loaded = false;
--
Gitblit v1.8.0