From 29ef68038de85180110eecc337b41b26ad5ae7d4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 十一月 2023 14:50:16 +0800
Subject: [PATCH] 优化拉流代理中关于ffmpeg.cmd的判断
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 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 bb6e3b0..375ac81 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,6 +132,9 @@
}
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");
--
Gitblit v1.8.0