From 0cad0920c649f073bb64cae10bd9b573a1d78f4e Mon Sep 17 00:00:00 2001
From: 648540858 <456PANlinlin>
Date: 星期五, 26 十一月 2021 23:13:59 +0800
Subject: [PATCH] 录像回放时不进行录像下载
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 127 +++++++++++++++++++++++++++++++-----------
1 files changed, 94 insertions(+), 33 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 b7aebf4..233416a 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
@@ -9,9 +9,13 @@
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.IMediaServerItem;
+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.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.IMediaService;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
+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;
@@ -32,7 +36,7 @@
import javax.servlet.http.HttpServletRequest;
/**
- * @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
+ * @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
* @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓婂崍10:46:48
*/
@@ -41,7 +45,6 @@
public class ZLMHttpHookListener {
private final static Logger logger = LoggerFactory.getLogger(ZLMHttpHookListener.class);
-
@Autowired
private SIPCommander cmder;
@@ -57,6 +60,12 @@
@Autowired
private IMediaServerService mediaServerService;
+
+ @Autowired
+ private IStreamProxyService streamProxyService;
+
+ @Autowired
+ private IMediaService mediaService;
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@@ -125,7 +134,7 @@
String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_play, json);
if (subscribe != null ) {
- IMediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
if (mediaInfo != null) {
subscribe.response(mediaInfo, json);
}
@@ -150,17 +159,25 @@
String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
if (subscribe != null) {
- IMediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
if (mediaInfo != null) {
subscribe.response(mediaInfo, json);
}
}
+ String app = json.getString("app");
+ String stream = json.getString("stream");
+ StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(stream);
JSONObject ret = new JSONObject();
+ // 褰曞儚鍥炴斁鏃朵笉杩涜褰曞儚涓嬭浇
+ if (streamInfo != null) {
+ ret.put("enableMP4", false);
+ }else {
+ ret.put("enableMP4", userSetup.isRecordPushLive());
+ }
ret.put("code", 0);
ret.put("msg", "success");
ret.put("enableHls", true);
ret.put("enableMP4", userSetup.isRecordPushLive());
- ret.put("enableRtxp", true);
return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
}
@@ -237,7 +254,7 @@
String mediaServerId = json.getString("mediaServerId");
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_shell_login, json);
if (subscribe != null ) {
- IMediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
if (mediaInfo != null) {
subscribe.response(mediaInfo, json);
}
@@ -256,27 +273,27 @@
*/
@ResponseBody
@PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onStreamChanged(@RequestBody JSONObject json){
+ public ResponseEntity<String> onStreamChanged(@RequestBody MediaItem item){
if (logger.isDebugEnabled()) {
- logger.debug("ZLM HOOK on_stream_changed API璋冪敤锛屽弬鏁帮細" + json.toString());
+ logger.debug("ZLM HOOK on_stream_changed API璋冪敤锛屽弬鏁帮細" + JSONObject.toJSONString(item));
}
- String mediaServerId = json.getString("mediaServerId");
+ String mediaServerId = item.getMediaServerId();
+ JSONObject json = (JSONObject) JSON.toJSON(item);
ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, json);
if (subscribe != null ) {
- IMediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
if (mediaInfo != null) {
subscribe.response(mediaInfo, json);
}
}
-
// 娴佹秷澶辩Щ闄edis play
- String app = json.getString("app");
- String streamId = json.getString("stream");
- String schema = json.getString("schema");
- JSONArray tracks = json.getJSONArray("tracks");
- boolean regist = json.getBoolean("regist");
+ String app = item.getApp();
+ String streamId = item.getStream();
+ String schema = item.getSchema();
+ List<MediaItem.MediaTrack> tracks = item.getTracks();
+ boolean regist = item.isRegist();
if (tracks != null) {
logger.info("[stream: " + streamId + "] on_stream_changed->>" + schema);
}
@@ -296,12 +313,34 @@
redisCatchStorage.stopPlayback(streamInfo);
}
}else {
- if (!"rtp".equals(app) ){
- IMediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+ if (!"rtp".equals(app)){
+
+ boolean pushChange = false;
+
+ MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
if (regist) {
- zlmMediaListManager.addMedia(mediaServerItem, app, streamId);
+ if ((item.getOriginType() == 1 || item.getOriginType() == 2 || item.getOriginType() == 8)) {
+ pushChange = true;
+ zlmMediaListManager.addMedia(item);
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks);
+ redisCatchStorage.addPushStream(mediaServerItem, app, streamId, streamInfo);
+ }
}else {
- zlmMediaListManager.removeMedia( app, streamId);
+ int result = zlmMediaListManager.removeMedia( app, streamId);
+ redisCatchStorage.removePushStream(mediaServerItem, app, streamId);
+ if (result > 0) {
+ pushChange = true;
+ }
+ }
+ if(pushChange) {
+ // 鍙戦�佹祦鍙樺寲redis娑堟伅
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("serverId", userSetup.getServerId());
+ jsonObject.put("app", app);
+ jsonObject.put("stream", streamId);
+ jsonObject.put("register", regist);
+ jsonObject.put("mediaServerId", mediaServerId);
+ redisCatchStorage.sendStreamChangeMsg(jsonObject);
}
}
}
@@ -327,13 +366,13 @@
String mediaServerId = json.getString("mediaServerId");
String streamId = json.getString("stream");
String app = json.getString("app");
-
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
if ("rtp".equals(app)){
- JSONObject ret = new JSONObject();
- ret.put("code", 0);
ret.put("close", true);
StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId);
if (streamInfoForPlayCatch != null) {
+ // 濡傛灉鍦ㄧ粰涓婄骇鎺ㄦ祦锛屼篃涓嶅仠姝€��
if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) {
ret.put("close", false);
} else {
@@ -346,13 +385,29 @@
if (streamInfoForPlayBackCatch != null) {
cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(), streamInfoForPlayBackCatch.getChannelId());
redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch);
+ }else {
+ StreamInfo streamInfoForDownload = redisCatchStorage.queryDownloadByStreamId(streamId);
+ // 杩涜褰曞儚涓嬭浇鏃舵棤浜鸿鐪嬩笉鏂祦
+ if (streamInfoForDownload != null) {
+ ret.put("close", false);
+ }
}
+ }
+ 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();
- ret.put("code", 0);
- ret.put("close", false);
+ StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId);
+ if (streamProxyItem != null && streamProxyItem.isEnable_remove_none_reader()) {
+ ret.put("close", true);
+ streamProxyService.del(app, streamId);
+ String url = streamProxyItem.getUrl() != null?streamProxyItem.getUrl():streamProxyItem.getSrc_url();
+ logger.info("[{}/{}]<-[{}] 鎷夋祦浠ｇ悊鏃犱汉瑙傜湅宸茬粡绉婚櫎", app, streamId, url);
+ }else {
+ ret.put("close", false);
+ }
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -369,19 +424,25 @@
logger.debug("ZLM HOOK on_stream_not_found API璋冪敤锛屽弬鏁帮細" + json.toString());
}
String mediaServerId = json.getString("mediaServerId");
- IMediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
if (userSetup.isAutoApplyPlay() && mediaInfo != null) {
String app = json.getString("app");
String streamId = json.getString("stream");
- if ("rtp".equals(app) && streamId.contains("gb_play") ) {
+ 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(mediaInfo, device, channelId, (IMediaServerItem mediaServerItemInuse, 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(mediaServerItemInuse, response, deviceId, channelId, uuid.toString());
}, null);
--
Gitblit v1.8.0