From dabee4ed7d503a06a78a7c12491416206a48eec1 Mon Sep 17 00:00:00 2001
From: XiaoQiTong <69035114+XiaoQiTong@users.noreply.github.com>
Date: 星期六, 15 十月 2022 20:57:24 +0800
Subject: [PATCH] 增加指定流媒体收流功能
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
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 1c8689b..9ce76ae 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
@@ -113,9 +113,6 @@
@Autowired
private ThreadPoolTaskExecutor taskExecutor;
- @Value("${server.ssl.enabled}")
- private boolean sslEnabled;
-
@Override
public PlayResult play(MediaServerItem mediaServerItem, String deviceId, String channelId,
ZlmHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
@@ -149,7 +146,7 @@
if (Objects.requireNonNull(wvpResult).getCode() == 0) {
StreamInfo streamInfoForSuccess = (StreamInfo) wvpResult.getData();
MediaServerItem mediaInfo = mediaServerService.getOne(streamInfoForSuccess.getMediaServerId());
- String streamUrl = sslEnabled ? streamInfoForSuccess.getHttps_fmp4() : streamInfoForSuccess.getFmp4();
+ String streamUrl = streamInfoForSuccess.getFmp4();
// 璇锋眰鎴浘
logger.info("[璇锋眰鎴浘]: " + fileName);
@@ -410,7 +407,7 @@
}
String mediaServerId = device.getMediaServerId();
MediaServerItem mediaServerItem;
- if (mediaServerId == null) {
+ if (mediaServerId == null || "".equals(device.getMediaServerId()) || "auto".equals(device.getMediaServerId())) {
mediaServerItem = mediaServerService.getMediaServerForMinimumLoad();
} else {
mediaServerItem = mediaServerService.getOne(mediaServerId);
--
Gitblit v1.8.0