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 2024-01-03 15:12:04 +08:00
parent 96a16e94e0
commit 37fcc77c26
2 changed files with 6 additions and 5 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/PlayServiceImpl.java
View File

@ -956,6 +956,7 @@ public class PlayServiceImpl implements IPlayService {
// zlm 暂停RTP超时检查 // zlm 暂停RTP超时检查
JSONObject jsonObject = zlmresTfulUtils.pauseRtpCheck(mediaServerItem, streamId); JSONObject jsonObject = zlmresTfulUtils.pauseRtpCheck(mediaServerItem, streamId);
if (jsonObject == null || jsonObject.getInteger("code") != 0) { if (jsonObject == null || jsonObject.getInteger("code") != 0) {
logger.warn("[暂停流] 暂停RTP接收失败： {}", jsonObject );
throw new ServiceException("暂停RTP接收失败"); throw new ServiceException("暂停RTP接收失败");
} }
Device device = storager.queryVideoDevice(inviteInfo.getDeviceId()); Device device = storager.queryVideoDevice(inviteInfo.getDeviceId());
@ -976,9 +977,11 @@ public class PlayServiceImpl implements IPlayService {
logger.warn("mediaServer 不存在!"); logger.warn("mediaServer 不存在!");
throw new ServiceException("mediaServer不存在"); throw new ServiceException("mediaServer不存在");
} }
// zlm 暂停RTP超时检查 // zlm 暂停RTP超时检查
JSONObject jsonObject = zlmresTfulUtils.resumeRtpCheck(mediaServerItem, streamId); JSONObject jsonObject = zlmresTfulUtils.resumeRtpCheck(mediaServerItem, streamId);
if (jsonObject == null || jsonObject.getInteger("code") != 0) { if (jsonObject == null || jsonObject.getInteger("code") != 0) {
logger.info("[暂停RTP超时检查] 失败：" + jsonObject);
throw new ServiceException("继续RTP接收失败"); throw new ServiceException("继续RTP接收失败");
} }
Device device = storager.queryVideoDevice(inviteInfo.getDeviceId()); Device device = storager.queryVideoDevice(inviteInfo.getDeviceId());

8
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
View File

@ -145,9 +145,9 @@ public class PlaybackController {
} }
try { try {
cmder.streamByeCmd(device, channelId, stream, null); cmder.streamByeCmd(device, channelId, stream, null);
} catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) { } catch (InvalidArgumentException | ParseException | SipException e) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "发送bye失败： " + e.getMessage()); throw new ControllerException(ErrorCode.ERROR100.getCode(), "发送bye失败： " + e.getMessage());
} } catch (SsrcTransactionNotFoundException ignored) {}
} }
@ -159,9 +159,7 @@ public class PlaybackController {
try { try {
playService.pauseRtp(streamId); playService.pauseRtp(streamId);
} catch (ServiceException e) { }catch (ServiceException | InvalidArgumentException | ParseException | SipException e) {
throw new ControllerException(ErrorCode.ERROR400.getCode(), e.getMessage());
} catch (InvalidArgumentException | ParseException | SipException e) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage()); throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
} }
} }