调整上级观看消息的发送

648540858

2024-05-29 764d04b497356ba6bcbb75fd42b51eca750f7223

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java

@@ -13,7 +13,6 @@
import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
@@ -108,18 +107,16 @@
         if (!userSetting.getServerId().equals(sendRtpItem.getServerId())) {
            WVPResult wvpResult = redisRpcService.startSendRtp(sendRtpItem.getRedisKey(), sendRtpItem);
            if (wvpResult.getCode() == 0) {
                    RequestPushStreamMsg requestPushStreamMsg = RequestPushStreamMsg.getInstance(sendRtpItem);
                    redisGbPlayMsgListener.sendMsgForStartSendRtpStream(sendRtpItem.getServerId(), requestPushStreamMsg, () -> {
                        playService.startSendRtpStreamFailHand(sendRtpItem, parentPlatform, callIdHeader);
                    });
               redisCatchStorage.sendPlatformStartPlayMsg(sendRtpItem, parentPlatform);
            }
         } else {
            try {
               if (sendRtpItem.isTcpActive()) {
                  mediaServerService.startSendRtpPassive(mediaInfo, parentPlatform, sendRtpItem, null);
                  mediaServerService.startSendRtpPassive(mediaInfo,sendRtpItem, null);
               } else {
                  mediaServerService.startSendRtp(mediaInfo, parentPlatform, sendRtpItem);
                  mediaServerService.startSendRtp(mediaInfo, sendRtpItem);
               }
               redisCatchStorage.sendPlatformStartPlayMsg(sendRtpItem, parentPlatform);
            }catch (ControllerException e) {
               logger.error("RTP推流失败: {}", e.getMessage());
               playService.startSendRtpStreamFailHand(sendRtpItem, parentPlatform, callIdHeader);
@@ -141,9 +138,9 @@
         }
         try {
            if (sendRtpItem.isTcpActive()) {
               mediaServerService.startSendRtpPassive(mediaInfo, null, sendRtpItem, null);
               mediaServerService.startSendRtpPassive(mediaInfo, sendRtpItem, null);
            } else {
               mediaServerService.startSendRtp(mediaInfo, null, sendRtpItem);
               mediaServerService.startSendRtp(mediaInfo, sendRtpItem);
            }
         }catch (ControllerException e) {
            logger.error("RTP推流失败: {}", e.getMessage());