From 0a70257b4c821149fe7e16191403a78072b51f58 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 25 十一月 2020 11:42:51 +0800
Subject: [PATCH] 增加对部分NVR的兼容性处理
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 186 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 141 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
index 134e692..300ffc3 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
@@ -3,6 +3,7 @@
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.media.zlm.ZLMRESTfulUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,101 +27,196 @@
@RestController
@RequestMapping("/api")
public class PlayController {
-
+
private final static Logger logger = LoggerFactory.getLogger(PlayController.class);
-
+
@Autowired
private SIPCommander cmder;
-
+
@Autowired
private IVideoManagerStorager storager;
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
-
+
+ @Value("${media.closeWaitRTPInfo}")
+ private boolean closeWaitRTPInfo;
+
@GetMapping("/play/{deviceId}/{channelId}")
- public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId){
-
+ public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId,
+ Integer getEncoding) {
+
+ if (getEncoding == null) getEncoding = 0;
+ getEncoding = closeWaitRTPInfo ? 0 : getEncoding;
Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId);
if (streamInfo == null) {
streamInfo = cmder.playStreamCmd(device, channelId);
- }else {
+ } else {
String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
if (rtpInfo.getBoolean("exist")) {
- return new ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
- }else {
+ return new ResponseEntity<String>(JSON.toJSONString(streamInfo), HttpStatus.OK);
+ } else {
storager.stopPlay(streamInfo);
streamInfo = cmder.playStreamCmd(device, channelId);
}
-
}
String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
// 绛夊緟鎺ㄦ祦, TODO 榛樿瓒呮椂30s
boolean lockFlag = true;
+ boolean rtpPushed = false;
long startTime = System.currentTimeMillis();
+ JSONObject rtpInfo = null;
- while (lockFlag) {
- try {
- if (System.currentTimeMillis() - startTime > 30 * 1000) {
- storager.stopPlay(streamInfo);
- return new ResponseEntity<String>("timeout",HttpStatus.OK);
- }else {
- streamInfo = storager.queryPlayByDevice(deviceId, channelId);
- JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
- if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo.getFlv() != null){
- JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);
- if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
- lockFlag = false;
- JSONArray tracks = mediaInfo.getJSONArray("tracks");
- streamInfo.setTracks(tracks);
- storager.startPlay(streamInfo);
- }else {
-
+ if (getEncoding == 1) {
+ while (lockFlag) {
+ try {
+ if (System.currentTimeMillis() - startTime > 60 * 1000) {
+ storager.stopPlay(streamInfo);
+ logger.info("鎾斁绛夊緟瓒呮椂");
+ return new ResponseEntity<String>("timeout", HttpStatus.OK);
+ } else {
+ streamInfo = storager.queryPlayByDevice(deviceId, channelId);
+ if (!rtpPushed) {
+ logger.info("鏌ヨRTP鎺ㄦ祦淇℃伅...");
+ rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
}
- }else {
- Thread.sleep(2000);
- continue;
- };
+ if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null
+ && streamInfo.getFlv() != null) {
+ logger.info("鏌ヨ娴佺紪鐮佷俊鎭細" + streamInfo.getFlv());
+ rtpPushed = true;
+ Thread.sleep(2000);
+ JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);
+ if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
+ lockFlag = false;
+ logger.info("娴佺紪鐮佷俊鎭凡鑾峰彇");
+ JSONArray tracks = mediaInfo.getJSONArray("tracks");
+ streamInfo.setTracks(tracks);
+ storager.startPlay(streamInfo);
+ } else {
+ logger.info("娴佺紪鐮佷俊鎭湭鑾峰彇锛�2绉掑悗閲嶈瘯...");
+ }
+ } else {
+ Thread.sleep(2000);
+ continue;
+ }
+ }
+ } catch (InterruptedException e) {
+ e.printStackTrace();
}
- } catch (InterruptedException e) {
- e.printStackTrace();
}
+ } else {
+ String flv = storager.getMediaInfo().getWanIp() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/"
+ + streamId + ".flv";
+ streamInfo.setFlv("http://" + flv);
+ streamInfo.setWs_flv("ws://" + flv);
+ storager.startPlay(streamInfo);
}
if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧棰勮 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s",deviceId, channelId));
- logger.debug("璁惧棰勮 API璋冪敤锛宻src锛�"+streamInfo.getSsrc()+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(streamInfo.getSsrc())));
+ logger.debug(String.format("璁惧棰勮 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
+ logger.debug("璁惧棰勮 API璋冪敤锛宻src锛�" + streamInfo.getSsrc() + ",ZLMedia streamId:"
+ + Integer.toHexString(Integer.parseInt(streamInfo.getSsrc())));
}
-
- if(streamInfo!=null) {
- return new ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
+
+ if (streamInfo != null) {
+ return new ResponseEntity<String>(JSON.toJSONString(streamInfo), HttpStatus.OK);
} else {
logger.warn("璁惧棰勮API璋冪敤澶辫触锛�");
return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
}
}
-
+
@PostMapping("/play/{ssrc}/stop")
- public ResponseEntity<String> playStop(@PathVariable String ssrc){
-
+ public ResponseEntity<String> playStop(@PathVariable String ssrc) {
+
cmder.streamByeCmd(ssrc);
StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
- if (streamInfo == null) return new ResponseEntity<String>(HttpStatus.PAYMENT_REQUIRED);
+ if (streamInfo == null)
+ return new ResponseEntity<String>("ssrc not found", HttpStatus.OK);
storager.stopPlay(streamInfo);
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧棰勮鍋滄API璋冪敤锛宻src锛�%s", ssrc));
}
-
- if(ssrc!=null) {
+
+ if (ssrc != null) {
JSONObject json = new JSONObject();
json.put("ssrc", ssrc);
- return new ResponseEntity<String>(json.toString(),HttpStatus.OK);
+ return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
} else {
logger.warn("璁惧棰勮鍋滄API璋冪敤澶辫触锛�");
return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
}
}
+
+ /**
+ * 灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac
+ * @param ssrc
+ * @return
+ */
+ @PostMapping("/play/{ssrc}/convert")
+ public ResponseEntity<String> playConvert(@PathVariable String ssrc) {
+ StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
+ if (streamInfo == null) {
+ logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡缁忓仠姝�!");
+ return new ResponseEntity<String>("鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡缁忓仠姝�", HttpStatus.OK);
+ }
+ String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
+ if (!rtpInfo.getBoolean("exist")) {
+ logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡鍋滄鎺ㄦ祦!");
+ return new ResponseEntity<String>("鎺ㄦ祦淇℃伅鍦ㄦ祦濯掍綋涓笉瀛樺湪, 瑙嗛娴佸彲鑳藉凡鍋滄鎺ㄦ祦", HttpStatus.OK);
+ } else {
+ MediaServerConfig mediaInfo = storager.getMediaInfo();
+ String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(),
+ streamId );
+ JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(streamInfo.getRtsp(), dstUrl, "1000000");
+ System.out.println(jsonObject);
+ JSONObject result = new JSONObject();
+ if (jsonObject != null && jsonObject.getInteger("code") == 0) {
+ result.put("code", 0);
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data != null) {
+ result.put("key", data.getString("key"));
+ result.put("rtmp", dstUrl);
+ result.put("flv", String.format("http://%s:%s/convert/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+ result.put("ws_flv", String.format("ws://%s:%s/convert/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+ }
+ }else {
+ result.put("code", 1);
+ result.put("msg", "cover fail");
+ }
+ return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
+ }
+ }
+
+ /**
+ * 缁撴潫杞爜
+ * @param key
+ * @return
+ */
+ @PostMapping("/play/convert/stop/{key}")
+ public ResponseEntity<String> playConvertStop(@PathVariable String key) {
+
+ JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(key);
+ System.out.println(jsonObject);
+ JSONObject result = new JSONObject();
+ if (jsonObject != null && jsonObject.getInteger("code") == 0) {
+ result.put("code", 0);
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data != null && data.getBoolean("flag")) {
+ result.put("code", "0");
+ result.put("msg", "success");
+ }else {
+
+ }
+ }else {
+ result.put("code", 1);
+ result.put("msg", "delFFmpegSource fail");
+ }
+ return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
+ }
}
+
--
Gitblit v1.8.0