From 6bb8f45e270681dbcb70aed663b406e7d905e091 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 18 四月 2022 15:04:22 +0800
Subject: [PATCH] 优化摄像头注册流程
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 156 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 144 insertions(+), 12 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 9ee5867..61c37a8 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,7 +4,7 @@
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.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;
@@ -12,6 +12,8 @@
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;
@@ -21,14 +23,13 @@
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;
import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.service.IPlayService;
import gov.nist.javax.sip.stack.SIPDialog;
-import jdk.nashorn.internal.ir.RuntimeNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,10 +39,8 @@
import org.springframework.util.ResourceUtils;
import org.springframework.web.context.request.async.DeferredResult;
-import javax.sip.header.CallIdHeader;
-import javax.sip.header.Header;
-import javax.sip.message.Request;
import java.io.FileNotFoundException;
+import java.math.BigDecimal;
import java.util.*;
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@@ -51,7 +50,7 @@
private final static Logger logger = LoggerFactory.getLogger(PlayServiceImpl.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private SIPCommander cmder;
@@ -72,6 +71,9 @@
private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired
+ private AssistRESTfulUtils assistRESTfulUtils;
+
+ @Autowired
private IMediaService mediaService;
@Autowired
@@ -81,7 +83,7 @@
private VideoStreamSessionManager streamSession;
@Autowired
- private UserSetup userSetup;
+ private UserSetting userSetting;
@@ -97,7 +99,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());
playResult.setResult(result);
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
resultHolder.put(key, uuid, result);
@@ -253,7 +255,7 @@
streamSession.remove(device.getDeviceId(), channelId, finalSsrcInfo.getStream());
}
}
- }, userSetup.getPlayTimeout());
+ }, userSetting.getPlayTimeout());
cmder.playStreamCmd(mediaServerItem, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {
logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
@@ -344,7 +346,7 @@
return result;
}
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId, uuid, result);
+ resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId, uuid, result);
RequestMessage msg = new RequestMessage();
msg.setId(uuid);
msg.setKey(key);
@@ -372,7 +374,7 @@
// 鍥炲涔嬪墠鎵�鏈夌殑鐐规挱璇锋眰
playBackCallback.call(playBackResult);
}
- }, userSetup.getPlayTimeout());
+ }, userSetting.getPlayTimeout());
cmder.playbackStreamCmd(mediaServerItem, ssrcInfo, device, channelId, startTime, endTime, infoCallBack,
(InviteStreamInfo inviteStreamInfo) -> {
logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + inviteStreamInfo.getResponse().toJSONString());
@@ -406,6 +408,136 @@
}
@Override
+ 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);
+
+ Timer timer = new Timer();
+ timer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ 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());
+ cmder.downloadStreamCmd(mediaServerItem, ssrcInfo, device, channelId, startTime, endTime, downloadSpeed, infoCallBack,
+ inviteStreamInfo -> {
+ logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + inviteStreamInfo.getResponse().toJSONString());
+ timer.cancel();
+ 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 -> {
+ timer.cancel();
+ 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);
--
Gitblit v1.8.0