From 20dca0f6b664f6124e3492eee2e3ef6dfde80d88 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 02 四月 2021 19:14:12 +0800
Subject: [PATCH] 增加推流转发到国标，尚不完善
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 107 +++++++++++++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 49 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 9fc64c7..0065b21 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
@@ -1,20 +1,15 @@
package com.genersoft.iot.vmp.media.zlm;
-import java.math.BigInteger;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
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.gb28181.bean.Device;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.utils.IpUtil;
-import com.genersoft.iot.vmp.vmanager.service.IPlayService;
+import com.genersoft.iot.vmp.service.IPlayService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,8 +52,8 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
- @Autowired
- private ZLMRESTfulUtils zlmresTfulUtils;
+ @Autowired
+ private ZLMMediaListManager zlmMediaListManager;
@Autowired
private ZLMHttpHookSubscribe subscribe;
@@ -82,10 +77,10 @@
@ResponseBody
@PostMapping(value = "/on_flow_report", produces = "application/json;charset=UTF-8")
public ResponseEntity<String> onFlowReport(@RequestBody JSONObject json){
-
- logger.debug("ZLM HOOK on_flow_report API璋冪敤锛屽弬鏁帮細" + json.toString());
- // TODO Auto-generated method stub
-
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_flow_report API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -103,8 +98,6 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_http_access API 璋冪敤锛屽弬鏁帮細" + json.toString());
}
- // TODO Auto-generated method stub
-
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("err", "");
@@ -124,8 +117,6 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_play API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- // TODO Auto-generated method stub
-
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -143,15 +134,10 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_publish API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- String app = json.getString("app");
- String streamId = json.getString("id");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
if (subscribe != null) subscribe.response(json);
-
- // TODO Auto-generated method stub
-
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -172,8 +158,6 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_record_mp4 API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- // TODO Auto-generated method stub
-
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -191,8 +175,6 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_rtsp_realm API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- // TODO Auto-generated method stub
-
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("realm", "");
@@ -211,8 +193,6 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_rtsp_auth API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- // TODO Auto-generated method stub
-
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("encrypted", false);
@@ -232,8 +212,8 @@
logger.debug("ZLM HOOK on_shell_login API璋冪敤锛屽弬鏁帮細" + json.toString());
}
// TODO 濡傛灉鏄甫鏈塺tpstream鍒欏紑鍚寜闇�鎷夋祦
- String app = json.getString("app");
- String stream = json.getString("stream");
+ // String app = json.getString("app");
+ // String stream = json.getString("stream");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
if (subscribe != null) subscribe.response(json);
@@ -258,9 +238,11 @@
// 娴佹秷澶辩Щ闄edis play
String app = json.getString("app");
String streamId = json.getString("stream");
+ String schema = json.getString("schema");
boolean regist = json.getBoolean("regist");
- StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
+
if ("rtp".equals(app) && !regist ) {
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
if (streamInfo!=null){
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
@@ -268,9 +250,15 @@
streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
redisCatchStorage.stopPlayback(streamInfo);
}
+ }else {
+ if (!"rtp".equals(app) && "rtmp".equals(schema)){
+ if (regist) {
+ zlmMediaListManager.addMedia(app, streamId);
+ }else {
+ zlmMediaListManager.removeMedia(app, streamId);
+ }
+ }
}
-
-
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -290,21 +278,35 @@
}
String streamId = json.getString("stream");
-
- cmder.streamByeCmd(streamId);
+ String app = json.getString("app");
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
- if (streamInfo!=null){
- redisCatchStorage.stopPlay(streamInfo);
- storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
- }else{
- streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
- redisCatchStorage.stopPlayback(streamInfo);
+
+
+ if ("rtp".equals(app)){
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("close", true);
+ if (streamInfo != null) {
+ if (redisCatchStorage.isChannelSendingRTP(streamInfo.getChannelId())) {
+ ret.put("close", false);
+ } else {
+ cmder.streamByeCmd(streamId);
+ redisCatchStorage.stopPlay(streamInfo);
+ storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+ }
+ }else{
+ cmder.streamByeCmd(streamId);
+ streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
+ redisCatchStorage.stopPlayback(streamInfo);
+ }
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ }else {
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("close", false);
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
-
- JSONObject ret = new JSONObject();
- ret.put("code", 0);
- ret.put("close", true);
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+
}
/**
@@ -318,8 +320,6 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_stream_not_found API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- // TODO Auto-generated method stub
-
if (autoApplyPlay) {
String app = json.getString("app");
String streamId = json.getString("stream");
@@ -365,12 +365,21 @@
// String data = json.getString("data");
// List<MediaServerConfig> mediaServerConfigs = JSON.parseArray(JSON.toJSONString(json), MediaServerConfig.class);
// MediaServerConfig mediaServerConfig = mediaServerConfigs.get(0);
+
+ List<ZLMHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(ZLMHttpHookSubscribe.HookType.on_server_started);
+ if (subscribes != null && subscribes.size() > 0) {
+ for (ZLMHttpHookSubscribe.Event subscribe : subscribes) {
+ subscribe.response(json);
+ }
+ }
+
MediaServerConfig mediaServerConfig = JSON.toJavaObject(json, MediaServerConfig.class);
mediaServerConfig.setWanIp(StringUtils.isEmpty(mediaWanIp)? mediaIp: mediaWanIp);
mediaServerConfig.setLocalIP(mediaIp);
redisCatchStorage.updateMediaInfo(mediaServerConfig);
- // TODO Auto-generated method stub
-
+
+ // 閲嶆柊鍙戣捣浠ｇ悊
+
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
--
Gitblit v1.8.0