From f4aa3e0ee8c988c0d7535ad1c76e68e23e400194 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期日, 08 八月 2021 09:18:45 +0800
Subject: [PATCH] 修复自动点播
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 82 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 17 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..bbcad1c 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
@@ -2,10 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.service.IGbStreamService;
+import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
@@ -13,6 +14,8 @@
import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper;
import com.genersoft.iot.vmp.service.IStreamProxyService;
import com.github.pagehelper.PageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,6 +28,8 @@
@Service
public class StreamProxyServiceImpl implements IStreamProxyService {
+ private final static Logger logger = LoggerFactory.getLogger(StreamProxyServiceImpl.class);
+
@Autowired
private IVideoManagerStorager videoManagerStorager;
@@ -32,7 +37,7 @@
private IRedisCatchStorage redisCatchStorage;
@Autowired
- private ZLMRESTfulUtils zlmresTfulUtils;
+ private ZLMRESTfulUtils zlmresTfulUtils;;
@Autowired
private StreamProxyMapper streamProxyMapper;
@@ -46,15 +51,28 @@
@Autowired
private IGbStreamService gbStreamService;
+ @Autowired
+ private IMediaServerService mediaServerService;
+
@Override
public String save(StreamProxyItem param) {
- ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
+ MediaServerItem mediaInfo;
+ if ("auto".equals(param.getMediaServerId())){
+ mediaInfo = mediaServerService.getMediaServerForMinimumLoad();
+ }else {
+ mediaInfo = mediaServerService.getOne(param.getMediaServerId());
+ }
+ if (mediaInfo == null) {
+ logger.warn("淇濆瓨浠ｇ悊鏈壘鍒板湪绾跨殑ZLM...");
+ return "淇濆瓨澶辫触";
+ }
String dstUrl = String.format("rtmp://%s:%s/%s/%s", "127.0.0.1", mediaInfo.getRtmpPort(), param.getApp(),
param.getStream() );
param.setDst_url(dstUrl);
StringBuffer result = new StringBuffer();
boolean streamLive = false;
+ param.setMediaServerId(mediaInfo.getId());
// 鏇存柊
if (videoManagerStorager.queryStreamProxy(param.getApp(), param.getStream()) != null) {
if (videoManagerStorager.updateStreamProxy(param)) {
@@ -81,6 +99,8 @@
videoManagerStorager.updateStreamProxy(param);
}
}
+ }else {
+ result.append("淇濆瓨澶辫触");
}
}
@@ -99,20 +119,29 @@
@Override
public JSONObject addStreamProxyToZlm(StreamProxyItem param) {
JSONObject result = null;
+ MediaServerItem mediaServerItem = null;
+ if (param.getMediaServerId() == null) {
+ logger.warn("娣诲姞浠ｇ悊鏃禡ediaServerId 涓簄ull");
+ return null;
+ }else {
+ mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
+ }
if ("default".equals(param.getType())){
- result = zlmresTfulUtils.addStreamProxy(param.getApp(), param.getStream(), param.getUrl(),
+ result = zlmresTfulUtils.addStreamProxy(mediaServerItem, param.getApp(), param.getStream(), param.getUrl(),
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() + "");
+ result = zlmresTfulUtils.addFFmpegSource(mediaServerItem, param.getSrc_url(), param.getDst_url(),
+ param.getTimeout_ms() + "", param.isEnable_hls(), param.isEnable_mp4(),
+ param.getFfmpeg_cmd_key());
}
return result;
}
@Override
public JSONObject removeStreamProxyFromZlm(StreamProxyItem param) {
- JSONObject result = zlmresTfulUtils.closeStreams(param.getApp(), param.getStream());
-
+ if (param ==null) return null;
+ MediaServerItem mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
+ JSONObject result = zlmresTfulUtils.closeStreams(mediaServerItem, param.getApp(), param.getStream());
return result;
}
@@ -123,17 +152,18 @@
@Override
public void del(String app, String stream) {
- StreamProxyItem streamProxyItem = new StreamProxyItem();
- streamProxyItem.setApp(app);
- streamProxyItem.setStream(stream);
- JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyItem);
- if (jsonObject.getInteger("code") == 0) {
+ StreamProxyItem streamProxyItem = videoManagerStorager.queryStreamProxy(app, stream);
+ if (streamProxyItem != null) {
videoManagerStorager.deleteStreamProxy(app, stream);
- // 濡傛灉鍏宠仈浜嗗浗鏍囬偅涔堢Щ闄ゅ叧鑱�
- gbStreamMapper.del(app, stream);
- platformGbStreamMapper.delByAppAndStream(app, stream);
- // TODO 濡傛灉鍏宠仈鐨勬帹娴侊紝 閭ｄ箞鐘舵�佽缃负绂荤嚎
+ JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyItem);
+ if (jsonObject != null && jsonObject.getInteger("code") == 0) {
+ // 濡傛灉鍏宠仈浜嗗浗鏍囬偅涔堢Щ闄ゅ叧鑱�
+ gbStreamMapper.del(app, stream);
+ platformGbStreamMapper.delByAppAndStream(app, stream);
+ // TODO 濡傛灉鍏宠仈鐨勬帹娴侊紝 閭ｄ箞鐘舵�佽缃负绂荤嚎
+ }
}
+
}
@Override
@@ -165,4 +195,22 @@
}
return result;
}
+
+ @Override
+ public JSONObject getFFmpegCMDs(MediaServerItem mediaServerItem) {
+ JSONObject result = new JSONObject();
+ JSONObject mediaServerConfigResuly = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ 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