From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 五月 2022 10:12:34 +0800
Subject: [PATCH] 使用阿里代码规范。规范代码写法
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 509 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 401 insertions(+), 108 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index cf30a79..f2b6c28 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -4,21 +4,27 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.UserSetup;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.conf.DynamicTask;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
+import com.genersoft.iot.vmp.gb28181.utils.DateUtil;
+import com.genersoft.iot.vmp.media.zlm.AssistRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.bean.InviteTimeOutCallback;
+import com.genersoft.iot.vmp.service.bean.PlayBackCallback;
+import com.genersoft.iot.vmp.service.bean.PlayBackResult;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
@@ -34,9 +40,10 @@
import org.springframework.util.ResourceUtils;
import org.springframework.web.context.request.async.DeferredResult;
+import javax.sip.ResponseEvent;
import java.io.FileNotFoundException;
-import java.util.Objects;
-import java.util.UUID;
+import java.math.BigDecimal;
+import java.util.*;
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Service
@@ -45,10 +52,13 @@
private final static Logger logger = LoggerFactory.getLogger(PlayServiceImpl.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private SIPCommander cmder;
+
+ @Autowired
+ private SIPCommanderFroPlatform sipCommanderFroPlatform;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -63,6 +73,9 @@
private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired
+ private AssistRESTfulUtils assistRESTfulUtils;
+
+ @Autowired
private IMediaService mediaService;
@Autowired
@@ -72,11 +85,18 @@
private VideoStreamSessionManager streamSession;
@Autowired
- private UserSetup userSetup;
+ private UserSetting userSetting;
+
+ @Autowired
+ private DynamicTask dynamicTask;
+
+
@Override
- public PlayResult play(MediaServerItem mediaServerItem, String deviceId, String channelId, ZLMHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent) {
+ public PlayResult play(MediaServerItem mediaServerItem, String deviceId, String channelId,
+ ZLMHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
+ Runnable timeoutCallback) {
PlayResult playResult = new PlayResult();
RequestMessage msg = new RequestMessage();
String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
@@ -84,7 +104,7 @@
String uuid = UUID.randomUUID().toString();
msg.setId(uuid);
playResult.setUuid(uuid);
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<>(userSetup.getPlayTimeout());
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
playResult.setResult(result);
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
resultHolder.put(key, uuid, result);
@@ -99,30 +119,12 @@
Device device = redisCatchStorage.getDevice(deviceId);
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
playResult.setDevice(device);
- // 瓒呮椂澶勭悊
- result.onTimeout(()->{
- logger.warn(String.format("璁惧鐐规挱瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(-1);
- SIPDialog dialog = streamSession.getDialog(deviceId, channelId);
- if (dialog != null) {
- wvpResult.setMsg("鏀舵祦瓒呮椂锛岃绋嶅�欓噸璇�");
- }else {
- wvpResult.setMsg("鐐规挱瓒呮椂锛岃绋嶅�欓噸璇�");
- }
- msg.setData(wvpResult);
- // 鐐规挱瓒呮椂鍥炲BYE
- cmder.streamByeCmd(device.getDeviceId(), channelId);
- // 閲婃斁rtpserver
- mediaServerService.closeRTPServer(playResult.getDevice(), channelId);
- // 鍥炲涔嬪墠鎵�鏈夌殑鐐规挱璇锋眰
- resultHolder.invokeAllResult(msg);
- });
+
result.onCompletion(()->{
// 鐐规挱缁撴潫鏃惰皟鐢ㄦ埅鍥炬帴鍙�
+ // TODO 搴旇鍦ㄤ笂娴佹椂璋冪敤鏇村ソ锛岀粨鏉熶篃鍙兘鏄敊璇粨鏉�
try {
String classPath = ResourceUtils.getURL("classpath:").getPath();
- // System.out.println(classPath);
// 鍏煎鎵撳寘涓簀ar鐨刢lass璺緞
if(classPath.contains("jar")) {
classPath = classPath.substring(0, classPath.lastIndexOf("."));
@@ -153,38 +155,8 @@
e.printStackTrace();
}
});
- if (streamInfo == null) {
- SSRCInfo ssrcInfo;
- String streamId = null;
- if (mediaServerItem.isRtpEnable()) {
- streamId = String.format("%s_%s", device.getDeviceId(), channelId);
- }
-
- ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId);
-
- // 鍙戦�佺偣鎾秷鎭�
- cmder.playStreamCmd(mediaServerItem, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInUse, JSONObject response) -> {
- logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
- onPublishHandlerForPlay(mediaServerItemInUse, response, deviceId, channelId, uuid);
- if (hookEvent != null) {
- hookEvent.response(mediaServerItem, response);
- }
- }, (event) -> {
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(-1);
- // 鐐规挱杩斿洖sip閿欒
- mediaServerService.closeRTPServer(playResult.getDevice(), channelId);
- wvpResult.setMsg(String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
- msg.setData(wvpResult);
- resultHolder.invokeAllResult(msg);
- if (errorEvent != null) {
- errorEvent.response(event);
- }
-
-
- });
- } else {
- String streamId = streamInfo.getStreamId();
+ if (streamInfo != null) {
+ String streamId = streamInfo.getStream();
if (streamId == null) {
WVPResult wvpResult = new WVPResult();
wvpResult.setCode(-1);
@@ -209,48 +181,143 @@
if (hookEvent != null) {
hookEvent.response(mediaServerItem, JSONObject.parseObject(JSON.toJSONString(streamInfo)));
}
- } else {
- // TODO 鐐规挱鍓嶆槸鍚﹂噸缃姸鎬�
+ }else {
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
- SSRCInfo ssrcInfo;
- String streamId2 = null;
- if (mediaServerItem.isRtpEnable()) {
- streamId2 = String.format("%s_%s", device.getDeviceId(), channelId);
- }
- ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId2);
-
- cmder.playStreamCmd(mediaServerItem, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {
- logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
- onPublishHandlerForPlay(mediaServerItemInuse, response, deviceId, channelId, uuid);
- }, (event) -> {
- mediaServerService.closeRTPServer(playResult.getDevice(), channelId);
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(-1);
- wvpResult.setMsg(String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
- msg.setData(wvpResult);
- resultHolder.invokeAllResult(msg);
- });
+ streamInfo = null;
}
- }
+ }
+ if (streamInfo == null) {
+ String streamId = null;
+ if (mediaServerItem.isRtpEnable()) {
+ streamId = String.format("%s_%s", device.getDeviceId(), channelId);
+ }
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, device.isSsrcCheck());
+ play(mediaServerItem, ssrcInfo, device, channelId, (mediaServerItemInUse, response)->{
+ if (hookEvent != null) {
+ hookEvent.response(mediaServerItem, response);
+ }
+ }, event -> {
+ // sip error閿欒
+ WVPResult wvpResult = new WVPResult();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg(String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
+ msg.setData(wvpResult);
+ resultHolder.invokeAllResult(msg);
+ if (errorEvent != null) {
+ errorEvent.response(event);
+ }
+ }, (code, msgStr)->{
+ // invite鐐规挱瓒呮椂
+ WVPResult wvpResult = new WVPResult();
+ wvpResult.setCode(-1);
+ if (code == 0) {
+ wvpResult.setMsg("鐐规挱瓒呮椂锛岃绋嶅�欓噸璇�");
+ }else if (code == 1) {
+ wvpResult.setMsg("鏀舵祦瓒呮椂锛岃绋嶅�欓噸璇�");
+ }
+ msg.setData(wvpResult);
+ // 鍥炲涔嬪墠鎵�鏈夌殑鐐规挱璇锋眰
+ resultHolder.invokeAllResult(msg);
+ }, uuid);
+ }
return playResult;
}
+
+
@Override
- public void onPublishHandlerForPlay(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) {
+ public void play(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
+ ZLMHttpHookSubscribe.Event hookEvent, SipSubscribe.Event errorEvent,
+ InviteTimeOutCallback timeoutCallback, String uuid) {
+
+ String streamId = null;
+ if (mediaServerItem.isRtpEnable()) {
+ streamId = String.format("%s_%s", device.getDeviceId(), channelId);
+ }
+ if (ssrcInfo == null) {
+ ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, device.isSsrcCheck());
+ }
+
+ // 瓒呮椂澶勭悊
+ String timeOutTaskKey = UUID.randomUUID().toString();
+ SSRCInfo finalSsrcInfo = ssrcInfo;
+ dynamicTask.startDelay( timeOutTaskKey,()->{
+ logger.warn(String.format("璁惧鐐规挱瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", device.getDeviceId(), channelId));
+
+ SIPDialog dialog = streamSession.getDialogByStream(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ if (dialog != null) {
+ timeoutCallback.run(1, "鏀舵祦瓒呮椂");
+ // 鐐规挱瓒呮椂鍥炲BYE 鍚屾椂閲婃斁ssrc浠ュ強姝ゆ鐐规挱鐨勮祫婧�
+ cmder.streamByeCmd(device.getDeviceId(), channelId, finalSsrcInfo.getStream(), null);
+ }else {
+ timeoutCallback.run(0, "鐐规挱瓒呮椂");
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
+ mediaServerService.closeRTPServer(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ }
+ }, userSetting.getPlayTimeout()*1000);
+ final String ssrc = ssrcInfo.getSsrc();
+ cmder.playStreamCmd(mediaServerItem, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {
+ logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
+ dynamicTask.stop(timeOutTaskKey);
+ // hook鍝嶅簲
+ onPublishHandlerForPlay(mediaServerItemInuse, response, device.getDeviceId(), channelId, uuid);
+ hookEvent.response(mediaServerItemInuse, response);
+ }, (event) -> {
+ ResponseEvent responseEvent = (ResponseEvent)event.event;
+ String contentString = new String(responseEvent.getResponse().getRawContent());
+ // 鑾峰彇ssrc
+ int ssrcIndex = contentString.indexOf("y=");
+ // 妫�鏌ユ槸鍚︽湁y瀛楁
+ if (ssrcIndex >= 0) {
+ //ssrc瑙勫畾闀垮害涓�10瀛楄妭锛屼笉鍙栦綑涓嬮暱搴︿互閬垮厤鍚庣画杩樻湁鈥渇=鈥濆瓧娈� TODO 鍚庣画瀵逛笉瑙勮寖鐨勯潪10浣峴src鍏煎
+ String ssrcInResponse = contentString.substring(ssrcIndex + 2, ssrcIndex + 12);
+ if (!ssrc.equals(ssrcInResponse) && device.isSsrcCheck()) { // 鏌ヨ鍒皊src涓嶄竴鑷翠笖寮�鍚簡ssrc鏍￠獙鍒欓渶瑕侀拡瀵瑰鐞�
+ // 鏌ヨ ssrcInResponse 鏄惁鍙敤
+ if (mediaServerItem.isRtpEnable() && !mediaServerItem.getSsrcConfig().checkSsrc(ssrcInResponse)) {
+ // ssrc 涓嶅彲鐢�
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
+ streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ event.msg = "涓嬬骇鑷畾涔変簡ssrc,浣嗘槸姝src涓嶅彲鐢�";
+ event.statusCode = 400;
+ errorEvent.response(event);
+ return;
+ }
+ // 鍏抽棴rtp server
+ mediaServerService.closeRTPServer(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ // 閲嶆柊寮�鍚痵src server
+ mediaServerService.openRTPServer(mediaServerItem, finalSsrcInfo.getStream(), ssrcInResponse, device.isSsrcCheck(), false);
+ }
+ }
+ }, (event) -> {
+ dynamicTask.stop(timeOutTaskKey);
+ mediaServerService.closeRTPServer(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), finalSsrcInfo.getSsrc());
+
+ streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
+ errorEvent.response(event);
+ });
+ }
+
+ @Override
+ public void onPublishHandlerForPlay(MediaServerItem mediaServerItem, JSONObject response, String deviceId, String channelId, String uuid) {
RequestMessage msg = new RequestMessage();
- msg.setId(uuid);
+ if (uuid != null) {
+ msg.setId(uuid);
+ }
msg.setKey(DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId);
- StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId, uuid);
+ StreamInfo streamInfo = onPublishHandler(mediaServerItem, response, deviceId, channelId);
if (streamInfo != null) {
DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
if (deviceChannel != null) {
- deviceChannel.setStreamId(streamInfo.getStreamId());
- storager.startPlay(deviceId, channelId, streamInfo.getStreamId());
+ deviceChannel.setStreamId(streamInfo.getStream());
+ storager.startPlay(deviceId, channelId, streamInfo.getStream());
}
redisCatchStorage.startPlay(streamInfo);
- msg.setData(JSON.toJSONString(streamInfo));
WVPResult wvpResult = new WVPResult();
wvpResult.setCode(0);
@@ -268,7 +335,9 @@
@Override
public MediaServerItem getNewMediaServerItem(Device device) {
- if (device == null) return null;
+ if (device == null) {
+ return null;
+ }
String mediaServerId = device.getMediaServerId();
MediaServerItem mediaServerItem;
if (mediaServerId == null) {
@@ -282,33 +351,234 @@
return mediaServerItem;
}
-
@Override
- public void onPublishHandlerForPlayBack(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) {
- RequestMessage msg = new RequestMessage();
- msg.setKey(DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId);
- msg.setId(uuid);
- StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId, uuid);
- if (streamInfo != null) {
- redisCatchStorage.startPlayback(streamInfo);
- msg.setData(JSON.toJSONString(streamInfo));
- resultHolder.invokeResult(msg);
- } else {
- logger.warn("璁惧鍥炴斁API璋冪敤澶辫触锛�");
- msg.setData("璁惧鍥炴斁API璋冪敤澶辫触锛�");
- resultHolder.invokeResult(msg);
+ public DeferredResult<ResponseEntity<String>> playBack(String deviceId, String channelId, String startTime,
+ String endTime,InviteStreamCallback inviteStreamCallback,
+ PlayBackCallback callback) {
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ return null;
}
+ MediaServerItem newMediaServerItem = getNewMediaServerItem(device);
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, true);
+
+ return playBack(newMediaServerItem, ssrcInfo, deviceId, channelId, startTime, endTime, inviteStreamCallback, callback);
}
+ @Override
+ public DeferredResult<ResponseEntity<String>> playBack(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo,
+ String deviceId, String channelId, String startTime,
+ String endTime, InviteStreamCallback infoCallBack,
+ PlayBackCallback playBackCallback) {
+ if (mediaServerItem == null || ssrcInfo == null) {
+ return null;
+ }
+ String uuid = UUID.randomUUID().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId;
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<>(30000L);
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
+ return result;
+ }
+
+ resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId, uuid, result);
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ PlayBackResult<RequestMessage> playBackResult = new PlayBackResult<>();
+ String playBackTimeOutTaskKey = UUID.randomUUID().toString();
+ dynamicTask.startDelay(playBackTimeOutTaskKey, ()->{
+ logger.warn(String.format("璁惧鍥炴斁瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
+ playBackResult.setCode(-1);
+ playBackResult.setData(msg);
+ playBackCallback.call(playBackResult);
+ SIPDialog dialog = streamSession.getDialogByStream(deviceId, channelId, ssrcInfo.getStream());
+ // 鐐规挱瓒呮椂鍥炲BYE 鍚屾椂閲婃斁ssrc浠ュ強姝ゆ鐐规挱鐨勮祫婧�
+ if (dialog != null) {
+ // 鐐规挱瓒呮椂鍥炲BYE 鍚屾椂閲婃斁ssrc浠ュ強姝ゆ鐐规挱鐨勮祫婧�
+ cmder.streamByeCmd(device.getDeviceId(), channelId, ssrcInfo.getStream(), null);
+ }else {
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+ mediaServerService.closeRTPServer(deviceId, channelId, ssrcInfo.getStream());
+ streamSession.remove(deviceId, channelId, ssrcInfo.getStream());
+ }
+ cmder.streamByeCmd(device.getDeviceId(), channelId, ssrcInfo.getStream(), null);
+ // 鍥炲涔嬪墠鎵�鏈夌殑鐐规挱璇锋眰
+ playBackCallback.call(playBackResult);
+ }, userSetting.getPlayTimeout()*1000);
+
+ cmder.playbackStreamCmd(mediaServerItem, ssrcInfo, device, channelId, startTime, endTime, infoCallBack,
+ (InviteStreamInfo inviteStreamInfo) -> {
+ logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + inviteStreamInfo.getResponse().toJSONString());
+ dynamicTask.stop(playBackTimeOutTaskKey);
+ StreamInfo streamInfo = onPublishHandler(inviteStreamInfo.getMediaServerItem(), inviteStreamInfo.getResponse(), deviceId, channelId);
+ if (streamInfo == null) {
+ logger.warn("璁惧鍥炴斁API璋冪敤澶辫触锛�");
+ msg.setData("璁惧鍥炴斁API璋冪敤澶辫触锛�");
+ playBackResult.setCode(-1);
+ playBackResult.setData(msg);
+ playBackCallback.call(playBackResult);
+ return;
+ }
+ redisCatchStorage.startPlayback(streamInfo, inviteStreamInfo.getCallId());
+ msg.setData(JSON.toJSONString(streamInfo));
+ playBackResult.setCode(0);
+ playBackResult.setData(msg);
+ playBackResult.setMediaServerItem(inviteStreamInfo.getMediaServerItem());
+ playBackResult.setResponse(inviteStreamInfo.getResponse());
+ playBackCallback.call(playBackResult);
+ }, event -> {
+ dynamicTask.stop(playBackTimeOutTaskKey);
+ msg.setData(String.format("鍥炴斁澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
+ playBackResult.setCode(-1);
+ playBackResult.setData(msg);
+ playBackResult.setEvent(event);
+ playBackCallback.call(playBackResult);
+ streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+ });
+ return result;
+ }
@Override
- public void onPublishHandlerForDownload(MediaServerItem mediaServerItem, JSONObject response, String deviceId, String channelId, String uuid) {
+ public DeferredResult<ResponseEntity<String>> download(String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback hookCallBack) {
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ return null;
+ }
+ MediaServerItem newMediaServerItem = getNewMediaServerItem(device);
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, true);
+
+ return download(newMediaServerItem, ssrcInfo, deviceId, channelId, startTime, endTime, downloadSpeed,infoCallBack, hookCallBack);
+ }
+
+ @Override
+ public DeferredResult<ResponseEntity<String>> download(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback hookCallBack) {
+ if (mediaServerItem == null || ssrcInfo == null) {
+ return null;
+ }
+ String uuid = UUID.randomUUID().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_DOWNLOAD + deviceId + channelId;
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<>(30000L);
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
+ return result;
+ }
+
+ resultHolder.put(key, uuid, result);
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ WVPResult<StreamInfo> wvpResult = new WVPResult<>();
+ msg.setData(wvpResult);
+ PlayBackResult<RequestMessage> downloadResult = new PlayBackResult<>();
+ downloadResult.setData(msg);
+
+ String downLoadTimeOutTaskKey = UUID.randomUUID().toString();
+ dynamicTask.startDelay(downLoadTimeOutTaskKey, ()->{
+ logger.warn(String.format("褰曞儚涓嬭浇璇锋眰瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("褰曞儚涓嬭浇璇锋眰瓒呮椂");
+ downloadResult.setCode(-1);
+ hookCallBack.call(downloadResult);
+ SIPDialog dialog = streamSession.getDialogByStream(deviceId, channelId, ssrcInfo.getStream());
+ // 鐐规挱瓒呮椂鍥炲BYE 鍚屾椂閲婃斁ssrc浠ュ強姝ゆ鐐规挱鐨勮祫婧�
+ if (dialog != null) {
+ // 鐐规挱瓒呮椂鍥炲BYE 鍚屾椂閲婃斁ssrc浠ュ強姝ゆ鐐规挱鐨勮祫婧�
+ cmder.streamByeCmd(device.getDeviceId(), channelId, ssrcInfo.getStream(), null);
+ }else {
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+ mediaServerService.closeRTPServer(deviceId, channelId, ssrcInfo.getStream());
+ streamSession.remove(deviceId, channelId, ssrcInfo.getStream());
+ }
+ cmder.streamByeCmd(device.getDeviceId(), channelId, ssrcInfo.getStream(), null);
+ // 鍥炲涔嬪墠鎵�鏈夌殑鐐规挱璇锋眰
+ hookCallBack.call(downloadResult);
+ }, userSetting.getPlayTimeout()*1000);
+ cmder.downloadStreamCmd(mediaServerItem, ssrcInfo, device, channelId, startTime, endTime, downloadSpeed, infoCallBack,
+ inviteStreamInfo -> {
+ logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + inviteStreamInfo.getResponse().toJSONString());
+ dynamicTask.stop(downLoadTimeOutTaskKey);
+ StreamInfo streamInfo = onPublishHandler(inviteStreamInfo.getMediaServerItem(), inviteStreamInfo.getResponse(), deviceId, channelId);
+ streamInfo.setStartTime(startTime);
+ streamInfo.setEndTime(endTime);
+ if (streamInfo == null) {
+ logger.warn("褰曞儚涓嬭浇API璋冪敤澶辫触锛�");
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("褰曞儚涓嬭浇API璋冪敤澶辫触");
+ downloadResult.setCode(-1);
+ hookCallBack.call(downloadResult);
+ return ;
+ }
+ redisCatchStorage.startDownload(streamInfo, inviteStreamInfo.getCallId());
+ wvpResult.setCode(0);
+ wvpResult.setMsg("success");
+ wvpResult.setData(streamInfo);
+ downloadResult.setCode(0);
+ downloadResult.setMediaServerItem(inviteStreamInfo.getMediaServerItem());
+ downloadResult.setResponse(inviteStreamInfo.getResponse());
+ hookCallBack.call(downloadResult);
+ }, event -> {
+ dynamicTask.stop(downLoadTimeOutTaskKey);
+ downloadResult.setCode(-1);
+ wvpResult.setCode(-1);
+ wvpResult.setMsg(String.format("褰曞儚涓嬭浇澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
+ downloadResult.setEvent(event);
+ hookCallBack.call(downloadResult);
+ streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+ });
+ return result;
+ }
+
+ @Override
+ public StreamInfo getDownLoadInfo(String deviceId, String channelId, String stream) {
+ StreamInfo streamInfo = redisCatchStorage.queryDownload(deviceId, channelId, stream, null);
+ if (streamInfo != null) {
+ if (streamInfo.getProgress() == 1) {
+ return streamInfo;
+ }
+
+ // 鑾峰彇褰撳墠宸蹭笅杞芥椂闀�
+ String mediaServerId = streamInfo.getMediaServerId();
+ MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+ if (mediaServerItem == null) {
+ logger.warn("鏌ヨ褰曞儚淇℃伅鏃跺彂鐜拌妭鐐瑰凡绂荤嚎");
+ return null;
+ }
+ if (mediaServerItem.getRecordAssistPort() != 0) {
+ JSONObject jsonObject = assistRESTfulUtils.fileDuration(mediaServerItem, streamInfo.getApp(), streamInfo.getStream(), null);
+ if (jsonObject != null && jsonObject.getInteger("code") == 0) {
+ long duration = jsonObject.getLong("data");
+
+ if (duration == 0) {
+ streamInfo.setProgress(0);
+ }else {
+ String startTime = streamInfo.getStartTime();
+ String endTime = streamInfo.getEndTime();
+ long start = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime);
+ long end = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime);
+
+ BigDecimal currentCount = new BigDecimal(duration/1000);
+ BigDecimal totalCount = new BigDecimal(end-start);
+ BigDecimal divide = currentCount.divide(totalCount,2, BigDecimal.ROUND_HALF_UP);
+ double process = divide.doubleValue();
+ streamInfo.setProgress(process);
+ }
+ }
+ }
+ }
+ return streamInfo;
+ }
+
+ @Override
+ public void onPublishHandlerForDownload(InviteStreamInfo inviteStreamInfo, String deviceId, String channelId, String uuid) {
RequestMessage msg = new RequestMessage();
msg.setKey(DeferredResultHolder.CALLBACK_CMD_DOWNLOAD + deviceId + channelId);
msg.setId(uuid);
- StreamInfo streamInfo = onPublishHandler(mediaServerItem, response, deviceId, channelId, uuid);
+ StreamInfo streamInfo = onPublishHandler(inviteStreamInfo.getMediaServerItem(), inviteStreamInfo.getResponse(), deviceId, channelId);
if (streamInfo != null) {
- redisCatchStorage.startDownload(streamInfo);
+ redisCatchStorage.startDownload(streamInfo, inviteStreamInfo.getCallId());
msg.setData(JSON.toJSONString(streamInfo));
resultHolder.invokeResult(msg);
} else {
@@ -319,7 +589,7 @@
}
- public StreamInfo onPublishHandler(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) {
+ public StreamInfo onPublishHandler(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId) {
String streamId = resonse.getString("stream");
JSONArray tracks = resonse.getJSONArray("tracks");
StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem,"rtp", streamId, tracks);
@@ -328,4 +598,27 @@
return streamInfo;
}
+ @Override
+ public void zlmServerOffline(String mediaServerId) {
+ // 澶勭悊姝ｅ湪鍚戜笂鎺ㄦ祦鐨勪笂绾у钩鍙�
+ List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServer(null);
+ if (sendRtpItems.size() > 0) {
+ for (SendRtpItem sendRtpItem : sendRtpItems) {
+ if (sendRtpItem.getMediaServerId().equals(mediaServerId)) {
+ ParentPlatform platform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());
+ sipCommanderFroPlatform.streamByeCmd(platform, sendRtpItem.getCallId());
+ }
+ }
+ }
+ // 澶勭悊姝ｅ湪瑙傜湅鐨勫浗鏍囪澶�
+ List<SsrcTransaction> allSsrc = streamSession.getAllSsrc();
+ if (allSsrc.size() > 0) {
+ for (SsrcTransaction ssrcTransaction : allSsrc) {
+ if(ssrcTransaction.getMediaServerId().equals(mediaServerId)) {
+ cmder.streamByeCmd(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(),
+ ssrcTransaction.getStream(), null);
+ }
+ }
+ }
+ }
}
--
Gitblit v1.8.0