From 038d360dd4f2dd3c06f5d97dc66ed13fd78de212 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 27 六月 2022 09:38:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rtc' into commercial
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 88 ++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index 3bab0eb..d8deb5c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -657,8 +657,11 @@
// 娣诲姞娴佹敞閿�鐨勮闃咃紝娉ㄩ攢浜嗗悗鍚戣澶囧彂閫乥ye
subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,
(MediaServerItem mediaServerItemForEnd, JSONObject jsonForEnd)->{
- logger.info("[褰曞儚]涓嬭浇缁撴潫锛� 鍙戦�丅YE");
- streamByeCmd(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());
+ ClientTransaction transaction = streamSession.getTransaction(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());
+ if (transaction != null) {
+ logger.info("[褰曞儚]涓嬭浇缁撴潫锛� 鍙戦�丅YE");
+ streamByeCmd(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());
+ }
});
});
@@ -741,42 +744,34 @@
}
}
- Request byeRequest = dialog.createRequest(Request.BYE);
- SipURI byeURI = (SipURI) byeRequest.getRequestURI();
- SIPRequest request = (SIPRequest)transaction.getRequest();
- byeURI.setHost(request.getRemoteAddress().getHostAddress());
- byeURI.setPort(request.getRemotePort());
- ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);
- String protocol = viaHeader.getTransport().toUpperCase();
- ClientTransaction clientTransaction = null;
- if("TCP".equals(protocol)) {
- clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);
- } else if("UDP".equals(protocol)) {
- clientTransaction = udpSipProvider.getNewClientTransaction(byeRequest);
- }
-
- CallIdHeader callIdHeader = (CallIdHeader) byeRequest.getHeader(CallIdHeader.NAME);
- if (okEvent != null) {
- sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), okEvent);
- }
-
- dialog.sendRequest(clientTransaction);
+ streamByeCmd(dialog, (SIPRequest)transaction.getRequest(), okEvent);
} catch (SipException | ParseException e) {
e.printStackTrace();
}
}
- /**
- * 璇煶骞挎挱
- *
- * @param device 瑙嗛璁惧
- * @param channelId 棰勮閫氶亾
- */
@Override
- public boolean audioBroadcastCmd(Device device, String channelId) {
- // 鏀逛负鏂扮殑瀹炵幇
- return false;
+ public void streamByeCmd(SIPDialog dialog, SIPRequest request, SipSubscribe.Event okEvent) throws SipException, ParseException {
+ Request byeRequest = dialog.createRequest(Request.BYE);
+ SipURI byeURI = (SipURI) byeRequest.getRequestURI();
+ byeURI.setHost(request.getRemoteAddress().getHostAddress());
+ byeURI.setPort(request.getRemotePort());
+ ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);
+ String protocol = viaHeader.getTransport().toUpperCase();
+ ClientTransaction clientTransaction = null;
+ if("TCP".equals(protocol)) {
+ clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);
+ } else if("UDP".equals(protocol)) {
+ clientTransaction = udpSipProvider.getNewClientTransaction(byeRequest);
+ }
+
+ CallIdHeader callIdHeader = (CallIdHeader) byeRequest.getHeader(CallIdHeader.NAME);
+ if (okEvent != null) {
+ sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), okEvent);
+ }
+
+ dialog.sendRequest(clientTransaction);
}
/**
@@ -785,7 +780,7 @@
* @param device 瑙嗛璁惧
*/
@Override
- public boolean audioBroadcastCmd(Device device) {
+ public boolean audioBroadcastCmd(Device device,String channelId, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {
try {
StringBuffer broadcastXml = new StringBuffer(200);
String charset = device.getCharset();
@@ -794,7 +789,7 @@
broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");
broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");
- broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");
+ broadcastXml.append("<TargetID>" + channelId + "</TargetID>\r\n");
broadcastXml.append("</Notify>\r\n");
String tm = Long.toString(System.currentTimeMillis());
@@ -803,39 +798,14 @@
: udpSipProvider.getNewCallId();
Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), "z9hG4bK-ViaBcst-" + tm, "FromBcst" + tm, null, callIdHeader);
- transmitRequest(device, request);
+ transmitRequest(device, request, errorEvent, okEvent);
return true;
} catch (SipException | ParseException | InvalidArgumentException e) {
e.printStackTrace();
}
return false;
}
- @Override
- public void audioBroadcastCmd(Device device, SipSubscribe.Event errorEvent) {
- try {
- StringBuffer broadcastXml = new StringBuffer(200);
- String charset = device.getCharset();
- broadcastXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
- broadcastXml.append("<Notify>\r\n");
- broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");
- broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
- broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");
- broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");
- broadcastXml.append("</Notify>\r\n");
-
- String tm = Long.toString(System.currentTimeMillis());
- CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
- : udpSipProvider.getNewCallId();
-
- Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), "z9hG4bK-ViaBcst-" + tm, "FromBcst" + tm, null, callIdHeader);
- transmitRequest(device, request, errorEvent);
- } catch (SipException | ParseException | InvalidArgumentException e) {
- e.printStackTrace();
- }
- }
-
-
/**
* 闊宠棰戝綍鍍忔帶鍒�
*
--
Gitblit v1.8.0