From 2af5cf496c811fd302564c7edb29d4e5f6cf31e2 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期五, 04 六月 2021 19:22:47 +0800
Subject: [PATCH] 修复 拉流代理的ffmpeg模式
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 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 a77371f..2eb99b8 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -104,7 +104,8 @@
param.isEnable_hls(), param.isEnable_mp4(), param.getRtp_type());
}else if ("ffmpeg".equals(param.getType())) {
result = zlmresTfulUtils.addFFmpegSource(param.getSrc_url(), param.getDst_url(),
- param.getTimeout_ms() + "");
+ param.getTimeout_ms() + "", param.isEnable_hls(), param.isEnable_mp4(),
+ param.getFfmpeg_cmd_key());
}
return result;
}
@@ -165,4 +166,22 @@
}
return result;
}
+
+ @Override
+ public JSONObject getFFmpegCMDs() {
+ JSONObject result = new JSONObject();
+ JSONObject mediaServerConfigResuly = zlmresTfulUtils.getMediaServerConfig();
+ if (mediaServerConfigResuly != null && mediaServerConfigResuly.getInteger("code") == 0
+ && mediaServerConfigResuly.getJSONArray("data").size() > 0){
+ JSONObject mediaServerConfig = mediaServerConfigResuly.getJSONArray("data").getJSONObject(0);
+
+ for (String key : mediaServerConfig.keySet()) {
+ if (key.startsWith("ffmpeg.cmd")){
+ result.put(key, mediaServerConfig.getString(key));
+ }
+ }
+ }
+
+ return result;
+ }
}
--
Gitblit v1.8.0