From 2c1dbe63de3d370d0b0f20fea474326e88b9ca23 Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期三, 10 三月 2021 14:39:40 +0800
Subject: [PATCH] 增加接收Bye请求后停止向上级推流功能
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 50 ++++++++++++++++----------------------------------
1 files changed, 16 insertions(+), 34 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 cb8ad05..90b5369 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,19 +1,13 @@
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,6 +15,7 @@
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;
@@ -56,8 +51,8 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
- @Autowired
- private ZLMRESTfulUtils zlmresTfulUtils;
+ // @Autowired
+ // private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired
private ZLMHttpHookSubscribe subscribe;
@@ -67,6 +62,9 @@
@Value("${media.ip}")
private String mediaIp;
+
+ @Value("${media.wanIp}")
+ private String mediaWanIp;
@Value("${media.port}")
private int mediaPort;
@@ -82,9 +80,6 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_flow_report API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- // TODO Auto-generated method stub
-
-
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -102,8 +97,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", "");
@@ -123,8 +116,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");
@@ -142,15 +133,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");
@@ -171,8 +157,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");
@@ -190,8 +174,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", "");
@@ -210,8 +192,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);
@@ -230,8 +210,13 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_shell_login API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- // TODO Auto-generated method stub
-
+ // TODO 濡傛灉鏄甫鏈塺tpstream鍒欏紑鍚寜闇�鎷夋祦
+ // 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);
+
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -257,13 +242,12 @@
if ("rtp".equals(app) && !regist ) {
if (streamInfo!=null){
redisCatchStorage.stopPlay(streamInfo);
+ storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
}else{
streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
redisCatchStorage.stopPlayback(streamInfo);
}
}
-
-
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -288,6 +272,7 @@
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);
@@ -310,8 +295,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");
@@ -358,10 +341,9 @@
// List<MediaServerConfig> mediaServerConfigs = JSON.parseArray(JSON.toJSONString(json), MediaServerConfig.class);
// MediaServerConfig mediaServerConfig = mediaServerConfigs.get(0);
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