648540858
2023-02-14 d5f26faf15ec2b9fbbd5225d86297364b48876b7
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -274,12 +274,14 @@
            logger.info("[ZLM HOOK] 流注销, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
        }
      JSONObject ret = new JSONObject();
      ret.put("code", 0);
      ret.put("msg", "success");
        MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());
        JSONObject json = (JSONObject) JSON.toJSON(param);
        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);
                }
@@ -330,36 +332,36 @@
            }
         }else if ("broadcast".equals(param.getApp())){
            // 语音对讲推流  stream需要满足格式deviceId_channelId
            if (param.getStream().indexOf("_") > 0) {
               String[] streamArray = param.getStream().split("_");
               if (streamArray.length == 2) {
                  String deviceId = streamArray[0];
                  String channelId = streamArray[1];
                  Device device = deviceService.getDevice(deviceId);
                  if (device != null) {
                     if (param.isRegist()) {
                        if (audioBroadcastManager.exit(deviceId, channelId)) {
                           playService.stopAudioBroadcast(deviceId, channelId);
                        }
                        // 开启语音对讲通道
                        try {
                           playService.audioBroadcastCmd(device, channelId, 60, (msg)->{
                              logger.info("[语音对讲] 通道建立成功, device: {}, channel: {}", deviceId, channelId);
                           });
                        } catch (InvalidArgumentException | ParseException | SipException e) {
                           logger.error("[命令发送失败] 语音对讲: {}", e.getMessage());
                        }
                     }else {
                        // 流注销
                        playService.stopAudioBroadcast(deviceId, channelId);
                     }
                  } else{
                     logger.info("[语音对讲] 未找到设备:{}", deviceId);
                  }
               }
            }
                if (param.getStream().indexOf("_") > 0) {
                    String[] streamArray = param.getStream().split("_");
                    if (streamArray.length == 2) {
                        String deviceId = streamArray[0];
                        String channelId = streamArray[1];
                        Device device = deviceService.getDevice(deviceId);
                        if (device != null) {
                            if (param.isRegist()) {
                                if (audioBroadcastManager.exit(deviceId, channelId)) {
                                    playService.stopAudioBroadcast(deviceId, channelId);
                                }
                                // 开启语音对讲通道
                                try {
                                    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());
                                }
                            }else {
                                // 流注销
                                playService.stopAudioBroadcast(deviceId, channelId);
                            }
                        } else{
                            logger.info("[语音对讲] 未找到设备:{}", deviceId);
                        }
                    }
                }
         }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) {
@@ -375,33 +377,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("开始推流");