From ed08c7ef77b3466e8f388fe3ea3f6a94f324fa4e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 22 三月 2023 09:27:17 +0800
Subject: [PATCH] Merge pull request #785 from xiaoQQya/wvp-28181-2.0
---
web_src/src/components/channelList.vue | 2 +-
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 2 +-
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 4 ++--
web_src/src/components/common/jessibuca.vue | 8 +-------
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 6 ++++--
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 1 +
6 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
index 8311745..9d4323b 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -3,6 +3,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
+import java.util.Objects;
@Schema(description = "娴佷俊鎭�")
public class StreamInfo implements Serializable, Cloneable{
@@ -168,7 +169,7 @@
}
public void setRtmp(String host, int port, int sslPort, String app, String stream, String callIdParam) {
- String file = String.format("%s/%s/%s", app, stream, callIdParam);
+ String file = String.format("%s/%s%s", app, stream, callIdParam);
if (port > 0) {
this.rtmp = new StreamURL("rtmp", host, port, file);
}
@@ -178,7 +179,7 @@
}
public void setRtsp(String host, int port, int sslPort, String app, String stream, String callIdParam) {
- String file = String.format("%s/%s/%s", app, stream, callIdParam);
+ String file = String.format("%s/%s%s", app, stream, callIdParam);
if (port > 0) {
this.rtsp = new StreamURL("rtsp", host, port, file);
}
@@ -237,6 +238,7 @@
}
public void setRtc(String host, int port, int sslPort, String app, String stream, String callIdParam) {
+ callIdParam = Objects.equals(callIdParam, "") ? callIdParam : callIdParam.replace("?", "&");
String file = String.format("index/api/webrtc?app=%s&stream=%s&type=play%s", app, stream, callIdParam);
if (port > 0) {
this.rtc = new StreamURL("http", host, port, file);
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index 3610f31..a289197 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -323,9 +323,9 @@
sendPost(mediaServerItem, "kick_sessions",param, null);
}
- public void getSnap(MediaServerItem mediaServerItem, String flvUrl, int timeout_sec, int expire_sec, String targetPath, String fileName) {
+ public void getSnap(MediaServerItem mediaServerItem, String streamUrl, int timeout_sec, int expire_sec, String targetPath, String fileName) {
Map<String, Object> param = new HashMap<>(3);
- param.put("url", flvUrl);
+ param.put("url", streamUrl);
param.put("timeout_sec", timeout_sec);
param.put("expire_sec", expire_sec);
sendGetForImg(mediaServerItem, "getSnap", param, targetPath, fileName);
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index c93e449..c45f9f0 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -547,6 +547,7 @@
Map<String, Object> param = new HashMap<>();
param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
+ param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -t 0.001 %s");
param.put("hook.enable","1");
param.put("hook.on_flow_report","");
param.put("hook.on_play",String.format("%s/on_play", hookPrex));
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index 8b46086..582d9a7 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -266,7 +266,7 @@
onPublishHandlerForPlay(mediaServerItemInuse, response, device.getDeviceId(), channelId);
hookEvent.response(mediaServerItemInuse, response);
logger.info("[鐐规挱鎴愬姛] deviceId: {}, channelId: {}", device.getDeviceId(), channelId);
- String streamUrl = String.format("http://127.0.0.1:%s/%s/%s.live.flv", mediaServerItemInuse.getHttpPort(), "rtp", ssrcInfo.getStream());
+ String streamUrl = String.format("rtsp://127.0.0.1:%s/%s/%s", mediaServerItemInuse.getRtspPort(), "rtp", ssrcInfo.getStream());
String path = "snap";
String fileName = device.getDeviceId() + "_" + channelId + ".jpg";
// 璇锋眰鎴浘
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index f020f34..563f43f 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -69,7 +69,7 @@
<span v-if="scope.row.longitude*scope.row.latitude === 0">鏃�</span>
</template>
</el-table-column>
- <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷" min-width="120"/>
+ <el-table-column prop="PTZTypeText" label="浜戝彴绫诲瀷" min-width="120"/>
<el-table-column label="寮�鍚煶棰�" min-width="120">
<template slot-scope="scope">
<el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
diff --git a/web_src/src/components/common/jessibuca.vue b/web_src/src/components/common/jessibuca.vue
index 7715076..c02960e 100644
--- a/web_src/src/components/common/jessibuca.vue
+++ b/web_src/src/components/common/jessibuca.vue
@@ -167,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) {
--
Gitblit v1.8.0