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

Merge branch 'wvp-28181-2.0' into 结构优化

结构优化
648540858 2024-01-12 15:03:53 +08:00
parent 9c114823af 674ab18c02
commit 07401b8621
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/genersoft/iot/vmp/service/impl/InviteStreamServiceImpl.java
View File

@ -116,6 +116,9 @@ public class InviteStreamServiceImpl implements IInviteStreamService {
":" + (stream != null ? stream : "*") ":" + (stream != null ? stream : "*")
+ ":*"; + ":*";
List<Object> scanResult = RedisUtil.scan(redisTemplate, key); List<Object> scanResult = RedisUtil.scan(redisTemplate, key);
if (scanResult.isEmpty()) {
return null;
}
if (scanResult.size() != 1) { if (scanResult.size() != 1) {
logger.warn("[获取InviteInfo] 发现 key: {}存在多条", key); logger.warn("[获取InviteInfo] 发现 key: {}存在多条", key);
} }

14
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
View File

@ -982,8 +982,11 @@ public class PlayServiceImpl implements IPlayService {
} }
// zlm 暂停RTP超时检查 // zlm 暂停RTP超时检查
// 使用zlm中的流ID // 使用zlm中的流ID
String ssrc = Long.toHexString(Long.parseLong(ssrcTransaction.getSsrc())).toUpperCase(); String streamKey = inviteInfo.getStream();
JSONObject jsonObject = zlmresTfulUtils.pauseRtpCheck(mediaServerItem, ssrc); if (!mediaServerItem.isRtpEnable()) {
streamKey = Long.toHexString(Long.parseLong(inviteInfo.getSsrcInfo().getSsrc())).toUpperCase();
}
JSONObject jsonObject = zlmresTfulUtils.pauseRtpCheck(mediaServerItem, streamKey);
if (jsonObject == null || jsonObject.getInteger("code") != 0) { if (jsonObject == null || jsonObject.getInteger("code") != 0) {
logger.warn("[暂停流] 暂停RTP接收失败： {}", jsonObject ); logger.warn("[暂停流] 暂停RTP接收失败： {}", jsonObject );
throw new ServiceException("暂停RTP接收失败"); throw new ServiceException("暂停RTP接收失败");
@ -1009,8 +1012,11 @@ public class PlayServiceImpl implements IPlayService {
// zlm 暂停RTP超时检查 // zlm 暂停RTP超时检查
// 使用zlm中的流ID // 使用zlm中的流ID
String ssrc = Long.toHexString(Long.parseLong(ssrcTransaction.getSsrc())).toUpperCase(); String streamKey = inviteInfo.getStream();
JSONObject jsonObject = zlmresTfulUtils.resumeRtpCheck(mediaServerItem, ssrc); if (!mediaServerItem.isRtpEnable()) {
streamKey = Long.toHexString(Long.parseLong(inviteInfo.getSsrcInfo().getSsrc())).toUpperCase();
}
JSONObject jsonObject = zlmresTfulUtils.resumeRtpCheck(mediaServerItem, streamKey);
if (jsonObject == null || jsonObject.getInteger("code") != 0) { if (jsonObject == null || jsonObject.getInteger("code") != 0) {
logger.info("[暂停RTP超时检查] 失败：" + jsonObject); logger.info("[暂停RTP超时检查] 失败：" + jsonObject);
throw new ServiceException("继续RTP接收失败"); throw new ServiceException("继续RTP接收失败");