Merge branch 'refs/heads/master' into develop-add-api-key

leesam

2024-04-10 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd

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

@@ -3,6 +3,9 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.AudioBroadcastCatch;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
@@ -10,10 +13,10 @@
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.bean.RequestPushStreamMsg;
import com.genersoft.iot.vmp.service.redisMsg.RedisGbPlayMsgListener;
@@ -25,12 +28,15 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
import javax.sip.SipException;
import javax.sip.address.SipURI;
import javax.sip.header.CallIdHeader;
import javax.sip.header.FromHeader;
import javax.sip.header.HeaderAddress;
import javax.sip.header.ToHeader;
import java.text.ParseException;
import java.util.HashMap;
import java.util.Map;

@@ -69,7 +75,7 @@
   private ZLMServerFactory zlmServerFactory;

   @Autowired
   private ZlmHttpHookSubscribe hookSubscribe;
   private HookSubscribe hookSubscribe;

   @Autowired
   private IMediaServerService mediaServerService;
@@ -104,7 +110,7 @@
         logger.info("收到ACK，rtp/{} TCP主动方式后续处理", sendRtpItem.getStream());
         return;
      }
      MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
      MediaServer mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
      logger.info("收到ACK，rtp/{}开始向上级推流, 目标={}:{}，SSRC={}, 协议:{}",
            sendRtpItem.getStream(),
            sendRtpItem.getIp(),
@@ -115,19 +121,24 @@
      ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(fromUserId);

      if (parentPlatform != null) {
         Map<String, Object> param = getSendRtpParam(sendRtpItem);
         if (!userSetting.getServerId().equals(sendRtpItem.getServerId())) {
            RequestPushStreamMsg requestPushStreamMsg = RequestPushStreamMsg.getInstance(
                  sendRtpItem.getMediaServerId(), sendRtpItem.getApp(), sendRtpItem.getStream(),
                  sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isTcp(),
                  sendRtpItem.getLocalPort(), sendRtpItem.getPt(), sendRtpItem.isUsePs(), sendRtpItem.isOnlyAudio());
            redisGbPlayMsgListener.sendMsgForStartSendRtpStream(sendRtpItem.getServerId(), requestPushStreamMsg, json -> {
               playService.startSendRtpStreamHand(sendRtpItem, parentPlatform, json, param, callIdHeader);
               playService.startSendRtpStreamFailHand(sendRtpItem, parentPlatform, callIdHeader);
            });
         } else {
            JSONObject startSendRtpStreamResult = sendRtp(sendRtpItem, mediaInfo, param);
            if (startSendRtpStreamResult != null) {
               playService.startSendRtpStreamHand(sendRtpItem, parentPlatform, startSendRtpStreamResult, param, callIdHeader);
            try {
               if (sendRtpItem.isTcpActive()) {
                  mediaServerService.startSendRtpPassive(mediaInfo, parentPlatform, sendRtpItem, null);
               } else {
                  mediaServerService.startSendRtpStream(mediaInfo, parentPlatform, sendRtpItem);
               }
            }catch (ControllerException e) {
               logger.error("RTP推流失败: {}", e.getMessage());
               playService.startSendRtpStreamFailHand(sendRtpItem, parentPlatform, callIdHeader);
            }
         }
      }else {
@@ -144,56 +155,17 @@
            logger.warn("[收到ACK]：来自{}，目标为({})的推流信息为找到流体服务[{}]信息",fromUserId, toUserId, sendRtpItem.getMediaServerId());
            return;
         }
         Map<String, Object> param = getSendRtpParam(sendRtpItem);
         JSONObject startSendRtpStreamResult = sendRtp(sendRtpItem, mediaInfo, param);
         if (startSendRtpStreamResult != null) {
            playService.startSendRtpStreamHand(sendRtpItem, device, startSendRtpStreamResult, param, callIdHeader);
         try {
            if (sendRtpItem.isTcpActive()) {
               mediaServerService.startSendRtpPassive(mediaInfo, null, sendRtpItem, null);
            } else {
               mediaServerService.startSendRtpStream(mediaInfo, null, sendRtpItem);
            }
         }catch (ControllerException e) {
            logger.error("RTP推流失败: {}", e.getMessage());
            playService.startSendRtpStreamFailHand(sendRtpItem, null, callIdHeader);
         }
      }
   }

   private Map<String, Object> getSendRtpParam(SendRtpItem sendRtpItem) {
      String isUdp = sendRtpItem.isTcp() ? "0" : "1";
      Map<String, Object> param = new HashMap<>(12);
      param.put("vhost","__defaultVhost__");
      param.put("app",sendRtpItem.getApp());
      param.put("stream",sendRtpItem.getStream());
      param.put("ssrc", sendRtpItem.getSsrc());
      param.put("dst_url",sendRtpItem.getIp());
      param.put("dst_port", sendRtpItem.getPort());
      param.put("src_port", sendRtpItem.getLocalPort());
      param.put("pt", sendRtpItem.getPt());
      param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
      param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
      param.put("is_udp", isUdp);
      if (!sendRtpItem.isTcp()) {
         // udp模式下开启rtcp保活
         param.put("udp_rtcp_timeout", sendRtpItem.isRtcp()? "1":"0");
      }
      return param;
   }

   private JSONObject sendRtp(SendRtpItem sendRtpItem, MediaServerItem mediaInfo, Map<String, Object> param){
      JSONObject startSendRtpStreamResult = null;
      if (sendRtpItem.getLocalPort() != 0) {
         if (sendRtpItem.isTcpActive()) {
            startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
         }else {
            param.put("dst_url", sendRtpItem.getIp());
            param.put("dst_port", sendRtpItem.getPort());
            startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
         }
      }else {
         if (sendRtpItem.isTcpActive()) {
            startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
         }else {
            param.put("dst_url", sendRtpItem.getIp());
            param.put("dst_port", sendRtpItem.getPort());
            startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
         }
      }
      return startSendRtpStreamResult;

   }

}