From e48fa711a3664bece9b3e58840a75fe7c05bc47c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期六, 08 五月 2021 17:14:05 +0800
Subject: [PATCH] 添加截图（快照）功能
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 96 +++++++++++++++++++++++++++--------------------
1 files changed, 55 insertions(+), 41 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 b2c1597..7fa0a47 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
@@ -4,12 +4,13 @@
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.gb28181.bean.Device;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-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;
@@ -52,23 +53,20 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+ @Autowired
+ private ZLMServerManger zlmServerManger;
+
@Autowired
private ZLMMediaListManager zlmMediaListManager;
@Autowired
private ZLMHttpHookSubscribe subscribe;
- @Value("${media.autoApplyPlay}")
+ @Value("${userSettings.autoApplyPlay}")
private boolean autoApplyPlay;
- @Value("${media.ip}")
- private String mediaIp;
-
- @Value("${media.wanIp}")
- private String mediaWanIp;
-
- @Value("${media.port}")
- private int mediaPort;
+ @Autowired
+ private MediaConfig mediaConfig;
/**
* 娴侀噺缁熻浜嬩欢锛屾挱鏀惧櫒鎴栨帹娴佸櫒鏂紑鏃跺苟涓旇�楃敤娴侀噺瓒呰繃鐗瑰畾闃堝�兼椂浼氳Е鍙戞浜嬩欢锛岄槇鍊奸�氳繃閰嶇疆鏂囦欢general.flowThreshold閰嶇疆锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
@@ -116,6 +114,10 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_play API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
+ ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_play, json);
+ if (subscribe != null ) {
+ subscribe.response(json);
}
JSONObject ret = new JSONObject();
ret.put("code", 0);
@@ -215,7 +217,7 @@
// String app = json.getString("app");
// String stream = json.getString("stream");
- ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
+ ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_shell_login, json);
if (subscribe != null) subscribe.response(json);
JSONObject ret = new JSONObject();
@@ -235,25 +237,40 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_stream_changed API璋冪敤锛屽弬鏁帮細" + json.toString());
}
+
+ ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, json);
+ if (subscribe != null) subscribe.response(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");
- StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
- 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);
- }
- }else {
- if (!"rtp".equals(app) && "rtsp".equals(schema)){
- zlmMediaListManager.updateMediaList();
+ if (tracks != null) {
+ logger.info("[stream: " + streamId + "] on_stream_changed->>" + schema);
+ }
+ if ("rtmp".equals(schema)){
+ if ("rtp".equals(app) && !regist ) {
+ 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);
+ }
+ }else {
+ if (!"rtp".equals(app) ){
+ if (regist) {
+ zlmMediaListManager.addMedia(app, streamId);
+ }else {
+ zlmMediaListManager.removeMedia(app, streamId);
+ }
+ }
}
}
+
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
@@ -274,25 +291,26 @@
String streamId = json.getString("stream");
String app = json.getString("app");
- StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
-
if ("rtp".equals(app)){
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("close", true);
- if (streamInfo != null) {
- if (redisCatchStorage.isChannelSendingRTP(streamInfo.getChannelId())) {
+ StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId);
+ if (streamInfoForPlayCatch != null) {
+ if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) {
ret.put("close", false);
} else {
- cmder.streamByeCmd(streamId);
- redisCatchStorage.stopPlay(streamInfo);
- storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+ cmder.streamByeCmd(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId());
+ redisCatchStorage.stopPlay(streamInfoForPlayCatch);
+ storager.stopPlay(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId());
}
}else{
- cmder.streamByeCmd(streamId);
- streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
- redisCatchStorage.stopPlayback(streamInfo);
+ StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlaybackByStreamId(streamId);
+ if (streamInfoForPlayBackCatch != null) {
+ cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(), streamInfoForPlayBackCatch.getChannelId());
+ redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch);
+ }
}
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}else {
@@ -319,7 +337,7 @@
String app = json.getString("app");
String streamId = json.getString("stream");
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
- if ("rtp".equals(app) && streamId.indexOf("gb_play") > -1 && streamInfo == null) {
+ if ("rtp".equals(app) && streamId.contains("gb_play") && streamInfo == null) {
String[] s = streamId.split("_");
if (s.length == 4) {
String deviceId = s[2];
@@ -367,12 +385,8 @@
subscribe.response(json);
}
}
-
- MediaServerConfig mediaServerConfig = JSON.toJavaObject(json, MediaServerConfig.class);
- mediaServerConfig.setWanIp(StringUtils.isEmpty(mediaWanIp)? mediaIp: mediaWanIp);
- mediaServerConfig.setLocalIP(mediaIp);
- redisCatchStorage.updateMediaInfo(mediaServerConfig);
-
+ ZLMServerConfig ZLMServerConfig = JSON.toJavaObject(json, ZLMServerConfig.class);
+ zlmServerManger.updateServerCatch(ZLMServerConfig);
// 閲嶆柊鍙戣捣浠ｇ悊
JSONObject ret = new JSONObject();
--
Gitblit v1.8.0