guzijian / wvp-GB28181-pro · Commits

Commit 0c10c77a56ad8fd88d8491b55802db4e717f2f7d

Authored by 648540858
1 parent 1af6324a

优化录像路径的设置

Inline Side-by-side
Showing 3 changed files with 4 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
  View file @0c10c77
@@ -84,7 +84,7 @@ public class MediaConfig{ @@ -84,7 +84,7 @@ public class MediaConfig{
84 @Value("${media.record-day:7}") 84 @Value("${media.record-day:7}")
85 private Integer recordDay; 85 private Integer recordDay;
86 86
87 - @Value("${media.record-path}") 87 + @Value("${media.record-path:}")
88 private String recordPath; 88 private String recordPath;
89 89
90 public String getId() { 90 public String getId() {
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
  View file @0c10c77
@@ -731,6 +731,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -731,6 +731,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
731 dynamicTask.startDelay(callIdHeader.getCallId(), () -> { 731 dynamicTask.startDelay(callIdHeader.getCallId(), () -> {
732 logger.info("[ app={}, stream={} ] 等待设备开始推流超时", gbStream.getApp(), gbStream.getStream()); 732 logger.info("[ app={}, stream={} ] 等待设备开始推流超时", gbStream.getApp(), gbStream.getStream());
733 try { 733 try {
  734 + redisPushStreamResponseListener.removeEvent(gbStream.getApp(), gbStream.getStream());
734 mediaListManager.removedChannelOnlineEventLister(gbStream.getApp(), gbStream.getStream()); 735 mediaListManager.removedChannelOnlineEventLister(gbStream.getApp(), gbStream.getStream());
735 responseAck(request, Response.REQUEST_TIMEOUT); // 超时 736 responseAck(request, Response.REQUEST_TIMEOUT); // 超时
736 } catch (SipException e) { 737 } catch (SipException e) {
@@ -748,6 +749,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -748,6 +749,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
748 // 添加在本机上线的通知 749 // 添加在本机上线的通知
749 mediaListManager.addChannelOnlineEventLister(gbStream.getApp(), gbStream.getStream(), (app, stream, serverId) -> { 750 mediaListManager.addChannelOnlineEventLister(gbStream.getApp(), gbStream.getStream(), (app, stream, serverId) -> {
750 dynamicTask.stop(callIdHeader.getCallId()); 751 dynamicTask.stop(callIdHeader.getCallId());
  752 + redisPushStreamResponseListener.removeEvent(gbStream.getApp(), gbStream.getStream());
751 if (serverId.equals(userSetting.getServerId())) { 753 if (serverId.equals(userSetting.getServerId())) {
752 SendRtpItem sendRtpItem = zlmServerFactory.createSendRtpItem(mediaServerItem, addressStr, finalPort, ssrc, requesterId, 754 SendRtpItem sendRtpItem = zlmServerFactory.createSendRtpItem(mediaServerItem, addressStr, finalPort, ssrc, requesterId,
753 app, stream, channelId, mediaTransmissionTCP, platform.isRtcp()); 755 app, stream, channelId, mediaTransmissionTCP, platform.isRtcp());
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
  View file @0c10c77
@@ -591,7 +591,7 @@ public class MediaServerServiceImpl implements IMediaServerService { @@ -591,7 +591,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
591 param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-")); 591 param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
592 } 592 }
593 593
594 - if (mediaServerItem.getRecordPath() != null) { 594 + if (!ObjectUtils.isEmpty(mediaServerItem.getRecordPath())) {
595 File recordPathFile = new File(mediaServerItem.getRecordPath()); 595 File recordPathFile = new File(mediaServerItem.getRecordPath());
596 param.put("protocol.mp4_save_path", recordPathFile.getParentFile().getPath()); 596 param.put("protocol.mp4_save_path", recordPathFile.getParentFile().getPath());
597 param.put("protocol.downloadRoot", recordPathFile.getParentFile().getPath()); 597 param.put("protocol.downloadRoot", recordPathFile.getParentFile().getPath());