roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题

Browse Source
This commit is contained in:
648540858
2023-05-06 17:40:57 +08:00
parent 9ccce01692
commit e2f9ee8f7b
26 changed files with 916 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
View File

@@ -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.bean.DeviceChannel;
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;
@@ -45,6 +51,9 @@ public class ApiStreamController {
@Autowired
private IRedisCatchStorage redisCatchStorage;
@Autowired
private IInviteStreamService inviteStreamService;
@Autowired
private IDeviceService deviceService;
@@ -111,46 +120,96 @@ public class ApiStreamController {
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 @@ public class ApiStreamController {
){
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 @@ public class ApiStreamController {
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","发送BYE失败：" + e.getMessage());
return result;
}
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
inviteStreamService.removeInviteInfo(inviteInfo);
storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());
return null;
}