From f6320c7dd3dfd25e98bb63f41d79a33af5009a93 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 17:02:16 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 81 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 5194a9a..a1420e0 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -553,7 +553,6 @@
if (sendRtpItem == null) {
// TODO 鍙兘鏁版嵁閿欒锛岄噸鏂板紑鍚闊抽�氶亾
}else {
- String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
logger.info("rtp/{}寮�濮嬪悜涓婄骇鎺ㄦ祦, 鐩爣={}:{}锛孲SRC={}", sendRtpItem.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc());
Map<String, Object> param = new HashMap<>(12);
@@ -570,7 +569,7 @@
if (sendRtpItem.isTcpActive()) {
jsonObject = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);
} else {
- param.put("is_udp", is_Udp);
+ param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");
param.put("dst_url", sendRtpItem.getIp());
param.put("dst_port", sendRtpItem.getPort());
jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
@@ -581,8 +580,8 @@
}
}else {
// 寮�鍚闊冲璁查�氶亾
- MediaServerItem mediaServerForMinimumLoad = mediaServerService.getMediaServerForMinimumLoad();
- playService.talk(mediaServerForMinimumLoad, device, channelId, (mediaServerItem, jsonObject)->{
+ MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+ playService.talk(mediaServerItem, device, channelId, (mediaServer, jsonObject)->{
System.out.println("寮�濮嬫帹娴�");
}, eventResult -> {
System.out.println(eventResult.msg);
@@ -644,7 +643,7 @@
}
}
}
- if (!regist) {
+ if (!regist ) {
List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(stream);
if (sendRtpItems.size() > 0) {
for (SendRtpItem sendRtpItem : sendRtpItems) {
@@ -657,7 +656,7 @@
if (platform != null) {
commanderFroPlatform.streamByeCmd(platform, sendRtpItem);
}else {
- if (sendRtpItem.isOnlyAudio()) {
+ if ("talk".equals(app) && sendRtpItem.isOnlyAudio()) {
AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
if (device != null && audioBroadcastCatch != null) {
// cmder.streamByeCmd(device, sendRtpItem.getChannelId(), audioBroadcastCatch.getSipTransactionInfo(), null);
@@ -696,9 +695,12 @@
String app = json.getString("app");
JSONObject ret = new JSONObject();
ret.put("code", 0);
+ // 褰曞儚涓嬭浇
+ ret.put("close", userSetting.getStreamOnDemand());
if ("rtp".equals(app)){
- ret.put("close", true);
+ // 鍥芥爣娴侊紝 鐐规挱/褰曞儚鍥炴斁/褰曞儚涓嬭浇
StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId);
+ // 鐐规挱
if (streamInfoForPlayCatch != null) {
// 鏀跺埌鏃犱汉瑙傜湅璇存槑娴佷篃娌℃湁鍦ㄥ線涓婄骇鎺ㄩ��
if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) {
@@ -728,10 +730,15 @@
redisCatchStorage.stopPlay(streamInfoForPlayCatch);
storager.stopPlay(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId());
- }else{
- StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, streamId, null);
- if (streamInfoForPlayBackCatch != null) {
- Device device = deviceService.queryDevice(streamInfoForPlayCatch.getDeviceID());
+ return ret;
+ }
+ // 褰曞儚鍥炴斁
+ StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, streamId, null);
+ if (streamInfoForPlayBackCatch != null ) {
+ if (streamInfoForPlayBackCatch.isPause()) {
+ ret.put("close", false);
+ }else {
+ Device device = deviceService.queryDevice(streamInfoForPlayBackCatch.getDeviceID());
if (device != null) {
try {
cmder.streamByeCmd(device,streamInfoForPlayBackCatch.getChannelId(),
@@ -743,20 +750,19 @@
}
redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch.getDeviceID(),
streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream(), null);
- }else {
- StreamInfo streamInfoForDownload = redisCatchStorage.queryDownload(null, null, streamId, null);
- // 杩涜褰曞儚涓嬭浇鏃舵棤浜鸿鐪嬩笉鏂祦
- if (streamInfoForDownload != null) {
- ret.put("close", false);
- }
}
+ return ret;
}
- MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
- if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) {
+ // 褰曞儚涓嬭浇
+ StreamInfo streamInfoForDownload = redisCatchStorage.queryDownload(null, null, streamId, null);
+ // 杩涜褰曞儚涓嬭浇鏃舵棤浜鸿鐪嬩笉鏂祦
+ if (streamInfoForDownload != null) {
ret.put("close", false);
+ return ret;
}
- return ret;
}else {
+ // 闈炲浗鏍囨祦 鎺ㄦ祦/鎷夋祦浠ｇ悊
+ // 鎷夋祦浠ｇ悊
StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId);
if (streamProxyItem != null ) {
if (streamProxyItem.isEnable_remove_none_reader()) {
@@ -768,12 +774,21 @@
}else if (streamProxyItem.isEnable_disable_none_reader()) {
// 鏃犱汉瑙傜湅鍋滅敤
ret.put("close", true);
+ // 淇敼鏁版嵁
+ streamProxyService.stop(app, streamId);
}else {
ret.put("close", false);
}
+ return ret;
}
- return ret;
+ // 鎺ㄦ祦鍏锋湁涓诲姩鎬э紝鏆傛椂涓嶅仛澶勭悊
+// StreamPushItem streamPushItem = streamPushService.getPush(app, streamId);
+// if (streamPushItem != null) {
+// // TODO 鍙戦�佸仠姝�
+//
+// }
}
+ return ret;
}
/**
@@ -788,19 +803,27 @@
}
String mediaServerId = json.getString("mediaServerId");
MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
- if (userSetting.isAutoApplyPlay() && mediaInfo != null && mediaInfo.isRtpEnable()) {
+ if (userSetting.isAutoApplyPlay() && mediaInfo != null) {
String app = json.getString("app");
String streamId = json.getString("stream");
if ("rtp".equals(app)) {
- String[] s = streamId.split("_");
- if (s.length == 2) {
- String deviceId = s[0];
- String channelId = s[1];
- Device device = redisCatchStorage.getDevice(deviceId);
- if (device != null) {
- playService.play(mediaInfo,deviceId, channelId, null, null, null);
+ if (mediaInfo.isRtpEnable()) {
+ String[] s = streamId.split("_");
+ if (s.length == 2) {
+ String deviceId = s[0];
+ String channelId = s[1];
+ Device device = redisCatchStorage.getDevice(deviceId);
+ if (device != null) {
+ playService.play(mediaInfo,deviceId, channelId, null, null, null);
+ }
}
}
+ }else {
+ // 鎷夋祦浠ｇ悊
+ StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(app, streamId);
+ if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnable_disable_none_reader()) {
+ streamProxyService.start(app, streamId);
+ }
}
}
--
Gitblit v1.8.0