From 6968839f21fb05bf6e3204c2040ee47130006cd0 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 27 十二月 2020 08:19:34 +0800
Subject: [PATCH] 修复空指针异常
---
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java | 104 +++++++++++++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 41 deletions(-)
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 d2644f3..6ef3a5f 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -1,19 +1,23 @@
package com.genersoft.iot.vmp.web;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.play.PlayController;
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.*;
+import org.springframework.web.context.request.async.DeferredResult;
/**
* 鍏煎LiveGBS鐨凙PI锛氬疄鏃剁洿鎾�
@@ -31,6 +35,16 @@
@Autowired
private IVideoManagerStorager storager;
+ private boolean closeWaitRTPInfo = false;
+
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
+
+
+ @Autowired
+ private PlayController playController;
+
/**
* 瀹炴椂鐩存挱 - 寮�濮嬬洿鎾�
* @param serial 璁惧缂栧彿
@@ -45,51 +59,63 @@
* @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
){
-
+ 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");
+ resultDeferredResult.setResult(result);
}
+ resultDeferredResult.onTimeout(()->{
+ logger.info("鎾斁绛夊緟瓒呮椂");
+ JSONObject result = new JSONObject();
+ result.put("error","timeout");
+ resultDeferredResult.setResult(result);
+
+ // 娓呯悊RTP server
+ });
+
DeviceChannel deviceChannel = storager.queryChannel(serial, code);
if (deviceChannel == null) {
JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]鏈壘鍒�");
- return result;
- }
- // 鏌ヨ鏄惁宸茬粡鍦ㄦ挱鏀�
- StreamInfo streamInfo = storager.queryPlay(device.getDeviceId(), code);
- if (streamInfo == null) streamInfo = cmder.playStreamCmd(device, code);
-
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧棰勮 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s",serial, code));
- logger.debug("璁惧棰勮 API璋冪敤锛宻src锛�"+streamInfo.getSsrc()+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(streamInfo.getSsrc())));
- }
-
- if(streamInfo!=null) {
+ resultDeferredResult.setResult(result);
+ }else if (deviceChannel.getStatus() == 0) {
JSONObject result = new JSONObject();
- result.put("StreamID", streamInfo.getSsrc());
+ result.put("error","channel[ " + code + " ]offline");
+ resultDeferredResult.setResult(result);
+ }
+ DeferredResult<ResponseEntity<String>> play = playController.play(serial, code);
+
+ 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());
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("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());
@@ -110,13 +136,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;
}
/**
@@ -135,14 +157,15 @@
@RequestParam(required = false)String check_outputs
){
- StreamInfo streamInfo = storager.queryPlay(serial, code);
+
+ StreamInfo streamInfo = storager.queryPlayByDevice(serial, code);
if (streamInfo == null) {
JSONObject result = new JSONObject();
result.put("error","鏈壘鍒版祦淇℃伅");
return result;
}
- cmder.streamByeCmd(streamInfo.getSsrc());
- storager.stopPlay(serial, code);
+ cmder.streamByeCmd(streamInfo.getStreamId());
+ storager.stopPlay(streamInfo);
return null;
}
@@ -151,7 +174,6 @@
* @param serial 璁惧缂栧彿
* @param channel 閫氶亾搴忓彿
* @param code 閫氶亾鍥芥爣缂栧彿
- * @param check_outputs
* @return
*/
@RequestMapping(value = "/touch")
--
Gitblit v1.8.0