From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java | 251 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 193 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
old mode 100644
new mode 100755
index 64812b6..178186f
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
@@ -1,37 +1,40 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
-import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
+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.*;
+import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
-import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.media.bean.MediaInfo;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
+import com.genersoft.iot.vmp.media.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.*;
+import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.sip.*;
-import javax.sip.address.SipURI;
-import javax.sip.header.FromHeader;
-import javax.sip.header.HeaderAddress;
-import javax.sip.header.ToHeader;
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.header.CallIdHeader;
import javax.sip.message.Response;
import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Map;
-/**
- * @description: BYE璇锋眰澶勭悊鍣�
- * @author: lawrencehj
- * @date: 2021骞�3鏈�9鏃�
+/**
+ * SIP鍛戒护绫诲瀷锛� BYE璇锋眰
*/
@Component
public class ByeRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
@@ -43,19 +46,50 @@
private ISIPCommander cmder;
@Autowired
+ private ISIPCommanderForPlatform commanderForPlatform;
+
+ @Autowired
private IRedisCatchStorage redisCatchStorage;
@Autowired
- private IVideoManagerStorager storager;
+ private IInviteStreamService inviteStreamService;
@Autowired
- private ZLMRTPServerFactory zlmrtpServerFactory;
+ private IPlatformService platformService;
+
+ @Autowired
+ private IDeviceService deviceService;
+
+ @Autowired
+ private AudioBroadcastManager audioBroadcastManager;
+
+ @Autowired
+ private IDeviceChannelService channelService;
+
+ @Autowired
+ private IVideoManagerStorage storager;
@Autowired
private IMediaServerService mediaServerService;
@Autowired
private SIPProcessorObserver sipProcessorObserver;
+
+ @Autowired
+ private VideoStreamSessionManager streamSession;
+
+ @Autowired
+ private IPlayService playService;
+
+ @Autowired
+ private UserSetting userSetting;
+
+ @Autowired
+ private IStreamPushService pushService;
+
+ @Autowired
+ private IRedisRpcService redisRpcService;
+
@Override
public void afterPropertiesSet() throws Exception {
@@ -65,52 +99,153 @@
/**
* 澶勭悊BYE璇锋眰
- * @param evt
*/
@Override
public void process(RequestEvent evt) {
+ SIPRequest request = (SIPRequest) evt.getRequest();
try {
- responseAck(evt, Response.OK);
- Dialog dialog = evt.getDialog();
- if (dialog == null) return;
- if (dialog.getState().equals(DialogState.TERMINATED)) {
- String platformGbId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
- String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
- SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, channelId);
- logger.info("鏀跺埌bye, [{}/{}]", platformGbId, channelId);
- if (sendRtpItem != null){
- String streamId = sendRtpItem.getStreamId();
- Map<String, Object> param = new HashMap<>();
- param.put("vhost","__defaultVhost__");
- param.put("app",sendRtpItem.getApp());
- param.put("stream",streamId);
- param.put("ssrc",sendRtpItem.getSsrc());
- logger.info("鍋滄鍚戜笂绾ф帹娴侊細" + streamId);
- MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
- zlmrtpServerFactory.stopSendRtpStream(mediaInfo, param);
- redisCatchStorage.deleteSendRTPServer(platformGbId, channelId);
- if (zlmrtpServerFactory.totalReaderCount(mediaInfo, sendRtpItem.getApp(), streamId) == 0) {
- logger.info(streamId + "鏃犲叾瀹冭鐪嬭�咃紝閫氱煡璁惧鍋滄鎺ㄦ祦");
- cmder.streamByeCmd(sendRtpItem.getDeviceId(), channelId);
+ responseAck(request, Response.OK);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍥炲BYE淇℃伅澶辫触]锛寋}", e.getMessage());
+ }
+ CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, null, callIdHeader.getCallId());
+
+ // 鏀舵祦绔彂閫佺殑鍋滄
+ if (sendRtpItem != null){
+ logger.info("[鏀跺埌bye] 鏉ヨ嚜{}锛屽仠姝㈤�氶亾锛歿}, 绫诲瀷锛� {}, callId: {}", sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), sendRtpItem.getPlayType(), callIdHeader.getCallId());
+
+ String streamId = sendRtpItem.getStream();
+ logger.info("[鏀跺埌bye] 鍋滄鎺ㄦ祦锛歿}, 濯掍綋鑺傜偣锛� {}", streamId, sendRtpItem.getMediaServerId());
+
+ if (sendRtpItem.getPlayType().equals(InviteStreamType.PUSH)) {
+ // 涓嶆槸鏈钩鍙扮殑灏卞彂閫乺edis娑堟伅璁╁叾浠杦vp鍋滄鍙戞祦
+ ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
+ if (platform != null) {
+ redisCatchStorage.sendPlatformStopPlayMsg(sendRtpItem, platform);
+ if (!userSetting.getServerId().equals(sendRtpItem.getServerId())) {
+ redisRpcService.stopSendRtp(sendRtpItem.getRedisKey());
+ redisCatchStorage.deleteSendRTPServer(null, null, sendRtpItem.getCallId(), null);
+ }else {
+ MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ redisCatchStorage.deleteSendRTPServer(null, null, callIdHeader.getCallId(), null);
+ mediaServerService.stopSendRtp(mediaServer, sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getSsrc());
+ if (userSetting.getUseCustomSsrcForParentInvite()) {
+ mediaServerService.releaseSsrc(mediaServer.getId(), sendRtpItem.getSsrc());
+ }
}
+ }else {
+ logger.info("[涓婄骇骞冲彴鍋滄瑙傜湅] 鏈壘鍒板钩鍙皗}鐨勪俊鎭紝鍙戦�乺edis娑堟伅澶辫触", sendRtpItem.getPlatformId());
}
- // 鍙兘鏄澶囦富鍔ㄥ仠姝�
- Device device = storager.queryVideoDeviceByChannelId(platformGbId);
- if (device != null) {
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(device.getDeviceId(), channelId);
- if (streamInfo != null) {
- redisCatchStorage.stopPlay(streamInfo);
- }
- storager.stopPlay(device.getDeviceId(), channelId);
- mediaServerService.closeRTPServer(device, channelId);
+ }else {
+ MediaServer mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(),
+ callIdHeader.getCallId(), null);
+ mediaServerService.stopSendRtp(mediaInfo, sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getSsrc());
+ if (userSetting.getUseCustomSsrcForParentInvite()) {
+ mediaServerService.releaseSsrc(mediaInfo.getId(), sendRtpItem.getSsrc());
}
}
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
+ MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ if (mediaServer != null) {
+ AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
+ if (audioBroadcastCatch != null && audioBroadcastCatch.getSipTransactionInfo().getCallId().equals(callIdHeader.getCallId())) {
+ // 鏉ヨ嚜涓婄骇骞冲彴鐨勫仠姝㈠璁�
+ logger.info("[鍋滄瀵硅] 鏉ヨ嚜涓婄骇锛屽钩鍙帮細{}, 閫氶亾锛歿}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
+ audioBroadcastManager.del(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
+ }
+
+ MediaInfo mediaInfo = mediaServerService.getMediaInfo(mediaServer, sendRtpItem.getApp(), streamId);
+
+ if (mediaInfo.getReaderCount() <= 0) {
+ logger.info("[鏀跺埌bye] {} 鏃犲叾瀹冭鐪嬭�咃紝閫氱煡璁惧鍋滄鎺ㄦ祦", streamId);
+ if (sendRtpItem.getPlayType().equals(InviteStreamType.PLAY)) {
+ Device device = deviceService.getDevice(sendRtpItem.getDeviceId());
+ if (device == null) {
+ logger.info("[鏀跺埌bye] {} 閫氱煡璁惧鍋滄鎺ㄦ祦鏃舵湭鎵惧埌璁惧淇℃伅", streamId);
+ }
+ try {
+ logger.info("[鍋滄鐐规挱] {}/{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
+ cmder.streamByeCmd(device, sendRtpItem.getChannelId(), streamId, null);
+ } catch (InvalidArgumentException | ParseException | SipException |
+ SsrcTransactionNotFoundException e) {
+ logger.error("[鏀跺埌bye] {} 鏃犲叾瀹冭鐪嬭�咃紝閫氱煡璁惧鍋滄鎺ㄦ祦锛� 鍙戦�丅YE澶辫触 {}",streamId, e.getMessage());
+ }
+ }
+ }
+ }
+ }
+ System.out.println(callIdHeader.getCallId());
+ // 鍙兘鏄澶囧彂閫佺殑鍋滄
+ SsrcTransaction ssrcTransaction = streamSession.getSsrcTransactionByCallId(callIdHeader.getCallId());
+ if (ssrcTransaction == null) {
+ return;
+ }
+ logger.info("[鏀跺埌bye] 鏉ヨ嚜璁惧锛歿}, 閫氶亾: {}, 绫诲瀷锛� {}", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getType());
+
+ ParentPlatform platform = platformService.queryPlatformByServerGBId(ssrcTransaction.getDeviceId());
+ if (platform != null ) {
+ if (ssrcTransaction.getType().equals(InviteSessionType.BROADCAST)) {
+ logger.info("[鏀跺埌bye] 涓婄骇鍋滄璇煶瀵硅锛屾潵鑷細{}, 閫氶亾宸插仠姝㈡帹娴�: {}", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());
+ DeviceChannel channel = storager.queryChannelInParentPlatform(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());
+ if (channel == null) {
+ logger.info("[鏀跺埌bye] 鏈壘鍒伴�氶亾锛岃澶囷細{}锛� 閫氶亾锛歿}", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());
+ return;
+ }
+ String mediaServerId = ssrcTransaction.getMediaServerId();
+ platformService.stopBroadcast(platform, channel, ssrcTransaction.getStream(), false,
+ mediaServerService.getOne(mediaServerId));
+
+ playService.stopAudioBroadcast(channel.getDeviceId(), channel.getChannelId());
+ }
+
+ }else {
+ Device device = deviceService.getDevice(ssrcTransaction.getDeviceId());
+ if (device == null) {
+ logger.info("[鏀跺埌bye] 鏈壘鍒拌澶囷細{} ", ssrcTransaction.getDeviceId());
+ return;
+ }
+ DeviceChannel channel = channelService.getOne(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());
+ if (channel == null) {
+ logger.info("[鏀跺埌bye] 鏈壘鍒伴�氶亾锛岃澶囷細{}锛� 閫氶亾锛歿}", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());
+ return;
+ }
+ switch (ssrcTransaction.getType()){
+ case PLAY:
+ case PLAYBACK:
+ case DOWNLOAD:
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, device.getDeviceId(), channel.getChannelId());
+ if (inviteInfo != null) {
+ storager.stopPlay(device.getDeviceId(), channel.getChannelId());
+ inviteStreamService.removeInviteInfo(inviteInfo);
+ if (inviteInfo.getStreamInfo() != null) {
+ mediaServerService.closeRTPServer(inviteInfo.getStreamInfo().getMediaServerId(), inviteInfo.getStreamInfo().getStream());
+ }
+ }
+ break;
+ case BROADCAST:
+ case TALK:
+ // 鏌ユ壘鏉ユ簮鐨勫璁茶澶囷紝鍙戦�佸仠姝�
+ Device sourceDevice = storager.queryVideoDeviceByPlatformIdAndChannelId(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());
+ AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(ssrcTransaction.getDeviceId(), channel.getChannelId());
+ if (sourceDevice != null) {
+ playService.stopAudioBroadcast(sourceDevice.getDeviceId(), channel.getChannelId());
+ }
+ if (audioBroadcastCatch != null) {
+ // 鏉ヨ嚜涓婄骇骞冲彴鐨勫仠姝㈠璁�
+ logger.info("[鍋滄瀵硅] 鏉ヨ嚜涓婄骇锛屽钩鍙帮細{}, 閫氶亾锛歿}", ssrcTransaction.getDeviceId(), channel.getChannelId());
+ audioBroadcastManager.del(ssrcTransaction.getDeviceId(), channel.getChannelId());
+ }
+ break;
+
+
+ }
+ // 閲婃斁ssrc
+ MediaServer mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());
+ if (mediaServerItem != null) {
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransaction.getSsrc());
+ }
+ streamSession.removeByCallId(device.getDeviceId(), channel.getChannelId(), ssrcTransaction.getCallId());
}
}
}
--
Gitblit v1.8.0