From 2f108a46d05e34981d52b447d73f0cfd8e8c30fd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 17 十一月 2021 16:24:31 +0800
Subject: [PATCH] Merge pull request #232 from chenparty/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java | 174 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 120 insertions(+), 54 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 5ffa467..ea1123c 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
@@ -1,19 +1,17 @@
package com.genersoft.iot.vmp.media.zlm;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.genersoft.iot.vmp.common.RealVideo;
-import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
-import com.genersoft.iot.vmp.gb28181.session.SsrcUtil;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.impl.RedisCatchStorageImpl;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
+import com.genersoft.iot.vmp.storager.dao.PlatformGbStreamMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.util.*;
@@ -29,60 +27,128 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+ @Autowired
+ private IVideoManagerStorager storager;
- public void updateMediaList() {
- JSONObject mediaList = zlmresTfulUtils.getMediaList();
- if (mediaList == null) return;
- String dataStr = mediaList.getString("data");
+ @Autowired
+ private GbStreamMapper gbStreamMapper;
- Integer code = mediaList.getInteger("code");
- Map<String, RealVideo> result = new HashMap<>();
- if (code == 0 ) {
- if (dataStr != null) {
- List<MediaItem> mediaItems = JSON.parseObject(dataStr, new TypeReference<List<MediaItem>>() {});
- for (MediaItem item : mediaItems) {
- if ("rtp".equals(item.getApp())) {
- continue;
- }
- String key = item.getApp() + "_" + item.getStream();
- RealVideo realVideo = result.get(key);
- if (realVideo == null) {
- realVideo = new RealVideo();
- realVideo.setApp(item.getApp());
- realVideo.setStream(item.getStream());
- realVideo.setAliveSecond(item.getAliveSecond());
- realVideo.setCreateStamp(item.getCreateStamp());
- realVideo.setOriginSock(item.getOriginSock());
- realVideo.setTotalReaderCount(item.getTotalReaderCount());
- realVideo.setOriginType(item.getOriginType());
- realVideo.setOriginTypeStr(item.getOriginTypeStr());
- realVideo.setOriginUrl(item.getOriginUrl());
- realVideo.setCreateStamp(item.getCreateStamp());
- realVideo.setAliveSecond(item.getAliveSecond());
+ @Autowired
+ private PlatformGbStreamMapper platformGbStreamMapper;
- ArrayList<RealVideo.MediaSchema> mediaSchemas = new ArrayList<>();
- realVideo.setSchemas(mediaSchemas);
- realVideo.setTracks(item.getTracks());
- realVideo.setVhost(item.getVhost());
- result.put(key, realVideo);
- }
+ @Autowired
+ private IStreamPushService streamPushService;
- RealVideo.MediaSchema mediaSchema = new RealVideo.MediaSchema();
- mediaSchema.setSchema(item.getSchema());
- mediaSchema.setBytesSpeed(item.getBytesSpeed());
- realVideo.getSchemas().add(mediaSchema);
+ @Autowired
+ private ZLMHttpHookSubscribe subscribe;
+
+
+ public void updateMediaList(MediaServerItem mediaServerItem) {
+ storager.clearMediaList();
+
+ // 浣跨敤寮傛鐨勫綋鏃舵洿鏂板獟浣撴祦鍒楄〃
+ zlmresTfulUtils.getMediaList(mediaServerItem, (mediaList ->{
+ if (mediaList == null) return;
+ String dataStr = mediaList.getString("data");
+
+ Integer code = mediaList.getInteger("code");
+ Map<String, StreamPushItem> result = new HashMap<>();
+ List<StreamPushItem> streamPushItems = null;
+ // 鑾峰彇鎵�鏈夌殑鍥芥爣鍏宠仈
+// List<GbStream> gbStreams = gbStreamMapper.selectAllByMediaServerId(mediaServerItem.getId());
+ if (code == 0 ) {
+ if (dataStr != null) {
+ streamPushItems = streamPushService.handleJSON(dataStr, mediaServerItem);
}
-
+ }else {
+ logger.warn("鏇存柊瑙嗛娴佸け璐ワ紝閿欒code锛� " + code);
}
- }else {
- logger.warn("鏇存柊瑙嗛娴佸け璐ワ紝閿欒code锛� " + code);
- }
- List<RealVideo> realVideos = new ArrayList<>(result.values());
- Collections.sort(realVideos);
- redisCatchStorage.updateMediaList(realVideos);
+ if (streamPushItems != null) {
+ storager.updateMediaList(streamPushItems);
+ for (StreamPushItem streamPushItem : streamPushItems) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("app", streamPushItem.getApp());
+ jsonObject.put("stream", streamPushItem.getStream());
+ jsonObject.put("mediaServerId", mediaServerItem.getId());
+ subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_play,jsonObject,
+ (MediaServerItem mediaServerItemInuse, JSONObject response)->{
+ updateMedia(mediaServerItem, response.getString("app"), response.getString("stream"));
+ }
+ );
+ }
+ }
+ }));
+
+ }
+
+ public void addMedia(MediaServerItem mediaServerItem, String app, String streamId) {
+ //浣跨敤寮傛鏇存柊鎺ㄦ祦
+ updateMedia(mediaServerItem, app, streamId);
}
+ public void updateMedia(MediaServerItem mediaServerItem, String app, String streamId) {
+ //浣跨敤寮傛鏇存柊鎺ㄦ祦
+ zlmresTfulUtils.getMediaList(mediaServerItem, app, streamId, "rtmp", json->{
+ if (json == null) return;
+ String dataStr = json.getString("data");
+
+ Integer code = json.getInteger("code");
+ Map<String, StreamPushItem> result = new HashMap<>();
+ List<StreamPushItem> streamPushItems = null;
+ if (code == 0 ) {
+ if (dataStr != null) {
+ streamPushItems = streamPushService.handleJSON(dataStr, mediaServerItem);
+ }
+ }else {
+ logger.warn("鏇存柊瑙嗛娴佸け璐ワ紝閿欒code锛� " + code);
+ }
+
+ if (streamPushItems != null && streamPushItems.size() == 1) {
+ storager.updateMedia(streamPushItems.get(0));
+ }
+ });
+ }
+
+
+ public void removeMedia(String app, String streamId) {
+ // 鏌ユ壘鏄惁鍏宠仈浜嗗浗鏍囷紝 鍏宠仈浜嗕笉鍒犻櫎锛� 缃负绂荤嚎
+ StreamProxyItem streamProxyItem = gbStreamMapper.selectOne(app, streamId);
+ if (streamProxyItem == null) {
+ storager.removeMedia(app, streamId);
+ }else {
+ storager.mediaOutline(app, streamId);
+ }
+ }
+
+// 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