Merge branch 'main' into main2

648540858

2023-02-10 ec95a429859e2819772231e70dcd80cb976c81d2

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -19,6 +19,7 @@
import com.genersoft.iot.vmp.service.*;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import com.genersoft.iot.vmp.vmanager.bean.StreamContent;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

@@ -287,15 +288,19 @@
         logger.info("[ZLM HOOK] 流注销, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());

      }



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");



      JSONObject json = (JSONObject) JSON.toJSON(param);

      MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());

      if (mediaInfo == null) {

         return ret;

      }

      taskExecutor.execute(()-> {

         ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);

         if (subscribe != null) {

            MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());

            if (mediaInfo != null) {

               subscribe.response(mediaInfo, json);

            }

         if (subscribe != null ) {

            subscribe.response(mediaInfo, json);

         }

         // 流消失移除redis play

         List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();

@@ -319,7 +324,7 @@
      });



      if ("rtsp".equals(param.getSchema())){

         logger.info("on_stream_changed：注册->{}, app->{}, stream->{}", param.isRegist(), param.getApp(), param.getStream());

         logger.info("流变化：注册->{}, app->{}, stream->{}", param.isRegist(), param.getApp(), param.getStream());

         if (param.isRegist()) {

            mediaServerService.addCount(param.getMediaServerId());

         }else {

@@ -351,61 +356,44 @@
                  String channelId = streamArray[1];

                  Device device = deviceService.getDevice(deviceId);

                  if (device != null) {

                     DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);

                     if (deviceChannel != null) {

                     if (param.isRegist()) {

                        if (audioBroadcastManager.exit(deviceId, channelId)) {

                           // 直接推流

                           SendRtpItem sendRtpItem =  redisCatchStorage.querySendRTPServer(null, null, param.getStream(), null);

                           if (sendRtpItem == null) {

                              // TODO 可能数据错误，重新开启语音通道

                           }else {

                              String is_Udp = sendRtpItem.isTcp() ? "0" : "1";

                              MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());

                              logger.info("rtp/{}开始向上级推流, 目标={}:{}，SSRC={}", sendRtpItem.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc());

                              Map<String, Object> sendParam = new HashMap<>(12);

                              sendParam.put("vhost","__defaultVhost__");

                              sendParam.put("app",sendRtpItem.getApp());

                              sendParam.put("stream",sendRtpItem.getStreamId());

                              sendParam.put("ssrc", sendRtpItem.getSsrc());

                              sendParam.put("src_port", sendRtpItem.getLocalPort());

                              sendParam.put("pt", sendRtpItem.getPt());

                              sendParam.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");

                              sendParam.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");



                              JSONObject jsonObject;

                              if (sendRtpItem.isTcpActive()) {

                                 jsonObject = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, sendParam);

                              } else {

                                 sendParam.put("is_udp", is_Udp);

                                 sendParam.put("dst_url", sendRtpItem.getIp());

                                 sendParam.put("dst_port", sendRtpItem.getPort());

                                 jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaInfo, sendParam);

                              }

                              if (jsonObject != null && jsonObject.getInteger("code") == 0) {

                                 logger.info("[语音对讲] 自动推流成功, device: {}, channel: {}", deviceId, channelId);

                              JSONObject jsonObject = zlmrtpServerFactory.startSendRtp(mediaInfo, sendRtpItem);

                              if (jsonObject != null && jsonObject.getInteger("code") == 0 ) {

                                 logger.info("[语音喊话] 自动推流成功, device: {}, channel: {}", device.getDeviceId(), channelId);

                              }else {

                                 logger.info("[语音对讲] 推流失败, 结果： {}", jsonObject);

                                 logger.info("[语音喊话] 推流失败, 结果： {}", jsonObject);

                              }



                           }

                        }else {

                           // 开启语音对讲通道

                           // 开启语音喊话通道

                           try {

                              playService.audioBroadcastCmd(device, channelId, 60, (msg)->{

                                 logger.info("[语音对讲] 通道建立成功, device: {}, channel: {}", deviceId, channelId);

                              playService.audioBroadcastCmd(device, channelId, mediaInfo, param.getApp(), param.getStream(),60, false, (msg)->{

                                 logger.info("[语音喊话] 通道建立成功, device: {}, channel: {}", deviceId, channelId);

                              });

                           } catch (InvalidArgumentException | ParseException | SipException e) {

                              logger.error("[命令发送失败] 语音对讲: {}", e.getMessage());

                              logger.error("[命令发送失败] 语音喊话: {}", e.getMessage());

                           }

                        }



                     }else {

                        // 流注销

                        playService.stopAudioBroadcast(deviceId, channelId);

                     }

                  } else{

                     logger.info("[语音对讲] 未找到设备：{}", deviceId);

                  }

               }else {

                  logger.info("[语音喊话] 推流格式有误, 格式为： broadcast/设备编号_通道编号 ");

               }

            }



         }else if ("talk".equals(param.getApp())){

            // 语音对讲推流  stream需要满足格式deviceId_channelId

            // 语音喊话推流  stream需要满足格式deviceId_channelId

            if (param.isRegist() && param.getStream().indexOf("_") > 0) {

               String[] streamArray = param.getStream().split("_");

               if (streamArray.length == 2) {

@@ -421,33 +409,11 @@
                           if (sendRtpItem == null) {

                              // TODO 可能数据错误，重新开启语音通道

                           }else {

                              MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());

                              logger.info("rtp/{}开始向上级推流, 目标={}:{}，SSRC={}", sendRtpItem.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc());

                              Map<String, Object> sendParam = new HashMap<>(12);

                              sendParam.put("vhost","__defaultVhost__");

                              sendParam.put("app",sendRtpItem.getApp());

                              sendParam.put("stream",sendRtpItem.getStreamId());

                              sendParam.put("ssrc", sendRtpItem.getSsrc());

                              sendParam.put("src_port", sendRtpItem.getLocalPort());

                              sendParam.put("pt", sendRtpItem.getPt());

                              sendParam.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");

                              sendParam.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");



                              JSONObject jsonObject;

                              if (sendRtpItem.isTcpActive()) {

                                 jsonObject = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, sendParam);

                              } else {

                                 sendParam.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");

                                 sendParam.put("dst_url", sendRtpItem.getIp());

                                 sendParam.put("dst_port", sendRtpItem.getPort());

                                 jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaInfo, sendParam);

                              }

                              if (jsonObject != null && jsonObject.getInteger("code") == 0) {

                                 logger.info("[语音对讲] 自动推流成功, device: {}, channel: {}", deviceId, channelId);

                              }

                              zlmrtpServerFactory.startSendRtp(mediaInfo, sendRtpItem);

                           }

                        }else {

                           // 开启语音对讲通道

                           // 开启语音喊话通道

                           MediaServerItem mediaServerItem = mediaServerService.getOne(param.getMediaServerId());

                           playService.talk(mediaServerItem, device, channelId, (mediaServer, jsonObject)->{

                              System.out.println("开始推流");

@@ -477,7 +443,7 @@
                        }

                        StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem,

                              param.getApp(), param.getStream(), param.getTracks(), callId);

                        param.setStreamInfo(streamInfoByAppAndStream);

                        param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));

                        redisCatchStorage.addStream(mediaServerItem, type, param.getApp(), param.getStream(), param);

                        if (param.getOriginType() == OriginType.RTSP_PUSH.ordinal()

                              || param.getOriginType() == OriginType.RTMP_PUSH.ordinal()

@@ -495,7 +461,7 @@
                        }

                        GbStream gbStream = storager.getGbStream(param.getApp(), param.getStream());

                        if (gbStream != null) {

//                        eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);

//                           eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);

                        }

                        zlmMediaListManager.removeMedia(param.getApp(), param.getStream());

                     }

