From 72c1b36d6d2ece497e032c8434641d6576590f9d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 03 七月 2022 00:44:36 +0800
Subject: [PATCH] 优化对讲逻辑
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java | 160 ++++++++++++++++++++-------------------
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 4
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 18 +++
web_src/src/components/dialog/devicePlayer.vue | 50 +++++++-----
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java | 2
5 files changed, 128 insertions(+), 106 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
index 628bc15..12083ed 100644
--- 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
@@ -93,7 +93,7 @@
String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, null, null, callIdHeader.getCallId());
logger.info("鏀跺埌bye, [{}/{}]", platformGbId, channelId);
- if (sendRtpItem != null){
+ if (sendRtpItem != null ){
String streamId = sendRtpItem.getStreamId();
Map<String, Object> param = new HashMap<>();
param.put("vhost","__defaultVhost__");
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 04982c3..7b7136f 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
@@ -834,83 +834,87 @@
subscribeKey.put("mediaServerId", mediaServerItem.getId());
String finalSsrc = ssrc;
// 娴佸凡缁忓瓨鍦ㄦ椂鐩存帴鎺ㄦ祦
- JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem, app, "rtsp", stream);
- JSONArray tracks = mediaInfo.getJSONArray("tracks");
- Integer codecId = null;
- if (tracks != null && tracks.size() > 0) {
- for (int i = 0; i < tracks.size(); i++) {
- MediaItem.MediaTrack track = JSON.toJavaObject((JSON)tracks.get(i),MediaItem.MediaTrack.class);
- if (track.getCodecType() == 1) {
- codecId = track.getCodecId();
- break;
- }
- }
- }
- if ((mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online"))) {
- logger.info("鍙戠幇宸茬粡鍦ㄦ帹娴�");
- sendRtpItem.setStatus(2);
- redisCatchStorage.updateSendRTPSever(sendRtpItem);
- StringBuffer content = new StringBuffer(200);
- content.append("v=0\r\n");
- content.append("o="+ config.getId() +" "+ sdp.getOrigin().getSessionId() +" " + sdp.getOrigin().getSessionVersion() + " 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");
- if (codecId == null) {
- if (mediaTransmissionTCP) {
- content.append("m=audio "+ sendRtpItem.getLocalPort()+" TCP/RTP/AVP 8\r\n");
- }else {
- content.append("m=audio "+ sendRtpItem.getLocalPort()+" RTP/AVP 8\r\n");
- }
-
- content.append("a=rtpmap:8 PCMA/8000\r\n");
- }else {
- if (codecId == 4) {
- if (mediaTransmissionTCP) {
- content.append("m=audio "+ sendRtpItem.getLocalPort()+" TCP/RTP/AVP 0\r\n");
- }else {
- content.append("m=audio "+ sendRtpItem.getLocalPort()+" RTP/AVP 0\r\n");
- }
- content.append("a=rtpmap:0 PCMU/8000\r\n");
- }else {
- if (mediaTransmissionTCP) {
- content.append("m=audio "+ sendRtpItem.getLocalPort()+" TCP/RTP/AVP 8\r\n");
- }else {
- content.append("m=audio "+ sendRtpItem.getLocalPort()+" RTP/AVP 8\r\n");
- }
- content.append("a=rtpmap:8 PCMA/8000\r\n");
- }
- }
- if (sendRtpItem.isTcp()) {
- content.append("a=connection:new\r\n");
- if (!sendRtpItem.isTcpActive()) {
- content.append("a=setup:active\r\n");
- }else {
- content.append("a=setup:passive\r\n");
- }
- }
- content.append("a=sendonly\r\n");
- content.append("y="+ finalSsrc + "\r\n");
- content.append("f=v/////a/1/8/1\r\n");
-
- ParentPlatform parentPlatform = new ParentPlatform();
- parentPlatform.setServerIP(device.getIp());
- parentPlatform.setServerPort(device.getPort());
- 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) {
- throw new RuntimeException(e);
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
- }else {
+// JSONObject mediaInfo = zlmresTfulUtils.getMediaList(mediaServerItem, app, stream);
+// System.out.println(mediaInfo != null);
+// System.out.println(mediaInfo);
+// if (mediaInfo != null &&
+// (mediaInfo.getInteger("code") != null && mediaInfo.getInteger("code") == 0
+// && mediaInfo.getJSONArray("data") != null && mediaInfo.getJSONArray("data").size() > 0)) {
+// logger.info("鍙戠幇宸茬粡鍦ㄦ帹娴�");
+// JSONArray tracks = mediaInfo.getJSONArray("data").getJSONObject(0).getJSONArray("tracks");
+// Integer codecId = null;
+// if (tracks != null && tracks.size() > 0) {
+// for (int i = 0; i < tracks.size(); i++) {
+// MediaItem.MediaTrack track = JSON.toJavaObject((JSON)tracks.get(i),MediaItem.MediaTrack.class);
+// if (track.getCodecType() == 1) {
+// codecId = track.getCodecId();
+// break;
+// }
+// }
+// }
+// sendRtpItem.setStatus(2);
+// redisCatchStorage.updateSendRTPSever(sendRtpItem);
+// StringBuffer content = new StringBuffer(200);
+// content.append("v=0\r\n");
+// content.append("o="+ config.getId() +" "+ sdp.getOrigin().getSessionId() +" " + sdp.getOrigin().getSessionVersion() + " 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");
+// if (codecId == null) {
+// if (mediaTransmissionTCP) {
+// content.append("m=audio "+ sendRtpItem.getLocalPort()+" TCP/RTP/AVP 8\r\n");
+// }else {
+// content.append("m=audio "+ sendRtpItem.getLocalPort()+" RTP/AVP 8\r\n");
+// }
+//
+// content.append("a=rtpmap:8 PCMA/8000\r\n");
+// }else {
+// if (codecId == 4) {
+// if (mediaTransmissionTCP) {
+// content.append("m=audio "+ sendRtpItem.getLocalPort()+" TCP/RTP/AVP 0\r\n");
+// }else {
+// content.append("m=audio "+ sendRtpItem.getLocalPort()+" RTP/AVP 0\r\n");
+// }
+// content.append("a=rtpmap:0 PCMU/8000\r\n");
+// }else {
+// if (mediaTransmissionTCP) {
+// content.append("m=audio "+ sendRtpItem.getLocalPort()+" TCP/RTP/AVP 8\r\n");
+// }else {
+// content.append("m=audio "+ sendRtpItem.getLocalPort()+" RTP/AVP 8\r\n");
+// }
+// content.append("a=rtpmap:8 PCMA/8000\r\n");
+// }
+// }
+// if (sendRtpItem.isTcp()) {
+// content.append("a=connection:new\r\n");
+// if (!sendRtpItem.isTcpActive()) {
+// content.append("a=setup:active\r\n");
+// }else {
+// content.append("a=setup:passive\r\n");
+// }
+// }
+// content.append("a=sendonly\r\n");
+// content.append("y="+ finalSsrc + "\r\n");
+// content.append("f=v/////a/1/8/1\r\n");
+//
+// ParentPlatform parentPlatform = new ParentPlatform();
+// parentPlatform.setServerIP(device.getIp());
+// parentPlatform.setServerPort(device.getPort());
+// 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) {
+// throw new RuntimeException(e);
+// } catch (ParseException e) {
+// throw new RuntimeException(e);
+// }
+// }else {
// 娴佷笉瀛樺湪鏃剁洃鍚祦涓婄嚎
// 璁剧疆绛夊緟鎺ㄦ祦鐨勮秴鏃�; 榛樿20s
String waiteStreamTimeoutTaskKey = "waite-stream-" + device.getDeviceId() + audioBroadcastCatch.getChannelId();
@@ -1012,7 +1016,7 @@
throw new RuntimeException(e);
}
});
- }
+// }
String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + device.getDeviceId();
WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
wvpResult.setCode(0);
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
index 4007a40..f06c078 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -294,11 +294,11 @@
return 0;
}
Integer code = mediaInfo.getInteger("code");
- if ( code < 0) {
+ if (code < 0) {
logger.warn("鏌ヨ娴�({}/{})鏄惁鏈夊叾瀹冭鐪嬭�呮椂寰楀埌锛� {}", app, streamId, mediaInfo.getString("msg"));
return -1;
}
- if ( code == 0 && ! mediaInfo.getBoolean("online")) {
+ if ( code == 0 && mediaInfo.getBoolean("online") != null && ! mediaInfo.getBoolean("online")) {
logger.warn("鏌ヨ娴�({}/{})鏄惁鏈夊叾瀹冭鐪嬭�呮椂寰楀埌锛� {}", app, streamId, mediaInfo.getString("msg"));
return -1;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index d945bfc..595f628 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -15,6 +15,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
+import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.media.zlm.AssistRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
@@ -74,6 +75,9 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private ZLMRTPServerFactory zlmrtpServerFactory;
@Autowired
private DeferredResultHolder resultHolder;
@@ -678,9 +682,14 @@
if (audioBroadcastManager.exit(device.getDeviceId(), channelId)) {
SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(device.getDeviceId(), channelId, null, null);
if (sendRtpItem != null && sendRtpItem.isOnlyAudio()) {
- logger.warn("璇煶骞挎挱宸茬粡寮�鍚細 {}", channelId);
- event.call("璇煶骞挎挱宸茬粡寮�鍚�");
- return;
+ // 鏌ヨ娴佹槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯璁や负鏄紓甯哥姸鎬�
+ MediaServerItem mediaServerItem = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ Boolean streamReady = zlmrtpServerFactory.isStreamReady(mediaServerItem, sendRtpItem.getApp(), sendRtpItem.getStreamId());
+ if (streamReady) {
+ logger.warn("璇煶骞挎挱宸茬粡寮�鍚細 {}", channelId);
+ event.call("璇煶骞挎挱宸茬粡寮�鍚�");
+ return;
+ }
}
}
@@ -712,10 +721,13 @@
param.put("app", sendRtpItem.getApp());
param.put("stream", sendRtpItem.getStreamId());
zlmresTfulUtils.stopSendRtp(mediaInfo, param);
+ // 绔嬪埢缁撴潫璁惧鐨勬帹娴侊紝绛夊緟鑷缁撴潫澶參
+// zlmresTfulUtils.closeStreams(mediaInfo, sendRtpItem.getApp(), sendRtpItem.getStreamId());
}
if (audioBroadcastCatch.getStatus() == AudioBroadcastCatchStatus.Ok) {
cmder.streamByeCmd(audioBroadcastCatch.getDialog(), audioBroadcastCatch.getRequest(), null);
}
+
} catch (SipException e) {
throw new RuntimeException(e);
} catch (ParseException e) {
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 25101ea..a33e8a4 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -537,6 +537,9 @@
this.stopPlayRecord();
}
this.recordPlay = ''
+ if (this.broadcastStatus === 1) {
+ this.stopBroadcast()
+ }
},
copySharedInfo: function (data) {
@@ -849,24 +852,7 @@
}
});
}else if (this.broadcastStatus === 1) {
- this.broadcastRtc.close()
- this.broadcastRtc = null;
- this.$axios({
- method: 'get',
- url: '/api/play/broadcast/stop/' + this.deviceId + '/' + this.channelId
- }).then( (res)=> {
- if (res.data.code == 0) {
- let streamInfo = res.data.data.streamInfo;
- this.startBroadcast(streamInfo.rtc)
- }else {
- this.$message({
- showClose: true,
- message: res.data.msg,
- type: "error",
- });
- }
- });
- this.broadcastStatus = -1;
+ this.stopBroadcast()
}
},
startBroadcast(url){
@@ -920,12 +906,12 @@
});
this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ON_CONNECTION_STATE_CHANGE,(e)=>{// offer anwser 浜ゆ崲澶辫触
console.log('鐘舵�佹敼鍙�',e)
- if (e === "failed") {
- this.broadcastStatus = -1;
- }else if (e === "connecting") {
+ if (e === "connecting") {
this.broadcastStatus = 0;
- }else{
+ }else if (e === "connected") {
this.broadcastStatus = 1;
+ }else {
+ this.broadcastStatus = -1;
}
});
this.broadcastRtc.on(ZLMRTCClient.Events.CAPTURE_STREAM_FAILED,(e)=>{// offer anwser 浜ゆ崲澶辫触
@@ -936,6 +922,26 @@
type: 'error'
});
});
+ },
+ stopBroadcast(){
+ this.broadcastRtc.close()
+ this.broadcastRtc = null;
+ this.$axios({
+ method: 'get',
+ url: '/api/play/broadcast/stop/' + this.deviceId + '/' + this.channelId
+ }).then( (res)=> {
+ if (res.data.code == 0) {
+ // this.broadcastStatus = -1;
+
+ }else {
+ this.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+ });
+
}
}
};
--
Gitblit v1.8.0