From 3d2aeb890b0d6bc13ea44ff6e0d5764bcf7aa529 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 14 十二月 2020 16:51:29 +0800
Subject: [PATCH] 使用线程安全的map存储订阅信息 修改点播消息内容,提升兼容性
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 168 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 130 insertions(+), 38 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 e4be40b..99da624 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,10 +1,20 @@
package com.genersoft.iot.vmp.media.zlm;
import java.math.BigInteger;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+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.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.IpUtil;
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.web.bind.annotation.PostMapping;
@@ -16,20 +26,38 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import javax.servlet.http.HttpServletRequest;
+
/**
* @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
- * @author: songww
+ * @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓婂崍10:46:48
*/
@RestController
-@RequestMapping("/hook/zlm")
+@RequestMapping("/index/hook")
public class ZLMHttpHookListener {
private final static Logger logger = LoggerFactory.getLogger(ZLMHttpHookListener.class);
-
+
+
@Autowired
private SIPCommander cmder;
-
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
+ private ZLMHttpHookSubscribe subscribe;
+
+ @Value("${media.ip}")
+ private String mediaIp;
+
+ @Value("${media.port}")
+ private int mediaPort;
+
/**
* 娴侀噺缁熻浜嬩欢锛屾挱鏀惧櫒鎴栨帹娴佸櫒鏂紑鏃跺苟涓旇�楃敤娴侀噺瓒呰繃鐗瑰畾闃堝�兼椂浼氳Е鍙戞浜嬩欢锛岄槇鍊奸�氳繃閰嶇疆鏂囦欢general.flowThreshold閰嶇疆锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
*
@@ -42,11 +70,11 @@
logger.debug("ZLM HOOK on_flow_report API璋冪敤锛屽弬鏁帮細" + json.toString());
}
// TODO Auto-generated method stub
-
+
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("msg", "success");
+ ret.put("code", 0);
+ ret.put("msg", "success");
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -64,10 +92,10 @@
// TODO Auto-generated method stub
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("err", "");
- json.put("path", "");
- json.put("second", 600);
+ ret.put("code", 0);
+ ret.put("err", "");
+ ret.put("path", "");
+ ret.put("second", 600);
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -85,8 +113,8 @@
// TODO Auto-generated method stub
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("msg", "success");
+ ret.put("code", 0);
+ ret.put("msg", "success");
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -101,14 +129,49 @@
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);
+
+// if ("rtp".equals(app)) {
+// String ssrc = new DecimalFormat("0000000000").format(Integer.parseInt(streamId, 16));
+// StreamInfo streamInfoForPlay = storager.queryPlayBySSRC(ssrc);
+// if ("rtp".equals(app) && streamInfoForPlay != null ) {
+// MediaServerConfig mediaInfo = storager.getMediaInfo();
+// streamInfoForPlay.setFlv(String.format("http://%s:%s/rtp/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+// streamInfoForPlay.setWs_flv(String.format("ws://%s:%s/rtp/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+// streamInfoForPlay.setFmp4(String.format("http://%s:%s/rtp/%s.live.mp4", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+// streamInfoForPlay.setWs_fmp4(String.format("ws://%s:%s/rtp/%s.live.mp4", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+// streamInfoForPlay.setRtmp(String.format("rtmp://%s:%s/rtp/%s", mediaInfo.getWanIp(), mediaInfo.getRtmpPort(), streamId));
+// streamInfoForPlay.setHls(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+// streamInfoForPlay.setRtsp(String.format("rtsp://%s:%s/rtp/%s", mediaInfo.getWanIp(), mediaInfo.getRtspPort(), streamId));
+// storager.startPlay(streamInfoForPlay);
+// }
+//
+// StreamInfo streamInfoForPlayBack = storager.queryPlaybackBySSRC(ssrc);
+// if ("rtp".equals(app) && streamInfoForPlayBack != null ) {
+// MediaServerConfig mediaInfo = storager.getMediaInfo();
+// streamInfoForPlayBack.setFlv(String.format("http://%s:%s/rtp/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+// streamInfoForPlayBack.setWs_flv(String.format("ws://%s:%s/rtp/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+// streamInfoForPlayBack.setFmp4(String.format("http://%s:%s/rtp/%s.live.mp4", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+// streamInfoForPlayBack.setWs_fmp4(String.format("ws://%s:%s/rtp/%s.live.mp4", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+// streamInfoForPlayBack.setRtmp(String.format("rtmp://%s:%s/rtp/%s", mediaInfo.getWanIp(), mediaInfo.getRtmpPort(), streamId));
+// streamInfoForPlayBack.setHls(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+// streamInfoForPlayBack.setRtsp(String.format("rtsp://%s:%s/rtp/%s", mediaInfo.getWanIp(), mediaInfo.getRtspPort(), streamId));
+// storager.startPlayback(streamInfoForPlayBack);
+// }
+// }
+
// TODO Auto-generated method stub
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("msg", "success");
- json.put("enableHls", true);
- json.put("enableMP4", false);
- json.put("enableRtxp", true);
+ ret.put("code", 0);
+ ret.put("msg", "success");
+ ret.put("enableHls", true);
+ ret.put("enableMP4", false);
+ ret.put("enableRtxp", true);
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -126,8 +189,8 @@
// TODO Auto-generated method stub
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("msg", "success");
+ ret.put("code", 0);
+ ret.put("msg", "success");
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -145,8 +208,8 @@
// TODO Auto-generated method stub
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("realm", "");
+ ret.put("code", 0);
+ ret.put("realm", "");
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -165,9 +228,9 @@
// TODO Auto-generated method stub
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("encrypted", false);
- json.put("passwd", "test");
+ ret.put("code", 0);
+ ret.put("encrypted", false);
+ ret.put("passwd", "test");
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -185,8 +248,8 @@
// TODO Auto-generated method stub
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("msg", "success");
+ ret.put("code", 0);
+ ret.put("msg", "success");
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -201,11 +264,26 @@
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_stream_changed API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- // TODO Auto-generated method stub
-
+ // 娴佹秷澶辩Щ闄edis play
+ String app = json.getString("app");
+ String streamId = json.getString("stream");
+ boolean regist = json.getBoolean("regist");
+// String ssrc = String.format("%10d", Integer.parseInt(streamId, 16)); // ZLM 瑕佹眰澶у啓涓旈浣嶈ˉ闆�
+ String ssrc = new DecimalFormat("0000000000").format(Integer.parseInt(streamId, 16));
+ StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
+ if ("rtp".equals(app) && !regist ) {
+ if (streamInfo!=null){
+ storager.stopPlay(streamInfo);
+ }else{
+ streamInfo = storager.queryPlaybackBySSRC(ssrc);
+ storager.stopPlayback(streamInfo);
+ }
+ }
+
+
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("msg", "success");
+ ret.put("code", 0);
+ ret.put("msg", "success");
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -226,10 +304,17 @@
String ssrc = String.format("%010d", numb);
cmder.streamByeCmd(ssrc);
+ StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
+ if (streamInfo!=null){
+ storager.stopPlay(streamInfo);
+ }else{
+ streamInfo = storager.queryPlaybackBySSRC(ssrc);
+ storager.stopPlayback(streamInfo);
+ }
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("close", true);
+ ret.put("code", 0);
+ ret.put("close", true);
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -247,8 +332,8 @@
// TODO Auto-generated method stub
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("msg", "success");
+ ret.put("code", 0);
+ ret.put("msg", "success");
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
@@ -258,16 +343,23 @@
*/
@ResponseBody
@PostMapping(value = "/on_server_started", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onServerStarted(@RequestBody JSONObject json){
+ public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject json){
if (logger.isDebugEnabled()) {
logger.debug("ZLM HOOK on_server_started API璋冪敤锛屽弬鏁帮細" + json.toString());
}
+
+// String data = json.getString("data");
+// List<MediaServerConfig> mediaServerConfigs = JSON.parseArray(JSON.toJSONString(json), MediaServerConfig.class);
+// MediaServerConfig mediaServerConfig = mediaServerConfigs.get(0);
+ MediaServerConfig mediaServerConfig = JSON.toJavaObject(json, MediaServerConfig.class);
+ mediaServerConfig.setLocalIP(mediaIp);
+ storager.updateMediaInfo(mediaServerConfig);
// TODO Auto-generated method stub
JSONObject ret = new JSONObject();
- json.put("code", 0);
- json.put("msg", "success");
+ ret.put("code", 0);
+ ret.put("msg", "success");
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
}
--
Gitblit v1.8.0