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/web/ApiStreamController.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 12 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..6180fbb 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -1,16 +1,19 @@
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.*;
@@ -30,6 +33,12 @@
@Autowired
private IVideoManagerStorager storager;
+
+ private boolean closeWaitRTPInfo = false;
+
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
/**
* 瀹炴椂鐩存挱 - 寮�濮嬬洿鎾�
@@ -56,40 +65,124 @@
@RequestParam(required = false)String timeout
){
-
+ int getEncoding = closeWaitRTPInfo? 1: 0;
Device device = storager.queryVideoDevice(serial);
+
if (device == null ) {
JSONObject result = new JSONObject();
result.put("error","device[ " + serial + " ]鏈壘鍒�");
return result;
+ }else if (device.getOnline() == 0) {
+ JSONObject result = new JSONObject();
+ result.put("error","device[ " + code + " ]offline");
+ return result;
}
+
DeviceChannel deviceChannel = storager.queryChannel(serial, code);
if (deviceChannel == null) {
JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]鏈壘鍒�");
return result;
+ }else if (deviceChannel.getStatus() == 0) {
+ JSONObject result = new JSONObject();
+ result.put("error","channel[ " + code + " ]offline");
+ return result;
}
+
// 鏌ヨ鏄惁宸茬粡鍦ㄦ挱鏀�
- StreamInfo streamInfo = storager.queryPlay(device.getDeviceId(), code);
- if (streamInfo == null) streamInfo = cmder.playStreamCmd(device, 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 = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
+ if (rtpInfo.getBoolean("exist")) {
+ logger.debug("鍚戞祦濯掍綋鏌ヨ姝ｅ湪鎺ㄦ祦, 鐩存帴杩斿洖: " + streamInfo.getRtsp());
+ JSONObject result = new JSONObject();
+ result.put("StreamID", streamInfo.getSsrc());
+ 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璋冪敤锛宻src锛�"+streamInfo.getSsrc()+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(streamInfo.getSsrc())));
}
+ 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) {
JSONObject result = new JSONObject();
result.put("StreamID", streamInfo.getSsrc());
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());
@@ -135,14 +228,14 @@
@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);
+ storager.stopPlay(streamInfo);
return null;
}
@@ -151,7 +244,6 @@
* @param serial 璁惧缂栧彿
* @param channel 閫氶亾搴忓彿
* @param code 閫氶亾鍥芥爣缂栧彿
- * @param check_outputs
* @return
*/
@RequestMapping(value = "/touch")
--
Gitblit v1.8.0