Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

去除调试内容

结构优化
648540858 2022-05-10 10:11:46 +08:00
parent 6e48dd3f32
commit 4a0f5cf76d
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
View File

@ -96,9 +96,9 @@ public class AckRequestProcessor extends SIPRequestProcessorParent implements In
param.put("src_port", sendRtpItem.getLocalPort()); param.put("src_port", sendRtpItem.getLocalPort());
param.put("pt", sendRtpItem.getPt()); param.put("pt", sendRtpItem.getPt());
param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0"); param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
param.put("only_audio", sendRtpItem.isOnlyAudio()); param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
zlmrtpServerFactory.startSendRtpStream(mediaInfo, param); JSONObject jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
System.out.println(jsonObject);
// if (streamInfo == null) { // 流还没上来，对方就回复ack // if (streamInfo == null) { // 流还没上来，对方就回复ack

13
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
View File

@ -671,6 +671,9 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
sendRtpItem.setStatus(1); sendRtpItem.setStatus(1);
sendRtpItem.setApp(app); sendRtpItem.setApp(app);
sendRtpItem.setStreamId(stream); sendRtpItem.setStreamId(stream);
sendRtpItem.setPt(8);
sendRtpItem.setUsePs(false);
sendRtpItem.setOnlyAudio(true);
redisCatchStorage.updateSendRTPSever(sendRtpItem); redisCatchStorage.updateSendRTPSever(sendRtpItem);
// hook监听等待设备推流上来 // hook监听等待设备推流上来
@ -683,6 +686,8 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
subscribeKey.put("mediaServerId", mediaServerItem.getId()); subscribeKey.put("mediaServerId", mediaServerItem.getId());
String finalSsrc = ssrc; String finalSsrc = ssrc;
String waiteStreamTimeoutTaskKey = "waite-stream-" + device.getDeviceId() + channelId; String waiteStreamTimeoutTaskKey = "waite-stream-" + device.getDeviceId() + channelId;
// 流已经存在时直接推流
if (zlmrtpServerFactory.isStreamReady(mediaServerItem, app, stream)) { if (zlmrtpServerFactory.isStreamReady(mediaServerItem, app, stream)) {
logger.info("发现已经在推流"); logger.info("发现已经在推流");
dynamicTask.stop(waiteStreamTimeoutTaskKey); dynamicTask.stop(waiteStreamTimeoutTaskKey);
@ -714,12 +719,12 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
throw new RuntimeException(e); throw new RuntimeException(e);
} }
}else { }else {
// 流不存在时监听流上线
// 设置等待推流的超时; 默认20s // 设置等待推流的超时; 默认20s
String finalChannelId = channelId;
dynamicTask.startDelay(waiteStreamTimeoutTaskKey, ()->{ dynamicTask.startDelay(waiteStreamTimeoutTaskKey, ()->{
logger.info("等待推流超时: {}/{}", app, stream); logger.info("等待推流超时: {}/{}", app, stream);
if (audioBroadcastManager.exit(device.getDeviceId(), finalChannelId)) { if (audioBroadcastManager.exit(device.getDeviceId(), channelId)) {
audioBroadcastManager.del(device.getDeviceId(), finalChannelId); audioBroadcastManager.del(device.getDeviceId(), channelId);
}else { }else {
// 兼容海康使用了错误的通道ID的情况 // 兼容海康使用了错误的通道ID的情况
audioBroadcastManager.delByDeviceId(device.getDeviceId()); audioBroadcastManager.delByDeviceId(device.getDeviceId());
@ -741,7 +746,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
redisCatchStorage.updateSendRTPSever(sendRtpItem); redisCatchStorage.updateSendRTPSever(sendRtpItem);
StringBuffer content = new StringBuffer(200); StringBuffer content = new StringBuffer(200);
content.append("v=0\r\n"); content.append("v=0\r\n");
content.append("o="+ finalChannelId +" 0 0 IN IP4 "+mediaServerItem.getSdpIp()+"\r\n"); content.append("o="+ channelId +" 0 0 IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");
content.append("s=Play\r\n"); content.append("s=Play\r\n");
content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n"); content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");
content.append("t=0 0\r\n"); content.append("t=0 0\r\n");