@@ -549,9 +515,7 @@
         }

      }



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");



      return ret;

   }

   

@@ -566,7 +530,7 @@
      logger.info("[ZLM HOOK]流无人观看：{]->{}->{}/{}" + param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());

      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      // 录像下载

      // 国标类型的流

      if ("rtp".equals(param.getApp())){

         ret.put("close", userSetting.getStreamOnDemand());

         // 国标流， 点播/录像回放/录像下载

@@ -673,7 +637,7 @@
   @ResponseBody

   @PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")

   public JSONObject onStreamNotFound(@RequestBody OnStreamNotFoundHookParam param){

      logger.info("[ZLM HOOK] 流未找到：{}->{}->{}/{}" + param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());

      logger.info("[ZLM HOOK] 流未找到：{}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());

      taskExecutor.execute(()->{

         MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());

         if (userSetting.isAutoApplyPlay() && mediaInfo != null) {

@@ -741,7 +705,7 @@
   @PostMapping(value = "/on_send_rtp_stopped", produces = "application/json;charset=UTF-8")

   public JSONObject onSendRtpStopped(HttpServletRequest request, @RequestBody OnSendRtpStoppedHookParam param){



      logger.info("[ZLM HOOK] 发送rtp被动关闭：{}->{}/{}", param.getMediaServerId(), param.getApp(), param.getStream());

      logger.info("[ZLM HOOK] rtp发送关闭：{}->{}/{}", param.getMediaServerId(), param.getApp(), param.getStream());



      JSONObject ret = new JSONObject();

      ret.put("code", 0);