guzijian / wvp-GB28181-pro · Commits

Commit dfb87c768538e280cf5e17d1d5ee5bbed1e1888d

Authored by 648540858
1 parent d7623b5c

合并主线

Inline Side-by-side
Showing 3 changed files with 14 additions and 2 deletions
README.md
  View file @dfb87c7
@@ -169,3 +169,11 @@ QQ遘∽ｿ｡荳闊ｬ荳榊屓, 邊ｾ蜉帶怏髯.谺｢霑主､ｧ螳ｶ蝨ｨ鄒､驥瑚ｮｨ隶ｺ.隗牙ｾ鈴｡ｹ逶ｮ蟇ｹ菴 @@ -169,3 +169,11 @@ QQ遘∽ｿ｡荳闊ｬ荳榊屓, 邊ｾ蜉帶怏髯.谺｢霑主､ｧ螳ｶ蝨ｨ鄒､驥瑚ｮｨ隶ｺ.隗牙ｾ鈴｡ｹ逶ｮ蟇ｹ菴
169 169
170 ps: 蛻壼｢槫刈莠ｿ吩ｸｪ蜷榊黒瑚け螳夐＠貍丈ｺｸ莠帛､ｧ菴ｬ梧ｬ｢霑主､ｧ菴ｬ閨皮ｳｻ謌第ｷｻ蜉縲 170 ps: 蛻壼｢槫刈莠ｿ吩ｸｪ蜷榊黒瑚け螳夐＠貍丈ｺｸ莠帛､ｧ菴ｬ梧ｬ｢霑主､ｧ菴ｬ閨皮ｳｻ謌第ｷｻ蜉縲
171 171
  172 +ffmpeg -re -i 123.mp3 -acodec pcm_alaw -ar 8000 -ac 1 -f rtsp rtsp://192.168.1.3:30554/broadcast/34020000001320000101_34020000001310000001
  173 +
  174 +ffmpeg -re -i 123.mp3 -acodec pcm_alaw -ar 8000 -ac 1 -f rtsp rtsp://192.168.1.3:30554/talk/34020000001320000011_34020000001370000001
  175 +
  176 +
  177 +
  178 +ffmpeg -re -i 123.mp3 -acodec pcm_alaw -ar 8000 -ac 1 -f rtsp rtsp://192.168.1.3:30554/talk/34020000001320000101_34020000001310000001
  179 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @dfb87c7
@@ -629,7 +629,7 @@ public class SIPCommander implements ISIPCommander { @@ -629,7 +629,7 @@ public class SIPCommander implements ISIPCommander {
629 content.append("f=v/////a/1/8/1" + "\r\n"); 629 content.append("f=v/////a/1/8/1" + "\r\n");
630 630
631 Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(), callIdHeader); 631 Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(), callIdHeader);
632 - sipSender.transmitRequest(device.getTransport(), request, (e -> { 632 + sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, (e -> {
633 streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream()); 633 streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
634 mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc()); 634 mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
635 errorEvent.response(e); 635 errorEvent.response(e);
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
  View file @dfb87c7
@@ -16,6 +16,8 @@ import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor @@ -16,6 +16,8 @@ import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor
16 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent; 16 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
17 import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory; 17 import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
18 import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe; 18 import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
  19 +import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;
  20 +import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForRtpServerTimeout;
19 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 21 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
20 import com.genersoft.iot.vmp.service.IDeviceService; 22 import com.genersoft.iot.vmp.service.IDeviceService;
21 import com.genersoft.iot.vmp.service.IMediaServerService; 23 import com.genersoft.iot.vmp.service.IMediaServerService;
@@ -131,7 +133,7 @@ public class AckRequestProcessor extends SIPRequestProcessorParent implements In @@ -131,7 +133,7 @@ public class AckRequestProcessor extends SIPRequestProcessorParent implements In
131 param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0"); 133 param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
132 param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0"); 134 param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
133 if (!sendRtpItem.isTcp()) { 135 if (!sendRtpItem.isTcp()) {
134 - // 开启rtcp保活 136 + // udp模式下开启rtcp保活
135 param.put("udp_rtcp_timeout", sendRtpItem.isRtcp()? "1":"0"); 137 param.put("udp_rtcp_timeout", sendRtpItem.isRtcp()? "1":"0");
136 } 138 }
137 139
@@ -147,6 +149,8 @@ public class AckRequestProcessor extends SIPRequestProcessorParent implements In @@ -147,6 +149,8 @@ public class AckRequestProcessor extends SIPRequestProcessorParent implements In
147 // 如果是非严格模式，需要关闭端口占用 149 // 如果是非严格模式，需要关闭端口占用
148 JSONObject startSendRtpStreamResult = null; 150 JSONObject startSendRtpStreamResult = null;
149 if (sendRtpItem.getLocalPort() != 0) { 151 if (sendRtpItem.getLocalPort() != 0) {
  152 + HookSubscribeForRtpServerTimeout hookSubscribeForRtpServerTimeout = HookSubscribeFactory.on_rtp_server_timeout(sendRtpItem.getSsrc(), null, mediaInfo.getId());
  153 + hookSubscribe.removeSubscribe(hookSubscribeForRtpServerTimeout);
150 if (zlmrtpServerFactory.releasePort(mediaInfo, sendRtpItem.getSsrc())) { 154 if (zlmrtpServerFactory.releasePort(mediaInfo, sendRtpItem.getSsrc())) {
151 if (sendRtpItem.isTcpActive()) { 155 if (sendRtpItem.isTcpActive()) {
152 startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param); 156 startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);