临时提交

This commit is contained in:
648540858
2024-07-09 17:55:51 +08:00
parent 2235caca36
commit 046e7802f3
14 changed files with 295 additions and 170 deletions

View File

@@ -60,6 +60,9 @@ public class ByeRequestProcessor extends SIPRequestProcessorParent implements In
@Autowired
private IDeviceService deviceService;
@Autowired
private IDeviceChannelService deviceChannelService;
@Autowired
private AudioBroadcastManager audioBroadcastManager;
@@ -216,7 +219,7 @@ public class ByeRequestProcessor extends SIPRequestProcessorParent implements In
InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY,
device.getDeviceId(), channel.getDeviceId());
if (inviteInfo != null) {
storager.stopPlay(ssrcTransaction.getDeviceId(), channel.getDeviceId());
deviceChannelService.stopPlay(ssrcTransaction.getDeviceId(), channel.getDeviceId());
inviteStreamService.removeInviteInfo(inviteInfo);
if (inviteInfo.getStreamInfo() != null) {
mediaServerService.closeRTPServer(inviteInfo.getStreamInfo().getMediaServerId(), inviteInfo.getStreamInfo().getStream());

View File

@@ -100,7 +100,7 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
if (sumNum == 0) {
log.info("[收到通道]设备:{}的: 0个", take.getDevice().getDeviceId());
// 数据已经完整接收
deviceChannelService.cleanChannelsForDevice(take.getDevice().getDeviceId());
deviceChannelService.cleanChannelsForDevice(take.getDevice().getId());
catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), null);
} else {
Iterator<Element> deviceListIterator = deviceListElement.elementIterator();