guzijian / wvp-GB28181-pro · Commits

Commit db493e262566c2ed2ac046e6f610b2da6cf61682

Authored by fine
Committed by GitHub
1 parent 8874c90d

修复单端口下历史回放暂停和恢复发送的流ID与zlm不一致

Inline Side-by-side
Showing 1 changed file with 6 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
  View file @db493e2
@@ -954,7 +954,9 @@ public class PlayServiceImpl implements IPlayService { @@ -954,7 +954,9 @@ public class PlayServiceImpl implements IPlayService {
954 throw new ServiceException("mediaServer不存在"); 954 throw new ServiceException("mediaServer不存在");
955 } 955 }
956 // zlm 暂停RTP超时检查 956 // zlm 暂停RTP超时检查
957 - JSONObject jsonObject = zlmresTfulUtils.pauseRtpCheck(mediaServerItem, streamId); 957 + // 使用zlm中的流ID
  958 + String ssrc = Long.toHexString(Long.parseLong(ssrcTransaction.getSsrc())).toUpperCase();
  959 + JSONObject jsonObject = zlmresTfulUtils.pauseRtpCheck(mediaServerItem, ssrc);
958 if (jsonObject == null || jsonObject.getInteger("code") != 0) { 960 if (jsonObject == null || jsonObject.getInteger("code") != 0) {
959 throw new ServiceException("暂停RTP接收失败"); 961 throw new ServiceException("暂停RTP接收失败");
960 } 962 }
@@ -977,7 +979,9 @@ public class PlayServiceImpl implements IPlayService { @@ -977,7 +979,9 @@ public class PlayServiceImpl implements IPlayService {
977 throw new ServiceException("mediaServer不存在"); 979 throw new ServiceException("mediaServer不存在");
978 } 980 }
979 // zlm 暂停RTP超时检查 981 // zlm 暂停RTP超时检查
980 - JSONObject jsonObject = zlmresTfulUtils.resumeRtpCheck(mediaServerItem, streamId); 982 + // 使用zlm中的流ID
  983 + String ssrc = Long.toHexString(Long.parseLong(ssrcTransaction.getSsrc())).toUpperCase();
  984 + JSONObject jsonObject = zlmresTfulUtils.resumeRtpCheck(mediaServerItem, ssrc);
981 if (jsonObject == null || jsonObject.getInteger("code") != 0) { 985 if (jsonObject == null || jsonObject.getInteger("code") != 0) {
982 throw new ServiceException("继续RTP接收失败"); 986 throw new ServiceException("继续RTP接收失败");
983 } 987 }