From f8f65d473bec182abeecd6fd17a9d4c4c4cfc7c5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 10 五月 2022 13:08:32 +0800
Subject: [PATCH] 优化语音广播流程
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java | 65 ++++++++++++--------------------
1 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
index 12bfd7f..dc77afc 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@@ -114,6 +114,7 @@
private SipConfig config;
+
@Override
public void afterPropertiesSet() throws Exception {
// 娣诲姞娑堟伅澶勭悊鐨勮闃�
@@ -492,7 +493,6 @@
gbStream.getApp(), gbStream.getStream(), channelId,
mediaTransmissionTCP);
-
if (sendRtpItem == null) {
logger.warn("鏈嶅姟鍣ㄧ鍙ｈ祫婧愪笉瓒�");
responseAck(evt, Response.BUSY_HERE);
@@ -562,25 +562,16 @@
}
}
- public void inviteFromDeviceHandle(RequestEvent evt, String requesterId, String channelId) throws InvalidArgumentException, ParseException, SipException, SdpException {
+ public void inviteFromDeviceHandle(RequestEvent evt, String requesterId, String channelId1) throws InvalidArgumentException, ParseException, SipException, SdpException {
- // 鍏煎濂囪懇鐨勬捣搴疯繖閲屼娇鐢ㄧ殑涓嶆槸閫氶亾缂栧彿鑰屾槸鏈钩鍙扮紪鍙�
-// if (channelId.equals(config.getId())) {
-// List<AudioBroadcastCatch> all = audioBroadcastManager.getAll();
-// for (AudioBroadcastCatch audioBroadcastCatch : all) {
-// if (audioBroadcastCatch.getDeviceId().equals(requesterId)) {
-// channelId = audioBroadcastCatch.getChannelId();
-// }
-// }
-// }
-// // 鍏煎澶辫触
-// if (channelId.equals(config.getId())) {
-// responseAck(evt, Response.BAD_REQUEST);
-// return;
-// }
// 闈炰笂绾у钩鍙拌姹傦紝鏌ヨ鏄惁璁惧璇锋眰锛堥�氬父涓烘帴鏀惰闊冲箍鎾殑璁惧锛�
Device device = redisCatchStorage.getDevice(requesterId);
-
+ AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(requesterId, channelId1);
+ if (audioBroadcastCatch == null) {
+ logger.warn("鏉ヨ嚜璁惧鐨処nvite璇锋眰闈炶闊冲箍鎾紝宸插拷鐣�");
+ responseAck(evt, Response.FORBIDDEN);
+ return;
+ }
Request request = evt.getRequest();
if (device != null) {
logger.info("鏀跺埌璁惧" + requesterId + "鐨勮闊冲箍鎾璉nvite璇锋眰");
@@ -606,7 +597,6 @@
// 鏌ョ湅鏄惁鏀寔PS 璐熻浇96
int port = -1;
- //boolean recvonly = false;
boolean mediaTransmissionTCP = false;
Boolean tcpActive = null;
for (int i = 0; i < mediaDescriptions.size(); i++) {
@@ -638,7 +628,6 @@
responseAck(evt, Response.UNSUPPORTED_MEDIA_TYPE); // 涓嶆敮鎸佺殑鏍煎紡锛屽彂415
return;
}
- String sessionName = sdp.getSessionName().getValue();
String addressStr = sdp.getOrigin().getAddress();
logger.info("璁惧{}璇锋眰璇煶娴侊紝鍦板潃锛歿}:{}锛宻src锛歿}", requesterId, addressStr, port, ssrc);
@@ -649,20 +638,19 @@
return;
}
SendRtpItem sendRtpItem = zlmrtpServerFactory.createSendRtpItem(mediaServerItem, addressStr, port, ssrc, requesterId,
- device.getDeviceId(), channelId,
+ device.getDeviceId(), audioBroadcastCatch.getChannelId(),
mediaTransmissionTCP);
- sendRtpItem.setTcp(mediaTransmissionTCP);
- if (tcpActive != null) {
- sendRtpItem.setTcpActive(tcpActive);
- }
if (sendRtpItem == null) {
logger.warn("鏈嶅姟鍣ㄧ鍙ｈ祫婧愪笉瓒�");
responseAck(evt, Response.BUSY_HERE);
return;
}
-
+ sendRtpItem.setTcp(mediaTransmissionTCP);
+ if (tcpActive != null) {
+ sendRtpItem.setTcpActive(tcpActive);
+ }
String app = "broadcast";
- String stream = device.getDeviceId() + "_" + channelId;
+ String stream = device.getDeviceId() + "_" + audioBroadcastCatch.getChannelId();
CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);
sendRtpItem.setPlayType(InviteStreamType.PLAY);
@@ -685,12 +673,9 @@
subscribeKey.put("schema", "rtmp");
subscribeKey.put("mediaServerId", mediaServerItem.getId());
String finalSsrc = ssrc;
- String waiteStreamTimeoutTaskKey = "waite-stream-" + device.getDeviceId() + channelId;
-
// 娴佸凡缁忓瓨鍦ㄦ椂鐩存帴鎺ㄦ祦
if (zlmrtpServerFactory.isStreamReady(mediaServerItem, app, stream)) {
logger.info("鍙戠幇宸茬粡鍦ㄦ帹娴�");
- dynamicTask.stop(waiteStreamTimeoutTaskKey);
sendRtpItem.setStatus(2);
redisCatchStorage.updateSendRTPSever(sendRtpItem);
StringBuffer content = new StringBuffer(200);
@@ -711,6 +696,10 @@
parentPlatform.setServerGBId(device.getDeviceId());
try {
responseSdpAck(evt, content.toString(), parentPlatform);
+ Dialog dialog = evt.getDialog();
+ audioBroadcastCatch.setDialog((SIPDialog) dialog);
+ audioBroadcastCatch.setRequest((SIPRequest) request);
+ audioBroadcastManager.update(audioBroadcastCatch);
} catch (SipException e) {
throw new RuntimeException(e);
} catch (InvalidArgumentException e) {
@@ -721,19 +710,16 @@
}else {
// 娴佷笉瀛樺湪鏃剁洃鍚祦涓婄嚎
// 璁剧疆绛夊緟鎺ㄦ祦鐨勮秴鏃�; 榛樿20s
+ String waiteStreamTimeoutTaskKey = "waite-stream-" + device.getDeviceId() + audioBroadcastCatch.getChannelId();
dynamicTask.startDelay(waiteStreamTimeoutTaskKey, ()->{
logger.info("绛夊緟鎺ㄦ祦瓒呮椂: {}/{}", app, stream);
- if (audioBroadcastManager.exit(device.getDeviceId(), channelId)) {
- audioBroadcastManager.del(device.getDeviceId(), channelId);
- }else {
- // 鍏煎娴峰悍浣跨敤浜嗛敊璇殑閫氶亾ID鐨勬儏鍐�
- audioBroadcastManager.delByDeviceId(device.getDeviceId());
- }
-
+ playService.stopAudioBroadcast(device.getDeviceId(), audioBroadcastCatch.getChannelId());
// 鍙戦�乥ye
try {
- cmder.streamByeCmd((SIPDialog)evt.getServerTransaction().getDialog(), (SIPRequest) evt.getRequest(), null);
+ responseAck(evt, Response.BUSY_HERE);
} catch (SipException e) {
+ throw new RuntimeException(e);
+ } catch (InvalidArgumentException e) {
throw new RuntimeException(e);
} catch (ParseException e) {
throw new RuntimeException(e);
@@ -743,10 +729,11 @@
subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,
(MediaServerItem mediaServerItemInUse, JSONObject json)->{
sendRtpItem.setStatus(2);
+ dynamicTask.stop(waiteStreamTimeoutTaskKey);
redisCatchStorage.updateSendRTPSever(sendRtpItem);
StringBuffer content = new StringBuffer(200);
content.append("v=0\r\n");
- content.append("o="+ channelId +" 0 0 IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");
+ content.append("o="+ audioBroadcastCatch.getChannelId() +" 0 0 IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");
content.append("s=Play\r\n");
content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");
content.append("t=0 0\r\n");
@@ -771,8 +758,6 @@
}
});
}
- String timeOutTaskKey = "audio-broadcast-" + device.getDeviceId() + channelId;
- dynamicTask.stop(timeOutTaskKey);
String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + device.getDeviceId();
WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
wvpResult.setCode(0);
--
Gitblit v1.8.0