Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复错误的使用stream作为ssrc导致的无法stop问题

Browse Source
This commit is contained in:
panlinlin 2021-01-11 17:35:46 +08:00
parent 4005962c5b
commit 74c9e0400d
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
View File

@ -121,7 +121,9 @@ public class SipLayer implements SipListener {
logger.debug(evt.getRequest().toString()); logger.debug(evt.getRequest().toString());
// 由于jainsip是单线程程序，为提高性能并发处理 // 由于jainsip是单线程程序，为提高性能并发处理
processThreadPool.execute(() -> { processThreadPool.execute(() -> {
if (processorFactory != null) {
processorFactory.createRequestProcessor(evt).process(); processorFactory.createRequestProcessor(evt).process();
}
}); });
} }

20
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
View File

@ -290,12 +290,8 @@ public class SIPCommander implements ISIPCommander {
@Override @Override
public void playStreamCmd(Device device, String channelId, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent) { public void playStreamCmd(Device device, String channelId, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent) {
try { try {
String ssrc = "";
if (rtpEnable) { String ssrc = streamSession.createPlaySsrc();
ssrc = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);
}else {
ssrc = streamSession.createPlaySsrc();
}
String streamId = null; String streamId = null;
if (rtpEnable) { if (rtpEnable) {
streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId); streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);
@ -412,16 +408,8 @@ public class SIPCommander implements ISIPCommander {
, SipSubscribe.Event errorEvent) { , SipSubscribe.Event errorEvent) {
try { try {
MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
String ssrc = null; String ssrc = streamSession.createPlayBackSsrc();
String streamId = null; String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
if (rtpEnable) {
ssrc = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId);
streamId = ssrc;
}else {
ssrc = streamSession.createPlayBackSsrc();
streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
}
// 添加订阅 // 添加订阅
JSONObject subscribeKey = new JSONObject(); JSONObject subscribeKey = new JSONObject();
subscribeKey.put("app", "rtp"); subscribeKey.put("app", "rtp");