guzijian / wvp-GB28181-pro · Commits

Commit f2f70fce980a961e11a7d521403089473a9d282b

Authored by 648540858
1 parent 562dbb08

修复合并错误

Inline Side-by-side
Showing 3 changed files with 2 additions and 3 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
  View file @f2f70fc
... ... @@ -537,7 +537,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
537 537 } else {
538 538 sendRtpItem.setPlayType(InviteStreamType.PLAY);
539 539 String streamId = String.format("%s_%s", device.getDeviceId(), channelId);
540   - sendRtpItem.setStreamId(streamId);
  540 + sendRtpItem.setStream(streamId);
541 541 redisCatchStorage.updateSendRTPSever(sendRtpItem);
542 542 SSRCInfo ssrcInfo = playService.play(mediaServerItem, device.getDeviceId(), channelId, ssrc, ((code, msg, data) -> {
543 543 if (code == InviteErrorCode.SUCCESS.getCode()) {
... ...
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @f2f70fc
... ... @@ -380,7 +380,6 @@ public class ZLMHttpHookListener {
380 380 redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
381 381 }
382 382 }
383   -
384 383 if ("rtsp".equals(param.getSchema())) {
385 384 logger.info("流变化：注册->{}, app->{}, stream->{}", param.isRegist(), param.getApp(), param.getStream());
386 385 if (param.isRegist()) {
... ...
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
  View file @f2f70fc
... ... @@ -79,7 +79,7 @@ public class RedisPushStreamCloseResponseListener implements MessageListener {
79 79 for (SendRtpItem sendRtpItem : sendRtpItems) {
80 80 ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());
81 81 if (parentPlatform != null) {
82   - redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), sendRtpItem.getCallId(), sendRtpItem.getStreamId());
  82 + redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), sendRtpItem.getCallId(), sendRtpItem.getStream());
83 83 try {
84 84 commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem);
85 85 } catch (SipException | InvalidArgumentException | ParseException e) {
... ...