From e2f9ee8f7b2c8b210c75fcd328b2d42c37f9d737 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 06 五月 2023 17:40:57 +0800
Subject: [PATCH] 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 153 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 106 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index 72a1b5d..5d04f10 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -1,7 +1,8 @@
package com.genersoft.iot.vmp.web.gb28181;
import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.common.InviteInfo;
+import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -9,13 +10,18 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IDeviceService;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IPlayService;
+import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.async.DeferredResult;
import javax.sip.InvalidArgumentException;
@@ -44,6 +50,9 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IInviteStreamService inviteStreamService;
@Autowired
private IDeviceService deviceService;
@@ -111,46 +120,96 @@
return resultDeferredResult;
}
MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
- playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
- JSONObject result = new JSONObject();
- result.put("StreamID", streamInfo.getStream());
- result.put("DeviceID", device.getDeviceId());
- result.put("ChannelID", code);
- result.put("ChannelName", deviceChannel.getName());
- result.put("ChannelCustomName", "");
- result.put("FLV", streamInfo.getFlv().getUrl());
- result.put("WS_FLV", streamInfo.getWs_flv().getUrl());
- result.put("RTMP", streamInfo.getRtmp().getUrl());
- result.put("HLS", streamInfo.getHls().getUrl());
- result.put("RTSP", streamInfo.getRtsp().getUrl());
- result.put("WEBRTC", streamInfo.getRtc().getUrl());
- 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");
- resultDeferredResult.setResult(result);
- }, (eventResult) -> {
- JSONObject result = new JSONObject();
- result.put("error", "channel[ " + code + " ] " + eventResult.msg);
- resultDeferredResult.setResult(result);
- }, null);
+// playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{
+// InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
+// if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
+// JSONObject result = new JSONObject();
+// result.put("StreamID", inviteInfo.getStreamInfo().getStream());
+// result.put("DeviceID", device.getDeviceId());
+// result.put("ChannelID", code);
+// result.put("ChannelName", deviceChannel.getName());
+// result.put("ChannelCustomName", "");
+// result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
+// result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
+// result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
+// result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
+// result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
+// result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
+// 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");
+// resultDeferredResult.setResult(result);
+// }
+//
+// }, (eventResult) -> {
+// JSONObject result = new JSONObject();
+// result.put("error", "channel[ " + code + " ] " + eventResult.msg);
+// resultDeferredResult.setResult(result);
+// }, null);
+
+
+ playService.play(newMediaServerItem, serial, code, (errorCode, msg, data) -> {
+ if (errorCode == InviteErrorCode.SUCCESS.getCode()) {
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
+ if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
+ JSONObject result = new JSONObject();
+ result.put("StreamID", inviteInfo.getStreamInfo().getStream());
+ result.put("DeviceID", device.getDeviceId());
+ result.put("ChannelID", code);
+ result.put("ChannelName", deviceChannel.getName());
+ result.put("ChannelCustomName", "");
+ result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
+ result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
+ result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
+ result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
+ result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
+ result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
+ 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");
+ resultDeferredResult.setResult(result);
+ }
+ }else {
+ JSONObject result = new JSONObject();
+ result.put("error", "channel[ " + code + " ] " + msg);
+ resultDeferredResult.setResult(result);
+ }
+ });
+
return resultDeferredResult;
}
@@ -171,8 +230,8 @@
){
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
- if (streamInfo == null) {
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
+ if (inviteInfo == null) {
JSONObject result = new JSONObject();
result.put("error","鏈壘鍒版祦淇℃伅");
return result;
@@ -184,14 +243,14 @@
return result;
}
try {
- cmder.streamByeCmd(device, code, streamInfo.getStream(), null);
+ cmder.streamByeCmd(device, code, inviteInfo.getStream(), null);
} catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {
JSONObject result = new JSONObject();
result.put("error","鍙戦�丅YE澶辫触锛�" + e.getMessage());
return result;
}
- redisCatchStorage.stopPlay(streamInfo);
- storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+ inviteStreamService.removeInviteInfo(inviteInfo);
+ storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());
return null;
}
--
Gitblit v1.8.0