From b4048fbe80dba8e7756ae557a15ab60b4f80a44b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 04 四月 2023 09:09:07 +0800
Subject: [PATCH] 合并开源主线
---
web_src/src/components/common/jessibuca.vue | 70 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/web_src/src/components/common/jessibuca.vue b/web_src/src/components/common/jessibuca.vue
index 4049721..c02960e 100644
--- a/web_src/src/components/common/jessibuca.vue
+++ b/web_src/src/components/common/jessibuca.vue
@@ -1,5 +1,6 @@
<template>
- <div ref="container" @dblclick="fullscreenSwich" style="width:100%;height:100%;background-color: #000000;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>
@@ -12,7 +13,7 @@
<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>
@@ -92,29 +93,49 @@
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
));
@@ -146,13 +167,7 @@
_this.isNotMute = !msg;
});
jessibuca.on("audioInfo", function (msg) {
- // console.log("audioInfo", msg);
- });
-
- jessibuca.on("videoInfo", function (msg) {
- // this.videoInfo = msg;
- console.log("videoInfo", msg);
-
+ console.log("audioInfo", msg);
});
jessibuca.on("bps", function (bps) {
@@ -243,6 +258,11 @@
this.err = "";
this.performance = "";
},
+ screenshot: function () {
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].screenshot();
+ }
+ },
mute: function () {
if (jessibucaPlayer[this._uid]) {
jessibucaPlayer[this._uid].mute();
--
Gitblit v1.8.0