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/ZLMHttpHookListener.java | 152 ++++++++++++++++++++++++++++++--------------------
1 files changed, 91 insertions(+), 61 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 5795690..f74dcfa 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
@@ -3,21 +3,22 @@
import java.util.List;
import java.util.UUID;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.conf.MediaConfig;
+import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.service.IPlayService;
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.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,7 +31,7 @@
import javax.servlet.http.HttpServletRequest;
/**
- * @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
+ * @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
* @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓婂崍10:46:48
*/
@@ -39,7 +40,6 @@
public class ZLMHttpHookListener {
private final static Logger logger = LoggerFactory.getLogger(ZLMHttpHookListener.class);
-
@Autowired
private SIPCommander cmder;
@@ -53,23 +53,23 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+ @Autowired
+ private IMediaServerService mediaServerService;
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
+
@Autowired
private ZLMMediaListManager zlmMediaListManager;
@Autowired
private ZLMHttpHookSubscribe subscribe;
- @Value("${media.autoApplyPlay}")
- private boolean autoApplyPlay;
+ @Autowired
+ private UserSetup userSetup;
- @Value("${media.ip}")
- private String mediaIp;
-
- @Value("${media.wanIp}")
- private String mediaWanIp;
-
- @Value("${media.port}")
- private int mediaPort;
+ @Autowired
+ private MediaConfig mediaConfig;
/**
* 娴侀噺缁熻浜嬩欢锛屾挱鏀惧櫒鎴栨帹娴佸櫒鏂紑鏃跺苟涓旇�楃敤娴侀噺瓒呰繃鐗瑰畾闃堝�兼椂浼氳Е鍙戞浜嬩欢锛岄槇鍊奸�氳繃閰嶇疆鏂囦欢general.flowThreshold閰嶇疆锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
@@ -82,6 +82,7 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_flow_report API璋冪敤锛屽弬鏁帮細" + json.toString());
}
+ String mediaServerId = json.getString("mediaServerId");
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -99,6 +100,7 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_http_access API 璋冪敤锛屽弬鏁帮細" + json.toString());
}
+ String mediaServerId = json.getString("mediaServerId");
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("err", "");
@@ -118,9 +120,14 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_play API璋冪敤锛屽弬鏁帮細" + json.toString());
}
+ String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_play, json);
if (subscribe != null ) {
- subscribe.response(json);
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ if (mediaInfo != null) {
+ subscribe.response(mediaInfo, json);
+ }
+
}
JSONObject ret = new JSONObject();
ret.put("code", 0);
@@ -134,22 +141,25 @@
*/
@ResponseBody
@PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onPublish(@RequestBody JSONObject json){
-
- if (logger.isDebugEnabled()) {
- logger.debug("ZLM HOOK on_publish API璋冪敤锛屽弬鏁帮細" + json.toString());
- }
+ public ResponseEntity<String> onPublish(@RequestBody JSONObject json) {
+ logger.debug("ZLM HOOK on_publish API璋冪敤锛屽弬鏁帮細" + json.toString());
+
+ String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
- if (subscribe != null) subscribe.response(json);
-
+ if (subscribe != null) {
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ if (mediaInfo != null) {
+ subscribe.response(mediaInfo, json);
+ }
+ }
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
ret.put("enableHls", true);
- ret.put("enableMP4", false);
+ ret.put("enableMP4", userSetup.isRecordPushLive());
ret.put("enableRtxp", true);
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
}
/**
@@ -163,6 +173,7 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_record_mp4 API璋冪敤锛屽弬鏁帮細" + json.toString());
}
+ String mediaServerId = json.getString("mediaServerId");
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -180,6 +191,7 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_rtsp_realm API璋冪敤锛屽弬鏁帮細" + json.toString());
}
+ String mediaServerId = json.getString("mediaServerId");
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("realm", "");
@@ -198,6 +210,7 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_rtsp_auth API璋冪敤锛屽弬鏁帮細" + json.toString());
}
+ String mediaServerId = json.getString("mediaServerId");
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("encrypted", false);
@@ -219,9 +232,15 @@
// TODO 濡傛灉鏄甫鏈塺tpstream鍒欏紑鍚寜闇�鎷夋祦
// String app = json.getString("app");
// String stream = json.getString("stream");
-
+ String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_shell_login, json);
- if (subscribe != null) subscribe.response(json);
+ if (subscribe != null ) {
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ if (mediaInfo != null) {
+ subscribe.response(mediaInfo, json);
+ }
+
+ }
JSONObject ret = new JSONObject();
ret.put("code", 0);
@@ -240,9 +259,15 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_stream_changed API璋冪敤锛屽弬鏁帮細" + json.toString());
}
-
+ String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, json);
- if (subscribe != null) subscribe.response(json);
+ if (subscribe != null ) {
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ if (mediaInfo != null) {
+ subscribe.response(mediaInfo, json);
+ }
+
+ }
// 娴佹秷澶辩Щ闄edis play
String app = json.getString("app");
@@ -251,9 +276,14 @@
JSONArray tracks = json.getJSONArray("tracks");
boolean regist = json.getBoolean("regist");
if (tracks != null) {
- System.out.println("on_stream_changed->>" + schema);
+ logger.info("[stream: " + streamId + "] on_stream_changed->>" + schema);
}
if ("rtmp".equals(schema)){
+ if (regist) {
+ mediaServerService.addCount(mediaServerId);
+ }else {
+ mediaServerService.removeCount(mediaServerId);
+ }
if ("rtp".equals(app) && !regist ) {
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
if (streamInfo!=null){
@@ -265,10 +295,11 @@
}
}else {
if (!"rtp".equals(app) ){
+ MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
if (regist) {
- zlmMediaListManager.addMedia(app, streamId);
+ zlmMediaListManager.addMedia(mediaServerItem, app, streamId);
}else {
- zlmMediaListManager.removeMedia(app, streamId);
+ zlmMediaListManager.removeMedia( app, streamId);
}
}
}
@@ -291,10 +322,11 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_stream_none_reader API璋冪敤锛屽弬鏁帮細" + json.toString());
}
-
+ String mediaServerId = json.getString("mediaServerId");
String streamId = json.getString("stream");
String app = json.getString("app");
+ // TODO 濡傛灉鍦ㄧ粰涓婄骇鎺ㄦ祦锛屼篃涓嶅仠姝€��
if ("rtp".equals(app)){
JSONObject ret = new JSONObject();
ret.put("code", 0);
@@ -315,6 +347,10 @@
redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch);
}
}
+ MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+ if (mediaServerItem != null && "-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())) {
+ ret.put("close", false);
+ }
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}else {
JSONObject ret = new JSONObject();
@@ -332,30 +368,35 @@
@ResponseBody
@PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")
public ResponseEntity<String> onStreamNotFound(@RequestBody JSONObject json){
-
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_stream_not_found API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- if (autoApplyPlay) {
+ String mediaServerId = json.getString("mediaServerId");
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ if (userSetup.isAutoApplyPlay() && mediaInfo != null) {
String app = json.getString("app");
String streamId = json.getString("stream");
- StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
- if ("rtp".equals(app) && streamId.contains("gb_play") && streamInfo == null) {
+ if ("rtp".equals(app)) {
String[] s = streamId.split("_");
- if (s.length == 4) {
- String deviceId = s[2];
- String channelId = s[3];
+ if (s.length == 2) {
+ String deviceId = s[0];
+ String channelId = s[1];
Device device = storager.queryVideoDevice(deviceId);
if (device != null) {
UUID uuid = UUID.randomUUID();
- cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
+ SSRCInfo ssrcInfo;
+ String streamId2 = null;
+ if (mediaInfo.isRtpEnable()) {
+ streamId2 = String.format("%s_%s", device.getDeviceId(), channelId);
+ }
+ ssrcInfo = mediaServerService.openRTPServer(mediaInfo, streamId2);
+ cmder.playStreamCmd(mediaInfo, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {
logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
- playService.onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
+ playService.onPublishHandlerForPlay(mediaServerItemInuse, response, deviceId, channelId, uuid.toString());
}, null);
}
}
-
}
}
@@ -372,30 +413,19 @@
*/
@ResponseBody
@PostMapping(value = "/on_server_started", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject json){
+ public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){
if (logger.isDebugEnabled()) {
- logger.debug("ZLM HOOK on_server_started API璋冪敤锛屽弬鏁帮細" + json.toString());
+ logger.debug("ZLM HOOK on_server_started API璋冪敤锛屽弬鏁帮細" + jsonObject.toString());
}
-
-// String data = json.getString("data");
-// List<MediaServerConfig> mediaServerConfigs = JSON.parseArray(JSON.toJSONString(json), MediaServerConfig.class);
-// MediaServerConfig mediaServerConfig = mediaServerConfigs.get(0);
-
+ String remoteAddr = request.getRemoteAddr();
+ jsonObject.put("ip", remoteAddr);
List<ZLMHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(ZLMHttpHookSubscribe.HookType.on_server_started);
- if (subscribes != null && subscribes.size() > 0) {
+ if (subscribes != null && subscribes.size() > 0) {
for (ZLMHttpHookSubscribe.Event subscribe : subscribes) {
- subscribe.response(json);
+ subscribe.response(null, jsonObject);
}
}
-
- MediaServerConfig mediaServerConfig = JSON.toJavaObject(json, MediaServerConfig.class);
- mediaServerConfig.setWanIp(StringUtils.isEmpty(mediaWanIp)? mediaIp: mediaWanIp);
- mediaServerConfig.setLocalIP(mediaIp);
- redisCatchStorage.updateMediaInfo(mediaServerConfig);
-
- // 閲嶆柊鍙戣捣浠ｇ悊
-
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
--
Gitblit v1.8.0