From b46e5efad22fb810e49f0a2e7835d785e85b4860 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 01 九月 2022 22:27:18 +0800
Subject: [PATCH] 测试sip消息预处理
---
web_src/src/components/dialog/devicePlayer.vue | 119 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 72 insertions(+), 47 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 43a929c..71530ce 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -4,10 +4,22 @@
<el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()">
<!-- <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></LivePlayer> -->
<div style="width: 100%; height: 100%">
- <player ref="videoPlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></player>
+ <el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
+ <el-tab-pane label="Jessibuca" name="jessibuca">
+ <jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer>
+ </el-tab-pane>
+ <el-tab-pane label="WebRTC" name="webRTC">
+ <rtc-player v-if="activePlayer === 'webRTC'" ref="webRTC" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></rtc-player>
+ </el-tab-pane>
+ <el-tab-pane label="h265web">h265web鏁鏈熷緟</el-tab-pane>
+ <el-tab-pane label="wsPlayer">wsPlayer 鏁鏈熷緟</el-tab-pane>
+ </el-tabs>
+ <jessibucaPlayer v-if="Object.keys(this.player).length == 1 && this.player.jessibuca" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer>
+ <rtc-player v-if="Object.keys(this.player).length == 1 && this.player.webRTC" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></rtc-player>
+
</div>
<div id="shared" style="text-align: right; margin-top: 1rem;">
- <el-tabs v-model="tabActiveName" @tab-click="tabHandleClick">
+ <el-tabs v-model="tabActiveName" @tab-click="tabHandleClick" >
<el-tab-pane label="瀹炴椂瑙嗛" name="media">
<div style="margin-bottom: 0.5rem;">
<!-- <el-button type="primary" size="small" @click="playRecord(true, '')">鎾斁</el-button>-->
@@ -273,16 +285,16 @@
</template>
<script>
-// import player from '../dialog/rtcPlayer.vue'
+import rtcPlayer from '../dialog/rtcPlayer.vue'
// import LivePlayer from '@liveqing/liveplayer'
// import player from '../dialog/easyPlayer.vue'
-import player from '../common/jessibuca.vue'
+import jessibucaPlayer from '../common/jessibuca.vue'
import recordDownload from '../dialog/recordDownload.vue'
export default {
name: 'devicePlayer',
props: {},
components: {
- player,recordDownload,
+ jessibucaPlayer, rtcPlayer, recordDownload,
},
computed: {
getPlayerShared: function () {
@@ -293,11 +305,22 @@
};
}
},
- created() {},
+ created() {
+ console.log(this.player)
+ if (Object.keys(this.player).length === 1) {
+ this.activePlayer = Object.keys(this.player)[0]
+ }
+ },
data() {
return {
video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4',
videoUrl: '',
+ activePlayer: "jessibuca",
+ // 濡備綍浣犲彧鏄敤涓�绉嶆挱鏀惧櫒锛岀洿鎺ユ敞閲婃帀涓嶇敤鐨勯儴鍒嗗嵆鍙�
+ player: {
+ jessibuca : ["ws_flv", "wss_flv"],
+ webRTC: ["rtc", "rtc"],
+ },
videoHistory: {
date: '',
searchHistoryResult: [] //濯掍綋娴佸巻鍙茶褰曟悳绱㈢粨鏋�
@@ -348,10 +371,10 @@
if (tab.name === "codec") {
this.$axios({
method: 'get',
- url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
+ url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtsp&app='+ this.app +'&stream='+ this.streamId
}).then(function (res) {
that.tracksLoading = false;
- if (res.data.code == 0 && res.data.online) {
+ if (res.data.code == 0 && res.data.tracks) {
that.tracks = res.data.tracks;
}else{
that.tracksNotLoaded = true;
@@ -364,6 +387,12 @@
}).catch(function (e) {});
}
},
+ changePlayer: function (tab) {
+ console.log(this.player[tab.name][0])
+ this.activePlayer = tab.name;
+ this.videoUrl = this.streamInfo[this.player[tab.name][0]]
+ console.log(this.videoUrl)
+ },
openDialog: function (tab, deviceId, channelId, param) {
this.tabActiveName = tab;
this.channelId = channelId;
@@ -372,8 +401,8 @@
this.mediaServerId = "";
this.app = "";
this.videoUrl = ""
- if (!!this.$refs.videoPlayer) {
- this.$refs.videoPlayer.pause();
+ if (!!this.$refs[this.activePlayer]) {
+ this.$refs[this.activePlayer].pause();
}
switch (tab) {
case "media":
@@ -402,43 +431,31 @@
this.hasAudio = hasAudio;
this.isLoging = false;
// this.videoUrl = streamInfo.rtc;
- this.videoUrl = this.getUrlByStreamInfo(streamInfo);
+ this.videoUrl = this.getUrlByStreamInfo();
this.streamId = streamInfo.stream;
this.app = streamInfo.app;
this.mediaServerId = streamInfo.mediaServerId;
this.playFromStreamInfo(false, streamInfo)
},
- getUrlByStreamInfo(streamInfo){
- let baseZlmApi = process.env.NODE_ENV === 'development'?`${location.host}/debug/zlm`:`${location.host}/zlm`
- // return `${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
- // return `http://${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
+ getUrlByStreamInfo(){
+ console.log(this.streamInfo)
if (location.protocol === "https:") {
- if (streamInfo.wss_flv === null) {
- console.error("濯掍綋鏈嶅姟鍣ㄦ湭閰嶇疆ssl绔彛, 浣跨敤http绔彛")
- // this.$message({
- // showClose: true,
- // message: '濯掍綋鏈嶅姟鍣ㄦ湭閰嶇疆ssl绔彛, ',
- // type: 'error'
- // });
- return streamInfo.ws_flv
- }else {
- return streamInfo.wss_flv;
- }
-
+ this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
}else {
- return streamInfo.ws_flv;
+ this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]]
}
+ return this.videoUrl;
},
coverPlay: function () {
var that = this;
this.coverPlaying = true;
- this.$refs.videoPlayer.pause()
+ this.$refs[this.activePlayer].pause()
that.$axios({
method: 'post',
- url: '/api/gb_record/convert/' + that.streamId
+ url: '/api/play/convert/' + that.streamId
}).then(function (res) {
- if (res.data.code == 0) {
+ if (res.data.code === 0) {
that.convertKey = res.data.key;
setTimeout(()=>{
that.isLoging = false;
@@ -465,7 +482,7 @@
},
convertStopClick: function() {
this.convertStop(()=>{
- this.$refs.videoPlayer.play(this.videoUrl)
+ this.$refs[this.activePlayer].play(this.videoUrl)
});
},
convertStop: function(callback) {
@@ -490,12 +507,12 @@
playFromStreamInfo: function (realHasAudio, streamInfo) {
this.showVideoDialog = true;
this.hasaudio = realHasAudio && this.hasaudio;
- this.$refs.videoPlayer.play(this.getUrlByStreamInfo(streamInfo))
+ this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
},
close: function () {
console.log('鍏抽棴瑙嗛');
- if (!!this.$refs.videoPlayer){
- this.$refs.videoPlayer.pause();
+ if (!!this.$refs[this.activePlayer]){
+ this.$refs[this.activePlayer].pause();
}
this.videoUrl = '';
this.coverPlaying = false;
@@ -547,10 +564,10 @@
url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
}).then(function (res) {
console.log(res)
+ that.recordsLoading = false;
if(res.data.code === 0) {
// 澶勭悊鏃堕棿淇℃伅
that.videoHistory.searchHistoryResult = res.data.data.recordList;
- that.recordsLoading = false;
}else {
this.$message({
showClose: true,
@@ -589,18 +606,26 @@
url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
row.endTime
}).then(function (res) {
- var streamInfo = res.data;
- that.app = streamInfo.app;
- that.streamId = streamInfo.stream;
- that.mediaServerId = streamInfo.mediaServerId;
- that.ssrc = streamInfo.ssrc;
- that.videoUrl = that.getUrlByStreamInfo(streamInfo);
- that.recordPlay = true;
+ if (res.data.code === 0) {
+ that.streamInfo = res.data.data;
+ that.app = that.streamInfo.app;
+ that.streamId = that.streamInfo.stream;
+ that.mediaServerId = that.streamInfo.mediaServerId;
+ that.ssrc = that.streamInfo.ssrc;
+ that.videoUrl = that.getUrlByStreamInfo();
+ }else {
+ that.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+ that.recordPlay = true;
});
}
},
stopPlayRecord: function (callback) {
- this.$refs.videoPlayer.pause();
+ this.$refs[this.activePlayer].pause();
this.videoUrl = '';
this.$axios({
method: 'get',
@@ -646,7 +671,7 @@
}
},
stopDownloadRecord: function (callback) {
- this.$refs.videoPlayer.pause();
+ this.$refs[this.activePlayer].pause();
this.videoUrl = '';
this.$axios({
method: 'get',
@@ -753,7 +778,7 @@
method: 'get',
url: '/api/playback/resume/' + this.streamId
}).then((res)=> {
- this.$refs.videoPlayer.play(this.videoUrl)
+ this.$refs[this.activePlayer].play(this.videoUrl)
});
},
gbPause(){
@@ -784,7 +809,7 @@
url: `/api/playback/seek/${this.streamId }/` + Math.floor(this.seekTime * val / 100000)
}).then( (res)=> {
setTimeout(()=>{
- this.$refs.videoPlayer.play(this.videoUrl)
+ this.$refs[this.activePlayer].play(this.videoUrl)
}, 600)
});
},
--
Gitblit v1.8.0