From 64b6a3560399cfe742d998209c3ff315c4856b9e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 04 一月 2024 11:33:29 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index 69bae41..d38ee43 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -132,7 +132,13 @@
}
JSONArray dataArray = jsonObject.getJSONArray("data");
JSONObject mediaServerConfig = dataArray.getJSONObject(0);
+ if (ObjectUtils.isEmpty(param.getFfmpegCmdKey())) {
+ param.setFfmpegCmdKey("ffmpeg.cmd");
+ }
String ffmpegCmd = mediaServerConfig.getString(param.getFfmpegCmdKey());
+ if (ffmpegCmd == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "ffmpeg鎷夋祦浠ｇ悊鏃犳硶鑾峰彇ffmpeg cmd");
+ }
String schema = getSchemaFromFFmpegCmd(ffmpegCmd);
if (schema == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "ffmpeg鎷夋祦浠ｇ悊鏃犳硶浠巉fmpeg cmd涓幏鍙栧埌杈撳嚭鏍煎紡");
@@ -460,7 +466,7 @@
streamProxyMapper.deleteAutoRemoveItemByMediaServerId(mediaServerId);
// 绉婚櫎鎷夋祦浠ｇ悊鐢熸垚鐨勬祦淇℃伅
-// syncPullStream(mediaServerId);
+ syncPullStream(mediaServerId);
// 鎭㈠娴佷唬鐞�, 鍙煡鎵捐繖涓繖涓祦濯掍綋
List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnableInMediaServer(
--
Gitblit v1.8.0