From 3ec3b88456cf9ac455d93baba40f339bb284dd77 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 14 十月 2020 14:39:10 +0800
Subject: [PATCH] 修复点播判断错误导致的15s超长延时 增加默认不关闭推流, 无人观看超时或点击停止按钮关闭流 修复点播其他bug
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 78 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 8 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 c0d2233..d5647fc 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
@@ -1,5 +1,9 @@
package com.genersoft.iot.vmp.vmanager.play;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,22 +33,78 @@
@Autowired
private IVideoManagerStorager storager;
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
@GetMapping("/play/{deviceId}/{channelId}")
public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId){
Device device = storager.queryVideoDevice(deviceId);
- String ssrc = cmder.playStreamCmd(device, channelId);
-
+ StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId);
+
+ if (streamInfo == null) {
+ streamInfo = cmder.playStreamCmd(device, channelId);
+ }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 {
+ storager.stopPlay(streamInfo);
+ streamInfo = cmder.playStreamCmd(device, channelId);
+ }
+
+ }
+ String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
+ // 绛夊緟鎺ㄦ祦, TODO 榛樿瓒呮椂15s
+ boolean lockFlag = true;
+ long startTime = System.currentTimeMillis();
+
+ while (lockFlag) {
+ try {
+
+ if (System.currentTimeMillis() - startTime > 15 * 1000) {
+ storager.stopPlay(streamInfo);
+ return new ResponseEntity<String>("timeout",HttpStatus.OK);
+ }else {
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
+ Boolean exist = rtpInfo.getBoolean("exist");
+ if (rtpInfo == null || !rtpInfo.getBoolean("exist") || streamInfo.getFlv() != null){
+ continue;
+ }else {
+ lockFlag = false;
+ streamInfo = storager.queryPlay(streamInfo);
+ // 鑾峰彇濯掍綋淇℃伅
+ JSONObject mediaList = zlmresTfulUtils.getMediaList("rtp", "rtmp");
+ if (mediaList.getInteger("code") == 0) {
+ JSONArray data = mediaList.getJSONArray("data");
+ if (data!= null) {
+ for (Object datum : data) {
+ JSONObject media = (JSONObject)datum;
+ if (streamId.equals(media.getString("stream"))) {
+ streamInfo.setTracks(media.getJSONArray("tracks"));
+ storager.startPlay(streamInfo);
+ }
+ }
+ }
+ }
+ };
+ }
+ Thread.sleep(200);
+ streamInfo = storager.queryPlayByDevice(deviceId, channelId);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧棰勮 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s",deviceId, channelId));
- logger.debug("璁惧棰勮 API璋冪敤锛宻src锛�"+ssrc+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(ssrc)));
+ logger.debug("璁惧棰勮 API璋冪敤锛宻src锛�"+streamInfo.getSsrc()+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(streamInfo.getSsrc())));
}
- if(ssrc!=null) {
- JSONObject json = new JSONObject();
- json.put("ssrc", ssrc);
- return new ResponseEntity<String>(json.toString(),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);
@@ -55,7 +115,9 @@
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);
+ storager.stopPlay(streamInfo);
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧棰勮鍋滄API璋冪敤锛宻src锛�%s", ssrc));
}
--
Gitblit v1.8.0