From d58064587d02f3bb11b2b355c41aee6fc9931a6c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 21 十二月 2020 11:13:27 +0800
Subject: [PATCH] 修复兼容接口
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java | 2
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 1
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java | 138 +++++++++++-----------------------------------
src/main/resources/application-dev.yml | 6 -
4 files changed, 36 insertions(+), 111 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
index 6477b72..93f533f 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
@@ -31,7 +31,7 @@
@Component
public class InviteResponseProcessor implements ISIPResponseProcessor {
- private final static Logger logger = LoggerFactory.getLogger(SIPProcessorFactory.class);
+ private final static Logger logger = LoggerFactory.getLogger(InviteResponseProcessor.class);
/**
* 澶勭悊invite鍝嶅簲
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
index f427e5e..e85d1ff 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -87,6 +87,7 @@
* @return
*/
public List<DeviceChannel> queryChannelsByDeviceId(String deviceId);
+
/**
* 鑾峰彇鏌愪釜璁惧鐨勯�氶亾
* @param deviceId 璁惧ID
diff --git a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
index b3fc247..5964e99 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -17,6 +17,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.async.DeferredResult;
/**
* 鍏煎LiveGBS鐨凙PI锛氬疄鏃剁洿鎾�
@@ -40,6 +41,10 @@
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
+ private PlayController playController;
+
/**
* 瀹炴椂鐩存挱 - 寮�濮嬬洿鎾�
* @param serial 璁惧缂栧彿
@@ -54,124 +59,50 @@
* @return
*/
@RequestMapping(value = "/start")
- private JSONObject start(String serial ,
- @RequestParam(required = false)Integer channel ,
- @RequestParam(required = false)String code,
- @RequestParam(required = false)String cdn,
- @RequestParam(required = false)String audio,
- @RequestParam(required = false)String transport,
- @RequestParam(required = false)String checkchannelstatus ,
- @RequestParam(required = false)String transportmode,
- @RequestParam(required = false)String timeout
+ private DeferredResult<JSONObject> start(String serial ,
+ @RequestParam(required = false)Integer channel ,
+ @RequestParam(required = false)String code,
+ @RequestParam(required = false)String cdn,
+ @RequestParam(required = false)String audio,
+ @RequestParam(required = false)String transport,
+ @RequestParam(required = false)String checkchannelstatus ,
+ @RequestParam(required = false)String transportmode,
+ @RequestParam(required = false)String timeout
){
- int getEncoding = closeWaitRTPInfo? 1: 0;
+ DeferredResult<JSONObject> resultDeferredResult = new DeferredResult<JSONObject>();
Device device = storager.queryVideoDevice(serial);
-
if (device == null ) {
JSONObject result = new JSONObject();
result.put("error","device[ " + serial + " ]鏈壘鍒�");
- return result;
+ resultDeferredResult.setResult(result);
}else if (device.getOnline() == 0) {
JSONObject result = new JSONObject();
result.put("error","device[ " + code + " ]offline");
- return result;
+ resultDeferredResult.setResult(result);
}
+ resultDeferredResult.onTimeout(()->{
+ logger.info("鎾斁绛夊緟瓒呮椂");
+ JSONObject result = new JSONObject();
+ result.put("error","timeout");
+ resultDeferredResult.setResult(result);
+ });
DeviceChannel deviceChannel = storager.queryChannel(serial, code);
if (deviceChannel == null) {
JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]鏈壘鍒�");
- return result;
+ resultDeferredResult.setResult(result);
}else if (deviceChannel.getStatus() == 0) {
JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]offline");
- return result;
+ resultDeferredResult.setResult(result);
}
+ DeferredResult<ResponseEntity<String>> play = playController.play(serial, code);
- // 鏌ヨ鏄惁宸茬粡鍦ㄦ挱鏀�
- StreamInfo streamInfo = storager.queryPlayByDevice(device.getDeviceId(), code);
- if (streamInfo == null) {
- logger.debug("streamInfo 绛変簬null, 閲嶆柊鐐规挱");
-// streamInfo = cmder.playStreamCmd(device, code);
- }else {
- logger.debug("streamInfo 涓嶇瓑浜巒ull, 鍚戞祦濯掍綋鏌ヨ鏄惁姝ｅ湪鎺ㄦ祦");
- String streamId = streamInfo.getStreamId();
- JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
- if (rtpInfo.getBoolean("exist")) {
- logger.debug("鍚戞祦濯掍綋鏌ヨ姝ｅ湪鎺ㄦ祦, 鐩存帴杩斿洖: " + streamInfo.getRtsp());
- JSONObject result = new JSONObject();
- result.put("StreamID", streamInfo.getStreamId());
- result.put("DeviceID", device.getDeviceId());
- result.put("ChannelID", code);
- result.put("ChannelName", deviceChannel.getName());
- result.put("ChannelCustomName", "");
- result.put("FLV", streamInfo.getFlv());
- result.put("WS_FLV", streamInfo.getWs_flv());
- result.put("RTMP", streamInfo.getRtmp());
- result.put("HLS", streamInfo.getHls());
- result.put("RTSP", streamInfo.getRtsp());
- result.put("CDN", "");
- result.put("SnapURL", "");
- result.put("Transport", device.getTransport());
- result.put("StartAt", "");
- result.put("Duration", "");
- result.put("SourceVideoCodecName", "");
- result.put("SourceVideoWidth", "");
- result.put("SourceVideoHeight", "");
- result.put("SourceVideoFrameRate", "");
- result.put("SourceAudioCodecName", "");
- result.put("SourceAudioSampleRate", "");
- result.put("AudioEnable", "");
- result.put("Ondemand", "");
- result.put("InBytes", "");
- result.put("InBitRate", "");
- result.put("OutBytes", "");
- result.put("NumOutputs", "");
- result.put("CascadeSize", "");
- result.put("RelaySize", "");
- result.put("ChannelPTZType", 0);
- return result;
- } else {
- logger.debug("鍚戞祦濯掍綋鏌ヨ娌℃湁鎺ㄦ祦, 閲嶆柊鐐规挱");
- storager.stopPlay(streamInfo);
-// streamInfo = cmder.playStreamCmd(device, code);
- }
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧棰勮 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s",serial, code));
- logger.debug("璁惧棰勮 API璋冪敤锛宻treamId锛�"+streamInfo.getStreamId());
- }
- boolean lockFlag = true;
- long startTime = System.currentTimeMillis();
- while (lockFlag) {
- try {
- if (System.currentTimeMillis() - startTime > 10 * 1000) {
- storager.stopPlay(streamInfo);
- logger.info("鎾斁绛夊緟瓒呮椂");
- JSONObject result = new JSONObject();
- result.put("error","timeout");
- return result;
- } else {
-
- StreamInfo streamInfoNow = storager.queryPlayByDevice(serial, code);
- logger.debug("姝ｅ湪鍚戞祦濯掍綋鏌ヨ");
- if (streamInfoNow != null && streamInfoNow.getFlv() != null) {
- streamInfo = streamInfoNow;
- logger.debug("鍚戞祦濯掍綋鏌ヨ鍒�: " + streamInfoNow.getRtsp());
- lockFlag = false;
- continue;
- } else {
- Thread.sleep(2000);
- continue;
- }
- }
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- if(streamInfo!=null) {
+ play.setResultHandler((Object o)->{
+ ResponseEntity<String> responseEntity = (ResponseEntity)o;
+ StreamInfo streamInfo = JSON.parseObject(responseEntity.getBody(), StreamInfo.class);
JSONObject result = new JSONObject();
result.put("StreamID", streamInfo.getStreamId());
result.put("DeviceID", device.getDeviceId());
@@ -203,13 +134,9 @@
result.put("CascadeSize", "");
result.put("RelaySize", "");
result.put("ChannelPTZType", 0);
- return result;
- } else {
- logger.warn("璁惧棰勮API璋冪敤澶辫触锛�");
- JSONObject result = new JSONObject();
- result.put("error","璋冪敤澶辫触");
- return result;
- }
+ resultDeferredResult.setResult(result);
+ });
+ return resultDeferredResult;
}
/**
@@ -228,6 +155,7 @@
@RequestParam(required = false)String check_outputs
){
+
StreamInfo streamInfo = storager.queryPlayByDevice(serial, code);
if (streamInfo == null) {
JSONObject result = new JSONObject();
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 868298a..de77739 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -69,11 +69,7 @@
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑general.streamNoneReaderDelayMS
- streamNoneReaderDelayMS: 600000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�
- # [鍙�塢 鍏抽棴绛夊緟鏀跺埌娴佺紪鐮佷俊鎭悗鍦ㄨ繑鍥�,
- # 璁句负false鍙互鑾峰緱鏇村ソ鐨勫吋瀹规��,淇濊瘉杩斿洖鍚庢祦灏卞彲浠ユ挱鏀�,
- # 璁句负true鍙互蹇�熸墦寮�鎾斁绐楀彛,鍙互鑾峰緱鏇村ソ鐨勪綋楠�
- closeWaitRTPInfo: false
+ streamNoneReaderDelayMS: 600000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�, -1琛ㄧず姘镐笉鑷姩鍏抽棴,鍗� 鍏抽棴鎸夐渶鎷夋祦
# [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱
autoApplyPlay: true
# 鍚敤udp澶氱鍙ｆā寮�, 璇︾粏瑙ｉ噴鍙傝��: https://github.com/xia-chu/ZLMediaKit/wiki/GB28181%E6%8E%A8%E6%B5%81 涓嬬殑楂橀樁浣跨敤
--
Gitblit v1.8.0