From b957ab61c7d7f54716f81f4cd9474238fd110e1d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 26 七月 2022 11:43:56 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java | 67 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
index 1b1fb9f..f78ca4a 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
@@ -4,6 +4,7 @@
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.media.zlm.dto.*;
+import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IStreamProxyService;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
@@ -63,7 +64,13 @@
@Autowired
private UserSetting userSetting;
- private Map<String, ChannelOnlineEvent> channelOnlineEvents = new ConcurrentHashMap<>();
+ @Autowired
+ private ZLMRTPServerFactory zlmrtpServerFactory;
+
+ @Autowired
+ private IMediaServerService mediaServerService;
+
+ private Map<String, ChannelOnlineEvent> channelOnPublishEvents = new ConcurrentHashMap<>();
public StreamPushItem addPush(MediaItem mediaItem) {
// 鏌ユ壘姝ょ洿鎾祦鏄惁瀛樺湪redis棰勮gbId
@@ -79,7 +86,24 @@
}else {
streamPushMapper.update(transform);
}
+ if (transform != null) {
+ if (getChannelOnlineEventLister(transform.getApp(), transform.getStream()) != null) {
+ getChannelOnlineEventLister(transform.getApp(), transform.getStream()).run(transform.getApp(), transform.getStream(), transform.getServerId());
+ removedChannelOnlineEventLister(transform.getApp(), transform.getStream());
+ }
+ }
return transform;
+ }
+
+ public void sendStreamEvent(String app, String stream, String mediaServerId) {
+ MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+ // 鏌ョ湅鎺ㄦ祦鐘舵��
+ if (zlmrtpServerFactory.isStreamReady(mediaServerItem, app, stream)) {
+ if (getChannelOnlineEventLister(app, stream) != null) {
+ getChannelOnlineEventLister(app, stream).run(app, stream, mediaServerId);
+ removedChannelOnlineEventLister(app, stream);
+ }
+ }
}
public int removeMedia(String app, String streamId) {
@@ -89,48 +113,21 @@
if (gbStream == null) {
result = storager.removeMedia(app, streamId);
}else {
- // TODO 鏆備笉璁剧疆涓虹绾�
result =storager.mediaOffline(app, streamId);
}
return result;
}
- public void addChannelOnlineEventLister(String key, ChannelOnlineEvent callback) {
- this.channelOnlineEvents.put(key,callback);
+ public void addChannelOnlineEventLister(String app, String stream, ChannelOnlineEvent callback) {
+ this.channelOnPublishEvents.put(app + "_" + stream, callback);
}
- public void removedChannelOnlineEventLister(String key) {
- this.channelOnlineEvents.remove(key);
+ public void removedChannelOnlineEventLister(String app, String stream) {
+ this.channelOnPublishEvents.remove(app + "_" + stream);
}
+ public ChannelOnlineEvent getChannelOnlineEventLister(String app, String stream) {
+ return this.channelOnPublishEvents.get(app + "_" + stream);
+ }
-
-// public void clearAllSessions() {
-// logger.info("娓呯┖鎵�鏈夊浗鏍囩浉鍏崇殑session");
-// JSONObject allSessionJSON = zlmresTfulUtils.getAllSession();
-// ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
-// HashSet<String> allLocalPorts = new HashSet();
-// if (allSessionJSON.getInteger("code") == 0) {
-// JSONArray data = allSessionJSON.getJSONArray("data");
-// if (data.size() > 0) {
-// for (int i = 0; i < data.size(); i++) {
-// JSONObject sessionJOSN = data.getJSONObject(i);
-// Integer local_port = sessionJOSN.getInteger("local_port");
-// if (!local_port.equals(Integer.valueOf(mediaInfo.getHttpPort())) &&
-// !local_port.equals(Integer.valueOf(mediaInfo.getHttpSSLport())) &&
-// !local_port.equals(Integer.valueOf(mediaInfo.getRtmpPort())) &&
-// !local_port.equals(Integer.valueOf(mediaInfo.getRtspPort())) &&
-// !local_port.equals(Integer.valueOf(mediaInfo.getRtspSSlport())) &&
-// !local_port.equals(Integer.valueOf(mediaInfo.getHookOnFlowReport()))){
-// allLocalPorts.add(sessionJOSN.getInteger("local_port") + "");
-// }
-// }
-// }
-// }
-// if (allLocalPorts.size() > 0) {
-// List<String> result = new ArrayList<>(allLocalPorts);
-// String localPortSStr = String.join(",", result);
-// zlmresTfulUtils.kickSessions(localPortSStr);
-// }
-// }
}
--
Gitblit v1.8.0