From 722f1d0ee761cee4f8a1a99da46cc799380303e8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 01 四月 2024 16:17:01 +0800
Subject: [PATCH] 国标级联-修复拉流代理播放
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java | 230 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 167 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
index 55161a9..06c8c3e 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
@@ -6,12 +6,12 @@
import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
-import com.genersoft.iot.vmp.media.bean.Track;
+import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.service.IMediaNodeServerService;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;
-import com.genersoft.iot.vmp.service.impl.DeviceServiceImpl;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,41 +39,41 @@
private String sipIp;
@Override
- public int createRTPServer(MediaServerItem mediaServerItem, String streamId, long ssrc, Integer port, Boolean onlyAuto, Boolean reUsePort, Integer tcpMode) {
- return zlmServerFactory.createRTPServer(mediaServerItem, streamId, ssrc, port, onlyAuto, reUsePort, tcpMode);
+ public int createRTPServer(MediaServer mediaServer, String streamId, long ssrc, Integer port, Boolean onlyAuto, Boolean reUsePort, Integer tcpMode) {
+ return zlmServerFactory.createRTPServer(mediaServer, streamId, ssrc, port, onlyAuto, reUsePort, tcpMode);
}
@Override
- public void closeRtpServer(MediaServerItem mediaServerItem, String streamId) {
- zlmresTfulUtils.closeStreams(mediaServerItem, "rtp", streamId);
+ public void closeRtpServer(MediaServer mediaServer, String streamId) {
+ zlmresTfulUtils.closeStreams(mediaServer, "rtp", streamId);
}
@Override
- public void closeRtpServer(MediaServerItem mediaServerItem, String streamId, CommonCallback<Boolean> callback) {
- zlmServerFactory.closeRtpServer(mediaServerItem, streamId, callback);
+ public void closeRtpServer(MediaServer mediaServer, String streamId, CommonCallback<Boolean> callback) {
+ zlmServerFactory.closeRtpServer(mediaServer, streamId, callback);
}
@Override
- public void closeStreams(MediaServerItem mediaServerItem, String app, String stream) {
- zlmresTfulUtils.closeStreams(mediaServerItem, app, stream);
+ public void closeStreams(MediaServer mediaServer, String app, String stream) {
+ zlmresTfulUtils.closeStreams(mediaServer, app, stream);
}
@Override
- public Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
- return zlmServerFactory.updateRtpServerSSRC(mediaServerItem, streamId, ssrc);
+ public Boolean updateRtpServerSSRC(MediaServer mediaServer, String streamId, String ssrc) {
+ return zlmServerFactory.updateRtpServerSSRC(mediaServer, streamId, ssrc);
}
@Override
- public boolean checkNodeId(MediaServerItem mediaServerItem) {
- if (mediaServerItem == null) {
+ public boolean checkNodeId(MediaServer mediaServer) {
+ if (mediaServer == null) {
return false;
}
- JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServer);
if (responseJSON != null) {
JSONArray data = responseJSON.getJSONArray("data");
if (data != null && !data.isEmpty()) {
ZLMServerConfig zlmServerConfig= JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
- return zlmServerConfig.getGeneralMediaServerId().equals(mediaServerItem.getId());
+ return zlmServerConfig.getGeneralMediaServerId().equals(mediaServer.getId());
}else {
return false;
}
@@ -84,17 +84,17 @@
}
@Override
- public void online(MediaServerItem mediaServerItem) {
+ public void online(MediaServer mediaServer) {
}
@Override
- public MediaServerItem checkMediaServer(String ip, int port, String secret) {
- MediaServerItem mediaServerItem = new MediaServerItem();
- mediaServerItem.setIp(ip);
- mediaServerItem.setHttpPort(port);
- mediaServerItem.setSecret(secret);
- JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ public MediaServer checkMediaServer(String ip, int port, String secret) {
+ MediaServer mediaServer = new MediaServer();
+ mediaServer.setIp(ip);
+ mediaServer.setHttpPort(port);
+ mediaServer.setSecret(secret);
+ JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServer);
if (responseJSON == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "杩炴帴澶辫触");
}
@@ -106,22 +106,22 @@
if (zlmServerConfig == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "璇诲彇閰嶇疆澶辫触");
}
- mediaServerItem.setId(zlmServerConfig.getGeneralMediaServerId());
- mediaServerItem.setHttpSSlPort(zlmServerConfig.getHttpPort());
- mediaServerItem.setRtmpPort(zlmServerConfig.getRtmpPort());
- mediaServerItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- mediaServerItem.setRtspPort(zlmServerConfig.getRtspPort());
- mediaServerItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
- mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- mediaServerItem.setStreamIp(ip);
- mediaServerItem.setHookIp(sipIp.split(",")[0]);
- mediaServerItem.setSdpIp(ip);
- mediaServerItem.setType("zlm");
- return mediaServerItem;
+ mediaServer.setId(zlmServerConfig.getGeneralMediaServerId());
+ mediaServer.setHttpSSlPort(zlmServerConfig.getHttpPort());
+ mediaServer.setRtmpPort(zlmServerConfig.getRtmpPort());
+ mediaServer.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
+ mediaServer.setRtspPort(zlmServerConfig.getRtspPort());
+ mediaServer.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
+ mediaServer.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
+ mediaServer.setStreamIp(ip);
+ mediaServer.setHookIp(sipIp.split(",")[0]);
+ mediaServer.setSdpIp(ip);
+ mediaServer.setType("zlm");
+ return mediaServer;
}
@Override
- public boolean stopSendRtp(MediaServerItem mediaInfo, String app, String stream, String ssrc) {
+ public boolean stopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc) {
Map<String, Object> param = new HashMap<>();
param.put("vhost", "__defaultVhost__");
param.put("app", app);
@@ -135,22 +135,22 @@
}
@Override
- public boolean deleteRecordDirectory(MediaServerItem mediaServerItem, String app, String stream, String date, String fileName) {
- logger.info("[zlm-deleteRecordDirectory] 鍒犻櫎纾佺洏鏂囦欢, server: {} {}:{}->{}/{}", mediaServerItem.getId(), app, stream, date, fileName);
- JSONObject jsonObject = zlmresTfulUtils.deleteRecordDirectory(mediaServerItem, app,
+ public boolean deleteRecordDirectory(MediaServer mediaServer, String app, String stream, String date, String fileName) {
+ logger.info("[zlm-deleteRecordDirectory] 鍒犻櫎纾佺洏鏂囦欢, server: {} {}:{}->{}/{}", mediaServer.getId(), app, stream, date, fileName);
+ JSONObject jsonObject = zlmresTfulUtils.deleteRecordDirectory(mediaServer, app,
stream, date, fileName);
if (jsonObject.getInteger("code") == 0) {
return true;
}else {
- logger.info("[zlm-deleteRecordDirectory] 鍒犻櫎纾佺洏鏂囦欢閿欒, server: {} {}:{}->{}/{}, 缁撴灉锛� {}", mediaServerItem.getId(), app, stream, date, fileName, jsonObject);
+ logger.info("[zlm-deleteRecordDirectory] 鍒犻櫎纾佺洏鏂囦欢閿欒, server: {} {}:{}->{}/{}, 缁撴灉锛� {}", mediaServer.getId(), app, stream, date, fileName, jsonObject);
return false;
}
}
@Override
- public List<StreamInfo> getMediaList(MediaServerItem mediaServerItem, String app, String stream) {
+ public List<StreamInfo> getMediaList(MediaServer mediaServer, String app, String stream, String callId) {
List<StreamInfo> streamInfoList = new ArrayList<>();
- JSONObject mediaList = zlmresTfulUtils.getMediaList(mediaServerItem, app, stream);
+ JSONObject mediaList = zlmresTfulUtils.getMediaList(mediaServer, app, stream);
if (mediaList != null) {
if (mediaList.getInteger("code") == 0) {
JSONArray data = mediaList.getJSONArray("data");
@@ -158,38 +158,142 @@
return null;
}
JSONObject mediaJSON = data.getJSONObject(0);
- JSONArray tracks = mediaJSON.getJSONArray("tracks");
-
- if (authority) {
- streamInfo = getStreamInfoByAppAndStream(mediaServerItem, app, stream, tracks, null, calld, true);
- }else {
- streamInfo = getStreamInfoByAppAndStream(mediaServerItem, app, stream, tracks, null,null, true);
+ MediaInfo mediaInfo = MediaInfo.getInstance(mediaJSON, mediaServer);
+ StreamInfo streamInfo = getStreamInfoByAppAndStream(mediaServer, app, stream, mediaInfo, callId, true);
+ if (streamInfo != null) {
+ streamInfoList.add(streamInfo);
}
}
}
return streamInfoList;
}
- public StreamInfo getStreamInfoByAppAndStream(MediaServerItem mediaInfo, String app, String stream, Track track, String addr, String callId, boolean isPlay) {
+ public StreamInfo getStreamInfoByAppAndStream(MediaServer mediaServer, String app, String stream, MediaInfo mediaInfo, String callId, boolean isPlay) {
StreamInfo streamInfoResult = new StreamInfo();
streamInfoResult.setStream(stream);
streamInfoResult.setApp(app);
- if (addr == null) {
- addr = mediaInfo.getStreamIp();
- }
-
+ String addr = mediaServer.getStreamIp();
streamInfoResult.setIp(addr);
- streamInfoResult.setMediaServerId(mediaInfo.getId());
+ streamInfoResult.setMediaServerId(mediaServer.getId());
String callIdParam = ObjectUtils.isEmpty(callId)?"":"?callId=" + callId;
- streamInfoResult.setRtmp(addr, mediaInfo.getRtmpPort(),mediaInfo.getRtmpSSlPort(), app, stream, callIdParam);
- streamInfoResult.setRtsp(addr, mediaInfo.getRtspPort(),mediaInfo.getRtspSSLPort(), app, stream, callIdParam);
- streamInfoResult.setFlv(addr, mediaInfo.getHttpPort(),mediaInfo.getHttpSSlPort(), app, stream, callIdParam);
- streamInfoResult.setFmp4(addr, mediaInfo.getHttpPort(),mediaInfo.getHttpSSlPort(), app, stream, callIdParam);
- streamInfoResult.setHls(addr, mediaInfo.getHttpPort(),mediaInfo.getHttpSSlPort(), app, stream, callIdParam);
- streamInfoResult.setTs(addr, mediaInfo.getHttpPort(),mediaInfo.getHttpSSlPort(), app, stream, callIdParam);
- streamInfoResult.setRtc(addr, mediaInfo.getHttpPort(),mediaInfo.getHttpSSlPort(), app, stream, callIdParam, isPlay);
+ streamInfoResult.setRtmp(addr, mediaServer.getRtmpPort(),mediaServer.getRtmpSSlPort(), app, stream, callIdParam);
+ streamInfoResult.setRtsp(addr, mediaServer.getRtspPort(),mediaServer.getRtspSSLPort(), app, stream, callIdParam);
+ streamInfoResult.setFlv(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), app, stream, callIdParam);
+ streamInfoResult.setFmp4(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), app, stream, callIdParam);
+ streamInfoResult.setHls(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), app, stream, callIdParam);
+ streamInfoResult.setTs(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), app, stream, callIdParam);
+ streamInfoResult.setRtc(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), app, stream, callIdParam, isPlay);
- streamInfoResult.setTrack(track);
+ streamInfoResult.setMediaInfo(mediaInfo);
+ streamInfoResult.setOriginType(mediaInfo.getOriginType());
return streamInfoResult;
}
+
+ @Override
+ public Boolean connectRtpServer(MediaServer mediaServer, String address, int port, String stream) {
+ JSONObject jsonObject = zlmresTfulUtils.connectRtpServer(mediaServer, address, port, stream);
+ logger.info("[TCP涓诲姩杩炴帴瀵规柟] 缁撴灉锛� {}", jsonObject);
+ return jsonObject.getInteger("code") == 0;
+ }
+
+ @Override
+ public void getSnap(MediaServer mediaServer, String streamUrl, int timeoutSec, int expireSec, String path, String fileName) {
+ zlmresTfulUtils.getSnap(mediaServer, streamUrl, timeoutSec, expireSec, path, fileName);
+ }
+
+ @Override
+ public MediaInfo getMediaInfo(MediaServer mediaServer, String app, String stream) {
+ JSONObject jsonObject = zlmresTfulUtils.getMediaInfo(mediaServer, app, "rtsp", stream);
+ if (jsonObject.getInteger("code") != 0) {
+ return null;
+ }
+ return MediaInfo.getInstance(jsonObject, mediaServer);
+ }
+
+ @Override
+ public Boolean pauseRtpCheck(MediaServer mediaServer, String streamKey) {
+ JSONObject jsonObject = zlmresTfulUtils.pauseRtpCheck(mediaServer, streamKey);
+ return jsonObject.getInteger("code") == 0;
+ }
+
+ @Override
+ public Boolean resumeRtpCheck(MediaServer mediaServer, String streamKey) {
+ JSONObject jsonObject = zlmresTfulUtils.resumeRtpCheck(mediaServer, streamKey);
+ return jsonObject.getInteger("code") == 0;
+ }
+
+ @Override
+ public String getFfmpegCmd(MediaServer mediaServer, String cmdKey) {
+ JSONObject jsonObject = zlmresTfulUtils.getMediaServerConfig(mediaServer);
+ if (jsonObject.getInteger("code") != 0) {
+ logger.warn("[getFfmpegCmd] 鑾峰彇娴佸獟浣撻厤缃け璐�");
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鑾峰彇娴佸獟浣撻厤缃け璐�");
+ }
+ JSONArray dataArray = jsonObject.getJSONArray("data");
+ JSONObject mediaServerConfig = dataArray.getJSONObject(0);
+ if (ObjectUtils.isEmpty(cmdKey)) {
+ cmdKey = "ffmpeg.cmd";
+ }
+ return mediaServerConfig.getString(cmdKey);
+ }
+
+ @Override
+ public WVPResult<String> addFFmpegSource(MediaServer mediaServer, String srcUrl, String dstUrl, int timeoutMs, boolean enableAudio, boolean enableMp4, String ffmpegCmdKey) {
+ JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(mediaServer, srcUrl, dstUrl, timeoutMs, enableAudio, enableMp4, ffmpegCmdKey);
+ if (jsonObject.getInteger("code") != 0) {
+ logger.warn("[getFfmpegCmd] 娣诲姞FFMPEG浠ｇ悊澶辫触");
+ return WVPResult.fail(ErrorCode.ERROR100.getCode(), "娣诲姞FFMPEG浠ｇ悊澶辫触");
+ }else {
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data == null) {
+ return WVPResult.fail(ErrorCode.ERROR100.getCode(), "浠ｇ悊缁撴灉寮傚父锛� " + jsonObject);
+ }else {
+ return WVPResult.success(data.getString("key"));
+ }
+ }
+ }
+
+ @Override
+ public WVPResult<String> addStreamProxy(MediaServer mediaServer, String app, String stream, String url, boolean enableAudio, boolean enableMp4, String rtpType) {
+ JSONObject jsonObject = zlmresTfulUtils.addStreamProxy(mediaServer, app, stream, url, enableAudio, enableMp4, rtpType);
+ if (jsonObject.getInteger("code") != 0) {
+ return WVPResult.fail(ErrorCode.ERROR100.getCode(), "娣诲姞浠ｇ悊澶辫触");
+ }else {
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data == null) {
+ return WVPResult.fail(ErrorCode.ERROR100.getCode(), "浠ｇ悊缁撴灉寮傚父锛� " + jsonObject);
+ }else {
+ return WVPResult.success(data.getString("key"));
+ }
+ }
+ }
+
+ @Override
+ public Boolean delFFmpegSource(MediaServer mediaServer, String streamKey) {
+ JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(mediaServer, streamKey);
+ return jsonObject.getInteger("code") == 0;
+ }
+
+ @Override
+ public Boolean delStreamProxy(MediaServer mediaServer, String streamKey) {
+ JSONObject jsonObject = zlmresTfulUtils.delStreamProxy(mediaServer, streamKey);
+ return jsonObject.getInteger("code") == 0;
+ }
+
+ @Override
+ public Map<String, String> getFFmpegCMDs(MediaServer mediaServer) {
+ Map<String, String> result = new HashMap<>();
+ JSONObject mediaServerConfigResuly = zlmresTfulUtils.getMediaServerConfig(mediaServer);
+ 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